Skip to content

Commit d428cc7

Browse files
slonopotamusslonopotamus
committed
UserDB configuration
1 parent 3711a2d commit d428cc7

File tree

8 files changed

+205
-54
lines changed

8 files changed

+205
-54
lines changed

‎git-as-svn/.idea/runConfigurations/Main.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎git-as-svn/config.example

+12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
!!svnserver.config.Config:
22
port: 3690
3+
realm: Example Realm
4+
35
repository:
46
branch: local
57
path: ../.git
8+
9+
userDB: !!svnserver.config.LocalUserDBConfig {}
10+
#userDB: !!svnserver.config.LDAPUserDBConfig
11+
# authentication: DIGEST-MD5
12+
# connectionUrl: ldap://localhost:389/ou=groups,dc=mycompany,dc=com
13+
# contextFactory: com.sun.jndi.ldap.LdapCtxFactory
14+
# emailAttribute: mail
15+
# nameAttribute: name
16+
# userSearch: (mail={0})
17+
# userSubtree: false

‎git-as-svn/src/main/java/svnserver/auth/LDAPUserDB.java

+11-50
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.tmatesoft.svn.core.SVNErrorCode;
88
import org.tmatesoft.svn.core.SVNErrorMessage;
99
import org.tmatesoft.svn.core.SVNException;
10+
import svnserver.config.LDAPUserDBConfig;
1011

