IMConnectionProvider.java: getAuthenticationHolder(): fix check for B…

…ot user name, to exempt empty strings (lack of specific configuration) if Jenkins security setting allows that [JENKINS-72590] Signed-off-by: Jim Klimov <jimklimov+jenkinsci@gmail.com>
jenkinsci · Jan 22, 2024 · 064547c · 064547c
1 parent 6017646
commit 064547c
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/src/main/java/hudson/plugins/im/IMConnectionProvider.java b/src/main/java/hudson/plugins/im/IMConnectionProvider.java
@@ -8,6 +8,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import jenkins.model.Jenkins;
 import org.acegisecurity.Authentication;
 
 /**
@@ -115,9 +116,15 @@ private void tryReconnect() {
     // we need an additional level of indirection to the Authentication entity
     // to fix HUDSON-5978 and HUDSON-5233
     public synchronized AuthenticationHolder getAuthenticationHolder() {
-        if (descriptor == null || descriptor.getHudsonUserName() == null
-            || descriptor.getHudsonUserName().isBlank()
-        ) {
+        if (descriptor == null || descriptor.getHudsonUserName() == null) {
+            return null;
+        }
+
+        if (descriptor.getHudsonUserName().isBlank()) {
+            if (Jenkins.getInstance().isUseSecurity()) {
+                throw org.acegisecurity.userdetails.UsernameNotFoundException(
+                    "No local Jenkins user name is configured for instant messaging to act as");
+            }
             return null;
         }
 
@@ -130,9 +137,15 @@ public Authentication getAuthentication() {
 
                 // New spotbugs UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR
                 // just can't be quiesced, so duplicating the sanity-check here
-                if (descriptor == null || descriptor.getHudsonUserName() == null
-                    || descriptor.getHudsonUserName().isBlank()
-                ) {
+                if (descriptor == null || descriptor.getHudsonUserName() == null) {
+                    return null;
+                }
+
+                if (descriptor.getHudsonUserName().isBlank()) {
+                    if (Jenkins.getInstance().isUseSecurity()) {
+                        throw org.acegisecurity.userdetails.UsernameNotFoundException(
+                            "No local Jenkins user name is configured for instant messaging to act as");
+                    }
                     return null;
                 }