Merge pull request #68 from jenkinsci/JENKINS-34896

[JENKINS-34896] Skip searching users when searching for teams
jenkinsci · Oct 24, 2016 · 4bd1519 · 4bd1519
2 parents ce15460 + 597ade3
commit 4bd1519
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/GithubSecurityRealm.java b/src/main/java/org/jenkinsci/plugins/GithubSecurityRealm.java
@@ -579,6 +579,10 @@ public DescriptorImpl getDescriptor() {
     @Override
     public UserDetails loadUserByUsername(String username)
             throws UsernameNotFoundException, DataAccessException {
+        //username is in org*team format
+        if(username.indexOf(GithubOAuthGroupDetails.ORG_TEAM_SEPARATOR) >= 0 ) {
+            throw new UsernameNotFoundException("Using org*team format instead of username: " + username);
+        }
 
         Authentication token = SecurityContextHolder.getContext().getAuthentication();