1112
import javax.naming.AuthenticationException;
1213
import javax.naming.Context;
@@ -34,60 +35,20 @@ public final class LDAPUserDB implements UserDB, PasswordChecker {
3435
@NotNull
3536
private final Collection<Authenticator> authenticators = Collections.singleton(new PlainAuthenticator(this));
3637

37-
/**
38-
* This is a URL whose format is defined by the JNDI provider.
39-
* It is usually an LDAP URL that specifies the domain name of the directory server to connect to,
40-
* and optionally the port number and distinguished name (DN) of the required root naming context.
41-
* <p>
42-
* Example:
43-
*/
4438
@NotNull
45-
private String connectionUrl = "ldap://localhost:389/ou=groups,dc=mycompany,dc=com";
46-
/**
47-
* The JNDI context factory used to acquire our InitialContext. By
48-
* default, assumes use of an LDAP server using the standard JNDI LDAP
49-
* provider.
50-
*/
51-
@NotNull
52-
private final String contextFactory = "com.sun.jndi.ldap.LdapCtxFactory";
53-
/**
54-
* The type of authentication to use.
55-
*/
56-
@NotNull
57-
private String authentication = "DIGEST-MD5";
58-
/**
59-
* The search scope. Set to <code>true</code> if you wish to search the entire subtree rooted at the <code>userBase</code> entry. The default value of <code>false</code> requests a single-level search including only the top level.
60-
*/
61-
private boolean userSubtree;
62-
/**
63-
* Pattern specifying the LDAP search filter to use after substitution of the username.
64-
*/
65-
@NotNull
66-
private String userSearch = "(mail={0})";
67-
/**
68-
* LDAP attribute, containing user name.
69-
*/
70-
@NotNull
71-
private String nameAttribute = "name";
72-
/**
73-
* LDAP attribute, containing user email.
74-
*/
75-
@NotNull
76-
private String emailAttribute = "mail";
39+
private final LDAPUserDBConfig config;
7740

78-
public LDAPUserDB(@NotNull String connectionUrl, @NotNull String userSearch, boolean userSubtree) {
79-
this.userSearch = userSearch;
80-
this.userSubtree = userSubtree;
81-
this.connectionUrl = connectionUrl;
41+
public LDAPUserDB(@NotNull LDAPUserDBConfig config) {
42+
this.config = config;
8243
}
8344

8445
@Nullable
8546
@Override
8647
public User check(@NotNull String username, @NotNull String password) throws SVNException {
8748
final Hashtable<String, Object> env = new Hashtable<>();
88-
env.put(Context.INITIAL_CONTEXT_FACTORY, contextFactory);
89-
env.put(Context.PROVIDER_URL, connectionUrl);
90-
env.put(Context.SECURITY_AUTHENTICATION, authentication);
49+
env.put(Context.INITIAL_CONTEXT_FACTORY, config.getContextFactory());
50+
env.put(Context.PROVIDER_URL, config.getConnectionUrl());
51+
env.put(Context.SECURITY_AUTHENTICATION, config.getAuthentication());
9152
env.put(Context.SECURITY_PRINCIPAL, username);
9253
env.put(Context.SECURITY_CREDENTIALS, password);
9354

@@ -96,15 +57,15 @@ public User check(@NotNull String username, @NotNull String password) throws SVN
9657
context = new InitialDirContext(env);
9758

9859
final SearchControls searchControls = new SearchControls();
99-
searchControls.setSearchScope(userSubtree ? SearchControls.SUBTREE_SCOPE : SearchControls.ONELEVEL_SCOPE);
60+
searchControls.setSearchScope(config.isUserSubtree() ? SearchControls.SUBTREE_SCOPE : SearchControls.ONELEVEL_SCOPE);
10061

101-
final NamingEnumeration<SearchResult> search = context.search("", MessageFormat.format(userSearch, username), searchControls);
62+
final NamingEnumeration<SearchResult> search = context.search("", MessageFormat.format(config.getUserSearch(), username), searchControls);
10263
if (!search.hasMore())
10364
return null;
10465

10566
final Attributes attributes = search.next().getAttributes();
106-
final String realName = String.valueOf(attributes.get(nameAttribute).get());
107-
final String email = String.valueOf(attributes.get(emailAttribute).get());
67+
final String realName = String.valueOf(attributes.get(config.getNameAttribute()).get());
68+
final String email = String.valueOf(attributes.get(config.getEmailAttribute()).get());
10869

10970
return new User(username, realName, email);
11071
} catch (AuthenticationException e) {

‎git-as-svn/src/main/java/svnserver/config/Config.java

+23
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,15 @@
1010
public final class Config {
1111
private int port = 3690;
1212

13+
@NotNull
14+
private String realm = "";
15+
1316
@NotNull
1417
private RepositoryConfig repository = new RepositoryConfig();
1518

19+
@NotNull
20+
private UserDBConfig userDB = new LocalUserDBConfig();
21+
1622
public void setPort(int port) {
1723
this.port = port;
1824
}
@@ -21,6 +27,14 @@ public int getPort() {
2127
return port;
2228
}
2329

30+
@NotNull
31+
public String getRealm() {
32+
return realm;
33+
}
34+
35+
public void setRealm(@NotNull String realm) {
36+
this.realm = realm;
37+
}
2438
public void setRepository(@NotNull RepositoryConfig repository) {
2539
this.repository = repository;
2640
}
@@ -29,4 +43,13 @@ public void setRepository(@NotNull RepositoryConfig repository) {
2943
public RepositoryConfig getRepository() {
3044
return repository;
3145
}
46+
47+
public void setUserDB(@NotNull UserDBConfig userDB) {
48+
this.userDB = userDB;
49+
}
50+
51+
@NotNull
52+
public UserDBConfig getUserDB() {
53+
return userDB;
54+
}
3255
}

‎git-as-svn/src/main/java/svnserver/config/LDAPUserDBConfig.java

+120
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
package svnserver.config;
2+
3+
import org.jetbrains.annotations.NotNull;
4+
import svnserver.auth.LDAPUserDB;
5+
import svnserver.auth.UserDB;
6+
7+
/**
8+
* @author Marat Radchenko <[email protected]>
9+
*/
10+
public final class LDAPUserDBConfig implements UserDBConfig {
11+
12+
/**
13+
* This is a URL whose format is defined by the JNDI provider.
14+
* It is usually an LDAP URL that specifies the domain name of the directory server to connect to,
15+
* and optionally the port number and distinguished name (DN) of the required root naming context.
16+
* <p>
17+
* Example:
18+
*/
19+
@NotNull
20+
private String connectionUrl = "ldap://localhost:389/ou=groups,dc=mycompany,dc=com";
21+
/**
22+
* The JNDI context factory used to acquire our InitialContext. By
23+
* default, assumes use of an LDAP server using the standard JNDI LDAP
24+
* provider.
25+
*/
26+
@NotNull
27+
private String contextFactory = "com.sun.jndi.ldap.LdapCtxFactory";
28+
/**
29+
* The type of authentication to use.
30+
*/
31+
@NotNull
32+
private String authentication = "DIGEST-MD5";
33+
/**
34+
* The search scope. Set to <code>true</code> if you wish to search the entire subtree rooted at the <code>userBase</code> entry. The default value of <code>false</code> requests a single-level search including only the top level.
35+
*/
36+
private boolean userSubtree;
37+
/**
38+
* Pattern specifying the LDAP search filter to use after substitution of the username.
39+
*/
40+
@NotNull
41+
private String userSearch = "(mail={0})";
42+
/**
43+
* LDAP attribute, containing user name.
44+
*/
45+
@NotNull
46+
private String nameAttribute = "name";
47+
/**
48+
* LDAP attribute, containing user email.
49+
*/
50+
@NotNull
51+
private String emailAttribute = "mail";
52+
53+
@NotNull
54+
public String getConnectionUrl() {
55+
return connectionUrl;
56+
}
57+
58+
public void setConnectionUrl(@NotNull String connectionUrl) {
59+
this.connectionUrl = connectionUrl;
60+
}
61+
62+
@NotNull
63+
public String getContextFactory() {
64+
return contextFactory;
65+
}
66+
67+
public void setContextFactory(@NotNull String contextFactory) {
68+
this.contextFactory = contextFactory;
69+
}
70+
71+
@NotNull
72+
public String getAuthentication() {
73+
return authentication;
74+
}
75+
76+
public void setAuthentication(@NotNull String authentication) {
77+
this.authentication = authentication;
78+
}
79+
80+
public boolean isUserSubtree() {
81+
return userSubtree;
82+
}
83+
84+
public void setUserSubtree(boolean userSubtree) {
85+
this.userSubtree = userSubtree;
86+
}
87+
88+
@NotNull
89+
public String getUserSearch() {
90+
return userSearch;
91+
}
92+
93+
public void setUserSearch(@NotNull String userSearch) {
94+
this.userSearch = userSearch;
95+
}
96+
97+
@NotNull
98+
public String getNameAttribute() {
99+
return nameAttribute;
100+
}
101+
102+
public void setNameAttribute(@NotNull String nameAttribute) {
103+
this.nameAttribute = nameAttribute;
104+
}
105+
106+
@NotNull
107+
public String getEmailAttribute() {
108+
return emailAttribute;
109+
}
110+
111+
public void setEmailAttribute(@NotNull String emailAttribute) {
112+
this.emailAttribute = emailAttribute;
113+
}
114+
115+
@NotNull
116+
@Override
117+
public UserDB create() {
118+
return new LDAPUserDB(this);
119+
}
120+
}

‎git-as-svn/src/main/java/svnserver/config/LocalUserDBConfig.java

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package svnserver.config;
2+
3+
import org.jetbrains.annotations.NotNull;
4+
import svnserver.auth.LocalUserDB;
5+
import svnserver.auth.UserDB;
6+
7+
/**
8+
* Created by marat on 15.08.14.
9+
*/
10+
public final class LocalUserDBConfig implements UserDBConfig {
11+
@NotNull
12+
@Override
13+
public UserDB create() {
14+
return new LocalUserDB();
15+
}
16+
}

‎git-as-svn/src/main/java/svnserver/config/UserDBConfig.java

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package svnserver.config;
2+
3+
import org.jetbrains.annotations.NotNull;
4+
import svnserver.auth.UserDB;
5+
6+
import javax.xml.bind.annotation.XmlSeeAlso;
7+
8+
/**
9+
* @author Marat Radchenko <[email protected]>
10+
*/
11+
@XmlSeeAlso({
12+
LDAPUserDBConfig.class,
13+
LocalUserDBConfig.class
14+
})
15+
public interface UserDBConfig {
16+
@NotNull
17+
UserDB create();
18+
}

‎git-as-svn/src/main/java/svnserver/server/SvnServer.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import org.tmatesoft.svn.core.SVNException;
99
import svnserver.SvnConstants;
1010
import svnserver.auth.Authenticator;
11-
import svnserver.auth.LocalUserDB;
1211
import svnserver.auth.User;
1312
import svnserver.auth.UserDB;
1413
import svnserver.config.Config;
@@ -44,7 +43,7 @@ public class SvnServer {
4443
@NotNull
4544
private static final Logger log = LoggerFactory.getLogger(SvnServer.class);
4645
@NotNull
47-
private final UserDB userDB = new LocalUserDB();
46+
private final UserDB userDB;
4847
@NotNull
4948
private final Map<String, BaseCmd<?>> commands = new HashMap<>();
5049
@NotNull
@@ -55,6 +54,8 @@ public class SvnServer {
5554
public SvnServer(@NotNull Config config) throws IOException, SVNException {
5655
this.config = config;
5756

57+
userDB = config.getUserDB().create();
58+
5859
commands.put("commit", new CommitCmd());
5960
commands.put("diff", new DiffCmd());
6061
commands.put("get-latest-rev", new GetLatestRevCmd());
@@ -187,7 +188,7 @@ private User authenticate(@NotNull SvnServerParser parser, @NotNull SvnServerWri
187188
.listBegin()
188189
.word(String.join(" ", authenticators.stream().map(Authenticator::getMethodName).toArray(String[]::new)))
189190
.listEnd()
190-
.string("Realm name")
191+
.string(config.getRealm())
191192
.listEnd()
192193
.listEnd();
193194

0 commit comments

Comments
 (0)