Commit 751473a

Browse files
Byroncodex
Byron
and
codex
committed
fix: parse actor identities without regular expressions
<!-- agent --> GHSA-g5vv-9gxw-82hx reports quadratic backtracking when an actor identity contains a long unterminated email delimiter. Add a regression that exercises a 20,000-character malformed identity, then replace both actor regexes with direct delimiter scans following Git's first-opening, first-closing delimiter behavior. Keep GitPython's whole-string fallback when either delimiter is absent. Reference Git baseline cf5497b14c5a24f10c13f7e0ee85cb95 ident.c::split_ident_line and its invalid-committer cases in t/t9300-fast-import.sh. Also reference gix-actor's signature decoder and lenient identity tests. Assisted-by: GPT 5.6 Co-authored-by: GPT 5.6 <codex@openai.com>
1 parent 9a92677 commit 751473a

3 files changed

Lines changed: 41 additions & 16 deletions

File tree

‎doc/source/changes.rst‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22
Changelog
33
=========
44

5+
3.1.60
6+
======
7+
8+
Security fixes for
9+
10+
* https://github.com/gitpython-developers/GitPython/security/advisories/GHSA-g5vv-9gxw-82hx
11+
12+
If you can, also try and provide feedback on the upcoming v4 branch
13+
https://github.com/gitpython-developers/GitPython/pull/2177 - patches welcome.
14+
15+
See the following for all changes.
16+
https://github.com/gitpython-developers/GitPython/releases/tag/3.1.60
17+
518
3.1.59
619
======
720

‎git/util.py‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -858,10 +858,6 @@ class Actor:
858858
committers and authors or anything with a name and an email as mentioned in the git
859859
log entries."""
860860

861-
# PRECOMPILED REGEX
862-
name_only_regex=re.compile(r"<(.*)>")
863-
name_email_regex=re.compile(r"(.*) <(.*?)>")
864-
865861
# ENVIRONMENT VARIABLES
866862
# These are read when creating new commits.
867863
env_author_name="GIT_AUTHOR_NAME"
@@ -906,18 +902,14 @@ def _from_string(cls, string: str) -> "Actor":
906902
:return:
907903
:class:`Actor`
908904
"""
909-
m=cls.name_email_regex.search(string)
910-
ifm:
911-
name, email=m.groups()
912-
returnActor(name, email)
913-
else:
914-
m=cls.name_only_regex.search(string)
915-
ifm:
916-
returnActor(m.group(1), None)
917-
# Assume the best and use the whole string as name.
918-
returnActor(string, None)
919-
# END special case name
920-
# END handle name/email matching
905+
line=string.partition("\n")[0]
906+
left_bracket=line.find("<")
907+
right_bracket=line.find(">", left_bracket+1)
908+
ifleft_bracket>=0andright_bracket>=0:
909+
returnActor(line[:left_bracket].rstrip(), line[left_bracket+1 : right_bracket])
910+
911+
# Assume the best and use the whole string as name.
912+
returnActor(string, None)
921913

