Bot.java: onMessage(): if we have a UsernameNotFoundException blockin…

…g command execution, outline this to private message sender [JENKINS-72590] Signed-off-by: Jim Klimov <[email protected]>
jenkinsci · Jan 23, 2024 · 438d0ca · 438d0ca
1 parent ce1bbe9
commit 438d0ca
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/src/main/java/hudson/plugins/im/bot/Bot.java b/src/main/java/hudson/plugins/im/bot/Bot.java
@@ -26,6 +26,7 @@
 
 import jenkins.model.Jenkins;
 import jenkins.security.NotReallyRoleSensitiveCallable;
+import org.acegisecurity.userdetails.UsernameNotFoundException;
 
 /**
  * Instant messaging bot.
@@ -162,15 +163,20 @@ public void onMessage(final IMMessage msg) {
                     final BotCommand command = this.cmdsAndAliases.get(cmd);
                     if (command != null) {
                         if (isAuthenticationNeeded()) {
-                            ACL.impersonate(this.authentication.getAuthentication(), new NotReallyRoleSensitiveCallable<Void, IMException>() {
-                                private static final long serialVersionUID = 1L;
-
-                                @Override
-                                public Void call() throws IMException {
-                                    command.executeCommand(Bot.this, chat, msg, s, args);
-                                    return null;
-                                }
-                            });
+                            try {
+                                ACL.impersonate(this.authentication.getAuthentication(), new NotReallyRoleSensitiveCallable<Void, IMException>() {
+                                    private static final long serialVersionUID = 1L;
+
+                                    @Override
+                                    public Void call() throws IMException {
+                                        command.executeCommand(Bot.this, chat, msg, s, args);
+                                        return null;
+                                    }
+                                });
+                            } catch (UsernameNotFoundException ue) {
+                                this.chat.sendMessage(s.getNickname() + " This bot is not authorized to execute commands at this time, sorry!");
+                                throw ue;
+                            }
                         } else {
                             command.executeCommand(Bot.this, chat, msg, s, args);
                         }