summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorJames Moger <james.moger@gmail.com>2016-01-16 18:23:46 -0500
committerJames Moger <james.moger@gmail.com>2016-01-16 18:23:46 -0500
commit1607b9f90face68eecd5df3e8e7677ba1f22e1e7 (patch)
treed5025aa91c0bdacba227aec86bd03e1670030abd /src/main/java
parentb180e500aadc1eb48779754055545a4f271c12a0 (diff)
parent5274e12c7cc19451355082418f78004c4d97e263 (diff)
downloadgitblit-1607b9f90face68eecd5df3e8e7677ba1f22e1e7.tar.gz
gitblit-1607b9f90face68eecd5df3e8e7677ba1f22e1e7.zip
Merge pull request #990 from dbywalec/authenthication-of-federation-user
Fix authentication failure warning log messages for FEDERATION_USER
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/gitblit/manager/AuthenticationManager.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/com/gitblit/manager/AuthenticationManager.java b/src/main/java/com/gitblit/manager/AuthenticationManager.java
index 147badfb..49787631 100644
--- a/src/main/java/com/gitblit/manager/AuthenticationManager.java
+++ b/src/main/java/com/gitblit/manager/AuthenticationManager.java
@@ -466,6 +466,12 @@ public class AuthenticationManager implements IAuthenticationManager {
return null;
}
+ if (username.equalsIgnoreCase(Constants.FEDERATION_USER)) {
+ // can not authenticate internal FEDERATION_USER at this point
+ // it must be routed to FederationManager
+ return null;
+ }
+
String usernameDecoded = StringUtils.decodeUsername(username);
String pw = new String(password);
if (StringUtils.isEmpty(pw)) {