The Unified and Autonomous Development Platform
LDAP integration
robin shenb16f702ad055
diff --git a/core/src/main/java/com/gitplex/server/CoreModule.java b/core/src/main/java/com/gitplex/server/CoreModule.javaindex 77b46d7974..8934c729dc 100644--- a/core/src/main/java/com/gitplex/server/CoreModule.java+++ b/core/src/main/java/com/gitplex/server/CoreModule.java@@ -56,9 +56,9 @@ import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.DataManager;import com.gitplex.server.manager.GroupAuthorizationManager;import com.gitplex.server.manager.GroupManager;-import com.gitplex.server.manager.MembershipManager;import com.gitplex.server.manager.MailManager;import com.gitplex.server.manager.MarkdownManager;+import com.gitplex.server.manager.MembershipManager;import com.gitplex.server.manager.ProjectManager;import com.gitplex.server.manager.PullRequestCommentManager;import com.gitplex.server.manager.PullRequestManager;@@ -87,9 +87,9 @@ import com.gitplex.server.manager.impl.DefaultConfigManager;import com.gitplex.server.manager.impl.DefaultDataManager;import com.gitplex.server.manager.impl.DefaultGroupAuthorizationManager;import com.gitplex.server.manager.impl.DefaultGroupManager;-import com.gitplex.server.manager.impl.DefaultMembershipManager;import com.gitplex.server.manager.impl.DefaultMailManager;import com.gitplex.server.manager.impl.DefaultMarkdownManager;+import com.gitplex.server.manager.impl.DefaultMembershipManager;import com.gitplex.server.manager.impl.DefaultNotificationManager;import com.gitplex.server.manager.impl.DefaultProjectManager;import com.gitplex.server.manager.impl.DefaultPullRequestCommentManager;@@ -127,9 +127,11 @@ import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.DefaultDao;import com.gitplex.server.security.BasicAuthenticationFilter;import com.gitplex.server.security.DefaultFilterChainResolver;+import com.gitplex.server.security.DefaultPasswordService;import com.gitplex.server.security.DefaultWebSecurityManager;import com.gitplex.server.security.FilterChainConfigurator;-import com.gitplex.server.security.SecurityRealm;+import com.gitplex.server.security.GitPlexAuthorizingRealm;+import com.gitplex.server.security.authenticator.Authenticator;import com.gitplex.server.util.ClassUtils;import com.gitplex.server.util.jackson.ObjectMapperConfigurator;import com.gitplex.server.util.jackson.ObjectMapperProvider;@@ -143,7 +145,6 @@ import com.gitplex.server.util.validation.EntityValidator;import com.gitplex.server.util.validation.ValidatorProvider;import com.google.inject.matcher.AbstractMatcher;import com.google.inject.matcher.Matchers;-import com.pmease.security.shiro.bcrypt.BCryptPasswordService;import com.thoughtworks.xstream.XStream;import com.thoughtworks.xstream.annotations.XStreamOmitField;import com.thoughtworks.xstream.converters.basic.NullConverter;@@ -228,11 +229,11 @@ public class CoreModule extends AbstractPluginModule {contribute(ObjectMapperConfigurator.class, GitObjectMapperConfigurator.class);contribute(ObjectMapperConfigurator.class, HibernateObjectMapperConfigurator.class);- bind(AuthorizingRealm.class).to(SecurityRealm.class);+ bind(AuthorizingRealm.class).to(GitPlexAuthorizingRealm.class);bind(WebSecurityManager.class).to(DefaultWebSecurityManager.class);bind(FilterChainResolver.class).to(DefaultFilterChainResolver.class);bind(BasicAuthenticationFilter.class);- bind(PasswordService.class).to(BCryptPasswordService.class).in(Singleton.class);+ bind(PasswordService.class).to(DefaultPasswordService.class);bind(ShiroFilter.class);install(new ShiroAopModule());contribute(FilterChainConfigurator.class, new FilterChainConfigurator() {@@ -245,6 +246,7 @@ public class CoreModule extends AbstractPluginModule {}});+ contributeFromPackage(Authenticator.class, Authenticator.class);bind(EntityValidator.class).to(DefaultEntityValidator.class);}diff --git a/core/src/main/java/com/gitplex/server/manager/CacheManager.java b/core/src/main/java/com/gitplex/server/manager/CacheManager.javaindex 7fc59f11bd..02f514b93c 100644--- a/core/src/main/java/com/gitplex/server/manager/CacheManager.java+++ b/core/src/main/java/com/gitplex/server/manager/CacheManager.java@@ -51,4 +51,8 @@ public interface CacheManager {@NullableLong getProjectIdByName(String name);++ @Nullable+ Long getGroupIdByName(String name);+}diff --git a/core/src/main/java/com/gitplex/server/manager/ConfigManager.java b/core/src/main/java/com/gitplex/server/manager/ConfigManager.javaindex 67fa83538b..238debd263 100644--- a/core/src/main/java/com/gitplex/server/manager/ConfigManager.java+++ b/core/src/main/java/com/gitplex/server/manager/ConfigManager.java@@ -8,6 +8,7 @@ import com.gitplex.server.model.support.setting.MailSetting;import com.gitplex.server.model.support.setting.SecuritySetting;import com.gitplex.server.model.support.setting.SystemSetting;import com.gitplex.server.persistence.dao.EntityManager;+import com.gitplex.server.security.authenticator.Authenticator;public interface ConfigManager extends EntityManager<Config> {@@ -86,4 +87,10 @@ public interface ConfigManager extends EntityManager<Config> {SecuritySetting getSecuritySetting();void saveSecuritySetting(SecuritySetting securitySetting);++ @Nullable+ Authenticator getAuthenticator();++ void saveAuthenticator(@Nullable Authenticator authenticator);+}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.javaindex f49d1cbfb0..6aea04bd59 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.java@@ -58,6 +58,8 @@ public class DefaultCacheManager implements CacheManager {private final Map<Long, GroupFacade> groups = new HashMap<>();+ private final BiMap<String, Long> groupIdsByName = HashBiMap.create();+private final ReadWriteLock groupsLock = new ReentrantReadWriteLock();private final Map<Long, MembershipFacade> memberships = new HashMap<>();@@ -91,8 +93,10 @@ public class DefaultCacheManager implements CacheManager {if (user.getEmail() != null)userIdsByEmail.inverse().put(user.getId(), user.getEmail());}- for (Group group: dao.findAll(Group.class))+ for (Group group: dao.findAll(Group.class)) {groups.put(group.getId(), group.getFacade());+ groupIdsByName.inverse().put(group.getId(), group.getName());+ }for (Membership membership: dao.findAll(Membership.class))memberships.put(membership.getId(), membership.getFacade());for (GroupAuthorization groupAuthorization: dao.findAll(GroupAuthorization.class))@@ -131,7 +135,9 @@ public class DefaultCacheManager implements CacheManager {} else if (event.getEntity() instanceof Group) {groupsLock.writeLock().lock();try {- groups.put(event.getEntity().getId(), ((Group) event.getEntity()).getFacade());+ GroupFacade group = ((Group) event.getEntity()).getFacade();+ groups.put(event.getEntity().getId(), group);+ groupIdsByName.inverse().put(group.getId(), group.getName());} finally {groupsLock.writeLock().unlock();}@@ -228,6 +234,7 @@ public class DefaultCacheManager implements CacheManager {groupsLock.writeLock().lock();try {groups.remove(event.getEntity().getId());+ groupIdsByName.inverse().remove(event.getEntity().getId());} finally {groupsLock.writeLock().unlock();}@@ -386,6 +393,16 @@ public class DefaultCacheManager implements CacheManager {}}+ @Override+ public Long getGroupIdByName(String name) {+ groupsLock.readLock().lock();+ try {+ return groupIdsByName.get(name);+ } finally {+ groupsLock.readLock().unlock();+ }+ }+@Overridepublic GroupFacade getGroup(Long id) {groupsLock.readLock().lock();diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultConfigManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultConfigManager.javaindex 679796b30c..1422619f72 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultConfigManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultConfigManager.java@@ -7,6 +7,7 @@ import org.hibernate.criterion.Restrictions;import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.DataManager;+import com.gitplex.server.migration.VersionedDocument;import com.gitplex.server.model.Config;import com.gitplex.server.model.Config.Key;import com.gitplex.server.model.support.setting.BackupSetting;@@ -18,6 +19,7 @@ import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;+import com.gitplex.server.security.authenticator.Authenticator;import com.google.common.base.Preconditions;@Singleton@@ -33,6 +35,8 @@ public class DefaultConfigManager extends AbstractEntityManager<Config> implemenprivate volatile Long securitySettingConfigId;+ private volatile Long authenticatorConfigId;+@Injectpublic DefaultConfigManager(Dao dao, DataManager dataManager) {super(dao);@@ -154,4 +158,34 @@ public class DefaultConfigManager extends AbstractEntityManager<Config> implemendao.persist(config);}+ @Sessional+ @Override+ public Authenticator getAuthenticator() {+ Config config;+ if (authenticatorConfigId == null) {+ config = getConfig(Key.AUTHENTICATOR);+ Preconditions.checkNotNull(config);+ authenticatorConfigId = config.getId();+ } else {+ config = load(authenticatorConfigId);+ }+ VersionedDocument dom = (VersionedDocument) config.getSetting();+ if (dom != null)+ return (Authenticator) dom.toBean();+ else+ return null;+ }++ @Transactional+ @Override+ public void saveAuthenticator(Authenticator authenticator) {+ Config config = getConfig(Key.AUTHENTICATOR);+ if (config == null) {+ config = new Config();+ config.setKey(Key.AUTHENTICATOR);+ }+ config.setSetting(VersionedDocument.fromBean(authenticator));+ dao.persist(config);+ }+}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultDataManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultDataManager.javaindex 73defd453c..aee62cef67 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultDataManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultDataManager.java@@ -142,29 +142,20 @@ public class DefaultDataManager implements DataManager, Serializable {if (securityConfig == null) {configManager.saveSecuritySetting(new SecuritySetting());}+ Config authenticatorConfig = configManager.getConfig(Key.AUTHENTICATOR);+ if (authenticatorConfig == null) {+ configManager.saveAuthenticator(null);+ }Config mailConfig = configManager.getConfig(Key.MAIL);- Serializable mailSetting = null;if (mailConfig == null) {- mailSetting = new MailSetting();- } else if (mailConfig.getSetting() != null) {- if (!validator.validate(mailConfig.getSetting()).isEmpty())- mailSetting = mailConfig.getSetting();- }-- if (mailSetting != null) {- manualConfigs.add(new ManualConfig("Specify Mail Setting", mailSetting) {+ configManager.saveMailSetting(null);+ } else if (mailConfig.getSetting() != null && !validator.validate(mailConfig.getSetting()).isEmpty()) {+ manualConfigs.add(new ManualConfig("Specify Mail Setting", mailConfig.getSetting()) {@Overridepublic Skippable getSkippable() {- return new Skippable() {-- @Override- public void skip() {- configManager.saveMailSetting(null);- }-- };+ return null;}@Overridediff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultGroupManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultGroupManager.javaindex 98866aca58..c658a7a94d 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultGroupManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultGroupManager.java@@ -3,29 +3,36 @@ package com.gitplex.server.manager.impl;import javax.inject.Inject;import javax.inject.Singleton;-import org.hibernate.criterion.Restrictions;--import com.gitplex.server.manager.ProjectManager;+import com.gitplex.server.manager.CacheManager;+import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.GroupManager;-import com.gitplex.server.model.Project;+import com.gitplex.server.manager.ProjectManager;import com.gitplex.server.model.Group;+import com.gitplex.server.model.Project;import com.gitplex.server.model.support.BranchProtection;import com.gitplex.server.model.support.TagProtection;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;-import com.gitplex.server.persistence.dao.EntityCriteria;+import com.gitplex.server.security.authenticator.Authenticator;@Singletonpublic class DefaultGroupManager extends AbstractEntityManager<Group> implements GroupManager {private final ProjectManager projectManager;+ private final ConfigManager configManager;++ private final CacheManager cacheManager;+@Inject- public DefaultGroupManager(Dao dao, ProjectManager projectManager) {+ public DefaultGroupManager(Dao dao, ProjectManager projectManager, ConfigManager configManager,+ CacheManager cacheManager) {super(dao);this.projectManager = projectManager;+ this.configManager = configManager;+ this.cacheManager = cacheManager;}@Transactional@@ -38,6 +45,12 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implementsfor (TagProtection protection: project.getTagProtections())protection.onGroupRename(oldName, group.getName());}++ Authenticator authenticator = configManager.getAuthenticator();+ if (authenticator != null) {+ if (authenticator.onGroupRename(oldName, group.getName()))+ configManager.saveAuthenticator(authenticator);+ }}dao.persist(group);}@@ -51,15 +64,23 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implementsfor (TagProtection protection: project.getTagProtections())protection.onGroupDelete(group.getName());}+ Authenticator authenticator = configManager.getAuthenticator();+ if (authenticator != null) {+ if (authenticator.onGroupDelete(group.getName()))+ configManager.saveAuthenticator(authenticator);+ }+dao.remove(group);}@Sessional@Overridepublic Group find(String name) {- EntityCriteria<Group> criteria = newCriteria();- criteria.add(Restrictions.eq("name", name));- return find(criteria);+ Long id = cacheManager.getGroupIdByName(name);+ if (id != null)+ return load(id);+ else+ return null;}}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserManager.javaindex af49d8ae56..e0d47bc60e 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserManager.java@@ -20,6 +20,7 @@ import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;+import com.gitplex.server.util.StringUtils;@Singletonpublic class DefaultUserManager extends AbstractEntityManager<User> implements UserManager {@@ -174,7 +175,7 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Upublic void on(SystemStarted event) {for (User user: findAll()) {// Fix a critical issue that password of self-registered users are not hashed- if (user.getPassword() != null && !user.getPassword().startsWith("$2a$10")+ if (StringUtils.isNotBlank(user.getPassword()) && !user.getPassword().startsWith("$2a$10")&& !user.getPassword().startsWith("@hash^prefix@")) {user.setPassword(passwordService.encryptPassword(user.getPassword()));save(user);diff --git a/core/src/main/java/com/gitplex/server/migration/VersionedDocument.java b/core/src/main/java/com/gitplex/server/migration/VersionedDocument.javaindex 7797f8288a..99c8c1e138 100644--- a/core/src/main/java/com/gitplex/server/migration/VersionedDocument.java+++ b/core/src/main/java/com/gitplex/server/migration/VersionedDocument.java@@ -8,6 +8,7 @@ import java.io.IOException;import java.io.ObjectInput;import java.io.ObjectOutput;import java.io.OutputStream;+import java.io.StringReader;import java.io.Writer;import java.util.Iterator;import java.util.List;@@ -31,16 +32,16 @@ import org.dom4j.QName;import org.dom4j.Visitor;import org.dom4j.XPath;import org.dom4j.io.OutputFormat;+import org.dom4j.io.SAXReader;import org.dom4j.io.XMLWriter;-import org.dom4j.io.XPP3Reader;import org.xml.sax.EntityResolver;-import com.google.common.base.Charsets;-import com.google.common.base.Preconditions;-import com.google.common.base.Throwables;import com.gitplex.launcher.loader.AppLoader;import com.gitplex.server.util.ClassUtils;import com.gitplex.server.util.FileUtils;+import com.google.common.base.Charsets;+import com.google.common.base.Preconditions;+import com.google.common.base.Throwables;import com.thoughtworks.xstream.XStream;import com.thoughtworks.xstream.core.util.HierarchicalStreams;import com.thoughtworks.xstream.io.xml.Dom4JReader;@@ -398,7 +399,7 @@ public final class VersionedDocument implements Document, Externalizable {public static VersionedDocument fromXML(String xml) {try {- return new VersionedDocument(new XPP3Reader().read(xml.toCharArray()));+ return new VersionedDocument(new SAXReader().read(new StringReader(xml)));} catch (Exception e) {throw Throwables.propagate(e);}diff --git a/core/src/main/java/com/gitplex/server/model/Config.java b/core/src/main/java/com/gitplex/server/model/Config.javaindex 13ed78bd55..bcbc9e3ed6 100644--- a/core/src/main/java/com/gitplex/server/model/Config.java+++ b/core/src/main/java/com/gitplex/server/model/Config.java@@ -5,9 +5,11 @@ import java.io.Serializable;import javax.persistence.Column;import javax.persistence.Entity;import javax.persistence.Lob;+import javax.persistence.Version;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;+import org.hibernate.annotations.DynamicUpdate;/*** This entity stores object in serialized form, with one entity@@ -16,11 +18,19 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;*/@Entity@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+@DynamicUpdatepublic class Config extends AbstractEntity {private static final long serialVersionUID = 1L;- public enum Key {SYSTEM, MAIL, BACKUP, SECURITY};+ public enum Key {SYSTEM, MAIL, BACKUP, SECURITY, AUTHENTICATOR};++ /*+ * Optimistic lock is necessary to ensure database integrity when update+ * information such as authenticator default group names+ */+ @Version+ private long version;@Column(nullable=false, unique=true)private Key key;diff --git a/core/src/main/java/com/gitplex/server/model/Group.java b/core/src/main/java/com/gitplex/server/model/Group.javaindex 35c830f6d1..765b3d5002 100644--- a/core/src/main/java/com/gitplex/server/model/Group.java+++ b/core/src/main/java/com/gitplex/server/model/Group.java@@ -42,8 +42,6 @@ public class Group extends AbstractEntity {private transient Collection<User> members;- private transient Collection<Project> authorizedProjects;-@Editable(order=100)@NotEmptypublic String getName() {@@ -111,16 +109,6 @@ public class Group extends AbstractEntity {return members;}- public Collection<Project> getAuthorizedProjects() {- if (authorizedProjects == null) {- authorizedProjects = new HashSet<>();- for (GroupAuthorization authorization: getAuthorizations()) {- authorizedProjects.add(authorization.getProject());- }- }- return authorizedProjects;- }-@Overridepublic int compareTo(AbstractEntity entity) {Group group = (Group) entity;diff --git a/core/src/main/java/com/gitplex/server/model/Project.java b/core/src/main/java/com/gitplex/server/model/Project.javaindex 5cf60cf77a..0978aadac3 100644--- a/core/src/main/java/com/gitplex/server/model/Project.java+++ b/core/src/main/java/com/gitplex/server/model/Project.java@@ -166,10 +166,6 @@ public class Project extends AbstractEntity {private transient Optional<String> defaultBranchOptional;- private transient Collection<Group> authorizedGroups;-- private transient Collection<User> authorizedUsers;-private transient Optional<RevCommit> lastCommitOptional;@Editable(order=100)@@ -845,26 +841,6 @@ public class Project extends AbstractEntity {return null;}- public Collection<Group> getAuthorizedGroups() {- if (authorizedGroups == null) {- authorizedGroups = new HashSet<>();- for (GroupAuthorization authorization: getGroupAuthorizations()) {- authorizedGroups.add(authorization.getGroup());- }- }- return authorizedGroups;- }-- public Collection<User> getAuthorizedUsers() {- if (authorizedUsers == null) {- authorizedUsers = new HashSet<>();- for (UserAuthorization authorization: getUserAuthorizations()) {- authorizedUsers.add(authorization.getUser());- }- }- return authorizedUsers;- }-public ProjectFacade getFacade() {return new ProjectFacade(this);}diff --git a/core/src/main/java/com/gitplex/server/model/User.java b/core/src/main/java/com/gitplex/server/model/User.javaindex f04ff64b89..3b66bcf465 100644--- a/core/src/main/java/com/gitplex/server/model/User.java+++ b/core/src/main/java/com/gitplex/server/model/User.java@@ -2,7 +2,6 @@ package com.gitplex.server.model;import java.util.ArrayList;import java.util.Collection;-import java.util.HashSet;import java.util.UUID;import javax.annotation.Nullable;@@ -88,10 +87,6 @@ public class User extends AbstractEntity implements AuthenticationInfo {@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)private Collection<PullRequestTask> requestTasks = new ArrayList<>();- private transient Collection<Project> authorizedProjects;-- private transient Collection<Group> groups;-@Overridepublic PrincipalCollection getPrincipals() {return new SimplePrincipalCollection(getId(), "");@@ -147,11 +142,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {* password to set*/public void setPassword(String password) {- if (password != null) {- this.password = password;- } else {- this.password = null;- }+ this.password = password;}@Editable(order=200)@@ -250,26 +241,6 @@ public class User extends AbstractEntity implements AuthenticationInfo {return user;}- public Collection<Project> getAuthorizedProjects() {- if (authorizedProjects == null) {- authorizedProjects = new HashSet<>();- for (UserAuthorization authorization: getAuthorizations()) {- authorizedProjects.add(authorization.getProject());- }- }- return authorizedProjects;- }-- public Collection<Group> getGroups() {- if (groups == null) {- groups = new HashSet<>();- for (Membership membership: getMemberships()) {- groups.add(membership.getGroup());- }- }- return groups;- }-public UserFacade getFacade() {return new UserFacade(this);}diff --git a/core/src/main/java/com/gitplex/server/model/support/setting/SecuritySetting.java b/core/src/main/java/com/gitplex/server/model/support/setting/SecuritySetting.javaindex 0ffc74fda0..16f55cc67d 100644--- a/core/src/main/java/com/gitplex/server/model/support/setting/SecuritySetting.java+++ b/core/src/main/java/com/gitplex/server/model/support/setting/SecuritySetting.java@@ -12,7 +12,7 @@ public class SecuritySetting implements Serializable {private boolean enableAnonymousAccess = false;private boolean enableSelfRegister = true;-+@Editable(order=100, description="Whether or not to allow anonymous users to access this server")public boolean isEnableAnonymousAccess() {return enableAnonymousAccess;diff --git a/core/src/main/java/com/gitplex/server/security/DefaultPasswordService.java b/core/src/main/java/com/gitplex/server/security/DefaultPasswordService.javanew file mode 100644index 0000000000..c067a5c0fe--- /dev/null+++ b/core/src/main/java/com/gitplex/server/security/DefaultPasswordService.java@@ -0,0 +1,28 @@+package com.gitplex.server.security;++import javax.inject.Singleton;++import org.apache.shiro.authc.credential.PasswordService;++import com.gitplex.server.util.StringUtils;+import com.pmease.security.shiro.bcrypt.BCryptPasswordService;++@Singleton+public class DefaultPasswordService implements PasswordService {++ private final PasswordService bcryptPasswordService = new BCryptPasswordService();++ @Override+ public String encryptPassword(Object plaintextPassword) throws IllegalArgumentException {+ return bcryptPasswordService.encryptPassword(plaintextPassword);+ }++ @Override+ public boolean passwordsMatch(Object submittedPlaintext, String encrypted) {+ if (StringUtils.isNotBlank(encrypted))+ return bcryptPasswordService.passwordsMatch(submittedPlaintext, encrypted);+ else+ return true;+ }++}diff --git a/core/src/main/java/com/gitplex/server/security/SecurityRealm.java b/core/src/main/java/com/gitplex/server/security/GitPlexAuthorizingRealm.javasimilarity index 50%rename from core/src/main/java/com/gitplex/server/security/SecurityRealm.javarename to core/src/main/java/com/gitplex/server/security/GitPlexAuthorizingRealm.javaindex 1abd42bd9e..a2b0b80682 100644--- a/core/src/main/java/com/gitplex/server/security/SecurityRealm.java+++ b/core/src/main/java/com/gitplex/server/security/GitPlexAuthorizingRealm.java@@ -3,6 +3,7 @@ package com.gitplex.server.security;import java.util.ArrayList;import java.util.Collection;import java.util.HashSet;+import java.util.Iterator;import javax.inject.Inject;import javax.inject.Singleton;@@ -17,33 +18,52 @@ import org.apache.shiro.authz.AuthorizationInfo;import org.apache.shiro.authz.Permission;import org.apache.shiro.realm.AuthorizingRealm;import org.apache.shiro.subject.PrincipalCollection;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;import com.gitplex.launcher.loader.AppLoader;import com.gitplex.server.manager.CacheManager;import com.gitplex.server.manager.ConfigManager;+import com.gitplex.server.manager.GroupManager;+import com.gitplex.server.manager.MembershipManager;import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.Group;+import com.gitplex.server.model.Membership;+import com.gitplex.server.model.User;+import com.gitplex.server.persistence.annotation.Transactional;+import com.gitplex.server.security.authenticator.Authenticated;+import com.gitplex.server.security.authenticator.Authenticator;import com.gitplex.server.security.permission.CreateProjects;import com.gitplex.server.security.permission.ProjectPermission;import com.gitplex.server.security.permission.PublicPermission;import com.gitplex.server.security.permission.SystemAdministration;import com.gitplex.server.security.permission.UserAdministration;+import com.gitplex.server.util.StringUtils;import com.gitplex.server.util.facade.GroupAuthorizationFacade;import com.gitplex.server.util.facade.GroupFacade;import com.gitplex.server.util.facade.MembershipFacade;import com.gitplex.server.util.facade.UserAuthorizationFacade;import com.gitplex.server.util.facade.UserFacade;+import com.google.common.base.Throwables;@Singleton-public class SecurityRealm extends AuthorizingRealm {+public class GitPlexAuthorizingRealm extends AuthorizingRealm {+ private static final Logger logger = LoggerFactory.getLogger(GitPlexAuthorizingRealm.class);+private final UserManager userManager;private final CacheManager cacheManager;private final ConfigManager configManager;+ private final MembershipManager membershipManager;++ private final GroupManager groupManager;+@Inject- public SecurityRealm(UserManager userManager, CacheManager cacheManager, ConfigManager configManager) {+ public GitPlexAuthorizingRealm(UserManager userManager, CacheManager cacheManager, ConfigManager configManager,+ MembershipManager membershipManager, GroupManager groupManager) {PasswordMatcher passwordMatcher = new PasswordMatcher();passwordMatcher.setPasswordService(AppLoader.getInstance(PasswordService.class));setCredentialsMatcher(passwordMatcher);@@ -51,6 +71,8 @@ public class SecurityRealm extends AuthorizingRealm {this.userManager = userManager;this.cacheManager = cacheManager;this.configManager = configManager;+ this.membershipManager = membershipManager;+ this.groupManager = groupManager;}@SuppressWarnings("serial")@@ -114,10 +136,95 @@ public class SecurityRealm extends AuthorizingRealm {};}+ @Transactional@Overrideprotected final AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token)throws AuthenticationException {- return userManager.findByName(((UsernamePasswordToken) token).getUsername());+ User user = userManager.findByName(((UsernamePasswordToken) token).getUsername());+ if (user != null && user.isRoot())+ return user;++ if (user == null || StringUtils.isBlank(user.getPassword())) {+ Authenticator authenticator = configManager.getAuthenticator();+ if (authenticator != null) {+ Authenticated authenticated;+ try {+ authenticated = authenticator.authenticate((UsernamePasswordToken) token);+ } catch (Throwable e) {+ if (e instanceof AuthenticationException) {+ logger.debug("Authentication not passed", e);+ throw Throwables.propagate(e);+ } else {+ logger.error("Error authenticating user", e);+ throw new AuthenticationException("Error authenticating user", e);+ }+ }+ if (user != null) {+ if (authenticated.getEmail() != null)+ user.setEmail(authenticated.getEmail());+ if (authenticated.getFullName() != null)+ user.setFullName(authenticated.getFullName());++ Collection<String> existingGroupNames = new HashSet<>();+ for (Membership membership: user.getMemberships())+ existingGroupNames.add(membership.getGroup().getName());+ if (!authenticated.getGroupNames().isEmpty()) {+ Collection<String> retrievedGroupNames = new HashSet<>();+ for (String groupName: authenticated.getGroupNames()) {+ Group group = groupManager.find(groupName);+ if (group != null) {+ if (!existingGroupNames.contains(groupName)) {+ Membership membership = new Membership();+ membership.setGroup(group);+ membership.setUser(user);+ membershipManager.save(membership);+ user.getMemberships().add(membership);+ existingGroupNames.add(groupName);+ }+ retrievedGroupNames.add(groupName);+ } else {+ logger.debug("Group '{}' from external authenticator is not defined", groupName);+ }+ }+ for (Iterator<Membership> it = user.getMemberships().iterator(); it.hasNext();) {+ Membership membership = it.next();+ if (!retrievedGroupNames.contains(membership.getGroup().getName())) {+ it.remove();+ membershipManager.delete(membership);+ }+ }+ }+ userManager.save(user);+ } else {+ user = new User();+ user.setName(((UsernamePasswordToken) token).getUsername());+ user.setPassword("");+ if (authenticated.getEmail() != null)+ user.setEmail(authenticated.getEmail());+ if (authenticated.getFullName() != null)+ user.setFullName(authenticated.getFullName());+ userManager.save(user);+ if (authenticated.getGroupNames().isEmpty()) {+ for (String groupName: authenticator.getDefaultGroupNames()) {+ Group group = groupManager.find(groupName);+ if (group != null) {+ Membership membership = new Membership();+ membership.setGroup(group);+ membership.setUser(user);+ user.getMemberships().add(membership);+ membershipManager.save(membership);+ } else {+ logger.warn("Default group '{}' of external authenticator is not defined", groupName);+ }+ }+ }+ }+ } else {+ user = null;+ }+ }++ return user;}}diff --git a/core/src/main/java/com/gitplex/server/security/authenticator/Authenticated.java b/core/src/main/java/com/gitplex/server/security/authenticator/Authenticated.javanew file mode 100644index 0000000000..da960093e0--- /dev/null+++ b/core/src/main/java/com/gitplex/server/security/authenticator/Authenticated.java@@ -0,0 +1,35 @@+package com.gitplex.server.security.authenticator;++import java.util.Collection;++import javax.annotation.Nullable;++public class Authenticated {++ private final String fullName;++ private final String email;++ private final Collection<String> groupNames;++ public Authenticated(@Nullable String fullName, @Nullable String email, Collection<String> groupNames) {+ this.fullName = fullName;+ this.email = email;+ this.groupNames = groupNames;+ }++ @Nullable+ public String getFullName() {+ return fullName;+ }++ @Nullable+ public String getEmail() {+ return email;+ }++ public Collection<String> getGroupNames() {+ return groupNames;+ }++}diff --git a/core/src/main/java/com/gitplex/server/security/authenticator/Authenticator.java b/core/src/main/java/com/gitplex/server/security/authenticator/Authenticator.javanew file mode 100644index 0000000000..f9faa80271--- /dev/null+++ b/core/src/main/java/com/gitplex/server/security/authenticator/Authenticator.java@@ -0,0 +1,64 @@+package com.gitplex.server.security.authenticator;++import java.io.Serializable;+import java.util.Iterator;+import java.util.List;++import org.apache.shiro.authc.AuthenticationException;+import org.apache.shiro.authc.UsernamePasswordToken;++import com.gitplex.server.util.editable.annotation.Editable;+import com.gitplex.server.util.editable.annotation.GroupChoice;++@Editable+public abstract class Authenticator implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<String> defaultGroupNames;++ private int timeout = 300;++ @Editable(order=10000, description="Specify network timeout in seconds when authenticate through this system")+ public int getTimeout() {+ return timeout;+ }++ public void setTimeout(int timeout) {+ this.timeout = timeout;+ }++ @Editable(order=20000, description="Optionally add newly authenticated user to specified groups if group "+ + "information is not available in external authentication system")+ @GroupChoice+ public List<String> getDefaultGroupNames() {+ return defaultGroupNames;+ }++ public void setDefaultGroupNames(List<String> defaultGroupNames) {+ this.defaultGroupNames = defaultGroupNames;+ }++ public boolean onGroupRename(String oldName, String newName) {+ if (defaultGroupNames.contains(oldName)) {+ defaultGroupNames.remove(oldName);+ defaultGroupNames.add(newName);+ return true;+ } else {+ return false;+ }+ }++ public boolean onGroupDelete(String groupName) {+ for (Iterator<String> it = defaultGroupNames.iterator(); it.hasNext();) {+ if (it.next().equals(groupName)) {+ it.remove();+ return true;+ }+ }+ return false;+ }++ public abstract Authenticated authenticate(UsernamePasswordToken token) throws AuthenticationException;++}diff --git a/core/src/main/java/com/gitplex/server/security/authenticator/ldap/ActiveDirectoryAuthenticator.java b/core/src/main/java/com/gitplex/server/security/authenticator/ldap/ActiveDirectoryAuthenticator.javanew file mode 100644index 0000000000..bb4d966b17--- /dev/null+++ b/core/src/main/java/com/gitplex/server/security/authenticator/ldap/ActiveDirectoryAuthenticator.java@@ -0,0 +1,79 @@+package com.gitplex.server.security.authenticator.ldap;++import org.hibernate.validator.constraints.NotEmpty;++import com.gitplex.server.util.editable.annotation.Editable;++@Editable(name="Active Directory", order=100)+public class ActiveDirectoryAuthenticator extends LdapAuthenticator {++ private static final long serialVersionUID = 1L;++ private String groupSearchBase;++ @Editable(order=100, name="LDAP URL", description=+ "Specifies LDAP URL of the Active Directory server, for example: <i>ldap://ad-server</i>, or <i>ldaps://ad-server</i>")+ @NotEmpty+ @Override+ public String getLdapUrl() {+ return super.getLdapUrl();+ }++ @Editable(order=300, description=""+ + "To authenticate user against Active Directory and retrieve associated attributes and groups, GitPlex "+ + "would have to first authenticate itself against the Active Directory server and GitPlex does that by "+ + "sending 'manager' DN and password. The manager DN should be specified in form of "+ + "<i><account name>@<domain></i>, for instance: <i>[email protected]</i>")+ @NotEmpty+ @Override+ public String getManagerDN() {+ return super.getManagerDN();+ }++ @Editable(order=500, description=+ "Specifies the base node for user search. For example: <i>cn=Users, dc=example, dc=com</i>")+ @NotEmpty+ @Override+ public String getUserSearchBase() {+ return super.getUserSearchBase();+ }++ @Override+ public String getUserSearchFilter() {+ return "(&(sAMAccountName={0})(objectclass=user))";+ }++ @Override+ public String getUserFullNameAttribute() {+ return super.getUserFullNameAttribute();+ }++ @Override+ public String getUserEmailAttribute() {+ return super.getUserEmailAttribute();+ }++ @Editable(order=1000, description=""+ + "Specify group search base if you want to search groups associated with the user. For example: "+ + "<i>cn=Users, dc=example, dc=com</i>")+ public String getGroupSearchBase() {+ return groupSearchBase;+ }++ public void setGroupSearchBase(String groupSearchBase) {+ this.groupSearchBase = groupSearchBase;+ }++ @Override+ public GroupRetrieval getGroupRetrieval() {+ if (getGroupSearchBase() != null) {+ SearchGroupsUsingFilter groupRetrieval = new SearchGroupsUsingFilter();+ groupRetrieval.setGroupSearchBase(getGroupSearchBase());+ groupRetrieval.setGroupSearchFilter("(&(member:1.2.840.113556.1.4.1941:={0})(objectclass=group))");+ return groupRetrieval;+ } else {+ return new DoNotRetrieveGroups();+ }+ }++}diff --git a/core/src/main/java/com/gitplex/server/security/authenticator/ldap/DoNotRetrieveGroups.java b/core/src/main/java/com/gitplex/server/security/authenticator/ldap/DoNotRetrieveGroups.javanew file mode 100644index 0000000000..b0d2395ee6--- /dev/null+++ b/core/src/main/java/com/gitplex/server/security/authenticator/ldap/DoNotRetrieveGroups.java@@ -0,0 +1,10 @@+package com.gitplex.server.security.authenticator.ldap;++import com.gitplex.server.util.editable.annotation.Editable;++@Editable(order=100)+public class DoNotRetrieveGroups implements GroupRetrieval {++ private static final long serialVersionUID = 1L;++}diff --git a/core/src/main/java/com/gitplex/server/security/authenticator/ldap/GetGroupsUsingAttribute.java b/core/src/main/java/com/gitplex/server/security/authenticator/ldap/GetGroupsUsingAttribute.javanew file mode 100644index 0000000000..2b7cdcd868--- /dev/null+++ b/core/src/main/java/com/gitplex/server/security/authenticator/ldap/GetGroupsUsingAttribute.java@@ -0,0 +1,40 @@+package com.gitplex.server.security.authenticator.ldap;++import org.hibernate.validator.constraints.NotEmpty;++import com.gitplex.server.util.editable.annotation.Editable;++@Editable(order=200)+public class GetGroupsUsingAttribute implements GroupRetrieval {++ private static final long serialVersionUID = 1L;++ private String userGroupsAttribute;++ private String groupNameAttribute = "cn";++ @Editable(order=100, description=""+ + "Specifies name of the attribute inside the user LDAP entry whose value contains distinguished names of "+ + "belonging groups. For instance some LDAP servers uses attribute <i>memberOf</i> to list groups")+ @NotEmpty+ public String getUserGroupsAttribute() {+ return userGroupsAttribute;+ }++ public void setUserGroupsAttribute(String userGroupsAttribute) {+ this.userGroupsAttribute = userGroupsAttribute;+ }++ @Editable(order=200, description=""+ + "Specifies the attribute containing group name inside the found group LDAP entry. Value of this attribute "+ + "will be mapped to a GitPlex group. This attribute is normally set to <i>cn</i>")+ @NotEmpty+ public String getGroupNameAttribute() {+ return groupNameAttribute;+ }++ public void setGroupNameAttribute(String groupNameAttribute) {+ this.groupNameAttribute = groupNameAttribute;+ }++}diff --git a/core/src/main/java/com/gitplex/server/security/authenticator/ldap/GroupRetrieval.java b/core/src/main/java/com/gitplex/server/security/authenticator/ldap/GroupRetrieval.javanew file mode 100644index 0000000000..e3e595b666--- /dev/null+++ b/core/src/main/java/com/gitplex/server/security/authenticator/ldap/GroupRetrieval.java@@ -0,0 +1,10 @@+package com.gitplex.server.security.authenticator.ldap;++import java.io.Serializable;++import com.gitplex.server.util.editable.annotation.Editable;++@Editable+public interface GroupRetrieval extends Serializable {++}diff --git a/core/src/main/java/com/gitplex/server/security/authenticator/ldap/LdapAuthenticator.java b/core/src/main/java/com/gitplex/server/security/authenticator/ldap/LdapAuthenticator.javanew file mode 100644index 0000000000..9a0e9ad229--- /dev/null+++ b/core/src/main/java/com/gitplex/server/security/authenticator/ldap/LdapAuthenticator.java@@ -0,0 +1,355 @@+package com.gitplex.server.security.authenticator.ldap;++import java.util.ArrayList;+import java.util.Collection;+import java.util.HashSet;+import java.util.Hashtable;+import java.util.List;++import javax.naming.AuthenticationException;+import javax.naming.CompositeName;+import javax.naming.Context;+import javax.naming.InvalidNameException;+import javax.naming.Name;+import javax.naming.NamingEnumeration;+import javax.naming.NamingException;+import javax.naming.PartialResultException;+import javax.naming.directory.Attribute;+import javax.naming.directory.Attributes;+import javax.naming.directory.DirContext;+import javax.naming.directory.InitialDirContext;+import javax.naming.directory.SearchControls;+import javax.naming.directory.SearchResult;+import javax.validation.constraints.NotNull;++import org.apache.shiro.authc.UnknownAccountException;+import org.apache.shiro.authc.UsernamePasswordToken;+import org.hibernate.validator.constraints.NotEmpty;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.gitplex.server.security.authenticator.Authenticated;+import com.gitplex.server.security.authenticator.Authenticator;+import com.gitplex.server.util.StringUtils;+import com.gitplex.server.util.editable.annotation.Editable;+import com.gitplex.server.util.editable.annotation.Password;++@Editable(name="Generic LDAP", order=200)+public class LdapAuthenticator extends Authenticator {++ private static final long serialVersionUID = 1L;++ private static final Logger logger = LoggerFactory.getLogger(LdapAuthenticator.class);++ private String ldapUrl;++ private String managerDN;++ private String managerPassword;++ private String userSearchBase;++ private String userSearchFilter;++ private String userFullNameAttribute = "displayName";++ private String userEmailAttribute = "mail";++ private GroupRetrieval groupRetrieval = new DoNotRetrieveGroups();++ @Editable(order=100, name="LDAP URL", description=+ "Specifies LDAP URL, for example: <i>ldap://localhost</i>, or <i>ldaps://localhost</i>.")+ @NotEmpty+ public String getLdapUrl() {+ return ldapUrl;+ }++ public void setLdapUrl(String ldapUrl) {+ this.ldapUrl = ldapUrl;+ }++ @Editable(order=300, description=""+ + "To authenticate user against LDAP and retrieve associated attributes and groups, GitPlex would have to "+ + "first authenticate itself against the LDAP server and GitPlex does that by sending 'manager' DN and "+ + "password")+ @NotEmpty+ public String getManagerDN() {+ return managerDN;+ }++ public void setManagerDN(String managerDN) {+ this.managerDN = managerDN;+ }++ @Editable(order=400, description="Specifies password of above manager DN")+ @NotEmpty+ @Password+ public String getManagerPassword() {+ return managerPassword;+ }++ public void setManagerPassword(String managerPassword) {+ this.managerPassword = managerPassword;+ }++ @Editable(order=500, description=+ "Specifies the base node for user search. For example: <i>ou=users, dc=example, dc=com</i>")+ @NotEmpty+ public String getUserSearchBase() {+ return userSearchBase;+ }++ public void setUserSearchBase(String userSearchBase) {+ this.userSearchBase = userSearchBase;+ }++ @Editable(order=600, description=+ "This filter is used to determine the LDAP entry for current user. " ++ "For example: <i>(&(uid={0})(objectclass=person))</i>. In this example, " ++ "<i>{0}</i> represents login name of current user.")+ @NotEmpty+ public String getUserSearchFilter() {+ return userSearchFilter;+ }++ public void setUserSearchFilter(String userSearchFilter) {+ this.userSearchFilter = userSearchFilter;+ }++ @Editable(order=700, description=""+ + "Optionally specifies name of the attribute inside the user LDAP entry whose value will be taken as user "+ + "full name. This field is normally set to <i>displayName</i> according to RFC 2798. If left empty, full "+ + "name of the user will not be retrieved")+ public String getUserFullNameAttribute() {+ return userFullNameAttribute;+ }++ public void setUserFullNameAttribute(String userFullNameAttribute) {+ this.userFullNameAttribute = userFullNameAttribute;+ }++ @Editable(order=800, description=""+ + "Optionally specifies name of the attribute inside the user LDAP entry whose value will be taken as user "+ + "email. This field is normally set to <i>mail</i> according to RFC 2798. If left empty, email of the user "+ + "will not be retrieved")+ public String getUserEmailAttribute() {+ return userEmailAttribute;+ }++ public void setUserEmailAttribute(String userEmailAttribute) {+ this.userEmailAttribute = userEmailAttribute;+ }++ @Editable(order=900)+ @NotNull+ public GroupRetrieval getGroupRetrieval() {+ return groupRetrieval;+ }++ public void setGroupRetrieval(GroupRetrieval groupRetrieval) {+ this.groupRetrieval = groupRetrieval;+ }++ @Override+ public Authenticated authenticate(UsernamePasswordToken token) {+ String fullName = null;+ String email = null;+ Collection<String> groupNames = new HashSet<>();++ Name userSearchBase;+ try {+ userSearchBase = new CompositeName().add(getUserSearchBase());+ } catch (InvalidNameException e) {+ throw new RuntimeException(e);+ }+ String userSearchFilter = StringUtils.replace(getUserSearchFilter(), "{0}", token.getUsername());+ userSearchFilter = StringUtils.replace(userSearchFilter, "\\", "\\\\");+ logger.debug("Evaluated user search filter: " + userSearchFilter);++ SearchControls searchControls = new SearchControls();+ searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);+ List<String> attributeNames = new ArrayList<String>();+ if (getUserFullNameAttribute() != null)+ attributeNames.add(getUserFullNameAttribute());+ if (getUserEmailAttribute() != null)+ attributeNames.add(getUserEmailAttribute());+ if (getGroupRetrieval() instanceof GetGroupsUsingAttribute) {+ GetGroupsUsingAttribute groupRetrieval = (GetGroupsUsingAttribute)getGroupRetrieval();+ attributeNames.add(groupRetrieval.getUserGroupsAttribute());+ }+ searchControls.setReturningAttributes((String[]) attributeNames.toArray(new String[0]));+ searchControls.setReturningObjFlag(true);++ Hashtable<String, String> ldapEnv = new Hashtable<>();+ ldapEnv.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");+ ldapEnv.put(Context.PROVIDER_URL, getLdapUrl());+ ldapEnv.put(Context.SECURITY_AUTHENTICATION, "simple");+ ldapEnv.put("com.sun.jndi.ldap.connect.timeout", String.valueOf(getTimeout()*1000L));+ ldapEnv.put("com.sun.jndi.ldap.read.timeout", String.valueOf(getTimeout()*1000L));+ ldapEnv.put(Context.REFERRAL, "follow");++ ldapEnv.put(Context.SECURITY_PRINCIPAL, getManagerDN());+ ldapEnv.put(Context.SECURITY_CREDENTIALS, getManagerPassword());++ DirContext ctx = null;+ DirContext referralCtx = null;+ try {+ logger.debug("Binding to ldap url '" + getLdapUrl() + "'...");+ try {+ ctx = new InitialDirContext(ldapEnv);+ } catch (AuthenticationException e) {+ throw new RuntimeException("Can not bind to ldap server '" + getLdapUrl() + "': " + e.getMessage());+ }+ NamingEnumeration<SearchResult> results = ctx.search(userSearchBase, userSearchFilter, searchControls);+ if (results == null || !results.hasMore()) {+ throw new UnknownAccountException("Unknown account");+ }+ SearchResult searchResult = (SearchResult) results.next();+ String userDN = searchResult.getNameInNamespace();+ if (!searchResult.isRelative()) {+ StringBuffer buffer = new StringBuffer();+ buffer.append(StringUtils.substringBefore(searchResult.getName(), "//"));+ buffer.append("//");+ buffer.append(StringUtils.substringBefore(+ StringUtils.substringAfter(searchResult.getName(), "//"), "/"));++ ldapEnv.put(Context.PROVIDER_URL, buffer.toString());+ logger.debug("Binding to referral ldap url '" + buffer.toString() + "'...");+ referralCtx = new InitialDirContext(ldapEnv);+ }+ if (userDN.startsWith("ldap")) {+ userDN = StringUtils.substringAfter(userDN, "//");+ userDN = StringUtils.substringAfter(userDN, "/");+ }++ ldapEnv.put(Context.SECURITY_PRINCIPAL, userDN);+ ldapEnv.put(Context.SECURITY_CREDENTIALS, new String(token.getPassword()));+ DirContext userCtx = null;+ try {+ logger.debug("Authenticating user by binding as '" + userDN + "'...");+ userCtx = new InitialDirContext(ldapEnv);+ } catch (AuthenticationException e) {+ throw new org.apache.shiro.authc.AuthenticationException("Unable to bind as '" + userDN + "'", e);+ } finally {+ if (userCtx != null) {+ try {+ userCtx.close();+ } catch (NamingException e) {+ }+ }+ }++ Attributes searchResultAttributes = searchResult.getAttributes();+ if (searchResultAttributes != null) {+ if (getUserFullNameAttribute() != null) {+ Attribute attribute = searchResultAttributes.get(getUserFullNameAttribute());+ if (attribute != null && attribute.get() != null)+ fullName = (String) attribute.get();+ }+ if (getUserEmailAttribute() != null) {+ Attribute attribute = searchResultAttributes.get(getUserEmailAttribute());+ if (attribute != null && attribute.get() != null)+ email = (String) attribute.get();+ }+ if (getGroupRetrieval() instanceof GetGroupsUsingAttribute) {+ GetGroupsUsingAttribute groupRetrieval = (GetGroupsUsingAttribute) getGroupRetrieval();+ Attribute attribute = searchResultAttributes.get(+ groupRetrieval.getUserGroupsAttribute());+ if (attribute != null) {+ for (NamingEnumeration<?> e = attribute.getAll(); e.hasMore();) {++ // use composite name instead of DN according to+ // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4307193+ Name groupDN = new CompositeName().add((String) e.next());+ logger.debug("Looking up group entry '" + groupDN + "'...");++ DirContext groupCtx = null;+ try {+ if (referralCtx != null)+ groupCtx = (DirContext) referralCtx.lookup(groupDN);+ else+ groupCtx = (DirContext) ctx.lookup(groupDN);++ if (groupCtx == null) {+ throw new RuntimeException("Can not find group entry " ++ "identified by '" + groupDN + "'.");+ }+ String groupNameAttribute = groupRetrieval.getGroupNameAttribute();+ Attributes groupAttributes = groupCtx.getAttributes("",+ new String[]{groupNameAttribute});+ if (groupAttributes == null+ || groupAttributes.get(groupNameAttribute) == null+ || groupAttributes.get(groupNameAttribute).get() == null) {+ throw new RuntimeException("Can not find attribute '"+ + groupNameAttribute + "' in returned group entry.");+ }+ groupNames.add((String) groupAttributes.get(groupNameAttribute).get());+ } finally {+ if (groupCtx != null)+ try {+ groupCtx.close();+ } catch (NamingException ne) {+ }+ }+ }+ } else {+ logger.warn("No attribute identified by '" + groupRetrieval.getUserGroupsAttribute()+ + "' inside fetched user LDAP entry.");+ }+ }+ }++ if (getGroupRetrieval() instanceof SearchGroupsUsingFilter) {+ SearchGroupsUsingFilter groupRetrieval = (SearchGroupsUsingFilter) getGroupRetrieval();+ String groupNameAttribute = groupRetrieval.getGroupNameAttribute();+ Name groupSearchBase = new CompositeName().add(groupRetrieval.getGroupSearchBase());+ String groupSearchFilter = StringUtils.replace(groupRetrieval.getGroupSearchFilter(), "{0}", userDN);+ groupSearchFilter = StringUtils.replace(groupSearchFilter, "\\", "\\\\");++ logger.debug("Evaluated group search filter: " + groupSearchFilter);+ searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);+ searchControls.setReturningAttributes(new String[]{groupNameAttribute});++ try {+ if (referralCtx != null)+ results = referralCtx.search(groupSearchBase, groupSearchFilter, searchControls);+ else+ results = ctx.search(groupSearchBase, groupSearchFilter, searchControls);+ if (results != null) {+ while (results.hasMore()) {+ searchResult = (SearchResult) results.next();+ searchResultAttributes = searchResult.getAttributes();+ if (searchResultAttributes == null+ || searchResultAttributes.get(groupNameAttribute) == null+ || searchResultAttributes.get(groupNameAttribute).get() == null) {+ throw new RuntimeException("Can not find attribute '"+ + groupNameAttribute + "' in the returned group object.");+ }+ groupNames.add((String) searchResultAttributes.get(groupNameAttribute).get());+ }+ }+ } catch (PartialResultException pre) {+ logger.warn("Partial exception detected. You may try to set property " ++ "'follow referrals' to true to avoid this exception.", pre);+ }+ }+ return new Authenticated(fullName, email, groupNames);+ } catch (NamingException e) {+ throw new RuntimeException(e);+ } finally {+ if (ctx != null) {+ try {+ ctx.close();+ } catch (NamingException e) {+ }+ }+ if (referralCtx != null) {+ try {+ referralCtx.close();+ } catch (NamingException e) {+ }+ }+ }+ }++}diff --git a/core/src/main/java/com/gitplex/server/security/authenticator/ldap/SearchGroupsUsingFilter.java b/core/src/main/java/com/gitplex/server/security/authenticator/ldap/SearchGroupsUsingFilter.javanew file mode 100644index 0000000000..89e9711c41--- /dev/null+++ b/core/src/main/java/com/gitplex/server/security/authenticator/ldap/SearchGroupsUsingFilter.java@@ -0,0 +1,56 @@+package com.gitplex.server.security.authenticator.ldap;++import org.hibernate.validator.constraints.NotEmpty;++import com.gitplex.server.util.editable.annotation.Editable;++@Editable(order=300)+public class SearchGroupsUsingFilter implements GroupRetrieval {++ private static final long serialVersionUID = 1L;++ private String groupSearchBase;++ private String groupSearchFilter;++ private String groupNameAttribute = "cn";++ @Editable(order=100, description=+ "In case user group relationship maintained at group side, this property specifies " ++ "base node for group search. For example: <i>ou=groups, dc=example, dc=com</i>")+ @NotEmpty+ public String getGroupSearchBase() {+ return groupSearchBase;+ }++ public void setGroupSearchBase(String groupSearchBase) {+ this.groupSearchBase = groupSearchBase;+ }++ @Editable(order=200, description=""+ + "In case user group relationship maintained at group side, this filter is used to determine belonging "+ + "groups of current user. For example: <i>(&(uniqueMember={0})(objectclass=groupOfUniqueNames))</i>. In "+ + "this example, <i>{0}</i> represents DN of current user")+ @NotEmpty+ public String getGroupSearchFilter() {+ return groupSearchFilter;+ }++ public void setGroupSearchFilter(String groupSearchFilter) {+ this.groupSearchFilter = groupSearchFilter;+ }++ @Editable(order=300, description=""+ + "Specifies the attribute containing group name inside the found group LDAP entry. Value of this attribute "+ + "will be mapped to a GitPlex group. This attribute is normally set to <i>cn</i>")+ @NotEmpty+ public String getGroupNameAttribute() {+ return groupNameAttribute;+ }++ public void setGroupNameAttribute(String groupNameAttribute) {+ this.groupNameAttribute = groupNameAttribute;+ }++}+diff --git a/core/src/main/java/com/gitplex/server/util/editable/annotation/NullChoice.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/NullChoice.javanew file mode 100644index 0000000000..2cd2f00137--- /dev/null+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/NullChoice.java@@ -0,0 +1,12 @@+package com.gitplex.server.util.editable.annotation;++import java.lang.annotation.ElementType;+import java.lang.annotation.Retention;+import java.lang.annotation.RetentionPolicy;+import java.lang.annotation.Target;++@Retention(RetentionPolicy.RUNTIME)+@Target(ElementType.METHOD)+public @interface NullChoice {+ String value();+}diff --git a/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.java b/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.javaindex 54a5fca6ec..8bd5fb2c4b 100644--- a/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.java+++ b/web/src/main/java/com/gitplex/server/web/GitPlexUrlMapper.java@@ -9,12 +9,13 @@ import org.apache.wicket.request.IRequestHandler;import org.apache.wicket.request.Url;import org.apache.wicket.request.mapper.CompoundRequestMapper;-import com.gitplex.server.web.page.admin.DatabaseBackupPage;-import com.gitplex.server.web.page.admin.MailSettingPage;-import com.gitplex.server.web.page.admin.SecuritySettingPage;-import com.gitplex.server.web.page.admin.ServerInformationPage;-import com.gitplex.server.web.page.admin.ServerLogPage;-import com.gitplex.server.web.page.admin.SystemSettingPage;+import com.gitplex.server.web.page.admin.authenticator.AuthenticatorPage;+import com.gitplex.server.web.page.admin.databasebackup.DatabaseBackupPage;+import com.gitplex.server.web.page.admin.mailsetting.MailSettingPage;+import com.gitplex.server.web.page.admin.securitysetting.SecuritySettingPage;+import com.gitplex.server.web.page.admin.serverinformation.ServerInformationPage;+import com.gitplex.server.web.page.admin.serverlog.ServerLogPage;+import com.gitplex.server.web.page.admin.systemsetting.SystemSettingPage;import com.gitplex.server.web.page.group.GroupAuthorizationsPage;import com.gitplex.server.web.page.group.GroupListPage;import com.gitplex.server.web.page.group.GroupMembershipsPage;@@ -95,6 +96,7 @@ public class GitPlexUrlMapper extends CompoundRequestMapper {add(new WebPageMapper("administration/settings/mail", MailSettingPage.class));add(new WebPageMapper("administration/settings/backup", DatabaseBackupPage.class));add(new WebPageMapper("administration/settings/security", SecuritySettingPage.class));+ add(new WebPageMapper("administration/settings/authenticator", AuthenticatorPage.class));add(new WebPageMapper("administration/server-log", ServerLogPage.class));add(new WebPageMapper("administration/server-information", ServerInformationPage.class));}diff --git a/web/src/main/java/com/gitplex/server/web/behavior/testform/TestFormBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/testform/TestFormBehavior.javaindex 2891940581..55a9381478 100644--- a/web/src/main/java/com/gitplex/server/web/behavior/testform/TestFormBehavior.java+++ b/web/src/main/java/com/gitplex/server/web/behavior/testform/TestFormBehavior.java@@ -2,6 +2,8 @@ package com.gitplex.server.web.behavior.testform;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.ajax.AjaxRequestTarget;+import org.unbescape.html.HtmlEscape;+import org.unbescape.javascript.JavaScriptEscape;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;@@ -15,21 +17,20 @@ public abstract class TestFormBehavior extends AbstractPostAjaxBehavior {if (result.isSuccessful()) {feedbackHtml = String.format("<div class='test-feedback alert alert-success'>%s</div>",- result.getMessage());+ HtmlEscape.escapeHtml5(result.getMessage()));} else {feedbackHtml = String.format("<div class='test-feedback alert alert-danger'>%s</div>",- result.getMessage());+ HtmlEscape.escapeHtml5(result.getMessage()));}- feedbackHtml = StringUtils.replace(feedbackHtml, "'", "\\'");- feedbackHtml = StringUtils.replace(feedbackHtml, "\n", " ");+ feedbackHtml = StringUtils.replace(feedbackHtml, "\n", "<br>");target.appendJavaScript(String.format("var $button = $('#%s');"+ "$button.removeAttr('disabled');"+ "$button.val($button[0].prevValue);"+ "$button.html($button[0].prevHtml);"+ "$button.closest('form').append('%s');"+ "$button.removeClass('ajax-indicator');",- getComponent().getMarkupId(), feedbackHtml));+ getComponent().getMarkupId(), JavaScriptEscape.escapeJavaScript(feedbackHtml)));}public void requestTest(AjaxRequestTarget target) {diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.html b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.htmlindex 72d8c7742d..4cce862718 100644--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.html+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.html@@ -18,7 +18,7 @@<td class="path-filter"><form wicket:id="pathFilter"><div class="input-group">- <input wicket:id="input" class="form-control" spellcheck="false" autocomplete="off" placeholder="Search by path pattern" type="text"></input>+ <input wicket:id="input" class="form-control" spellcheck="false" autocomplete="off" placeholder="Filter by path" type="text"></input><span class="input-group-btn"><button wicket:id="submit" title="Filter" class="btn btn-default" type="submit"><i class="fa fa-search"></i></button></span>diff --git a/web/src/main/java/com/gitplex/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.java b/web/src/main/java/com/gitplex/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.javaindex 76b6f3bc80..2f23dac799 100644--- a/web/src/main/java/com/gitplex/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.java@@ -20,6 +20,7 @@ import com.gitplex.server.manager.ProjectManager;import com.gitplex.server.manager.UserManager;import com.gitplex.server.model.Group;import com.gitplex.server.model.GroupAuthorization;+import com.gitplex.server.model.Membership;import com.gitplex.server.model.Project;import com.gitplex.server.model.User;import com.gitplex.server.security.ProjectPrivilege;@@ -79,14 +80,14 @@ public class PrivilegeSourcePanel extends Panel {@Overrideprotected List<Group> load() {List<Group> groups = new ArrayList<>();- for (Group group: user.getGroups()) {- if (group.isAdministrator()) {- groups.add(group);+ for (Membership membership: user.getMemberships()) {+ if (membership.getGroup().isAdministrator()) {+ groups.add(membership.getGroup());} else {- for (GroupAuthorization authorization: group.getAuthorizations()) {+ for (GroupAuthorization authorization: membership.getGroup().getAuthorizations()) {if (authorization.getProject().equals(project)&& authorization.getPrivilege() == privilege) {- groups.add(group);+ groups.add(membership.getGroup());break;}}diff --git a/web/src/main/java/com/gitplex/server/web/editable/polymorphic/PolymorphicPropertyEditor.java b/web/src/main/java/com/gitplex/server/web/editable/polymorphic/PolymorphicPropertyEditor.javaindex db65d879cb..148e265f7d 100644--- a/web/src/main/java/com/gitplex/server/web/editable/polymorphic/PolymorphicPropertyEditor.java+++ b/web/src/main/java/com/gitplex/server/web/editable/polymorphic/PolymorphicPropertyEditor.java@@ -21,6 +21,7 @@ import com.gitplex.launcher.loader.AppLoader;import com.gitplex.launcher.loader.ImplementationRegistry;import com.gitplex.server.util.editable.EditableUtils;import com.gitplex.server.util.editable.annotation.Horizontal;+import com.gitplex.server.util.editable.annotation.NullChoice;import com.gitplex.server.util.editable.annotation.Vertical;import com.gitplex.server.web.editable.BeanContext;import com.gitplex.server.web.editable.BeanEditor;@@ -129,7 +130,18 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {fragment.replace(newBeanEditor(propertyValue));}- }, implementationNames);+ }, implementationNames) {++ @Override+ protected String getNullValidDisplayValue() {+ NullChoice nullChoice = getPropertyDescriptor().getPropertyGetter().getAnnotation(NullChoice.class);+ if (nullChoice != null)+ return nullChoice.value();+ else+ return super.getNullValidDisplayValue();+ }++ };typeSelector.setNullValid(!getPropertyDescriptor().isPropertyRequired());typeSelector.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.javaindex c72c7b2d9d..31e613ea22 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.java@@ -14,6 +14,13 @@ import com.gitplex.server.web.ComponentRenderer;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.tabbable.PageTab;import com.gitplex.server.web.component.tabbable.Tabbable;+import com.gitplex.server.web.page.admin.authenticator.AuthenticatorPage;+import com.gitplex.server.web.page.admin.databasebackup.DatabaseBackupPage;+import com.gitplex.server.web.page.admin.mailsetting.MailSettingPage;+import com.gitplex.server.web.page.admin.securitysetting.SecuritySettingPage;+import com.gitplex.server.web.page.admin.serverinformation.ServerInformationPage;+import com.gitplex.server.web.page.admin.serverlog.ServerLogPage;+import com.gitplex.server.web.page.admin.systemsetting.SystemSettingPage;import com.gitplex.server.web.page.layout.LayoutPage;@SuppressWarnings("serial")@@ -31,6 +38,7 @@ public abstract class AdministrationPage extends LayoutPage {List<PageTab> tabs = new ArrayList<>();tabs.add(new AdministrationTab("System Setting", "fa fa-fw fa-sliders", SystemSettingPage.class));tabs.add(new AdministrationTab("Security Setting", "fa fa-fw fa-lock", SecuritySettingPage.class));+ tabs.add(new AdministrationTab("External Authentication", "fa fa-fw fa-key", AuthenticatorPage.class));tabs.add(new AdministrationTab("Mail Setting", "fa fa-fw fa-envelope", MailSettingPage.class));tabs.add(new AdministrationTab("Database Backup", "fa fa-fw fa-database", DatabaseBackupPage.class));tabs.add(new AdministrationTab("Server Log", "fa fa-fw fa-file-text-o", ServerLogPage.class));diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/administration.css b/web/src/main/java/com/gitplex/server/web/page/admin/administration.cssindex 8cd2fd76f5..d9027163ce 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/administration.css+++ b/web/src/main/java/com/gitplex/server/web/page/admin/administration.css@@ -1,5 +1,5 @@#administration.sidebar>table>tbody>tr>td.nav a {- width: 200px;+ width: 240px;}#administration.sidebar>table>tbody>tr>td.content {padding: 20px;diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/authenticator/AuthenticationToken.java b/web/src/main/java/com/gitplex/server/web/page/admin/authenticator/AuthenticationToken.javanew file mode 100644index 0000000000..446a913047--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/admin/authenticator/AuthenticationToken.java@@ -0,0 +1,41 @@+package com.gitplex.server.web.page.admin.authenticator;++import java.io.Serializable;++import org.hibernate.validator.constraints.NotEmpty;++import com.gitplex.server.util.editable.annotation.Editable;+import com.gitplex.server.util.editable.annotation.Password;++@Editable+public class AuthenticationToken implements Serializable {++ private static final long serialVersionUID = 1L;++ private String userName;++ private String password;++ @Editable(order=100, description="Specify user name to authenticate with")+ @NotEmpty+ public String getUserName() {+ return userName;+ }++ public void setUserName(String userName) {+ this.userName = userName;+ }++ @Editable(order=200, description="Specify password to authenticate with")+ @Password+ @NotEmpty+ public String getPassword() {+ return password;+ }++ public void setPassword(String password) {+ this.password = password;+ }+++}diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/authenticator/AuthenticatorHolder.java b/web/src/main/java/com/gitplex/server/web/page/admin/authenticator/AuthenticatorHolder.javanew file mode 100644index 0000000000..ecfba48329--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/admin/authenticator/AuthenticatorHolder.java@@ -0,0 +1,26 @@+package com.gitplex.server.web.page.admin.authenticator;++import java.io.Serializable;++import com.gitplex.server.security.authenticator.Authenticator;+import com.gitplex.server.util.editable.annotation.Editable;+import com.gitplex.server.util.editable.annotation.NullChoice;++@Editable+public class AuthenticatorHolder implements Serializable {++ private static final long serialVersionUID = 1L;++ private Authenticator authenticator;++ @Editable+ @NullChoice("No external authentication")+ public Authenticator getAuthenticator() {+ return authenticator;+ }++ public void setAuthenticator(Authenticator authenticator) {+ this.authenticator = authenticator;+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/authenticator/AuthenticatorPage.html b/web/src/main/java/com/gitplex/server/web/page/admin/authenticator/AuthenticatorPage.htmlnew file mode 100644index 0000000000..f48ac9870d--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/admin/authenticator/AuthenticatorPage.html@@ -0,0 +1,28 @@+<wicket:extend>+ <form wicket:id="authenticator" class="authenticator leave-confirm">+ <div wicket:id="editor"></div>+ <div class="actions">+ <input wicket:id="save" type="submit" class="btn btn-primary dirty-aware" value="Save setting"></input>+ <input wicket:id="test" type="submit" class="btn btn-primary" value="Test setting"></input>+ </div>+ </form>+ <wicket:fragment wicket:id="testFrag">+ <form wicket:id="form" class="authenticator-test">+ <div class="modal-header">+ <button wicket:id="close" type="button" class="close">×</button>+ <h4 id="modal-title" class="modal-title">+ Authentication Test+ </h4>+ </div>+ <div class="modal-body">+ <div wicket:id="editor"></div>+ </div>+ <div class="modal-footer">+ <div class="form-group">+ <button wicket:id="ok" class="btn btn-primary">Ok</button>+ <button wicket:id="cancel" class="btn btn-default">Cancel</button>+ </div>+ </div>+ </form>+ </wicket:fragment>+</wicket:extend>diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/authenticator/AuthenticatorPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/authenticator/AuthenticatorPage.javanew file mode 100644index 0000000000..c7e9c7471b--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/admin/authenticator/AuthenticatorPage.java@@ -0,0 +1,217 @@+package com.gitplex.server.web.page.admin.authenticator;++import java.io.Serializable;++import org.apache.shiro.authc.AuthenticationException;+import org.apache.shiro.authc.UsernamePasswordToken;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.event.IEvent;+import org.apache.wicket.markup.html.form.Button;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.util.visit.IVisit;+import org.apache.wicket.util.visit.IVisitor;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.ConfigManager;+import com.gitplex.server.security.authenticator.Authenticated;+import com.gitplex.server.util.ExceptionUtils;+import com.gitplex.server.web.behavior.testform.TestFormBehavior;+import com.gitplex.server.web.behavior.testform.TestResult;+import com.gitplex.server.web.component.modal.ModalPanel;+import com.gitplex.server.web.editable.BeanContext;+import com.gitplex.server.web.editable.BeanEditor;+import com.gitplex.server.web.editable.EditorChanged;+import com.gitplex.server.web.editable.PropertyContext;+import com.gitplex.server.web.editable.PropertyEditor;+import com.gitplex.server.web.page.admin.AdministrationPage;+import com.google.common.base.Joiner;++@SuppressWarnings("serial")+public class AuthenticatorPage extends AdministrationPage {++ private static final Logger logger = LoggerFactory.getLogger(AuthenticatorPage.class);++ private AuthenticationToken token = new AuthenticationToken();++ @Override+ protected void onInitialize() {+ super.onInitialize();++ AuthenticatorHolder authenticatorHolder = new AuthenticatorHolder();+ authenticatorHolder.setAuthenticator(GitPlex.getInstance(ConfigManager.class).getAuthenticator());++ PropertyEditor<Serializable> authenticatorEditor =+ PropertyContext.editBean("editor", authenticatorHolder, "authenticator");+ authenticatorEditor.setOutputMarkupId(true);+ Button saveButton = new Button("save") {++ @Override+ public void onSubmit() {+ super.onSubmit();++ GitPlex.getInstance(ConfigManager.class).saveAuthenticator(authenticatorHolder.getAuthenticator());+ getSession().success("External authentication setting has been saved");+ }++ };+ AjaxButton testButton = new AjaxButton("test") {++ private TestFormBehavior testBehavior;++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(testBehavior = new TestFormBehavior() {++ @Override+ protected TestResult test() {+ try {+ Authenticated authenticated = authenticatorHolder.getAuthenticator().authenticate(+ new UsernamePasswordToken(token.getUserName(), token.getPassword()));+ StringBuilder retrievedInfoBuilder = new StringBuilder();+ if (authenticated.getFullName() != null) {+ retrievedInfoBuilder.append("Full name: ")+ .append(authenticated.getFullName())+ .append("\n");+ }+ if (authenticated.getEmail() != null) {+ retrievedInfoBuilder.append("Email: ")+ .append(authenticated.getEmail())+ .append("\n");+ }+ if (authenticated.getGroupNames() != null) {+ retrievedInfoBuilder.append("Groups: ")+ .append(Joiner.on(", ").join(authenticated.getGroupNames()))+ .append("\n");+ }+ StringBuilder messageBuilder =+ new StringBuilder("Test successful: authentication passed");+ if (retrievedInfoBuilder.length() != 0) {+ messageBuilder.append(" with below information retrieved:\n")+ .append(retrievedInfoBuilder);+ }+ return new TestResult.Successful(messageBuilder.toString());+ } catch (AuthenticationException e) {+ return new TestResult.Successful("Test successful: authentication not passed: " + e.getMessage());+ } catch (Exception e) {+ logger.error("Error testing external authentication", e);+ String suggestedSolution = ExceptionUtils.suggestSolution(e);+ if (suggestedSolution != null)+ logger.warn("!!! " + suggestedSolution);+ return new TestResult.Failed("Error testing external authentication: "+ + e.getMessage() + ", check server log for details.");+ }+ }++ });+ setOutputMarkupPlaceholderTag(true);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();++ BeanEditor<Serializable> beanEditor = authenticatorEditor.visitChildren(BeanEditor.class,+ new IVisitor<BeanEditor<Serializable>, BeanEditor<Serializable>>() {++ public void component(BeanEditor<Serializable> component, IVisit<BeanEditor<Serializable>> visit) {+ visit.stop(component);+ }++ });+ setVisible(beanEditor != null && beanEditor.isVisibleInHierarchy());+ }++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ new ModalPanel(target) {++ @Override+ protected Component newContent(String id) {+ Fragment fragment = new Fragment(id, "testFrag", AuthenticatorPage.this);+ BeanEditor<Serializable> tokenEditor = BeanContext.editBean("editor", token);+ tokenEditor.setOutputMarkupId(true);+ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onError() {+ super.onError();+ RequestCycle.get().find(AjaxRequestTarget.class).add(tokenEditor);+ }++ @Override+ protected void onSubmit() {+ super.onSubmit();+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ target.add(tokenEditor);+ target.focusComponent(null);+ close();+ testBehavior.requestTest(target);+ }++ };+ form.add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ close();+ }++ });+ form.add(tokenEditor);+ form.add(new AjaxButton("ok") {});+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ close();+ }++ });+ fragment.add(form);+ return fragment;+ }++ };+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ target.add(authenticatorEditor);+ }++ };++ Form<?> form = new Form<Void>("authenticator") {++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof EditorChanged) {+ EditorChanged editorChanged = (EditorChanged) event.getPayload();+ editorChanged.getHandler().add(testButton);+ }++ }++ };++ form.add(authenticatorEditor);+ form.add(saveButton);+ form.add(testButton);++ add(form);+ }++}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/admin/BackupSettingHolder.java b/web/src/main/java/com/gitplex/server/web/page/admin/databasebackup/BackupSettingHolder.javasimilarity index 90%rename from web/src/main/java/com/gitplex/server/web/page/admin/BackupSettingHolder.javarename to web/src/main/java/com/gitplex/server/web/page/admin/databasebackup/BackupSettingHolder.javaindex cc59936ef5..662cc2974e 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/BackupSettingHolder.java+++ b/web/src/main/java/com/gitplex/server/web/page/admin/databasebackup/BackupSettingHolder.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.admin;+package com.gitplex.server.web.page.admin.databasebackup;import java.io.Serializable;diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/DatabaseBackupPage.html b/web/src/main/java/com/gitplex/server/web/page/admin/databasebackup/DatabaseBackupPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/admin/DatabaseBackupPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/admin/databasebackup/DatabaseBackupPage.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/admin/DatabaseBackupPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/databasebackup/DatabaseBackupPage.javasimilarity index 94%rename from web/src/main/java/com/gitplex/server/web/page/admin/DatabaseBackupPage.javarename to web/src/main/java/com/gitplex/server/web/page/admin/databasebackup/DatabaseBackupPage.javaindex db20a30eff..e334fe7f52 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/DatabaseBackupPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/admin/databasebackup/DatabaseBackupPage.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.admin;+package com.gitplex.server.web.page.admin.databasebackup;import java.io.File;import java.io.IOException;@@ -14,6 +14,7 @@ import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.persistence.PersistManager;import com.gitplex.server.util.FileUtils;import com.gitplex.server.web.editable.BeanContext;+import com.gitplex.server.web.page.admin.AdministrationPage;@SuppressWarnings("serial")public class DatabaseBackupPage extends AdministrationPage {diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingHolder.java b/web/src/main/java/com/gitplex/server/web/page/admin/mailsetting/MailSettingHolder.javasimilarity index 90%rename from web/src/main/java/com/gitplex/server/web/page/admin/MailSettingHolder.javarename to web/src/main/java/com/gitplex/server/web/page/admin/mailsetting/MailSettingHolder.javaindex bcf89cc236..565d735ef5 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingHolder.java+++ b/web/src/main/java/com/gitplex/server/web/page/admin/mailsetting/MailSettingHolder.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.admin;+package com.gitplex.server.web.page.admin.mailsetting;import java.io.Serializable;diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingPage.html b/web/src/main/java/com/gitplex/server/web/page/admin/mailsetting/MailSettingPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/admin/MailSettingPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/admin/mailsetting/MailSettingPage.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/mailsetting/MailSettingPage.javasimilarity index 97%rename from web/src/main/java/com/gitplex/server/web/page/admin/MailSettingPage.javarename to web/src/main/java/com/gitplex/server/web/page/admin/mailsetting/MailSettingPage.javaindex ca512c0510..4c00ec444c 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/admin/mailsetting/MailSettingPage.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.admin;+package com.gitplex.server.web.page.admin.mailsetting;import java.io.Serializable;@@ -24,6 +24,7 @@ import com.gitplex.server.web.behavior.testform.TestResult;import com.gitplex.server.web.editable.BeanContext;import com.gitplex.server.web.editable.BeanEditor;import com.gitplex.server.web.editable.EditorChanged;+import com.gitplex.server.web.page.admin.AdministrationPage;@SuppressWarnings("serial")public class MailSettingPage extends AdministrationPage {diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/SecuritySettingPage.html b/web/src/main/java/com/gitplex/server/web/page/admin/securitysetting/SecuritySettingPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/admin/SecuritySettingPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/admin/securitysetting/SecuritySettingPage.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/admin/SecuritySettingPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/securitysetting/SecuritySettingPage.javasimilarity index 88%rename from web/src/main/java/com/gitplex/server/web/page/admin/SecuritySettingPage.javarename to web/src/main/java/com/gitplex/server/web/page/admin/securitysetting/SecuritySettingPage.javaindex 90ccd1ac7f..35b5174c2d 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/SecuritySettingPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/admin/securitysetting/SecuritySettingPage.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.admin;+package com.gitplex.server.web.page.admin.securitysetting;import org.apache.wicket.markup.html.form.Form;@@ -6,6 +6,7 @@ import com.gitplex.server.GitPlex;import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.model.support.setting.SecuritySetting;import com.gitplex.server.web.editable.BeanContext;+import com.gitplex.server.web.page.admin.AdministrationPage;@SuppressWarnings("serial")public class SecuritySettingPage extends AdministrationPage {diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/ServerInformationPage.html b/web/src/main/java/com/gitplex/server/web/page/admin/serverinformation/ServerInformationPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/admin/ServerInformationPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/admin/serverinformation/ServerInformationPage.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/admin/ServerInformationPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/serverinformation/ServerInformationPage.javasimilarity index 94%rename from web/src/main/java/com/gitplex/server/web/page/admin/ServerInformationPage.javarename to web/src/main/java/com/gitplex/server/web/page/admin/serverinformation/ServerInformationPage.javaindex 7f98cbf2b2..571a228cad 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/ServerInformationPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/admin/serverinformation/ServerInformationPage.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.admin;+package com.gitplex.server.web.page.admin.serverinformation;import java.util.Date;@@ -7,6 +7,7 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.server.util.FileUtils;+import com.gitplex.server.web.page.admin.AdministrationPage;import com.gitplex.server.web.util.DateUtils;import de.agilecoders.wicket.core.markup.html.bootstrap.components.progress.ProgressBar;diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/ServerLogPage.html b/web/src/main/java/com/gitplex/server/web/page/admin/serverlog/ServerLogPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/admin/ServerLogPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/admin/serverlog/ServerLogPage.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/admin/ServerLogPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/serverlog/ServerLogPage.javasimilarity index 90%rename from web/src/main/java/com/gitplex/server/web/page/admin/ServerLogPage.javarename to web/src/main/java/com/gitplex/server/web/page/admin/serverlog/ServerLogPage.javaindex 9005682827..4f0ad29292 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/ServerLogPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/admin/serverlog/ServerLogPage.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.admin;+package com.gitplex.server.web.page.admin.serverlog;import java.util.List;@@ -6,6 +6,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.ResourceLink;+import com.gitplex.server.web.page.admin.AdministrationPage;import com.gitplex.server.web.util.resource.ServerLogResource;import com.gitplex.server.web.util.resource.ServerLogResourceReference;import com.google.common.base.Joiner;diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/SystemSettingPage.html b/web/src/main/java/com/gitplex/server/web/page/admin/systemsetting/SystemSettingPage.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/admin/SystemSettingPage.htmlrename to web/src/main/java/com/gitplex/server/web/page/admin/systemsetting/SystemSettingPage.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/admin/SystemSettingPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/systemsetting/SystemSettingPage.javasimilarity index 88%rename from web/src/main/java/com/gitplex/server/web/page/admin/SystemSettingPage.javarename to web/src/main/java/com/gitplex/server/web/page/admin/systemsetting/SystemSettingPage.javaindex 6aa4a08226..d13af3d47c 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/SystemSettingPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/admin/systemsetting/SystemSettingPage.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.admin;+package com.gitplex.server.web.page.admin.systemsetting;import org.apache.wicket.markup.html.form.Form;@@ -6,6 +6,7 @@ import com.gitplex.server.GitPlex;import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.model.support.setting.SystemSetting;import com.gitplex.server.web.editable.BeanContext;+import com.gitplex.server.web.page.admin.AdministrationPage;@SuppressWarnings("serial")public class SystemSettingPage extends AdministrationPage {diff --git a/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.java b/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.javaindex 0ca1a1ea57..0cd5a5d9bf 100644--- a/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.java@@ -15,7 +15,7 @@ import com.gitplex.server.manager.ProjectManager;import com.gitplex.server.manager.UserManager;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.ComponentRenderer;-import com.gitplex.server.web.page.admin.SystemSettingPage;+import com.gitplex.server.web.page.admin.systemsetting.SystemSettingPage;import com.gitplex.server.web.page.group.GroupListPage;import com.gitplex.server.web.page.group.NewGroupPage;import com.gitplex.server.web.page.layout.LayoutPage;diff --git a/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.java b/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.javaindex 7b3ed37503..db0f294381 100644--- a/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.java@@ -113,7 +113,7 @@ public class LoginPage extends BasePage {continueToOriginalDestination();setResponsePage(getApplication().getHomePage());} catch (AuthenticationException ae) {- error("Invalid user name and/or password.");+ error("Authentication not passed");}}}diff --git a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.htmlindex 795b443f3a..6b05f6b5a5 100644--- a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html@@ -1,3 +1,4 @@<wicket:extend>- <a wicket:id="test">test</a>+ <a wicket:id="save">save</a>+ <a wicket:id="load">load</a></wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.javaindex 54b39e86e3..5e2ce2e605 100644--- a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java@@ -1,7 +1,13 @@package com.gitplex.server.web.page.test;+import java.io.File;+import org.apache.wicket.markup.html.link.Link;+import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.ConfigManager;+import com.gitplex.server.migration.VersionedDocument;+import com.gitplex.server.security.authenticator.ldap.LdapAuthenticator;import com.gitplex.server.web.page.base.BasePage;@SuppressWarnings("serial")@@ -11,13 +17,34 @@ public class TestPage extends BasePage {protected void onInitialize() {super.onInitialize();- add(new Link<Void>("test") {+ add(new Link<Void>("save") {@Overridepublic void onClick() {+ LdapAuthenticator authenticator = new LdapAuthenticator();+ authenticator.setManagerPassword("12345");+ authenticator.setManagerDN("robin");+ authenticator.setLdapUrl("ldaps://localhost:389");+ authenticator.setUserSearchFilter("&(ab)");+ VersionedDocument dom = VersionedDocument.fromBean(authenticator);+ dom.writeToFile(new File("w:\\temp\\authenticator.xml"), true);+ GitPlex.getInstance(ConfigManager.class).saveAuthenticator(authenticator);}});++ add(new Link<Void>("load") {++ @Override+ public void onClick() {+ VersionedDocument dom = VersionedDocument.fromFile(new File("w:\\temp\\authenticator.xml"));+ System.out.println(dom.asXML());+ LdapAuthenticator authenticator = (LdapAuthenticator) dom.toBean();+ System.out.println(authenticator.getUserSearchFilter());+ }++ });+}}