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
/
GroupUserCondition.java
diff --git
a/security/impl/src/main/java/org/wamblee/security/authorization/GroupUserCondition.java
b/security/impl/src/main/java/org/wamblee/security/authorization/GroupUserCondition.java
index 83e1d8ec8c0ab8c99071934266de2d8d85aa2cbf..f50c3d120bfb38468cbe115c44b23928f72b4052 100644
(file)
--- a/
security/impl/src/main/java/org/wamblee/security/authorization/GroupUserCondition.java
+++ b/
security/impl/src/main/java/org/wamblee/security/authorization/GroupUserCondition.java
@@
-15,21
+15,31
@@
*/
package org.wamblee.security.authorization;
*/
package org.wamblee.security.authorization;
-import org.wamblee.persistence.AbstractPersistent;
-import org.wamblee.usermgt.User;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+
+import org.wamblee.security.authentication.UserAdministration;
+
/**
* Checks if a user against a specific group.
*
* @author Erik Brakkee
*/
/**
* Checks if a user against a specific group.
*
* @author Erik Brakkee
*/
-public class GroupUserCondition extends AbstractPersistent implements
- UserCondition {
+@Entity
+@DiscriminatorValue("GROUP")
+public class GroupUserCondition extends AbstractUserCondition {
/**
* Group the user must be in.
*/
/**
* Group the user must be in.
*/
+ @Column(name = "GRP")
private String group;
private String group;
+
+ @Transient
+ private UserAdministration admin;
/**
* Constructs the condition.
/**
* Constructs the condition.
@@
-48,16
+58,15
@@
public class GroupUserCondition extends AbstractPersistent implements
protected GroupUserCondition() {
group = null;
}
protected GroupUserCondition() {
group = null;
}
+
+ @Override
+ public void setUserAdmin(UserAdministration aAdmin) {
+ admin = aAdmin;
+ }
- /*
- * (non-Javadoc)
- *
- * @see
- * org.wamblee.security.authorization.UserCondition#matches(org.wamblee.
- * usermgt.UserAccessor)
- */
- public boolean matches(User aUser) {
- return aUser.isInGroup(group);
+ @Override
+ public boolean matches(String aUser) {
+ return admin.isInGroup(aUser, group);
}
/**
}
/**