From 2539ceea0d47467d54cedd340afa6ede2909b2bd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gmail.com>
Date: Wed, 23 Dec 2015 08:43:39 -0500
Subject: [PATCH] Merge pull request #986 from rgroux/jenkins-groovy-all-proto
---
src/main/java/com/gitblit/transport/ssh/SshKrbAuthenticator.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/SshKrbAuthenticator.java b/src/main/java/com/gitblit/transport/ssh/SshKrbAuthenticator.java
index 4afc00f..b6d233c 100644
--- a/src/main/java/com/gitblit/transport/ssh/SshKrbAuthenticator.java
+++ b/src/main/java/com/gitblit/transport/ssh/SshKrbAuthenticator.java
@@ -31,6 +31,8 @@
protected final Logger log = LoggerFactory.getLogger(getClass());
protected final IAuthenticationManager authManager;
+ protected final boolean stripDomain;
+
public SshKrbAuthenticator(IStoredSettings settings, IAuthenticationManager authManager) {
this.authManager = authManager;
@@ -44,6 +46,8 @@
if(! servicePrincipalName.isEmpty()) {
setServicePrincipalName(servicePrincipalName);
}
+
+ this.stripDomain = settings.getBoolean(Keys.git.sshKrb5StripDomain, false);
}
@Override
@@ -55,6 +59,12 @@
return true;
}
String username = identity.toLowerCase(Locale.US);
+ if (stripDomain) {
+ int p = username.indexOf('@');
+ if (p > 0) {
+ username = username.substring(0, p);
+ }
+ }
UserModel user = authManager.authenticate(username);
if (user != null) {
client.setUser(user);
--
Gitblit v1.9.1