From ee5585e96c7c7d82782141943ab196472da084a2 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Fri, 1 Feb 2013 13:05:38 -0500 Subject: WIP --- base/ocsp/shared/webapps/ocsp/WEB-INF/acl.properties | 10 ++++++++++ base/ocsp/shared/webapps/ocsp/WEB-INF/auth.properties | 10 ---------- base/ocsp/src/com/netscape/ocsp/OCSPApplication.java | 4 +++- 3 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 base/ocsp/shared/webapps/ocsp/WEB-INF/acl.properties delete mode 100644 base/ocsp/shared/webapps/ocsp/WEB-INF/auth.properties (limited to 'base/ocsp') diff --git a/base/ocsp/shared/webapps/ocsp/WEB-INF/acl.properties b/base/ocsp/shared/webapps/ocsp/WEB-INF/acl.properties new file mode 100644 index 000000000..cd2e14058 --- /dev/null +++ b/base/ocsp/shared/webapps/ocsp/WEB-INF/acl.properties @@ -0,0 +1,10 @@ +# Restful API auth/authz mapping info +# +# Format: +# = , +# ex: admin.users = certServer.ca.users,read + +account.login = certServer.ocsp.account,login +account.logout = certServer.ocsp.account,logout +admin.users = certServer.ocsp.users,execute +admin.groups = certServer.ocsp.groups,execute diff --git a/base/ocsp/shared/webapps/ocsp/WEB-INF/auth.properties b/base/ocsp/shared/webapps/ocsp/WEB-INF/auth.properties deleted file mode 100644 index cd2e14058..000000000 --- a/base/ocsp/shared/webapps/ocsp/WEB-INF/auth.properties +++ /dev/null @@ -1,10 +0,0 @@ -# Restful API auth/authz mapping info -# -# Format: -# = , -# ex: admin.users = certServer.ca.users,read - -account.login = certServer.ocsp.account,login -account.logout = certServer.ocsp.account,logout -admin.users = certServer.ocsp.users,execute -admin.groups = certServer.ocsp.groups,execute diff --git a/base/ocsp/src/com/netscape/ocsp/OCSPApplication.java b/base/ocsp/src/com/netscape/ocsp/OCSPApplication.java index 21b37f801..6a5f60f6e 100644 --- a/base/ocsp/src/com/netscape/ocsp/OCSPApplication.java +++ b/base/ocsp/src/com/netscape/ocsp/OCSPApplication.java @@ -6,6 +6,7 @@ import java.util.Set; import javax.ws.rs.core.Application; import com.netscape.certsrv.acls.ACLInterceptor; +import com.netscape.certsrv.authentication.AuthInterceptor; import com.netscape.certsrv.base.PKIException; import com.netscape.cms.servlet.account.AccountService; import com.netscape.cms.servlet.admin.GroupMemberService; @@ -40,7 +41,8 @@ public class OCSPApplication extends Application { // exception mapper classes.add(PKIException.Mapper.class); - // ACL interceptor + // interceptors + singletons.add(new AuthInterceptor()); singletons.add(new ACLInterceptor()); } -- cgit