Make it compatible with Jira 8 and other SAML apps

src/com/lastpass/jira/SAMLAuthenticator.java

@@ -34,7 +34,9 @@
 import com.atlassian.jira.user.util.UserManager;
 import com.atlassian.jira.event.user.UserEventType;
 import com.atlassian.jira.component.ComponentAccessor;
+import com.atlassian.jira.user.ApplicationUser;
 import com.atlassian.jira.JiraException;
+import com.atlassian.jira.security.groups.GroupManager;
 
 import java.io.File;
 import java.io.UnsupportedEncodingException;
@@ -174,10 +176,11 @@ public Principal getUser(HttpServletRequest request,
         logger.debug("SAML user: " + username);
 
         UserManager userManager = new ComponentAccessor().getUserManager();
+        GroupManager groupManager = new ComponentAccessor().getGroupManager();
 
         if (userManager.getUserByName(username) == null) {
 
-            String email = username;
+            String email = aset.getAttributes().get("urn:oid:1.2.840.113549.1.9.1").get(0);
             String fullname = username;
 
             List<String> namelist = aset.getAttributes().get("Name");
@@ -186,15 +189,38 @@ public Principal getUser(HttpServletRequest request,
 
             String password = generatePassword(20);
 
-            UserDetails details = new UserDetails(email, fullname)
-                .withPassword(password);
+            UserDetails details = new UserDetails(username, fullname)
+                .withPassword(password)
+                .withEmail(email);
+
 
             try {
                 userManager.createUser(details);
             } catch (JiraException e) {
                 logger.error("Unable to auto-create user", e);
                 return null;
             }
+
+            ApplicationUser user;
+            com.atlassian.crowd.embedded.api.Group group;
+
+            try {user = userManager.getUserByName(username);}
+            catch (Exception e) {logger.error("Couldn't find user I just created" + username); return null; }
+
+            if (aset.getAttributes().get("member") != null ) {
+              for (String groupname : aset.getAttributes().get("member")) {
+                if ((group=groupManager.getGroup(groupname)) != null) {
+                  try {
+                    groupManager.addUserToGroup (user,group);
+                  } catch (Exception e) {
+                    logger.error("Unable to add " + username + " to group " + groupname + " because " + e);
+                  }
+                } else {
+                  logger.error("Unable to add " + username + " to missing group " + groupname );
+                }
+              }
+            }
+
         }
 
         Principal p = userManager.getUserByName(username);

web/saml_acs.jsp

@@ -16,14 +16,14 @@
   -- Copyright (c) 2014 LastPass, Inc.
   --
   --%>
-<%@ page import="com.atlassian.jira.ComponentManager" %>
+<%@ page import="com.atlassian.jira.component.ComponentAccessor" %>
 <%@ page import="com.atlassian.jira.security.JiraAuthenticationContext" %>
 <%
     // this page is where SAML authentication returns.
     // if auth is successful, user is added to session and
     // we redirect to the url in RelayState.  Otherwise, we
     // display an error page.
-    final JiraAuthenticationContext jiraAuthenticationContext = ComponentManager.getComponentInstanceOfType(JiraAuthenticationContext.class);
+    final JiraAuthenticationContext jiraAuthenticationContext = ComponentAccessor.getJiraAuthenticationContext();
 
     // verify SAMLResponse
     if (jiraAuthenticationContext.getLoggedInUser() != null) {

web/saml_login.jsp

@@ -17,12 +17,13 @@
   --
   --%>
 <%@ page import="com.lastpass.jira.SAMLAuthenticator" %>
+<% String context = request.getContextPath(); %>
 <%
     // This page is accessed to initiate SAML login when getUser() in the
     // authenticator returns null and there is no SAMLResponse being processed.
     // JIRA will go here when we click on a login link (based on seraph config).
     //
     // We generate an authnrequest and then redirect to the IdP.
-    String url = new SAMLAuthenticator().getRedirectUrl(request.getParameter("os_destination"));
+    String url = new SAMLAuthenticator().getRedirectUrl(context + request.getParameter("os_destination"));
     response.sendRedirect(response.encodeRedirectURL(url));
 %>