Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-10-26 00:56:09 +02:00
Code Issues Packages Projects Releases Activity

Bugfix for go-git client issue

Browse Source
This commit is contained in:
Till-André Diegeler
2025-08-15 07:59:05 +02:00
committed by René Pfeuffer
parent 59a9d4939a
commit 7858316a63
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/changelog/gogit_client_support.yaml Normal file
View File

@@ -0,0 +1,2 @@
- type: fixed
description: Support for go-git user agents (e.g. ArgoCD ≥ 2.14)

9
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitUserAgentProvider.java
View File

@@ -69,7 +69,12 @@ public class GitUserAgentProvider implements UserAgentProvider {
.basicAuthenticationCharset(Charsets.UTF_8)
.build();
private static final String PREFIX_GOGIT = "go-git/";
@VisibleForTesting
static final UserAgent GOGIT = UserAgent.scmClient("go-git")
.basicAuthenticationCharset(Charsets.UTF_8)
.build();
//~--- methods --------------------------------------------------------------
@@ -85,6 +90,8 @@ public class GitUserAgentProvider implements UserAgentProvider {
return GIT_LFS;
} else if (isGit(lowerUserAgent)) {
return GIT;
} else if (isGoGit(lowerUserAgent)) {
return GOGIT;
} else {
return null;
}
@@ -109,4 +116,6 @@ public class GitUserAgentProvider implements UserAgentProvider {
private boolean isGit(String userAgent) {
return userAgent.startsWith(PREFIX_REGULAR);
}
private boolean isGoGit(String userAgent) { return userAgent.startsWith(PREFIX_GOGIT); }
}

1
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/web/GitUserAgentProviderTest.java
View File

@@ -47,6 +47,7 @@ public class GitUserAgentProviderTest {
assertEquals(GitUserAgentProvider.JGIT, parse("jgit/4.5.2"));
assertEquals(GitUserAgentProvider.GIT_LFS, parse("git-lfs/2.0.1 (GitHub; windows amd64; go 1.8; git 678cdbd4)"));
assertEquals(GitUserAgentProvider.MSYSGIT, parse("git/1.8.3.msysgit.0"));
assertEquals(GitUserAgentProvider.GOGIT, parse("go-git/5.x"));
assertNull(parse("Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36"));
}