Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-07 14:05:44 +01:00
Code Issues Packages Projects Releases Activity

fix UserManager

Browse Source
This commit is contained in:
Sebastian Sdorra
2010-11-26 15:37:35 +01:00
parent c56b7aaf88
commit d52be48587
11 changed files with 113 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
View File

@@ -51,10 +51,10 @@ import sonia.scm.repository.RepositoryHandler;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.security.EncryptionHandler;
import sonia.scm.security.MessageDigestEncryptionHandler;
import sonia.scm.user.BasicUserManager;
import sonia.scm.user.UserHandler;
import sonia.scm.user.UserManager;
import sonia.scm.user.xml.XmlUserHandler;
import sonia.scm.util.DebugServlet;
import sonia.scm.util.Util;
import sonia.scm.web.plugin.SCMPlugin;
@@ -83,6 +83,7 @@ import java.util.Set;
import javax.xml.bind.JAXB;
import sonia.scm.repository.xml.XmlRepositoryManager;
import sonia.scm.user.xml.XmlUserManager;
/**
*
@@ -168,7 +169,7 @@ public class ScmServletModule extends ServletModule
//bind(RepositoryManager.class).annotatedWith(Undecorated.class).to(
// BasicRepositoryManager.class);
bind(RepositoryManager.class).to(XmlRepositoryManager.class);
bind(UserManager.class).to(BasicUserManager.class);
bind(UserManager.class).to(XmlUserManager.class);
bind(ScmWebPluginContext.class).toInstance(webPluginContext);
// filter(PATTERN_RESTAPI).through(LoggingFilter.class);
@@ -269,13 +270,6 @@ public class ScmServletModule extends ServletModule
Set<Class<? extends RepositoryHandler>> repositoryHandlerSet =
new LinkedHashSet<Class<? extends RepositoryHandler>>();
// user handlers
Multibinder<UserHandler> userHandlerBinder =
Multibinder.newSetBinder(binder(), UserHandler.class);
Set<Class<? extends UserHandler>> userHandlerSet =
new LinkedHashSet<Class<? extends UserHandler>>();
userHandlerSet.add(XmlUserHandler.class);
// security stuff
Class<? extends EncryptionHandler> encryptionHandler =
@@ -292,13 +286,6 @@ public class ScmServletModule extends ServletModule
repositoryHandlerSet.addAll(pluginRepositoryHandlers);
}
Collection<Class<? extends UserHandler>> pluginUserHandlers =
plugin.getUserHandlers();
if (Util.isNotEmpty(pluginUserHandlers))
{
userHandlerSet.addAll(pluginUserHandlers);
}
SecurityConfig securityConfig = plugin.getSecurityConfig();
@@ -325,7 +312,6 @@ public class ScmServletModule extends ServletModule
bind(EncryptionHandler.class).to(encryptionHandler);
bind(Authenticator.class).to(authenticator);
bindRepositoryHandlers(repositoryHandlerBinder, repositoryHandlerSet);
bindUserHandlers(userHandlerBinder, userHandlerSet);
}
}

2
scm-webapp/src/main/java/sonia/scm/api/rest/JsonJaxbContextResolver.java
View File

@@ -72,7 +72,7 @@ public class JsonJaxbContextResolver implements ContextResolver<JAXBContext>
this.context = new JSONJAXBContext(
JSONConfiguration.mapped().rootUnwrapping(true).arrays(
"member", "groups", "permissions", "repositories",
"repositoryTypes").nonStrings(
"repositoryTypes", "users").nonStrings(
"readable", "writeable", "groupPermission",
"admin").build(), types.toArray(new Class[0]));
}

6
scm-webapp/src/main/java/sonia/scm/web/security/XmlAuthenticator.java
View File

@@ -44,7 +44,6 @@ import org.slf4j.LoggerFactory;
import sonia.scm.SCMContextProvider;
import sonia.scm.security.EncryptionHandler;
import sonia.scm.user.User;
import sonia.scm.user.xml.XmlUserHandler;
//~--- JDK imports ------------------------------------------------------------
@@ -52,6 +51,7 @@ import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import sonia.scm.user.UserManager;
/**
*
@@ -86,7 +86,7 @@ public class XmlAuthenticator implements Authenticator
HttpServletResponse response, String username,
String password)
{
User user = userHandler.get(username);
User user = userManager.get(username);
if (user != null)
{
@@ -153,5 +153,5 @@ public class XmlAuthenticator implements Authenticator
/** Field description */
@Inject
private XmlUserHandler userHandler;
private UserManager userManager;
}