922914
@classmethod
923915
def_main_actor(

‎test/test_actor.py‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,26 @@ def test_from_string_should_handle_just_name(self):
2727
self.assertEqual("Michael Trier", a.name)
2828
self.assertEqual(None, a.email)
2929

30+
deftest_from_string_handles_unterminated_email_without_regex_backtracking(self):
31+
value="A"*20_000+" <unterminated"
32+
actor=Actor._from_string(value)
33+
self.assertNotIn("name_email_regex", vars(Actor))
34+
self.assertEqual(actor, Actor(value, None))
35+
36+
deftest_from_string_does_not_parse_across_lines(self):
37+
self.assertEqual(Actor._from_string("x <a>\n y <b>"), Actor("x", "a"))
38+
39+
deftest_from_string_uses_git_delimiters(self):
40+
forvalue, expectedin (
41+
("Name <e<mail>", Actor("Name", "e<mail")),
42+
("Name <email>>", Actor("Name", "email")),
43+
("Name<email>", Actor("Name", "email")),
44+
(" <>", Actor("", "")),
45+
("Name <email", Actor("Name <email", None)),
46+
("Name email>", Actor("Name email>", None)),
47+
):
48+
self.assertEqual(Actor._from_string(value), expected)
49+
3050
deftest_should_display_representation(self):
3151
a=Actor._from_string("Michael Trier <mtrier@example.com>")
3252
self.assertEqual('<git.Actor "Michael Trier <mtrier@example.com>">', repr(a))

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit 751473a
Browse files
Byroncodex
Byron
and
codex
committed
fix: parse actor identities without regular expressions
<!-- agent -->
GHSA-g5vv-9gxw-82hx reports quadratic backtracking when an actor
identity contains a long unterminated email delimiter.
Add a regression that exercises a 20,000-character malformed identity,
then replace both actor regexes with direct delimiter scans following
Git's first-opening, first-closing delimiter behavior. Keep GitPython's
whole-string fallback when either delimiter is absent.
Reference Git baseline cf5497b14c5a24f10c13f7e0ee85cb95
ident.c::split_ident_line and its invalid-committer cases in
t/t9300-fast-import.sh. Also reference gix-actor's signature decoder and
lenient identity tests.
Assisted-by: GPT 5.6
Co-authored-by: GPT 5.6 <codex@openai.com>
1 parent 9a92677 commit 751473a
3 files changed
Lines changed: 41 additions & 16 deletions
File tree
‎doc/source/changes.rst‎
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22
Changelog
33
=========
44

5+
3.1.60
6+
======
7+
8+
Security fixes for
9+
10+
* https://github.com/gitpython-developers/GitPython/security/advisories/GHSA-g5vv-9gxw-82hx
11+
12+
If you can, also try and provide feedback on the upcoming v4 branch
13+
https://github.com/gitpython-developers/GitPython/pull/2177 - patches welcome.
14+
15+
See the following for all changes.
16+
https://github.com/gitpython-developers/GitPython/releases/tag/3.1.60
17+
518
3.1.59
619
======
720

‎git/util.py‎
Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -858,10 +858,6 @@ class Actor:
858858
 committers and authors or anything with a name and an email as mentioned in the git
859859
 log entries."""
860860

861-
# PRECOMPILED REGEX
862-
name_only_regex=re.compile(r"<(.*)>")
863-
name_email_regex=re.compile(r"(.*) <(.*?)>")
864-
865861
# ENVIRONMENT VARIABLES
866862
# These are read when creating new commits.
867863
env_author_name="GIT_AUTHOR_NAME"
@@ -906,18 +902,14 @@ def _from_string(cls, string: str) -> "Actor":
906902
 :return:
907903
 :class:`Actor`
908904
 """
909-
m=cls.name_email_regex.search(string)
910-
ifm:
911-
name, email=m.groups()
912-
returnActor(name, email)
913-
else:
914-
m=cls.name_only_regex.search(string)
915-
ifm:
916-
returnActor(m.group(1), None)
917-
# Assume the best and use the whole string as name.
918-
returnActor(string, None)
919-
# END special case name
920-
# END handle name/email matching
905+
line=string.partition("\n")[0]
906+
left_bracket=line.find("<")
907+
right_bracket=line.find(">", left_bracket+1)
908+
ifleft_bracket>=0andright_bracket>=0:
909+
returnActor(line[:left_bracket].rstrip(), line[left_bracket+1 : right_bracket])
910+
911+
# Assume the best and use the whole string as name.
912+
returnActor(string, None)
921913

922914
@classmethod
923915
def_main_actor(
‎test/test_actor.py‎
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,26 @@ def test_from_string_should_handle_just_name(self):
2727
self.assertEqual("Michael Trier", a.name)
2828
self.assertEqual(None, a.email)
2929

30+
deftest_from_string_handles_unterminated_email_without_regex_backtracking(self):
31+
value="A"*20_000+" <unterminated"
32+
actor=Actor._from_string(value)
33+
self.assertNotIn("name_email_regex", vars(Actor))
34+
self.assertEqual(actor, Actor(value, None))
35+
36+
deftest_from_string_does_not_parse_across_lines(self):
37+
self.assertEqual(Actor._from_string("x <a>\n y <b>"), Actor("x", "a"))
38+
39+
deftest_from_string_uses_git_delimiters(self):
40+
forvalue, expectedin (
41+
 ("Name <e<mail>", Actor("Name", "e<mail")),
42+
 ("Name <email>>", Actor("Name", "email")),
43+
 ("Name<email>", Actor("Name", "email")),
44+
 (" <>", Actor("", "")),
45+
 ("Name <email", Actor("Name <email", None)),
46+
 ("Name email>", Actor("Name email>", None)),
47+
 ):
48+
self.assertEqual(Actor._from_string(value), expected)
49+
3050
deftest_should_display_representation(self):
3151
a=Actor._from_string("Michael Trier <mtrier@example.com>")
3252
self.assertEqual('<git.Actor "Michael Trier <mtrier@example.com>">', repr(a))
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 751473a
Browse files
Byroncodex
Byron
and
codex
committed
fix: parse actor identities without regular expressions
<!-- agent -->
GHSA-g5vv-9gxw-82hx reports quadratic backtracking when an actor
identity contains a long unterminated email delimiter.
Add a regression that exercises a 20,000-character malformed identity,
then replace both actor regexes with direct delimiter scans following
Git's first-opening, first-closing delimiter behavior. Keep GitPython's
whole-string fallback when either delimiter is absent.
Reference Git baseline cf5497b14c5a24f10c13f7e0ee85cb95
ident.c::split_ident_line and its invalid-committer cases in
t/t9300-fast-import.sh. Also reference gix-actor's signature decoder and
lenient identity tests.
Assisted-by: GPT 5.6
Co-authored-by: GPT 5.6 <codex@openai.com>
1 parent 9a92677 commit 751473a
3 files changed
Lines changed: 41 additions & 16 deletions
File tree
‎doc/source/changes.rst‎
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22
Changelog
33
=========
44

5+
3.1.60
6+
======
7+
8+
Security fixes for
9+
10+
* https://github.com/gitpython-developers/GitPython/security/advisories/GHSA-g5vv-9gxw-82hx
11+
12+
If you can, also try and provide feedback on the upcoming v4 branch
13+
https://github.com/gitpython-developers/GitPython/pull/2177 - patches welcome.
14+
15+
See the following for all changes.
16+
https://github.com/gitpython-developers/GitPython/releases/tag/3.1.60
17+
518
3.1.59
619
======
720

‎git/util.py‎
Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -858,10 +858,6 @@ class Actor:
858858
 committers and authors or anything with a name and an email as mentioned in the git
859859
 log entries."""
860860

861-
# PRECOMPILED REGEX
862-
name_only_regex=re.compile(r"<(.*)>")
863-
name_email_regex=re.compile(r"(.*) <(.*?)>")
864-
865861
# ENVIRONMENT VARIABLES
866862
# These are read when creating new commits.
867863
env_author_name="GIT_AUTHOR_NAME"
@@ -906,18 +902,14 @@ def _from_string(cls, string: str) -> "Actor":
906902
 :return:
907903
 :class:`Actor`
908904
 """
909-
m=cls.name_email_regex.search(string)
910-
ifm:
911-
name, email=m.groups()
912-
returnActor(name, email)
913-
else:
914-
m=cls.name_only_regex.search(string)
915-
ifm:
916-
returnActor(m.group(1), None)
917-
# Assume the best and use the whole string as name.
918-
returnActor(string, None)
919-
# END special case name
920-
# END handle name/email matching
905+
line=string.partition("\n")[0]
906+
left_bracket=line.find("<")
907+
right_bracket=line.find(">", left_bracket+1)
908+
ifleft_bracket>=0andright_bracket>=0:
909+
returnActor(line[:left_bracket].rstrip(), line[left_bracket+1 : right_bracket])
910+
911+
# Assume the best and use the whole string as name.
912+
returnActor(string, None)
921913

922914
@classmethod
923915
def_main_actor(
‎test/test_actor.py‎
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,26 @@ def test_from_string_should_handle_just_name(self):
2727
self.assertEqual("Michael Trier", a.name)
2828
self.assertEqual(None, a.email)
2929

30+
deftest_from_string_handles_unterminated_email_without_regex_backtracking(self):
31+
value="A"*20_000+" <unterminated"
32+
actor=Actor._from_string(value)
33+
self.assertNotIn("name_email_regex", vars(Actor))
34+
self.assertEqual(actor, Actor(value, None))
35+
36+
deftest_from_string_does_not_parse_across_lines(self):
37+
self.assertEqual(Actor._from_string("x <a>\n y <b>"), Actor("x", "a"))
38+
39+
deftest_from_string_uses_git_delimiters(self):
40+
forvalue, expectedin (
41+
 ("Name <e<mail>", Actor("Name", "e<mail")),
42+
 ("Name <email>>", Actor("Name", "email")),
43+
 ("Name<email>", Actor("Name", "email")),
44+
 (" <>", Actor("", "")),
45+
 ("Name <email", Actor("Name <email", None)),
46+
 ("Name email>", Actor("Name email>", None)),
47+
 ):
48+
self.assertEqual(Actor._from_string(value), expected)
49+
3050
deftest_should_display_representation(self):
3151
a=Actor._from_string("Michael Trier <mtrier@example.com>")
3252
self.assertEqual('<git.Actor "Michael Trier <mtrier@example.com>">', repr(a))
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 751473a
Browse files
Byroncodex
Byron
and
codex
committed
fix: parse actor identities without regular expressions
<!-- agent -->
GHSA-g5vv-9gxw-82hx reports quadratic backtracking when an actor
identity contains a long unterminated email delimiter.
Add a regression that exercises a 20,000-character malformed identity,
then replace both actor regexes with direct delimiter scans following
Git's first-opening, first-closing delimiter behavior. Keep GitPython's
whole-string fallback when either delimiter is absent.
Reference Git baseline cf5497b14c5a24f10c13f7e0ee85cb95
ident.c::split_ident_line and its invalid-committer cases in
t/t9300-fast-import.sh. Also reference gix-actor's signature decoder and
lenient identity tests.
Assisted-by: GPT 5.6
Co-authored-by: GPT 5.6 <codex@openai.com>
1 parent 9a92677 commit 751473a
3 files changed
Lines changed: 41 additions & 16 deletions
File tree
‎doc/source/changes.rst‎
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22
Changelog
33
=========
44

5+
3.1.60
6+
======
7+
8+
Security fixes for
9+
10+
* https://github.com/gitpython-developers/GitPython/security/advisories/GHSA-g5vv-9gxw-82hx
11+
12+
If you can, also try and provide feedback on the upcoming v4 branch
13+
https://github.com/gitpython-developers/GitPython/pull/2177 - patches welcome.
14+
15+
See the following for all changes.
16+
https://github.com/gitpython-developers/GitPython/releases/tag/3.1.60
17+
518
3.1.59
619
======
720

‎git/util.py‎
Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -858,10 +858,6 @@ class Actor:
858858
 committers and authors or anything with a name and an email as mentioned in the git
859859
 log entries."""
860860

861-
# PRECOMPILED REGEX
862-
name_only_regex=re.compile(r"<(.*)>")
863-
name_email_regex=re.compile(r"(.*) <(.*?)>")
864-
865861
# ENVIRONMENT VARIABLES
866862
# These are read when creating new commits.
867863
env_author_name="GIT_AUTHOR_NAME"
@@ -906,18 +902,14 @@ def _from_string(cls, string: str) -> "Actor":
906902
 :return:
907903
 :class:`Actor`
908904
 """
909-
m=cls.name_email_regex.search(string)
910-
ifm:
911-
name, email=m.groups()
912-
returnActor(name, email)
913-
else:
914-
m=cls.name_only_regex.search(string)
915-
ifm:
916-
returnActor(m.group(1), None)
917-
# Assume the best and use the whole string as name.
918-
returnActor(string, None)
919-
# END special case name
920-
# END handle name/email matching
905+
line=string.partition("\n")[0]
906+
left_bracket=line.find("<")
907+
right_bracket=line.find(">", left_bracket+1)
908+
ifleft_bracket>=0andright_bracket>=0:
909+
returnActor(line[:left_bracket].rstrip(), line[left_bracket+1 : right_bracket])
910+
911+
# Assume the best and use the whole string as name.
912+
returnActor(string, None)
921913

922914
@classmethod
923915
def_main_actor(
‎test/test_actor.py‎
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,26 @@ def test_from_string_should_handle_just_name(self):
2727
self.assertEqual("Michael Trier", a.name)
2828
self.assertEqual(None, a.email)
2929

30+
deftest_from_string_handles_unterminated_email_without_regex_backtracking(self):
31+
value="A"*20_000+" <unterminated"
32+
actor=Actor._from_string(value)
33+
self.assertNotIn("name_email_regex", vars(Actor))
34+
self.assertEqual(actor, Actor(value, None))
35+
36+
deftest_from_string_does_not_parse_across_lines(self):
37+
self.assertEqual(Actor._from_string("x <a>\n y <b>"), Actor("x", "a"))
38+
39+
deftest_from_string_uses_git_delimiters(self):
40+
forvalue, expectedin (
41+
 ("Name <e<mail>", Actor("Name", "e<mail")),
42+
 ("Name <email>>", Actor("Name", "email")),
43+
 ("Name<email>", Actor("Name", "email")),
44+
 (" <>", Actor("", "")),
45+
 ("Name <email", Actor("Name <email", None)),
46+
 ("Name email>", Actor("Name email>", None)),
47+
 ):
48+
self.assertEqual(Actor._from_string(value), expected)
49+
3050
deftest_should_display_representation(self):
3151
a=Actor._from_string("Michael Trier <mtrier@example.com>")
3252
self.assertEqual('<git.Actor "Michael Trier <mtrier@example.com>">', repr(a))
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit 751473a
Browse files
Byroncodex
Byron
and
codex
committed
fix: parse actor identities without regular expressions
<!-- agent -->
GHSA-g5vv-9gxw-82hx reports quadratic backtracking when an actor
identity contains a long unterminated email delimiter.
Add a regression that exercises a 20,000-character malformed identity,
then replace both actor regexes with direct delimiter scans following
Git's first-opening, first-closing delimiter behavior. Keep GitPython's
whole-string fallback when either delimiter is absent.
Reference Git baseline cf5497b14c5a24f10c13f7e0ee85cb95
ident.c::split_ident_line and its invalid-committer cases in
t/t9300-fast-import.sh. Also reference gix-actor's signature decoder and
lenient identity tests.
Assisted-by: GPT 5.6
Co-authored-by: GPT 5.6 <codex@openai.com>
1 parent 9a92677 commit 751473a
3 files changed
Lines changed: 41 additions & 16 deletions
File tree
‎doc/source/changes.rst‎
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22
Changelog
33
=========
44

5+
3.1.60
6+
======
7+
8+
Security fixes for
9+
10+
* https://github.com/gitpython-developers/GitPython/security/advisories/GHSA-g5vv-9gxw-82hx
11+
12+
If you can, also try and provide feedback on the upcoming v4 branch
13+
https://github.com/gitpython-developers/GitPython/pull/2177 - patches welcome.
14+
15+
See the following for all changes.
16+
https://github.com/gitpython-developers/GitPython/releases/tag/3.1.60
17+
518
3.1.59
619
======
720

‎git/util.py‎
Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -858,10 +858,6 @@ class Actor:
858858
 committers and authors or anything with a name and an email as mentioned in the git
859859
 log entries."""
860860

861-
# PRECOMPILED REGEX
862-
name_only_regex=re.compile(r"<(.*)>")
863-
name_email_regex=re.compile(r"(.*) <(.*?)>")
864-
865861
# ENVIRONMENT VARIABLES
866862
# These are read when creating new commits.
867863
env_author_name="GIT_AUTHOR_NAME"
@@ -906,18 +902,14 @@ def _from_string(cls, string: str) -> "Actor":
906902
 :return:
907903
 :class:`Actor`
908904
 """
909-
m=cls.name_email_regex.search(string)
910-
ifm:
911-
name, email=m.groups()
912-
returnActor(name, email)
913-
else:
914-
m=cls.name_only_regex.search(string)
915-
ifm:
916-
returnActor(m.group(1), None)
917-
# Assume the best and use the whole string as name.
918-
returnActor(string, None)
919-
# END special case name
920-
# END handle name/email matching
905+
line=string.partition("\n")[0]
906+
left_bracket=line.find("<")
907+
right_bracket=line.find(">", left_bracket+1)
908+
ifleft_bracket>=0andright_bracket>=0:
909+
returnActor(line[:left_bracket].rstrip(), line[left_bracket+1 : right_bracket])
910+
911+
# Assume the best and use the whole string as name.
912+
returnActor(string, None)
921913

922914
@classmethod
923915
def_main_actor(
‎test/test_actor.py‎
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,26 @@ def test_from_string_should_handle_just_name(self):
2727
self.assertEqual("Michael Trier", a.name)
2828
self.assertEqual(None, a.email)
2929

30+
deftest_from_string_handles_unterminated_email_without_regex_backtracking(self):
31+
value="A"*20_000+" <unterminated"
32+
actor=Actor._from_string(value)
33+
self.assertNotIn("name_email_regex", vars(Actor))
34+
self.assertEqual(actor, Actor(value, None))
35+
36+
deftest_from_string_does_not_parse_across_lines(self):
37+
self.assertEqual(Actor._from_string("x <a>\n y <b>"), Actor("x", "a"))
38+
39+
deftest_from_string_uses_git_delimiters(self):
40+
forvalue, expectedin (
41+
 ("Name <e<mail>", Actor("Name", "e<mail")),
42+
 ("Name <email>>", Actor("Name", "email")),
43+
 ("Name<email>", Actor("Name", "email")),
44+
 (" <>", Actor("", "")),
45+
 ("Name <email", Actor("Name <email", None)),
46+
 ("Name email>", Actor("Name email>", None)),
47+
 ):
48+
self.assertEqual(Actor._from_string(value), expected)
49+
3050
deftest_should_display_representation(self):
3151
a=Actor._from_string("Michael Trier <mtrier@example.com>")
3252
self.assertEqual('<git.Actor "Michael Trier <mtrier@example.com>">', repr(a))
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 751473a
Browse files
Byroncodex
Byron
and
codex
committed
fix: parse actor identities without regular expressions
<!-- agent -->
GHSA-g5vv-9gxw-82hx reports quadratic backtracking when an actor
identity contains a long unterminated email delimiter.
Add a regression that exercises a 20,000-character malformed identity,
then replace both actor regexes with direct delimiter scans following
Git's first-opening, first-closing delimiter behavior. Keep GitPython's
whole-string fallback when either delimiter is absent.
Reference Git baseline cf5497b14c5a24f10c13f7e0ee85cb95
ident.c::split_ident_line and its invalid-committer cases in
t/t9300-fast-import.sh. Also reference gix-actor's signature decoder and
lenient identity tests.
Assisted-by: GPT 5.6
Co-authored-by: GPT 5.6 <codex@openai.com>
1 parent 9a92677 commit 751473a
3 files changed
Lines changed: 41 additions & 16 deletions
File tree
‎doc/source/changes.rst‎
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22
Changelog
33
=========
44

5+
3.1.60
6+
======
7+
8+
Security fixes for
9+
10+
* https://github.com/gitpython-developers/GitPython/security/advisories/GHSA-g5vv-9gxw-82hx
11+
12+
If you can, also try and provide feedback on the upcoming v4 branch
13+
https://github.com/gitpython-developers/GitPython/pull/2177 - patches welcome.
14+
15+
See the following for all changes.
16+
https://github.com/gitpython-developers/GitPython/releases/tag/3.1.60
17+
518
3.1.59
619
======
720

‎git/util.py‎
Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -858,10 +858,6 @@ class Actor:
858858
 committers and authors or anything with a name and an email as mentioned in the git
859859
 log entries."""
860860

861-
# PRECOMPILED REGEX
862-
name_only_regex=re.compile(r"<(.*)>")
863-
name_email_regex=re.compile(r"(.*) <(.*?)>")
864-
865861
# ENVIRONMENT VARIABLES
866862
# These are read when creating new commits.
867863
env_author_name="GIT_AUTHOR_NAME"
@@ -906,18 +902,14 @@ def _from_string(cls, string: str) -> "Actor":
906902
 :return:
907903
 :class:`Actor`
908904
 """
909-
m=cls.name_email_regex.search(string)
910-
ifm:
911-
name, email=m.groups()
912-
returnActor(name, email)
913-
else:
914-
m=cls.name_only_regex.search(string)
915-
ifm:
916-
returnActor(m.group(1), None)
917-
# Assume the best and use the whole string as name.
918-
returnActor(string, None)
919-
# END special case name
920-
# END handle name/email matching
905+
line=string.partition("\n")[0]
906+
left_bracket=line.find("<")
907+
right_bracket=line.find(">", left_bracket+1)
908+
ifleft_bracket>=0andright_bracket>=0:
909+
returnActor(line[:left_bracket].rstrip(), line[left_bracket+1 : right_bracket])
910+
911+
# Assume the best and use the whole string as name.
912+
returnActor(string, None)
921913

922914
@classmethod
923915
def_main_actor(
‎test/test_actor.py‎
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,26 @@ def test_from_string_should_handle_just_name(self):
2727
self.assertEqual("Michael Trier", a.name)
2828
self.assertEqual(None, a.email)
2929

30+
deftest_from_string_handles_unterminated_email_without_regex_backtracking(self):
31+
value="A"*20_000+" <unterminated"
32+
actor=Actor._from_string(value)
33+
self.assertNotIn("name_email_regex", vars(Actor))
34+
self.assertEqual(actor, Actor(value, None))
35+
36+
deftest_from_string_does_not_parse_across_lines(self):
37+
self.assertEqual(Actor._from_string("x <a>\n y <b>"), Actor("x", "a"))
38+
39+
deftest_from_string_uses_git_delimiters(self):
40+
forvalue, expectedin (
41+
 ("Name <e<mail>", Actor("Name", "e<mail")),
42+
 ("Name <email>>", Actor("Name", "email")),
43+
 ("Name<email>", Actor("Name", "email")),
44+
 (" <>", Actor("", "")),
45+
 ("Name <email", Actor("Name <email", None)),
46+
 ("Name email>", Actor("Name email>", None)),
47+
 ):
48+
self.assertEqual(Actor._from_string(value), expected)
49+
3050
deftest_should_display_representation(self):
3151
a=Actor._from_string("Michael Trier <mtrier@example.com>")
3252
self.assertEqual('<git.Actor "Michael Trier <mtrier@example.com>">', repr(a))
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 751473a
Browse files
Byroncodex
Byron
and
codex
committed
fix: parse actor identities without regular expressions
<!-- agent -->
GHSA-g5vv-9gxw-82hx reports quadratic backtracking when an actor
identity contains a long unterminated email delimiter.
Add a regression that exercises a 20,000-character malformed identity,
then replace both actor regexes with direct delimiter scans following
Git's first-opening, first-closing delimiter behavior. Keep GitPython's
whole-string fallback when either delimiter is absent.
Reference Git baseline cf5497b14c5a24f10c13f7e0ee85cb95
ident.c::split_ident_line and its invalid-committer cases in
t/t9300-fast-import.sh. Also reference gix-actor's signature decoder and
lenient identity tests.
Assisted-by: GPT 5.6
Co-authored-by: GPT 5.6 <codex@openai.com>
1 parent 9a92677 commit 751473a
3 files changed
Lines changed: 41 additions & 16 deletions
File tree
‎doc/source/changes.rst‎
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22
Changelog
33
=========
44

5+
3.1.60
6+
======
7+
8+
Security fixes for
9+
10+
* https://github.com/gitpython-developers/GitPython/security/advisories/GHSA-g5vv-9gxw-82hx
11+
12+
If you can, also try and provide feedback on the upcoming v4 branch
13+
https://github.com/gitpython-developers/GitPython/pull/2177 - patches welcome.
14+
15+
See the following for all changes.
16+
https://github.com/gitpython-developers/GitPython/releases/tag/3.1.60
17+
518
3.1.59
619
======
720

‎git/util.py‎
Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -858,10 +858,6 @@ class Actor:
858858
 committers and authors or anything with a name and an email as mentioned in the git
859859
 log entries."""
860860

861-
# PRECOMPILED REGEX
862-
name_only_regex=re.compile(r"<(.*)>")
863-
name_email_regex=re.compile(r"(.*) <(.*?)>")
864-
865861
# ENVIRONMENT VARIABLES
866862
# These are read when creating new commits.
867863
env_author_name="GIT_AUTHOR_NAME"
@@ -906,18 +902,14 @@ def _from_string(cls, string: str) -> "Actor":
906902
 :return:
907903
 :class:`Actor`
908904
 """
909-
m=cls.name_email_regex.search(string)
910-
ifm:
911-
name, email=m.groups()
912-
returnActor(name, email)
913-
else:
914-
m=cls.name_only_regex.search(string)
915-
ifm:
916-
returnActor(m.group(1), None)
917-
# Assume the best and use the whole string as name.
918-
returnActor(string, None)
919-
# END special case name
920-
# END handle name/email matching
905+
line=string.partition("\n")[0]
906+
left_bracket=line.find("<")
907+
right_bracket=line.find(">", left_bracket+1)
908+
ifleft_bracket>=0andright_bracket>=0:
909+
returnActor(line[:left_bracket].rstrip(), line[left_bracket+1 : right_bracket])
910+
911+
# Assume the best and use the whole string as name.
912+
returnActor(string, None)
921913

922914
@classmethod
923915
def_main_actor(
‎test/test_actor.py‎
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,26 @@ def test_from_string_should_handle_just_name(self):
2727
self.assertEqual("Michael Trier", a.name)
2828
self.assertEqual(None, a.email)
2929

30+
deftest_from_string_handles_unterminated_email_without_regex_backtracking(self):
31+
value="A"*20_000+" <unterminated"
32+
actor=Actor._from_string(value)
33+
self.assertNotIn("name_email_regex", vars(Actor))
34+
self.assertEqual(actor, Actor(value, None))
35+
36+
deftest_from_string_does_not_parse_across_lines(self):
37+
self.assertEqual(Actor._from_string("x <a>\n y <b>"), Actor("x", "a"))
38+
39+
deftest_from_string_uses_git_delimiters(self):
40+
forvalue, expectedin (
41+
 ("Name <e<mail>", Actor("Name", "e<mail")),
42+
 ("Name <email>>", Actor("Name", "email")),
43+
 ("Name<email>", Actor("Name", "email")),
44+
 (" <>", Actor("", "")),
45+
 ("Name <email", Actor("Name <email", None)),
46+
 ("Name email>", Actor("Name email>", None)),
47+
 ):
48+
self.assertEqual(Actor._from_string(value), expected)
49+
3050
deftest_should_display_representation(self):
3151
a=Actor._from_string("Michael Trier <mtrier@example.com>")
3252
self.assertEqual('<git.Actor "Michael Trier <mtrier@example.com>">', repr(a))
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit 751473a
Browse files
Byroncodex
Byron
and
codex
committed
fix: parse actor identities without regular expressions
<!-- agent -->
GHSA-g5vv-9gxw-82hx reports quadratic backtracking when an actor
identity contains a long unterminated email delimiter.
Add a regression that exercises a 20,000-character malformed identity,
then replace both actor regexes with direct delimiter scans following
Git's first-opening, first-closing delimiter behavior. Keep GitPython's
whole-string fallback when either delimiter is absent.
Reference Git baseline cf5497b14c5a24f10c13f7e0ee85cb95
ident.c::split_ident_line and its invalid-committer cases in
t/t9300-fast-import.sh. Also reference gix-actor's signature decoder and
lenient identity tests.
Assisted-by: GPT 5.6
Co-authored-by: GPT 5.6 <codex@openai.com>
1 parent 9a92677 commit 751473a
3 files changed
Lines changed: 41 additions & 16 deletions
File tree
‎doc/source/changes.rst‎
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22
Changelog
33
=========
44

5+
3.1.60
6+
======
7+
8+
Security fixes for
9+
10+
* https://github.com/gitpython-developers/GitPython/security/advisories/GHSA-g5vv-9gxw-82hx
11+
12+
If you can, also try and provide feedback on the upcoming v4 branch
13+
https://github.com/gitpython-developers/GitPython/pull/2177 - patches welcome.
14+
15+
See the following for all changes.
16+
https://github.com/gitpython-developers/GitPython/releases/tag/3.1.60
17+
518
3.1.59
619
======
720

‎git/util.py‎
Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -858,10 +858,6 @@ class Actor:
858858
 committers and authors or anything with a name and an email as mentioned in the git
859859
 log entries."""
860860

861-
# PRECOMPILED REGEX
862-
name_only_regex=re.compile(r"<(.*)>")
863-
name_email_regex=re.compile(r"(.*) <(.*?)>")
864-
865861
# ENVIRONMENT VARIABLES
866862
# These are read when creating new commits.
867863
env_author_name="GIT_AUTHOR_NAME"
@@ -906,18 +902,14 @@ def _from_string(cls, string: str) -> "Actor":
906902
 :return:
907903
 :class:`Actor`
908904
 """
909-
m=cls.name_email_regex.search(string)
910-
ifm:
911-
name, email=m.groups()
912-
returnActor(name, email)
913-
else:
914-
m=cls.name_only_regex.search(string)
915-
ifm:
916-
returnActor(m.group(1), None)
917-
# Assume the best and use the whole string as name.
918-
returnActor(string, None)
919-
# END special case name
920-
# END handle name/email matching
905+
line=string.partition("\n")[0]
906+
left_bracket=line.find("<")
907+
right_bracket=line.find(">", left_bracket+1)
908+
ifleft_bracket>=0andright_bracket>=0:
909+
returnActor(line[:left_bracket].rstrip(), line[left_bracket+1 : right_bracket])
910+
911+
# Assume the best and use the whole string as name.
912+
returnActor(string, None)
921913

922914
@classmethod
923915
def_main_actor(
‎test/test_actor.py‎
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,26 @@ def test_from_string_should_handle_just_name(self):
2727
self.assertEqual("Michael Trier", a.name)
2828
self.assertEqual(None, a.email)
2929

30+
deftest_from_string_handles_unterminated_email_without_regex_backtracking(self):
31+
value="A"*20_000+" <unterminated"
32+
actor=Actor._from_string(value)
33+
self.assertNotIn("name_email_regex", vars(Actor))
34+
self.assertEqual(actor, Actor(value, None))
35+
36+
deftest_from_string_does_not_parse_across_lines(self):
37+
self.assertEqual(Actor._from_string("x <a>\n y <b>"), Actor("x", "a"))
38+
39+
deftest_from_string_uses_git_delimiters(self):
40+
forvalue, expectedin (
41+
 ("Name <e<mail>", Actor("Name", "e<mail")),
42+
 ("Name <email>>", Actor("Name", "email")),
43+
 ("Name<email>", Actor("Name", "email")),
44+
 (" <>", Actor("", "")),
45+
 ("Name <email", Actor("Name <email", None)),
46+
 ("Name email>", Actor("Name email>", None)),
47+
 ):
48+
self.assertEqual(Actor._from_string(value), expected)
49+
3050
deftest_should_display_representation(self):
3151
a=Actor._from_string("Michael Trier <mtrier@example.com>")
3252
self.assertEqual('<git.Actor "Michael Trier <mtrier@example.com>">', repr(a))
0 commit comments
Comments
 (0)