git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[utils]
/
security
/
impl
/
src
/
main
/
java
/
org
/
wamblee
/
security
/
authorization
/
DefaultAuthorizationService.java
diff --git
a/security/impl/src/main/java/org/wamblee/security/authorization/DefaultAuthorizationService.java
b/security/impl/src/main/java/org/wamblee/security/authorization/DefaultAuthorizationService.java
index 8ee411780d9fb0726776e14b2246999600f58701..8e449b9e9e4ce1a46e4943b9845cbfc77b1c5345 100644
(file)
--- a/
security/impl/src/main/java/org/wamblee/security/authorization/DefaultAuthorizationService.java
+++ b/
security/impl/src/main/java/org/wamblee/security/authorization/DefaultAuthorizationService.java
@@
-26,8
+26,9
@@
import javax.persistence.OneToMany;
import javax.persistence.OrderColumn;
import javax.persistence.Transient;
import javax.persistence.OrderColumn;
import javax.persistence.Transient;
-import org.wamblee.usermgt.User;
-import org.wamblee.usermgt.UserAccessor;
+import org.wamblee.security.authentication.User;
+import org.wamblee.security.authentication.UserAccessor;
+import org.wamblee.security.authentication.UserAdministration;
/**
* Default implementation of an authorization service. To determine whether
/**
* Default implementation of an authorization service. To determine whether
@@
-42,8
+43,7
@@
import org.wamblee.usermgt.UserAccessor;
@Entity
@DiscriminatorValue("DEFAULT")
public class DefaultAuthorizationService extends AbstractAuthorizationService {
@Entity
@DiscriminatorValue("DEFAULT")
public class DefaultAuthorizationService extends AbstractAuthorizationService {
-
-
+
/**
* List of ordered authorization rules.
*/
/**
* List of ordered authorization rules.
*/
@@
-57,23
+57,25
@@
public class DefaultAuthorizationService extends AbstractAuthorizationService {
@Transient
private UserAccessor userAccessor;
@Transient
private UserAccessor userAccessor;
- /**
- * Name for this instance of the authorization service.
- */
- private String name;
+ @Transient
+ private UserAdministration userAdmin;
/**
* Constructs the service.
*
* @param aAccessor
* User accessor.
/**
* Constructs the service.
*
* @param aAccessor
* User accessor.
+ * @param aUserAdmin
+ * User administration.
* @param aName
* Name of this instance of the service.
*/
* @param aName
* Name of this instance of the service.
*/
- public DefaultAuthorizationService(UserAccessor aAccessor, String aName) {
+ public DefaultAuthorizationService(UserAccessor aAccessor,
+ UserAdministration aUserAdmin, String aName) {
+ super(aName);
rules = new ArrayList<AuthorizationRule>();
userAccessor = aAccessor;
rules = new ArrayList<AuthorizationRule>();
userAccessor = aAccessor;
- name = aName;
+ userAdmin = aUserAdmin;
}
/**
}
/**
@@
-82,19
+84,22
@@
public class DefaultAuthorizationService extends AbstractAuthorizationService {
public DefaultAuthorizationService() {
rules = new ArrayList<AuthorizationRule>();
userAccessor = null;
public DefaultAuthorizationService() {
rules = new ArrayList<AuthorizationRule>();
userAccessor = null;
- name = null;
+ userAdmin = null;
}
}
- /**
- * Sets the user accessor.
- *
- * @param aUserAccessor
- * User accessor.
- */
+
@Override
public void setUserAccessor(UserAccessor aUserAccessor) {
userAccessor = aUserAccessor;
}
@Override
public void setUserAccessor(UserAccessor aUserAccessor) {
userAccessor = aUserAccessor;
}
+
+ @Override
+ public void setUserAdministration(UserAdministration aUserAdmin) {
+ userAdmin = aUserAdmin;
+ for (AuthorizationRule rule: rules) {
+ rule.setUserAdministration(userAdmin);
+ }
+ }
/*
* (non-Javadoc)
/*
* (non-Javadoc)
@@
-104,7
+109,7
@@
public class DefaultAuthorizationService extends AbstractAuthorizationService {
* .lang.Object, org.wamblee.security.authorization.Operation)
*/
public boolean isAllowed(Object aResource, Operation aOperation) {
* .lang.Object, org.wamblee.security.authorization.Operation)
*/
public boolean isAllowed(Object aResource, Operation aOperation) {
-
User
user = userAccessor.getCurrentUser();
+
String
user = userAccessor.getCurrentUser();
for (AuthorizationRule rule : rules) {
switch (rule.isAllowed(aResource, aOperation, user)) {
for (AuthorizationRule rule : rules) {
switch (rule.isAllowed(aResource, aOperation, user)) {
@@
-133,14
+138,6
@@
public class DefaultAuthorizationService extends AbstractAuthorizationService {
return aResource;
}
return aResource;
}
- protected String getName() {
- return name;
- }
-
- public void setName(String aName) {
- name = aName;
- }
-
/*
* (non-Javadoc)
*
/*
* (non-Javadoc)
*
@@
-158,6
+155,7
@@
public class DefaultAuthorizationService extends AbstractAuthorizationService {
* .wamblee.security.authorization.AuthorizationRule)
*/
public void appendRule(AuthorizationRule aRule) {
* .wamblee.security.authorization.AuthorizationRule)
*/
public void appendRule(AuthorizationRule aRule) {
+ aRule.setUserAdministration(userAdmin);
rules.add(aRule);
}
rules.add(aRule);
}
@@
-169,6
+167,7
@@
public class DefaultAuthorizationService extends AbstractAuthorizationService {
* (int, org.wamblee.security.authorization.AuthorizationRule)
*/
public void insertRuleAfter(int aIndex, AuthorizationRule aRule) {
* (int, org.wamblee.security.authorization.AuthorizationRule)
*/
public void insertRuleAfter(int aIndex, AuthorizationRule aRule) {
+ aRule.setUserAdministration(userAdmin);
rules.add(aIndex, aRule);
}
rules.add(aIndex, aRule);
}
@@
-199,5
+198,8
@@
public class DefaultAuthorizationService extends AbstractAuthorizationService {
*/
protected void setMappedRules(List<AuthorizationRule> aRules) {
rules = aRules;
*/
protected void setMappedRules(List<AuthorizationRule> aRules) {
rules = aRules;
+ for (AuthorizationRule rule: rules) {
+ rule.setUserAdministration(userAdmin);
+ }
}
}
}
}