diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-10-10 04:38:05 -0500 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-03 00:47:49 -0400 |
| commit | 07b24a4d1dcf600f48ce59626c09c2fd3c644d88 (patch) | |
| tree | d40e13641ba511ea6eb5ffba33d4491f8e70331f /base/tks | |
| parent | d9a9e23aae83f1d3d6c0e5968097fde12cfff3d2 (diff) | |
| download | pki-07b24a4d1dcf600f48ce59626c09c2fd3c644d88.tar.gz pki-07b24a4d1dcf600f48ce59626c09c2fd3c644d88.tar.xz pki-07b24a4d1dcf600f48ce59626c09c2fd3c644d88.zip | |
Added ACLInterceptor.
Previously ACL checking was done in PKIRealm by matching the URL.
This code has been replaced by ACLInterceptor which will intercept
RESTEasy method invocations. This allows more precise mapping of
REST methods to ACL entries in acl.ldif.
Ticket #287
Diffstat (limited to 'base/tks')
| -rw-r--r-- | base/tks/shared/webapps/tks/WEB-INF/auth.properties | 12 | ||||
| -rw-r--r-- | base/tks/src/com/netscape/tks/TKSApplication.java | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/base/tks/shared/webapps/tks/WEB-INF/auth.properties b/base/tks/shared/webapps/tks/WEB-INF/auth.properties index 90897683e..6de7f08e5 100644 --- a/base/tks/shared/webapps/tks/WEB-INF/auth.properties +++ b/base/tks/shared/webapps/tks/WEB-INF/auth.properties @@ -1,10 +1,10 @@ # Restful API auth/authz mapping info # # Format: -# <Rest API URL> = <ACL Resource ID>,<ACL resource operation> -# ex: /kra/pki/key/retrieve = certServer.kra.pki.key.retrieve,execute +# <ACL Mapping> = <ACL Resource ID>,<ACL Resource Operation> +# ex: admin.users = certServer.ca.users,read -/tks/rest/account/login = certServer.tks.account,login -/tks/rest/account/logout = certServer.tks.account,logout -/tks/rest/admin/users = certServer.tks.users,execute -/tks/rest/admin/groups = certServer.tks.groups,execute +account.login = certServer.tks.account,login +account.logout = certServer.tks.account,logout +admin.users = certServer.tks.users,execute +admin.groups = certServer.tks.groups,execute diff --git a/base/tks/src/com/netscape/tks/TKSApplication.java b/base/tks/src/com/netscape/tks/TKSApplication.java index 5493bb4da..229a64c95 100644 --- a/base/tks/src/com/netscape/tks/TKSApplication.java +++ b/base/tks/src/com/netscape/tks/TKSApplication.java @@ -5,6 +5,7 @@ import java.util.Set; import javax.ws.rs.core.Application; +import com.netscape.certsrv.acls.ACLInterceptor; import com.netscape.certsrv.base.PKIException; import com.netscape.cms.servlet.account.AccountService; import com.netscape.cms.servlet.admin.GroupMemberService; @@ -38,6 +39,9 @@ public class TKSApplication extends Application { // exception mapper classes.add(PKIException.Mapper.class); + + // ACL interceptor + singletons.add(new ACLInterceptor()); } public Set<Class<?>> getClasses() { |