mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-12 16:35:45 +01:00
added extension point for shiro realms
This commit is contained in:
@@ -40,4 +40,8 @@ http://bitbucket.org/sdorra/scm-manager
|
|||||||
<class>com.google.inject.Module</class>
|
<class>com.google.inject.Module</class>
|
||||||
<autoBind>false</autoBind>
|
<autoBind>false</autoBind>
|
||||||
</extension-point>
|
</extension-point>
|
||||||
|
<extension-point>
|
||||||
|
<class>org.apache.shiro.realm.Realm</class>
|
||||||
|
<autoBind>false</autoBind>
|
||||||
|
</extension-point>
|
||||||
</module>
|
</module>
|
||||||
|
|||||||
@@ -256,7 +256,9 @@ public class ScmContextListener extends GuiceServletContextListener
|
|||||||
moduleList.add(new EagerSingletonModule());
|
moduleList.add(new EagerSingletonModule());
|
||||||
moduleList.add(ShiroWebModule.guiceFilterModule());
|
moduleList.add(ShiroWebModule.guiceFilterModule());
|
||||||
moduleList.add(new ScmServletModule(servletCtx, pluginLoader, overrides));
|
moduleList.add(new ScmServletModule(servletCtx, pluginLoader, overrides));
|
||||||
moduleList.add(new ScmSecurityModule(servletCtx));
|
moduleList.add(
|
||||||
|
new ScmSecurityModule(servletCtx, pluginLoader.getExtensionProcessor())
|
||||||
|
);
|
||||||
appendModules(pluginLoader.getExtensionProcessor(), moduleList);
|
appendModules(pluginLoader.getExtensionProcessor(), moduleList);
|
||||||
moduleList.addAll(overrides.getModules());
|
moduleList.addAll(overrides.getModules());
|
||||||
|
|
||||||
|
|||||||
@@ -41,8 +41,12 @@ import org.apache.shiro.authc.credential.DefaultPasswordService;
|
|||||||
import org.apache.shiro.authc.credential.PasswordService;
|
import org.apache.shiro.authc.credential.PasswordService;
|
||||||
import org.apache.shiro.crypto.hash.DefaultHashService;
|
import org.apache.shiro.crypto.hash.DefaultHashService;
|
||||||
import org.apache.shiro.guice.web.ShiroWebModule;
|
import org.apache.shiro.guice.web.ShiroWebModule;
|
||||||
|
import org.apache.shiro.realm.Realm;
|
||||||
|
|
||||||
import sonia.scm.security.DefaultRealm;
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import sonia.scm.plugin.ExtensionProcessor;
|
||||||
|
|
||||||
import static org.apache.shiro.guice.web.ShiroWebModule.ROLES;
|
import static org.apache.shiro.guice.web.ShiroWebModule.ROLES;
|
||||||
|
|
||||||
@@ -60,6 +64,12 @@ public class ScmSecurityModule extends ShiroWebModule
|
|||||||
/** Field description */
|
/** Field description */
|
||||||
private static final int ITERATIONS = 8192;
|
private static final int ITERATIONS = 8192;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* the logger for ScmSecurityModule
|
||||||
|
*/
|
||||||
|
private static final Logger logger =
|
||||||
|
LoggerFactory.getLogger(ScmSecurityModule.class);
|
||||||
|
|
||||||
//~--- constructors ---------------------------------------------------------
|
//~--- constructors ---------------------------------------------------------
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -67,10 +77,13 @@ public class ScmSecurityModule extends ShiroWebModule
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* @param servletContext
|
* @param servletContext
|
||||||
|
* @param extensionProcessor
|
||||||
*/
|
*/
|
||||||
ScmSecurityModule(ServletContext servletContext)
|
ScmSecurityModule(ServletContext servletContext,
|
||||||
|
ExtensionProcessor extensionProcessor)
|
||||||
{
|
{
|
||||||
super(servletContext);
|
super(servletContext);
|
||||||
|
this.extensionProcessor = extensionProcessor;
|
||||||
}
|
}
|
||||||
|
|
||||||
//~--- methods --------------------------------------------------------------
|
//~--- methods --------------------------------------------------------------
|
||||||
@@ -89,7 +102,11 @@ public class ScmSecurityModule extends ShiroWebModule
|
|||||||
expose(PasswordService.class);
|
expose(PasswordService.class);
|
||||||
|
|
||||||
// bind realm
|
// bind realm
|
||||||
bindRealm().to(DefaultRealm.class);
|
for (Class<Realm> realm : extensionProcessor.byExtensionPoint(Realm.class))
|
||||||
|
{
|
||||||
|
logger.info("bind security realm {}", realm);
|
||||||
|
bindRealm().to(realm);
|
||||||
|
}
|
||||||
|
|
||||||
// bind constant
|
// bind constant
|
||||||
bindConstant().annotatedWith(Names.named("shiro.loginUrl")).to(
|
bindConstant().annotatedWith(Names.named("shiro.loginUrl")).to(
|
||||||
@@ -115,4 +132,9 @@ public class ScmSecurityModule extends ShiroWebModule
|
|||||||
|
|
||||||
return passwordService;
|
return passwordService;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//~--- fields ---------------------------------------------------------------
|
||||||
|
|
||||||
|
/** Field description */
|
||||||
|
private final ExtensionProcessor extensionProcessor;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ import org.slf4j.LoggerFactory;
|
|||||||
import sonia.scm.group.Group;
|
import sonia.scm.group.Group;
|
||||||
import sonia.scm.group.GroupDAO;
|
import sonia.scm.group.GroupDAO;
|
||||||
import sonia.scm.group.GroupNames;
|
import sonia.scm.group.GroupNames;
|
||||||
|
import sonia.scm.plugin.Extension;
|
||||||
import sonia.scm.user.User;
|
import sonia.scm.user.User;
|
||||||
import sonia.scm.user.UserDAO;
|
import sonia.scm.user.UserDAO;
|
||||||
|
|
||||||
@@ -74,6 +75,7 @@ import javax.inject.Singleton;
|
|||||||
*
|
*
|
||||||
* @since 2.0.0
|
* @since 2.0.0
|
||||||
*/
|
*/
|
||||||
|
@Extension
|
||||||
@Singleton
|
@Singleton
|
||||||
public class DefaultRealm extends AuthorizingRealm
|
public class DefaultRealm extends AuthorizingRealm
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user