[seam-commits] Seam SVN: r12464 - in modules/security/trunk/impl/src/main/java/org/jboss/seam/security: permission and 1 other directory.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Tue Apr 13 08:23:09 EDT 2010
Author: shane.bryzak at jboss.com
Date: 2010-04-13 08:23:07 -0400 (Tue, 13 Apr 2010)
New Revision: 12464
Added:
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/CredentialsImpl.java
Removed:
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/Credentials.java
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/ResolverChain.java
Modified:
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/IdentityImpl.java
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/RememberMe.java
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/SecurityEventMessages.java
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/PermissionCheck.java
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/PermissionMapper.java
Log:
split stuff into api/impl
Deleted: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/Credentials.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/Credentials.java 2010-04-13 12:05:04 UTC (rev 12463)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/Credentials.java 2010-04-13 12:23:07 UTC (rev 12464)
@@ -1,103 +0,0 @@
-package org.jboss.seam.security;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.jboss.seam.security.events.CredentialsInitializedEvent;
-import org.jboss.seam.security.events.CredentialsUpdatedEvent;
-
- at Named//("org.jboss.seam.security.credentials")
- at SessionScoped
-public class Credentials implements Serializable
-{
- private static final long serialVersionUID = -2271248957776488426L;
-
- @Inject BeanManager manager;
-
- private String username;
- private String password;
-
- private boolean invalid;
-
- private boolean initialized;
-
- public Credentials() {}
-
- public boolean isInitialized()
- {
- return initialized;
- }
-
- public void setInitialized(boolean initialized)
- {
- this.initialized = initialized;
- }
-
- public String getUsername()
- {
- if (!isInitialized())
- {
- setInitialized(true);
- manager.fireEvent(new CredentialsInitializedEvent(this));
- }
-
- return username;
- }
-
- public void setUsername(String username)
- {
- if (this.username != username && (this.username == null || !this.username.equals(username)))
- {
- this.username = username;
- invalid = false;
- manager.fireEvent(new CredentialsUpdatedEvent());
- }
- }
-
- public String getPassword()
- {
- return password;
- }
-
- public void setPassword(String password)
- {
- if (this.password != password && (this.password == null || !this.password.equals(password)))
- {
- this.password = password;
- invalid = false;
- manager.fireEvent(new CredentialsUpdatedEvent());
- }
- }
-
- public boolean isSet()
- {
- return getUsername() != null && password != null;
- }
-
- public boolean isInvalid()
- {
- return invalid;
- }
-
- public void invalidate()
- {
- invalid = true;
- }
-
- public void clear()
- {
- username = null;
- password = null;
- initialized = false;
- }
-
- @Override
- public String toString()
- {
- return "Credentials[" + username + "]";
- }
-}
Copied: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/CredentialsImpl.java (from rev 12453, modules/security/trunk/impl/src/main/java/org/jboss/seam/security/Credentials.java)
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/CredentialsImpl.java (rev 0)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/CredentialsImpl.java 2010-04-13 12:23:07 UTC (rev 12464)
@@ -0,0 +1,103 @@
+package org.jboss.seam.security;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.jboss.seam.security.events.CredentialsInitializedEvent;
+import org.jboss.seam.security.events.CredentialsUpdatedEvent;
+
+ at Named//("org.jboss.seam.security.credentials")
+ at SessionScoped
+public class CredentialsImpl implements Credentials, Serializable
+{
+ private static final long serialVersionUID = -2271248957776488426L;
+
+ @Inject BeanManager manager;
+
+ private String username;
+ private String password;
+
+ private boolean invalid;
+
+ private boolean initialized;
+
+ public CredentialsImpl() {}
+
+ public boolean isInitialized()
+ {
+ return initialized;
+ }
+
+ public void setInitialized(boolean initialized)
+ {
+ this.initialized = initialized;
+ }
+
+ public String getUsername()
+ {
+ if (!isInitialized())
+ {
+ setInitialized(true);
+ manager.fireEvent(new CredentialsInitializedEvent(this));
+ }
+
+ return username;
+ }
+
+ public void setUsername(String username)
+ {
+ if (this.username != username && (this.username == null || !this.username.equals(username)))
+ {
+ this.username = username;
+ invalid = false;
+ manager.fireEvent(new CredentialsUpdatedEvent());
+ }
+ }
+
+ public String getPassword()
+ {
+ return password;
+ }
+
+ public void setPassword(String password)
+ {
+ if (this.password != password && (this.password == null || !this.password.equals(password)))
+ {
+ this.password = password;
+ invalid = false;
+ manager.fireEvent(new CredentialsUpdatedEvent());
+ }
+ }
+
+ public boolean isSet()
+ {
+ return getUsername() != null && password != null;
+ }
+
+ public boolean isInvalid()
+ {
+ return invalid;
+ }
+
+ public void invalidate()
+ {
+ invalid = true;
+ }
+
+ public void clear()
+ {
+ username = null;
+ password = null;
+ initialized = false;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "Credentials[" + username + "]";
+ }
+}
Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/IdentityImpl.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/IdentityImpl.java 2010-04-13 12:05:04 UTC (rev 12463)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/IdentityImpl.java 2010-04-13 12:23:07 UTC (rev 12464)
@@ -63,7 +63,7 @@
Logger log = LoggerFactory.getLogger(Identity.class);
@Inject private BeanManager manager;
- @Inject private Credentials credentials;
+ @Inject private CredentialsImpl credentials;
@Inject private PermissionMapper permissionMapper;
@Inject private IdentityManager identityManager;
Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/RememberMe.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/RememberMe.java 2010-04-13 12:05:04 UTC (rev 12463)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/RememberMe.java 2010-04-13 12:23:07 UTC (rev 12464)
@@ -38,7 +38,7 @@
@Inject BeanManager manager;
@Inject Identity identity;
@Inject IdentityImpl identityImpl;
- @Inject Credentials credentials;
+ @Inject CredentialsImpl credentials;
@Inject IdentityManager identityManager;
// Heaps of stuff commented out here because we need to add generic cookie support
Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/SecurityEventMessages.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/SecurityEventMessages.java 2010-04-13 12:05:04 UTC (rev 12463)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/SecurityEventMessages.java 2010-04-13 12:23:07 UTC (rev 12464)
@@ -33,7 +33,7 @@
private static final String DEFAULT_NOT_LOGGED_IN_MESSAGE = "Please log in first.";
//@Inject StatusMessages statusMessages;
- @Inject Credentials credentials;
+ @Inject CredentialsImpl credentials;
public void postAuthenticate(@Observes PostAuthenticateEvent event)
{
Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/PermissionCheck.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/PermissionCheck.java 2010-04-13 12:05:04 UTC (rev 12463)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/PermissionCheck.java 2010-04-13 12:23:07 UTC (rev 12464)
@@ -14,20 +14,12 @@
{
private Object target;
- @Deprecated
- private String name;
-
private String action;
private boolean granted;
private Set<String> requirements;
public PermissionCheck(Object target, String action)
- {
- if (target instanceof String)
- {
- this.name = (String) target;
- }
-
+ {
this.target = target;
this.action = action;
granted = false;
@@ -38,12 +30,6 @@
return target;
}
- @Deprecated
- public String getName()
- {
- return name;
- }
-
public String getAction()
{
return action;
Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/PermissionMapper.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/PermissionMapper.java 2010-04-13 12:05:04 UTC (rev 12463)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/PermissionMapper.java 2010-04-13 12:23:07 UTC (rev 12464)
@@ -1,19 +1,21 @@
package org.jboss.seam.security.permission;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.SessionScoped;
import javax.inject.Inject;
+import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
-import org.jboss.seam.security.events.DefaultResolverChainCreatedEvent;
-
/**
* Maps permission checks to resolver chains
*
@@ -32,7 +34,7 @@
@Inject BeanManager manager;
- private ResolverChain getResolverChain(Object target, String action)
+ private List<PermissionResolver> getResolvers(Object target, String action)
{
Class<?> targetClass = null;
@@ -69,8 +71,8 @@
public boolean resolvePermission(Object target, String action)
{
- ResolverChain chain = getResolverChain(target, action);
- for (PermissionResolver resolver : chain.getResolvers())
+ List<PermissionResolver> resolvers = getResolvers(target, action);
+ for (PermissionResolver resolver : resolvers)
{
if (resolver.hasPermission(target, action))
{
@@ -99,8 +101,8 @@
if (homogenous)
{
Set<Object> denied = new HashSet<Object>(collection);
- ResolverChain chain = getResolverChain(targetClass, action);
- for (PermissionResolver resolver : chain.getResolvers())
+ List<PermissionResolver> resolvers = getResolvers(targetClass, action);
+ for (PermissionResolver resolver : resolvers)
{
resolver.filterSetByAction(denied, action);
}
@@ -130,8 +132,8 @@
for (Class cls : deniedByClass.keySet())
{
Set<Object> denied = deniedByClass.get(cls);
- ResolverChain chain = getResolverChain(cls, action);
- for (PermissionResolver resolver : chain.getResolvers())
+ List<PermissionResolver> resolvers = getResolvers(cls, action);
+ for (PermissionResolver resolver : resolvers)
{
resolver.filterSetByAction(denied, action);
}
@@ -144,27 +146,16 @@
}
}
- private ResolverChain createDefaultResolverChain()
+ @Produces public @SessionScoped List<PermissionResolver> createDefaultResolverChain()
{
- // TODO fix
- ResolverChain chain = null; //(ResolverChain) Contexts.getSessionContext().get(DEFAULT_RESOLVER_CHAIN);
-
- if (chain == null)
+ List<PermissionResolver> resolvers = new ArrayList<PermissionResolver>();
+
+ Set<Bean<?>> beans = manager.getBeans(PermissionResolver.class);
+ for (Bean<?> resolverBean : beans)
{
- chain = new ResolverChain();
-
- Set<Bean<?>> resolvers = manager.getBeans(PermissionResolver.class);
- for (Bean<?> resolverBean : resolvers)
- {
- chain.getResolvers().add((PermissionResolver) manager.getReference(resolverBean, PermissionResolver.class, manager.createCreationalContext(resolverBean)));
- }
-
- // TODO fix
- // Contexts.getSessionContext().set(DEFAULT_RESOLVER_CHAIN, chain);
-
- manager.fireEvent(new DefaultResolverChainCreatedEvent(chain));
+ resolvers.add((PermissionResolver) manager.getReference(resolverBean, PermissionResolver.class, manager.createCreationalContext(resolverBean)));
}
- return chain;
+ return resolvers;
}
}
Deleted: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/ResolverChain.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/ResolverChain.java 2010-04-13 12:05:04 UTC (rev 12463)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/ResolverChain.java 2010-04-13 12:23:07 UTC (rev 12464)
@@ -1,31 +0,0 @@
-package org.jboss.seam.security.permission;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.enterprise.context.SessionScoped;
-
-/**
- * A chain of permission resolvers. Specific permission checks are generally mapped to a
- * particular ResolverChain for resolution.
- *
- * @author Shane Bryzak
- */
- at SessionScoped
-public class ResolverChain implements Serializable
-{
- private static final long serialVersionUID = 4395507285094476740L;
-
- private List<PermissionResolver> resolvers = new ArrayList<PermissionResolver>();
-
- public List<PermissionResolver> getResolvers()
- {
- return resolvers;
- }
-
- public void setResolvers(List<PermissionResolver> resolvers)
- {
- this.resolvers = resolvers;
- }
-}
More information about the seam-commits
mailing list