From 71a94aba941b395a07a849eacb125b9657f70f59 Mon Sep 17 00:00:00 2001 From: Fraser Tweedale Date: Tue, 7 Feb 2017 11:38:03 +1000 Subject: [PATCH 157/158] Define AgentCertAuthentication token keys in IAuthToken Small refactor to define the auth token keys set by AgentCertAuthentication in IAuthToken, so that consumers do not need to import AgentCertAuthentication directly, or redefine the constants. Part of: https://fedorahosted.org/pki/ticket/1359 --- .../com/netscape/certsrv/authentication/IAuthToken.java | 3 +++ .../cms/authentication/AgentCertAuthentication.java | 17 +++++------------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java b/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java index a3f240e9c35987462eb2f176de650a769df1005c..59c6af20c32e2ae7b94fb80208539c01303a9fcd 100644 --- a/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java +++ b/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java @@ -37,8 +37,11 @@ public interface IAuthToken { /** * Constant for userid. */ + public static final String USER = "user"; + public static final String USER_DN = "userdn"; public static final String USER_ID = "userid"; public static final String UID = "uid"; + public static final String GROUP = "group"; public static final String GROUPS = "groups"; /* Subject name of the certificate in the authenticating entry */ diff --git a/base/server/cms/src/com/netscape/cms/authentication/AgentCertAuthentication.java b/base/server/cms/src/com/netscape/cms/authentication/AgentCertAuthentication.java index c65dd397148c989fd9aa4d0e1e4ae7faf735342d..b7fafc895781e4bc950fa60b03444a6ad33248c7 100644 --- a/base/server/cms/src/com/netscape/cms/authentication/AgentCertAuthentication.java +++ b/base/server/cms/src/com/netscape/cms/authentication/AgentCertAuthentication.java @@ -57,13 +57,6 @@ import com.netscape.certsrv.usrgrp.IUser; public class AgentCertAuthentication implements IAuthManager, IProfileAuthenticator { - /* result auth token attributes */ - public static final String TOKEN_USERDN = "user"; - public static final String TOKEN_USER_DN = "userdn"; - public static final String TOKEN_USERID = "userid"; - public static final String TOKEN_UID = "uid"; - public static final String TOKEN_GROUP = "group"; - /* required credentials */ public static final String CRED_CERT = IAuthManager.CRED_SSL_CLIENT_CERT; protected String[] mRequiredCreds = { CRED_CERT }; @@ -225,11 +218,11 @@ public class AgentCertAuthentication implements IAuthManager, throw new EInvalidCredentials(CMS.getUserMessage("CMS_AUTHORIZATION_ERROR")); } } - authToken.set(TOKEN_USERDN, user.getUserDN()); - authToken.set(TOKEN_USER_DN, user.getUserDN()); - authToken.set(TOKEN_USERID, user.getUserID()); - authToken.set(TOKEN_UID, user.getUserID()); - authToken.set(TOKEN_GROUP, groupname); + authToken.set(IAuthToken.USER, user.getUserDN()); + authToken.set(IAuthToken.USER_DN, user.getUserDN()); + authToken.set(IAuthToken.USER_ID, user.getUserID()); + authToken.set(IAuthToken.UID, user.getUserID()); + authToken.set(IAuthToken.GROUP, groupname); authToken.set(CRED_CERT, certs); CMS.debug("AgentCertAuthentication: authenticated " + user.getUserDN()); -- 2.9.3