git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new utility for updated cached values in a multi-threaded environment.
[utils]
/
security
/
impl
/
src
/
main
/
java
/
org
/
wamblee
/
security
/
authorization
/
UrlAuthorizationRule.java
diff --git
a/security/impl/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java
b/security/impl/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java
index e782a18e5c3c09485c6cc606be9aa1b6d3d885ec..3ed810df9a0a10699acc182f862d7c361c8508e1 100644
(file)
--- a/
security/impl/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java
+++ b/
security/impl/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java
@@
-30,7
+30,8
@@
import javax.persistence.OneToOne;
import javax.persistence.Transient;
import org.apache.log4j.Logger;
import javax.persistence.Transient;
import org.apache.log4j.Logger;
-import org.wamblee.usermgt.User;
+import org.wamblee.security.authentication.User;
+import org.wamblee.security.authentication.UserAdministration;
/**
* Utility base class for implementation of authentication rules based on the
/**
* Utility base class for implementation of authentication rules based on the
@@
-156,14
+157,14
@@
public abstract class UrlAuthorizationRule extends AbstractAuthorizationRule {
* .Object, org.wamblee.security.authorization.Operation)
*/
public AuthorizationResult isAllowed(Object aResource,
* .Object, org.wamblee.security.authorization.Operation)
*/
public AuthorizationResult isAllowed(Object aResource,
- Operation aOperation,
User
aUser) {
+ Operation aOperation,
String
aUser) {
if (!resourceClass.isInstance(aResource)) {
return UNSUPPORTED_RESOURCE;
}
String path = getResourcePath(aResource);
if (!resourceClass.isInstance(aResource)) {
return UNSUPPORTED_RESOURCE;
}
String path = getResourcePath(aResource);
- return isAllowed(path, aOperation, aUser);
+ return isAllowed
WithPath
(path, aOperation, aUser);
}
/**
}
/**
@@
-178,8
+179,8
@@
public abstract class UrlAuthorizationRule extends AbstractAuthorizationRule {
*
* @return Authorization result,
*/
*
* @return Authorization result,
*/
- protected AuthorizationResult isAllowed(String aPath, Operation aOperation,
-
User
aUser) {
+ protected AuthorizationResult isAllowed
WithPath
(String aPath, Operation aOperation,
+
String
aUser) {
if (!pathCondition.matches(aPath)) {
return UNDECIDED;
}
if (!pathCondition.matches(aPath)) {
return UNDECIDED;
}
@@
-317,4
+318,10
@@
public abstract class UrlAuthorizationRule extends AbstractAuthorizationRule {
protected void setUserCondition(UserCondition aUserCondition) {
userCondition = aUserCondition;
}
protected void setUserCondition(UserCondition aUserCondition) {
userCondition = aUserCondition;
}
+
+ @Override
+ public void setUserAdministration(UserAdministration aAdmin) {
+ userCondition.setUserAdmin(aAdmin);
+ }
+
}
}