Merge pull request #251 from basil/refresh

Migrate from Acegi to Spring Security

Author: jimklimov

src/main/java/hudson/plugins/im/AuthenticationHolder.java

@@ -1,6 +1,6 @@
 package hudson.plugins.im;
 
-import org.acegisecurity.Authentication;
+import org.springframework.security.core.Authentication;
 
 /**
  * Just a holder to return a (possibly cached) {@link Authentication}.

src/main/java/hudson/plugins/im/IMConnectionProvider.java

@@ -9,9 +9,8 @@
 import java.util.logging.Logger;
 
 import jenkins.model.Jenkins;
-import org.acegisecurity.Authentication;
-import org.acegisecurity.userdetails.UsernameNotFoundException;
-//import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 
 /**
  * Abstract implementation of a provider of {@link IMConnection}s.
@@ -141,7 +140,7 @@ public Authentication getAuthentication() {
 
                 try {
                     User u = User.get(descriptor.getHudsonUserName());
-                    return u.impersonate();
+                    return u.impersonate2();
                 } catch (UsernameNotFoundException ue) {
                     if (descriptor.getHudsonUserName().isBlank()) {
                         throw new UsernameNotFoundException(

src/main/java/hudson/plugins/im/bot/Bot.java

@@ -26,7 +26,7 @@
 
 import jenkins.model.Jenkins;
 import jenkins.security.NotReallyRoleSensitiveCallable;
-import org.acegisecurity.userdetails.UsernameNotFoundException;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 
 /**
  * Instant messaging bot.
@@ -164,7 +164,7 @@ public void onMessage(final IMMessage msg) {
                     if (command != null) {
                         if (isAuthenticationNeeded()) {
                             try {
-                                ACL.impersonate(this.authentication.getAuthentication(), new NotReallyRoleSensitiveCallable<Void, IMException>() {
+                                ACL.impersonate2(this.authentication.getAuthentication(), new NotReallyRoleSensitiveCallable<Void, IMException>() {
                                     private static final long serialVersionUID = 1L;
 
                                     @Override

src/main/java/hudson/plugins/im/bot/BuildCommand.java

@@ -247,7 +247,7 @@ private String checkPermission(Sender sender, AbstractProject<?, ?> project) {
         if ( senderUser != null ) {
             // This check is hopefully equivalent to legacy one defined above,
             // project.hasPermission(Item.BUILD), but for an arbitrary username
-            if (Jenkins.getInstance().getAuthorizationStrategy().getACL(project).hasPermission(senderUser.impersonate(), Item.BUILD)) {
+            if (Jenkins.getInstance().getAuthorizationStrategy().getACL(project).hasPermission2(senderUser.impersonate2(), Item.BUILD)) {
                 System.err.println("IM BuildCommand authorized Jenkins user '" +
                         senderUser.getId() + "' (IM ID '" + sender.getNickname() +
                         "' / '" + sender.getId() + "') to build '" + project.getName() +