diff --git a/plugins/scm-pam-plugin/src/main/java/sonia/scm/pam/PAMAuthenticationHandler.java b/plugins/scm-pam-plugin/src/main/java/sonia/scm/pam/PAMAuthenticationHandler.java index 207961eda6..048ec088ab 100644 --- a/plugins/scm-pam-plugin/src/main/java/sonia/scm/pam/PAMAuthenticationHandler.java +++ b/plugins/scm-pam-plugin/src/main/java/sonia/scm/pam/PAMAuthenticationHandler.java @@ -137,7 +137,6 @@ public class PAMAuthenticationHandler implements AuthenticationHandler { User user = new User(username); - user.setAdmin(isAdmin(unixUser)); result = new AuthenticationResult(user, unixUser.getGroups()); } } @@ -229,40 +228,6 @@ public class PAMAuthenticationHandler implements AuthenticationHandler this.config = config; } - //~--- get methods ---------------------------------------------------------- - - /** - * Method description - * - * - * @param unixUser - * - * @return - */ - private boolean isAdmin(UnixUser unixUser) - { - boolean admin = false; - - if (config.getAdminUserSet().contains(unixUser.getUserName())) - { - admin = true; - } - else - { - for (String group : unixUser.getGroups()) - { - if (config.getAdminGroupSet().contains(group)) - { - admin = true; - - break; - } - } - } - - return admin; - } - //~--- fields --------------------------------------------------------------- /** Field description */ diff --git a/plugins/scm-pam-plugin/src/main/java/sonia/scm/pam/PAMConfig.java b/plugins/scm-pam-plugin/src/main/java/sonia/scm/pam/PAMConfig.java index f810139bf4..9f6bc31a1a 100644 --- a/plugins/scm-pam-plugin/src/main/java/sonia/scm/pam/PAMConfig.java +++ b/plugins/scm-pam-plugin/src/main/java/sonia/scm/pam/PAMConfig.java @@ -52,28 +52,6 @@ import javax.xml.bind.annotation.XmlRootElement; public class PAMConfig { - /** - * Method description - * - * - * @return - */ - public String getAdminGroups() - { - return adminGroups; - } - - /** - * Method description - * - * - * @return - */ - public String getAdminUsers() - { - return adminUsers; - } - /** * Method description * @@ -87,28 +65,6 @@ public class PAMConfig //~--- set methods ---------------------------------------------------------- - /** - * Method description - * - * - * @param adminGroups - */ - public void setAdminGroups(String adminGroups) - { - this.adminGroups = adminGroups; - } - - /** - * Method description - * - * - * @param adminUsers - */ - public void setAdminUsers(String adminUsers) - { - this.adminUsers = adminUsers; - } - /** * Method description * @@ -120,65 +76,8 @@ public class PAMConfig this.serviceName = serviceName; } - //~--- get methods ---------------------------------------------------------- - - /** - * Method description - * - * - * @return - */ - Set getAdminGroupSet() - { - return split(adminGroups); - } - - /** - * Method description - * - * - * @return - */ - Set getAdminUserSet() - { - return split(adminUsers); - } - - //~--- methods -------------------------------------------------------------- - - /** - * Method description - * - * - * @param rawString - * - * @return - */ - private Set split(String rawString) - { - Set tokens = new HashSet(); - - for (String token : rawString.split(",")) - { - if (token.trim().length() > 0) - { - tokens.add(token); - } - } - - return tokens; - } - //~--- fields --------------------------------------------------------------- - /** Field description */ - @XmlElement(name = "admin-groups") - private String adminGroups = ""; - - /** Field description */ - @XmlElement(name = "admin-users") - private String adminUsers = ""; - /** Field description */ @XmlElement(name = "service-name") private String serviceName = "sshd"; diff --git a/plugins/scm-pam-plugin/src/main/resources/sonia/scm/pam/sonia.pam.js b/plugins/scm-pam-plugin/src/main/resources/sonia/scm/pam/sonia.pam.js index fd15e4085a..e0551e3dca 100644 --- a/plugins/scm-pam-plugin/src/main/resources/sonia/scm/pam/sonia.pam.js +++ b/plugins/scm-pam-plugin/src/main/resources/sonia/scm/pam/sonia.pam.js @@ -38,16 +38,6 @@ registerGeneralConfigPanel({ fieldLabel : 'Service name', name : 'service-name', allowBlank : false - },{ - xtype : 'textfield', - fieldLabel : 'Admin Groups', - name : 'admin-groups', - allowBlank : true - },{ - xtype : 'textfield', - fieldLabel : 'Admin Users', - name : 'admin-users', - allowBlank : true }], onSubmit: function(values){