eckehard 2005/03/02 02:53:36
Modified:
proposals/tamino/src/ssx/org/apache/slide/urm/authenticator/impl/ssx
URMAuthenticatorSSX.java
proposals/tamino/src/ssx/org/apache/slide/urm/authenticator/userdb/impl/ssx
URMUserDBManagerSpiSSX.java
proposals/tamino/src/urm/org/apache/slide/urm
URMException.java URMForbiddenException.java
URMNotImplementedException.java
URMNotSupportedException.java
proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler
URMAccessCheckException.java
URMAccessControlerSpi.java URMAce.java
URMAceCreateException.java URMAcl.java
URMAclAdministrator.java URMAclException.java
URMAclIdNotUniqueException.java
URMAclValidator.java URMAction.java
URMActionIdNotUniqueException.java
URMActionInUseException.java
URMPermissionResult.java URMSemantic.java
URMSemanticFactory.java
URMUnknownActionException.java
URMUnknownSubjectException.java
proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/impl
URMAceImpl.java URMAclAdministratorImpl.java
URMAclImpl.java URMAclValidatorImpl.java
URMActionImpl.java URMAllActionImpl.java
URMPermissionResultImpl.java
proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/impl/dummy
URMAccessControlerSpiDummy.java
proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/impl/semantic/firstmatch
URMFirstMatchSemantic.java
URMFirstMatchSemanticFactory.java
proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/impl/tamino
URMAccessControlerSpiTamino.java
proposals/tamino/src/urm/org/apache/slide/urm/authenticator
URMAdministrator.java
URMAuthenticationFailsException.java
URMAuthenticator.java
URMAuthenticatorException.java
URMDBTransactionException.java URMSubject.java
proposals/tamino/src/urm/org/apache/slide/urm/authenticator/impl
URMAdministratorImpl.java
URMGuestAdministratorImpl.java URMSubjectImpl.java
URMUserAdministratorImpl.java
proposals/tamino/src/urm/org/apache/slide/urm/authenticator/impl/jndi
URMAuthenticatorJNDI.java
proposals/tamino/src/urm/org/apache/slide/urm/authenticator/rolemanager
URMRole.java URMRoleAdministrator.java
URMRoleInUseException.java URMRoleManagerSpi.java
proposals/tamino/src/urm/org/apache/slide/urm/authenticator/rolemanager/impl
URMRoleAdminImpl.java URMRoleGuestImpl.java
URMRoleImpl.java
proposals/tamino/src/urm/org/apache/slide/urm/authenticator/rolemanager/impl/tamino
URMRoleManagerSpiTamino.java
proposals/tamino/src/urm/org/apache/slide/urm/authenticator/userdb
URMGroup.java URMMetadataPropsSpi.java URMUser.java
URMUserDBManager.java URMUserDBManagerSpi.java
proposals/tamino/src/urm/org/apache/slide/urm/authenticator/userdb/impl
URMGroupAdminImpl.java URMGroupImpl.java
URMUserAdminImpl.java URMUserImpl.java
proposals/tamino/src/urm/org/apache/slide/urm/authenticator/userdb/impl/jndi
URMUserDBManagerSpiJNDI.java
URMUserDBManagerSpiJndiBridge.java
proposals/tamino/src/urm/org/apache/slide/urm/authenticator/userdb/impl/tamino
URMMetadataPropsSpiTamino.java
proposals/tamino/src/urm/org/apache/slide/urm/common
URMCloseConnectionException.java
URMConfigurationException.java URMConfigurator.java
URMConnectionException.java URMConstants.java
URMDeleteException.java URMInit.java
URMInsertException.java
URMInternalServerException.java
URMParameterException.java URMPrincipal.java
URMQueryException.java URMSetRoleException.java
URMUpdateException.java
proposals/tamino/src/urm/org/apache/slide/urm/common/impl
URMConfiguratorUtil.java URMConfiguratorXML.java
URMPrincipalImpl.java
proposals/tamino/src/urm/org/apache/slide/urm/common/impl/tamino
URMTaminoConnection.java
URMTaminoConnectionHandler.java
proposals/tamino/src/urm/org/apache/slide/urm/utils
URMClassInstantiator.java URMFifoCache.java
URMSemanticUtils.java
proposals/tamino/src/urm/org/apache/slide/urm/utils/accesscontrolercache
URMAccessControlerCachedObject.java
URMAccessControlerFifoCache.java
proposals/tamino/src/urm/org/apache/slide/urm/utils/messagelogger
MessageLogger.java
proposals/tamino/src/urm/org/apache/slide/urm/utils/resourceutilities
AbstractXMLBasedResourceBundle.java
DefaultXMLResourceBundleFailureHandler.java
ResourceLocator.java XMLResourceBundle.java
XMLResourceBundleFailureHandler.java
proposals/tamino/src/urm/org/apache/slide/urm/utils/resourceutilities/message
AbstractDetailedMessage.java AbstractMessage.java
DefaultMessage.java DetailedMessage.java
Message.java MessageCode.java MessageConstants.java
MessageException.java MessageRetrieveException.java
ResourceMessage.java XMLMessageResourceBundle.java
proposals/tamino/src/urm/org/apache/slide/urm/utils/validatorcache
URMListener.java URMListenerElement.java
URMListenerResource.java URMValidatorCache.java
URMValidatorFifoCache.java
proposals/tamino/src/urmrealm/org/apache/slide/urm/realm
URMRealm.java
Log:
updated version of the tamino role management
Revision Changes Path
1.6 +27 -26
jakarta-slide/proposals/tamino/src/ssx/org/apache/slide/urm/authenticator/impl/ssx/URMAuthenticatorSSX.java
Index: URMAuthenticatorSSX.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/ssx/org/apache/slide/urm/authenticator/impl/ssx/URMAuthenticatorSSX.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- URMAuthenticatorSSX.java 1 Mar 2005 16:18:15 -0000 1.5
+++ URMAuthenticatorSSX.java 2 Mar 2005 10:53:32 -0000 1.6
@@ -65,31 +65,31 @@
private static Hashtable msAdminInitPropNamesTable = null;
static {
- String[] userDbPropStringKeys = {
- /*0*/ "cacheTime", "cacheSize", "denyTime", "denyCount",
- /*4*/ "nativeLogFile", "nativeLogLevel", "defaultGroup",
"defaultDomain",
- /*8*/ "serverHost", "serverPort", "personBindDn", "groupBindDn",
- /*12*/"personObjClass", "groupObjClass", "personGrpAttr",
"groupPrsAttr",
- /*16*/"userIdField", "groupIdField", "passwdField",
"addPersonAttr",
- /*20*/"addGroupAttr", "personPropAttr", "groupPropAttr",
"serverType",
- /*24*/"databaseUri", "connectionPerOperation",
+ String[] userDbPropStringKeys = {
+ /*0*/ "cacheTime", "cacheSize", "denyTime", "denyCount",
+ /*4*/ "nativeLogFile", "nativeLogLevel", "defaultGroup",
"defaultDomain",
+ /*8*/ "serverHost", "serverPort", "personBindDn",
"groupBindDn",
+ /*12*/"personObjClass", "groupObjClass", "personGrpAttr",
"groupPrsAttr",
+ /*16*/"userIdField", "groupIdField", "passwdField",
"addPersonAttr",
+ /*20*/"addGroupAttr", "personPropAttr", "groupPropAttr",
"serverType",
+ /*24*/"databaseUri", "connectionPerOperation",
/*26*/"authDaemonPath", "winUserExist",
/*28*/"winCheckLocalGroups", "useLogonUseron2000", null};
//"allowDomainAsBasebindDn"
- int[] userDbPropIntKeys = {
- /*0*/ SSXUserDBConstants.SSX_UDB_IPT_VALIDTIME,
SSXUserDBConstants.SSX_UDB_IPT_MAXUSERS,
- /*2*/ SSXUserDBConstants.SSX_UDB_IPT_DENYTIME,
SSXUserDBConstants.SSX_UDB_IPT_DENYCOUNT,
- /*4*/ SSXUserDBConstants.SSX_UDB_IPT_LOGFILE,
SSXUserDBConstants.SSX_UDB_IPT_LOGLEVEL,
- /*6*/ SSXUserDBConstants.SSX_UDB_IPT_DEFAULTGROUP,
SSXUserDBConstants.SSX_UDB_IPT_DEFAULTDOMAIN,
- /*8*/ SSXUserDBConstants.SSX_UDB_IPT_SERVERHOST,
SSXUserDBConstants.SSX_UDB_IPT_SERVERPORT,
- /*10*/SSXUserDBConstants.SSX_UDB_IPT_PERSON_BASE_BINDDN,
SSXUserDBConstants.SSX_UDB_IPT_GROUP_BASE_BINDDN,
- /*12*/SSXUserDBConstants.SSX_UDB_IPT_PERSON_OBJECTCLASS,
SSXUserDBConstants.SSX_UDB_IPT_GROUP_OBJECTCLASS,
- /*14*/SSXUserDBConstants.SSX_UDB_IPT_PERSON_GRP_ATTR,
SSXUserDBConstants.SSX_UDB_IPT_GROUP_PRS_ATTR,
- /*16*/SSXUserDBConstants.SSX_UDB_IPT_USERID_FIELD,
SSXUserDBConstants.SSX_UDB_IPT_GROUPID_FIELD,
- /*18*/SSXUserDBConstants.SSX_UDB_IPT_PASSWD_FIELD,
SSXUserDBConstants.SSX_UDB_IPT_ADD_PERSON_ATTR,
- /*20*/SSXUserDBConstants.SSX_UDB_IPT_ADD_GROUP_ATTR,
SSXUserDBConstants.SSX_UDB_IPT_PERSON_PROPERTY_ATTR,
- /*22*/SSXUserDBConstants.SSX_UDB_IPT_GROUP_PROPERTY_ATTR,
SSXUserDBConstants.SSX_UDB_IPT_SERVER_TYPE,
- /*24*/SSXUserDBConstants.SSX_UDB_IPT_DATABASEURI,
SSXUserDBConstants.SSX_UDB_IPT_CREATE_CONNECTION_PER_OPERATION,
+ int[] userDbPropIntKeys = {
+ /*0*/ SSXUserDBConstants.SSX_UDB_IPT_VALIDTIME,
SSXUserDBConstants.SSX_UDB_IPT_MAXUSERS,
+ /*2*/ SSXUserDBConstants.SSX_UDB_IPT_DENYTIME,
SSXUserDBConstants.SSX_UDB_IPT_DENYCOUNT,
+ /*4*/ SSXUserDBConstants.SSX_UDB_IPT_LOGFILE,
SSXUserDBConstants.SSX_UDB_IPT_LOGLEVEL,
+ /*6*/ SSXUserDBConstants.SSX_UDB_IPT_DEFAULTGROUP,
SSXUserDBConstants.SSX_UDB_IPT_DEFAULTDOMAIN,
+ /*8*/ SSXUserDBConstants.SSX_UDB_IPT_SERVERHOST,
SSXUserDBConstants.SSX_UDB_IPT_SERVERPORT,
+ /*10*/SSXUserDBConstants.SSX_UDB_IPT_PERSON_BASE_BINDDN,
SSXUserDBConstants.SSX_UDB_IPT_GROUP_BASE_BINDDN,
+ /*12*/SSXUserDBConstants.SSX_UDB_IPT_PERSON_OBJECTCLASS,
SSXUserDBConstants.SSX_UDB_IPT_GROUP_OBJECTCLASS,
+ /*14*/SSXUserDBConstants.SSX_UDB_IPT_PERSON_GRP_ATTR,
SSXUserDBConstants.SSX_UDB_IPT_GROUP_PRS_ATTR,
+ /*16*/SSXUserDBConstants.SSX_UDB_IPT_USERID_FIELD,
SSXUserDBConstants.SSX_UDB_IPT_GROUPID_FIELD,
+ /*18*/SSXUserDBConstants.SSX_UDB_IPT_PASSWD_FIELD,
SSXUserDBConstants.SSX_UDB_IPT_ADD_PERSON_ATTR,
+ /*20*/SSXUserDBConstants.SSX_UDB_IPT_ADD_GROUP_ATTR,
SSXUserDBConstants.SSX_UDB_IPT_PERSON_PROPERTY_ATTR,
+ /*22*/SSXUserDBConstants.SSX_UDB_IPT_GROUP_PROPERTY_ATTR,
SSXUserDBConstants.SSX_UDB_IPT_SERVER_TYPE,
+ /*24*/SSXUserDBConstants.SSX_UDB_IPT_DATABASEURI,
SSXUserDBConstants.SSX_UDB_IPT_CREATE_CONNECTION_PER_OPERATION,
/*26*/SSXUserDBConstants.SSX_UDB_IPT_AUTHD_PATH,
SSXUserDBConstants.SSX_UDB_IPT_WIN_AUTH_USER_EXIST,
/*28*/SSXUserDBConstants.SSX_UDB_IPT_WIN_CHECK_LOCAL_GROUPS,
SSXUserDBConstants.SSX_UDB_IPT_WIN_LOGONUSER_ON_2000, 0};
@@ -147,6 +147,7 @@
if (attrname == null)
continue;
+
if (attrname.equalsIgnoreCase("authType")) {
authtype = attr.getProperty("value");
continue;
@@ -163,7 +164,7 @@
if (attrkey == null || attrkey.intValue() == 0)
MessageLogger.logMessage(msLogger, "URMSUE0002", attrname);
else {
- ssxprops.put(attrkey, attrval);
+ ssxprops.put(attrkey, attrval);
}
}
mAdministratorProperties = conf.getSubConfigurator("Administrator");
1.4 +2 -2
jakarta-slide/proposals/tamino/src/ssx/org/apache/slide/urm/authenticator/userdb/impl/ssx/URMUserDBManagerSpiSSX.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/URMException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/URMForbiddenException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/URMNotImplementedException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/URMNotSupportedException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/URMAccessCheckException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/URMAccessControlerSpi.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/URMAce.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/URMAceCreateException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/URMAcl.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/URMAclAdministrator.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/URMAclException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/URMAclIdNotUniqueException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/URMAclValidator.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/URMAction.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/URMActionIdNotUniqueException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/URMActionInUseException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/URMPermissionResult.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/URMSemantic.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/URMSemanticFactory.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/URMUnknownActionException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/URMUnknownSubjectException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/impl/URMAceImpl.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/impl/URMAclAdministratorImpl.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/impl/URMAclImpl.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/impl/URMAclValidatorImpl.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/impl/URMActionImpl.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/impl/URMAllActionImpl.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/impl/URMPermissionResultImpl.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/impl/dummy/URMAccessControlerSpiDummy.java
1.5 +3 -3
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/impl/semantic/firstmatch/URMFirstMatchSemantic.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/impl/semantic/firstmatch/URMFirstMatchSemanticFactory.java
1.4 +5 -3
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/impl/tamino/URMAccessControlerSpiTamino.java
Index: URMAccessControlerSpiTamino.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/accesscontroler/impl/tamino/URMAccessControlerSpiTamino.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- URMAccessControlerSpiTamino.java 30 Jul 2004 06:52:10 -0000 1.3
+++ URMAccessControlerSpiTamino.java 2 Mar 2005 10:53:34 -0000 1.4
@@ -1,3 +1,4 @@
+
/*
* $Header$
* $Revision$
@@ -27,6 +28,7 @@
*/
package org.apache.slide.urm.accesscontroler.impl.tamino;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
1.4 +4 -4
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/URMAdministrator.java
Index: URMAdministrator.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/URMAdministrator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- URMAdministrator.java 30 Jul 2004 06:52:10 -0000 1.3
+++ URMAdministrator.java 2 Mar 2005 10:53:34 -0000 1.4
@@ -111,7 +111,7 @@
*/
public URMGroup getGroup(String group, String domain)
throws URMNotImplementedException, URMForbiddenException,
URMInternalServerException;
-
+
/**
* Returns the a URMSubject of type URMConstans.ALL.
* Each user, group, role is represented by this subject.
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/URMAuthenticationFailsException.java
1.4 +9 -3
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/URMAuthenticator.java
Index: URMAuthenticator.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/URMAuthenticator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- URMAuthenticator.java 30 Jul 2004 06:52:11 -0000 1.3
+++ URMAuthenticator.java 2 Mar 2005 10:53:34 -0000 1.4
@@ -57,6 +57,8 @@
private static final String AUTHENTICATOR_CONFIGURATOR = "Authenticator";
protected URMConfigurator conf = null;
+ protected static boolean sensitive = true;
+
/**
* Creates a new factory using the specified configuration.
*
@@ -98,6 +100,10 @@
}
}
+ public static boolean isCaseSensitive() {
+ return sensitive;
+ }
+
/**
* Creates a new factory using the default XML configuration and
* the java System property settings or the default config file,
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/URMAuthenticatorException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/URMDBTransactionException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/URMSubject.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/impl/URMAdministratorImpl.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/impl/URMGuestAdministratorImpl.java
1.4 +14 -9
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/impl/URMSubjectImpl.java
Index: URMSubjectImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/impl/URMSubjectImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- URMSubjectImpl.java 30 Jul 2004 06:52:11 -0000 1.3
+++ URMSubjectImpl.java 2 Mar 2005 10:53:34 -0000 1.4
@@ -21,6 +21,7 @@
*/
package org.apache.slide.urm.authenticator.impl;
+import org.apache.slide.urm.authenticator.URMAuthenticator;
import org.apache.slide.urm.authenticator.URMSubject;
/**
@@ -37,15 +38,19 @@
private String m_ToString;
// private URMAccessControlerSpi m_AccessControlerSpi = null;
- public URMSubjectImpl(String name,
+ public URMSubjectImpl(String inName,
int type,
- String domain
+ String inDomain
/* URMAccessControlerSpi accessControlerSpi */ ) {
-// m_AccessControlerSpi = accessControlerSpi;
- m_Name = name;
+// m_AccessControlerSpi = accessControlerSpi;
+ if ((inDomain != null) && !URMAuthenticator.isCaseSensitive() && (type
!= org.apache.slide.urm.common.URMConstants.ROLE) ) m_Domain =
inDomain.toUpperCase();
+ else m_Domain = inDomain;
+ // check if case sensitive
+ if ((inName != null) && !URMAuthenticator.isCaseSensitive() && (type
!= org.apache.slide.urm.common.URMConstants.ROLE)) m_Name =
inName.toUpperCase();
+ else m_Name = inName;
+
m_Type = type;
- m_Domain = domain;
- m_ToString = String.valueOf(type) + "@" + domain + "/" + name;
+ m_ToString = String.valueOf(type) + "@" + m_Domain + "/" + m_Name;
m_HashCode = m_ToString.hashCode();
}
1.5 +3 -3
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/impl/URMUserAdministratorImpl.java
Index: URMUserAdministratorImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/impl/URMUserAdministratorImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- URMUserAdministratorImpl.java 2 Feb 2005 14:56:09 -0000 1.4
+++ URMUserAdministratorImpl.java 2 Mar 2005 10:53:34 -0000 1.5
@@ -162,7 +162,7 @@
public URMUser getUser(String user, String domain)
throws URMNotImplementedException, URMForbiddenException,
URMInternalServerException {
- if (mUserDBManagerSpi.isUser(user, domain))
+ if (mUserDBManagerSpi.isUser(user, domain))
return new URMUserImpl(user, domain, mUserDBManagerSpi,
mMetadataPropsSpi, mRoleManagerSpi);
else
return null;
1.4 +4 -4
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/impl/jndi/URMAuthenticatorJNDI.java
Index: URMAuthenticatorJNDI.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/impl/jndi/URMAuthenticatorJNDI.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- URMAuthenticatorJNDI.java 30 Jul 2004 06:52:12 -0000 1.3
+++ URMAuthenticatorJNDI.java 2 Mar 2005 10:53:34 -0000 1.4
@@ -87,7 +87,7 @@
URMAclAdministratorImpl acladmin = new
URMAclAdministratorImpl(mAdministratorProperties,
null, null, null, owner);
- return new URMPrincipalImpl(user, domain, admin, acladmin);
+ return new URMPrincipalImpl(user, password, domain, admin, acladmin);
}
}
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/rolemanager/URMRole.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/rolemanager/URMRoleAdministrator.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/rolemanager/URMRoleInUseException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/rolemanager/URMRoleManagerSpi.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/rolemanager/impl/URMRoleAdminImpl.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/rolemanager/impl/URMRoleGuestImpl.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/rolemanager/impl/URMRoleImpl.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/rolemanager/impl/tamino/URMRoleManagerSpiTamino.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/userdb/URMGroup.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/userdb/URMMetadataPropsSpi.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/userdb/URMUser.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/userdb/URMUserDBManager.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/userdb/URMUserDBManagerSpi.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/userdb/impl/URMGroupAdminImpl.java
1.5 +19 -9
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/userdb/impl/URMGroupImpl.java
Index: URMGroupImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/userdb/impl/URMGroupImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- URMGroupImpl.java 15 Dec 2004 10:38:27 -0000 1.4
+++ URMGroupImpl.java 2 Mar 2005 10:53:34 -0000 1.5
@@ -29,6 +29,7 @@
import org.apache.slide.urm.URMForbiddenException;
import org.apache.slide.urm.URMNotImplementedException;
+import org.apache.slide.urm.authenticator.URMAuthenticator;
import org.apache.slide.urm.authenticator.URMSubject;
import org.apache.slide.urm.authenticator.rolemanager.URMRoleManagerSpi;
import org.apache.slide.urm.authenticator.rolemanager.impl.URMRoleImpl;
@@ -72,18 +73,27 @@
* @param URMUserDBManagerSpi
* @param URMRoleManagerSpi
*/
- public URMGroupImpl(String groupname, String domain,
+ public URMGroupImpl(String inGroupname, String inDomain,
URMUserDBManagerSpi userDbManagerSpi,
URMMetadataPropsSpi metadataPropsSpi,
URMRoleManagerSpi roleManagerSpi) {
mUserDBManagerSpi = userDbManagerSpi;
mMetadataPropsSpi = metadataPropsSpi;
mRoleManagerSpi = roleManagerSpi;
- if (groupname.endsWith("(local)")) {
- mGroupName =
groupname.substring(0,groupname.indexOf("(local)"));
- } else {
- mGroupName = groupname;
- mDomain = domain;
+ if (inGroupname.endsWith("(local)")) {
+ String groupName =
inGroupname.substring(0,inGroupname.indexOf("(local)"));
+
+ // check if case sensitive
+ if ((groupName != null) && !URMAuthenticator.isCaseSensitive())
mGroupName = groupName.toUpperCase();
+ else mGroupName = groupName;
+
+ } else {
+ if ((inDomain != null) && !URMAuthenticator.isCaseSensitive())
mDomain = inDomain.toUpperCase();
+ else mDomain = inDomain;
+ // check if case sensitive
+ if ((inGroupname != null) &&
!URMAuthenticator.isCaseSensitive()) mGroupName = inGroupname.toUpperCase();
+ else mGroupName = inGroupname;
+
}
mHashCode = ((mDomain != null ? (mDomain + "/") : "") + (mGroupName
!= null ? mGroupName : "")).hashCode();
}
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/userdb/impl/URMUserAdminImpl.java
1.4 +11 -6
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/userdb/impl/URMUserImpl.java
Index: URMUserImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/userdb/impl/URMUserImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- URMUserImpl.java 30 Jul 2004 06:52:13 -0000 1.3
+++ URMUserImpl.java 2 Mar 2005 10:53:34 -0000 1.4
@@ -26,6 +26,7 @@
import java.util.Properties;
import java.util.HashSet;
+import org.apache.slide.urm.authenticator.URMAuthenticator;
import org.apache.slide.urm.authenticator.URMSubject;
import org.apache.slide.urm.authenticator.rolemanager.URMRoleManagerSpi;
import org.apache.slide.urm.authenticator.rolemanager.impl.URMRoleImpl;
@@ -70,16 +71,20 @@
* @param domain name
* @param URMUserDBManagerSpi
*/
- public URMUserImpl( String username, String domain,
+ public URMUserImpl( String inUsername, String inDomain,
URMUserDBManagerSpi userDbManagerSpi,
URMMetadataPropsSpi metadataPropsSpi,
URMRoleManagerSpi roleManagerSpi) {
+ if ((inDomain != null) && !URMAuthenticator.isCaseSensitive()) mDomain
= inDomain.toUpperCase();
+ else mDomain = inDomain;
+ // check if case sensitive
+ if ((inUsername != null) && !URMAuthenticator.isCaseSensitive())
mUserName = inUsername.toUpperCase();
+ else mUserName = inUsername;
+
mUserDBManagerSpi = userDbManagerSpi;
mMetadataPropsSpi = metadataPropsSpi;
mRoleManagerSpi = roleManagerSpi;
- mUserName = username;
- mDomain = domain;
mHashCode = ((mDomain != null ? (mDomain + "/") : "") + (mUserName
!= null ? mUserName : "")).hashCode();
}
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/userdb/impl/jndi/URMUserDBManagerSpiJNDI.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/userdb/impl/jndi/URMUserDBManagerSpiJndiBridge.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/userdb/impl/tamino/URMMetadataPropsSpiTamino.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/URMCloseConnectionException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/URMConfigurationException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/URMConfigurator.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/URMConnectionException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/URMConstants.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/URMDeleteException.java
1.5 +3 -3
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/URMInit.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/URMInsertException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/URMInternalServerException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/URMParameterException.java
1.4 +13 -3
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/URMPrincipal.java
Index: URMPrincipal.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/URMPrincipal.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- URMPrincipal.java 30 Jul 2004 06:52:14 -0000 1.3
+++ URMPrincipal.java 2 Mar 2005 10:53:35 -0000 1.4
@@ -185,6 +185,16 @@
throws URMInternalServerException, URMNotImplementedException,
URMForbiddenException, URMUpdateException;
/**
+ * Delivers the an authentication ID for Single Sign On prozedure.
+ *
+ * @return Authentication ID
+ * @throws URMInternalServerException
+ * @throws URMNotImplementedException
+ * @throws URMForbiddenException
+ */
+ public char[] getAuthenticationID()
+ throws URMInternalServerException, URMNotImplementedException,
URMForbiddenException;
+ /**
* Close the connection to the meta store.
*
* @throws URMCloseConnectionException if any error occures during tho
close operation.
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/URMQueryException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/URMSetRoleException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/URMUpdateException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/impl/URMConfiguratorUtil.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/impl/URMConfiguratorXML.java
1.5 +76 -40
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/impl/URMPrincipalImpl.java
Index: URMPrincipalImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/impl/URMPrincipalImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- URMPrincipalImpl.java 30 Jul 2004 06:52:14 -0000 1.4
+++ URMPrincipalImpl.java 2 Mar 2005 10:53:35 -0000 1.5
@@ -26,10 +26,15 @@
import java.util.Properties;
import java.util.Set;
+import org.apache.slide.urm.URMException;
+import org.apache.slide.urm.URMForbiddenException;
+import org.apache.slide.urm.URMNotImplementedException;
import org.apache.slide.urm.accesscontroler.URMAclAdministrator;
import org.apache.slide.urm.accesscontroler.URMAclValidator;
import org.apache.slide.urm.accesscontroler.impl.URMAclAdministratorImpl;
import org.apache.slide.urm.authenticator.URMAdministrator;
+import org.apache.slide.urm.authenticator.URMAuthenticator;
+import org.apache.slide.urm.authenticator.URMSubject;
import org.apache.slide.urm.authenticator.impl.URMAdministratorImpl;
import org.apache.slide.urm.authenticator.impl.URMGuestAdministratorImpl;
import org.apache.slide.urm.authenticator.impl.URMUserAdministratorImpl;
@@ -40,15 +45,12 @@
import org.apache.slide.urm.authenticator.userdb.URMUser;
import org.apache.slide.urm.common.URMCloseConnectionException;
import org.apache.slide.urm.common.URMConnectionException;
+import org.apache.slide.urm.common.URMConstants;
import org.apache.slide.urm.common.URMInternalServerException;
import org.apache.slide.urm.common.URMPrincipal;
import org.apache.slide.urm.common.URMSetRoleException;
-import org.apache.slide.urm.utils.messagelogger.MessageLogger;
-import org.apache.slide.urm.URMException;
-import org.apache.slide.urm.URMForbiddenException;
-import org.apache.slide.urm.URMNotImplementedException;
-import org.apache.slide.urm.common.URMConstants;
import org.apache.slide.urm.common.URMUpdateException;
+import org.apache.slide.urm.utils.messagelogger.MessageLogger;
//import weblogic.security.principal.WLSUserImpl;
//import weblogic.security.principal.WLSPrincipal;
@@ -72,23 +74,29 @@
private URMAdministrator mUrmAdmin = null;
private URMAdministrator mActiveUrmAdmin = null;
private URMAclAdministrator mUrmAclAdmin = null;
+ private char[] mAuthID = null;
// private WLSUserImpl wlprin = null;
-
- public URMPrincipalImpl(String user, String domain,
+
+ public URMPrincipalImpl(String inUser, char[] pwd, String inDomain,
URMAdministrator urmAdmin,
URMAclAdministrator urmAclAdmin) {
// wlprin = new WLSUserImpl(user);
- mUserName = user;
- mDomain = domain;
+ if ((inDomain != null) && !URMAuthenticator.isCaseSensitive()) mDomain
= inDomain.toUpperCase();
+ else mDomain = inDomain;
+ // check if case sensitive
+ if ((inUser != null) && !URMAuthenticator.isCaseSensitive()) mUserName
= inUser.toUpperCase();
+ else mUserName = inUser;
+
// if (domain != null && domain.length() > 0)
// mName = domain + "/" + user;
// else
- mName = user;
-
+
+ mName = mUserName;
mCreationTime = System.currentTimeMillis();
mUrmAdmin = urmAdmin;
mActiveUrmAdmin = new URMUserAdministratorImpl(mUrmAdmin);
mUrmAclAdmin = urmAclAdmin;
+ mAuthID = pwd;
}
/**
@@ -133,7 +141,7 @@
if (mUserName == null)
throw new
URMForbiddenException(MessageLogger.getAndLogMessage(msLogger, "URMCOE0056"));
Object owner = new Object();
- URMPrincipal copy = new URMPrincipalImpl(mUserName, mDomain,
+ URMPrincipal copy = new URMPrincipalImpl(mUserName, mAuthID, mDomain,
new
URMAdministratorImpl(mUrmAdmin, owner),
new
URMAclAdministratorImpl(mUrmAclAdmin, owner));
if (activeRole != null)
@@ -149,7 +157,7 @@
throws URMSetRoleException, URMNotImplementedException,
URMForbiddenException, URMInternalServerException, URMConnectionException {
if (mUserName == null)
throw new
URMForbiddenException(MessageLogger.getAndLogMessage(msLogger, "URMCOE0056"));
- URMPrincipal copy = new URMPrincipalImpl(mUserName, mDomain,
+ URMPrincipal copy = new URMPrincipalImpl(mUserName, mAuthID, mDomain,
new
URMAdministratorImpl(mUrmAdmin, mUrmAdmin.getOwner()),
new
URMAclAdministratorImpl(mUrmAclAdmin, mUrmAclAdmin.getOwner()));
if (activeRole != null)
@@ -280,26 +288,36 @@
}*/
public Set getPossibleRoles() throws URMNotImplementedException,
URMException {
- if (mUserName == null)
- throw new
URMForbiddenException(MessageLogger.getAndLogMessage(msLogger, "URMCOE0057"));
-
Set ret_roles = new HashSet();
- URMUser user = null;
- try {
- user = mUrmAdmin.getUser(mUserName, mDomain);
- } catch (URMForbiddenException e) { }
- if (user == null)
- throw new URMException(MessageLogger.getAndLogMessage(msLogger,
"URMCOC0014", mName));
- // get direct roles
- ret_roles.addAll(user.getAllRoleMapping());
-
- Set grps = user.getAllGroups();
- if (grps != null) {
- Iterator iter = grps.iterator();
- while (iter.hasNext())
-
ret_roles.addAll(((URMGroup)iter.next()).getAllRoleMapping());
+ if (mUserName == null){
+ URMRole guestRole =
mUrmAdmin.getRole(URMConstants.URM_GUEST_ROLE);
+ ret_roles.add(guestRole);
+ ret_roles.addAll(guestRole.getAllAncestors());
+
+ } else {
+
+ URMUser user = null;
+ try {
+ user = mUrmAdmin.getUser(mUserName, mDomain);
+ } catch (URMForbiddenException e) { }
+ if (user == null)
+ throw new
URMException(MessageLogger.getAndLogMessage(msLogger, "URMCOC0014", mName));
+ // get direct roles
+ ret_roles.addAll(user.getAllRoleMapping());
+
+ Set grps = user.getAllGroups();
+ if (grps != null) {
+ Iterator iter = grps.iterator();
+ while (iter.hasNext())
+
ret_roles.addAll(((URMGroup)iter.next()).getAllRoleMapping());
+ }
+
+// URMRole guestRole =
mUrmAdmin.getRole(URMConstants.URM_GUEST_ROLE);
+// ret_roles.add(guestRole);
+// ret_roles.addAll(guestRole.getAllAncestors());
+
+ //if (!roleMapping.isEmpty())
ret_roles.addAll(getPossibleAncestorRoles(roleMapping));
}
- //if (!roleMapping.isEmpty())
ret_roles.addAll(getPossibleAncestorRoles(roleMapping));
return ret_roles;
}
@@ -315,12 +333,16 @@
}
public Set getPrimaryRoles() throws URMNotImplementedException,
URMException {
- if (mUserName == null)
- throw new
URMForbiddenException(MessageLogger.getAndLogMessage(msLogger, "URMCOE0057"));
- URMUser user = mUrmAdmin.getUser(mUserName, mDomain);
- if (user == null)
- throw new URMException(MessageLogger.getAndLogMessage(msLogger,
"URMCOC0014", mName));
- return user.getRoleMapping();
+ if (mUserName == null) {
+ Set roles = new HashSet();
+ roles.add(mUrmAdmin.getRole(URMConstants.URM_GUEST_ROLE));
+ return roles;
+ } else {
+ URMUser user = mUrmAdmin.getUser(mUserName, mDomain);
+ if (user == null)
+ throw new
URMException(MessageLogger.getAndLogMessage(msLogger, "URMCOC0014", mName));
+ return user.getRoleMapping();
+ }
}
public long getCreationTime() {
@@ -353,5 +375,19 @@
if (mUserName == null)
throw new
URMForbiddenException(MessageLogger.getAndLogMessage(msLogger, "URMCOE0057"));
mUrmAdmin.getUser(mUserName, mDomain).setPassword(oldpassword,
newpassword);
+ mAuthID=newpassword;
}
+
+ /**
+ * Delivers the an authentication ID for Single Sign On prozedure.
+ *
+ * @return Authentication ID
+ * @throws URMInternalServerException
+ * @throws URMNotImplementedException
+ * @throws URMForbiddenException
+ */
+ public char[] getAuthenticationID()
+ throws URMInternalServerException, URMNotImplementedException,
URMForbiddenException {
+ return mAuthID;
+ }
}
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/impl/tamino/URMTaminoConnection.java
1.6 +4 -4
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/impl/tamino/URMTaminoConnectionHandler.java
Index: URMTaminoConnectionHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/impl/tamino/URMTaminoConnectionHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- URMTaminoConnectionHandler.java 10 Jan 2005 16:18:05 -0000 1.5
+++ URMTaminoConnectionHandler.java 2 Mar 2005 10:53:35 -0000 1.6
@@ -493,8 +493,8 @@
TConnectionPoolDescriptor descriptor = new
TConnectionPoolDescriptor();
descriptor.setDatabaseURI( mDatabaseUri );
descriptor.setUser( mUserName );
- descriptor.setPassword( mUserPwd );
descriptor.setDomain(mUserDomain);
+ descriptor.setPassword( mUserPwd );
descriptor.setInitConnections( CONNPOOL_INIT_SIZE );
descriptor.setMaxConnections( mConnPoolMax.intValue() );
descriptor.setTimeOut( 0 );
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/URMClassInstantiator.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/URMFifoCache.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/URMSemanticUtils.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/accesscontrolercache/URMAccessControlerCachedObject.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/accesscontrolercache/URMAccessControlerFifoCache.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/messagelogger/MessageLogger.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/resourceutilities/AbstractXMLBasedResourceBundle.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/resourceutilities/DefaultXMLResourceBundleFailureHandler.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/resourceutilities/ResourceLocator.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/resourceutilities/XMLResourceBundle.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/resourceutilities/XMLResourceBundleFailureHandler.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/resourceutilities/message/AbstractDetailedMessage.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/resourceutilities/message/AbstractMessage.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/resourceutilities/message/DefaultMessage.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/resourceutilities/message/DetailedMessage.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/resourceutilities/message/Message.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/resourceutilities/message/MessageCode.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/resourceutilities/message/MessageConstants.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/resourceutilities/message/MessageException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/resourceutilities/message/MessageRetrieveException.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/resourceutilities/message/ResourceMessage.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/resourceutilities/message/XMLMessageResourceBundle.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/validatorcache/URMListener.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/validatorcache/URMListenerElement.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/validatorcache/URMListenerResource.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/validatorcache/URMValidatorCache.java
1.4 +2 -2
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/utils/validatorcache/URMValidatorFifoCache.java
1.4 +72 -12
jakarta-slide/proposals/tamino/src/urmrealm/org/apache/slide/urm/realm/URMRealm.java
Index: URMRealm.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/urmrealm/org/apache/slide/urm/realm/URMRealm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- URMRealm.java 30 Jul 2004 06:52:17 -0000 1.3
+++ URMRealm.java 2 Mar 2005 10:53:36 -0000 1.4
@@ -32,12 +32,14 @@
import java.util.Iterator;
import java.util.Properties;
import java.util.Set;
+
import org.apache.catalina.LifecycleException;
import org.apache.catalina.realm.RealmBase;
import org.apache.slide.urm.URMException;
import org.apache.slide.urm.authenticator.URMAuthenticationFailsException;
import org.apache.slide.urm.authenticator.URMAuthenticator;
import org.apache.slide.urm.authenticator.URMAuthenticatorException;
+import org.apache.slide.urm.authenticator.URMSubject;
import org.apache.slide.urm.authenticator.rolemanager.URMRole;
import org.apache.slide.urm.common.URMCloseConnectionException;
import org.apache.slide.urm.common.URMConfigurationException;
@@ -69,13 +71,24 @@
protected String configFile = null;
protected String principalCacheSize = null;
protected String principalValidTime = null;
+ protected String guestId = null;
+ protected String guestPwd = null;
+ protected boolean case_sen = true;
/**
* Used by Tomcat to set the attribute configFile.
*/
public void setConfigFile(String configFile) {
this.configFile = configFile;
+ }
+
+ /**
+ * Used by Tomcat to set the attribute configFile.
+ */
+ public String getConfigFile() {
+ return configFile;
}
+
/**
* Used by Tomcat to set the attribute principalCacheSize.
*/
@@ -84,12 +97,26 @@
}
/**
+ * Used by Tomcat to set the attribute principalCacheSize.
+ */
+ public String getPrincipalCacheSize() {
+ return this.principalCacheSize;
+ }
+
+ /**
* Used by Tomcat to set the attribute principalValidTime.
*/
public void setPrincipalValidTime(String principalValidTime) {
this.principalValidTime = principalValidTime;
}
+ /**
+ * Used by Tomcat to set the attribute principalValidTime.
+ */
+ public String getPrincipalValidTime() {
+ return this.principalValidTime;
+ }
+
/* (non-Javadoc)
* @see org.apache.catalina.Lifecycle#start()
*/
@@ -153,9 +180,15 @@
try {
URMConfigurator udbconf =
conf.getSubConfigurator("/Authenticator/Attributes");
if (udbconf != null) {
+
Properties ssxprops =
URMConfiguratorUtil.getNodeAttrsAsProperties(
udbconf, "Attribute",
"name", "value");
String authdpath = ssxprops != null ?
ssxprops.getProperty("authDaemonPath") : null;
+
+ // check if user/domain are case sensetive
+ String caseS = ssxprops.getProperty("sensitive");
+ if (caseS != null) case_sen = new
Boolean(caseS).booleanValue();
+
if (authdpath == null) {
authdpath =
System.getProperty("catalina.home")+"/native/bin/sagssxauthd2";
Properties dpathprop = new Properties();
@@ -166,7 +199,7 @@
if (msLogger.isInfoEnabled())
msLogger.info("Using '"+authdpath+"' path to run
authenticator daemon.");
mAuthenticator = URMAuthenticator.newInstance(conf);
- URMConfiguratorXML.setDefaultConfigurator(conf);
+ URMConfiguratorXML.setDefaultConfigurator(conf);
}
} catch (URMException e) {
e.printStackTrace();
@@ -187,6 +220,10 @@
stmp = aprops.getProperty("allCacheTime");
if (stmp != null && stmp.length() > 0)
cachetime = Integer.parseInt(stmp);
+
+ // get guest account
+ guestId = aprops.getProperty("guestId");
+ guestPwd = aprops.getProperty("guestPassword");
}
if (principalCacheSize != null && principalCacheSize.length() > 0)
cachesize = Integer.parseInt(principalCacheSize);
@@ -250,9 +287,11 @@
String rstr = "";
Iterator ri = rset.iterator();
if (ri.hasNext()) {
- rstr = ((URMRole)ri.next()).getName();
- while (ri.hasNext())
- rstr += "," + ((URMRole)ri.next()).getName();
+ rstr = ((URMSubject)ri.next()).getName();
+ while (ri.hasNext()){
+ URMSubject sub = (URMSubject)ri.next();
+ rstr += "," + sub.getName();
+ }
}
msLogger.debug("Checking '"+role+"' role of
'"+principal.getName()+"' in the ("+rstr+") set.");
}
@@ -279,13 +318,25 @@
throw new RuntimeException(err);
}
+ String upper_dom = null;
+ String upper_user = null;
String dom = null;
String usr = username;
if (mDomainInUsername) {
int idx = 0;
if ((idx = username.lastIndexOf('\\')) > 0) {
- dom = username.substring(0, idx);
- usr = username.substring(idx + 1);
+ if (!case_sen) {
+ upper_dom = username.substring(0, idx);
+ // converts the domain to upper case (if it's not done,
the domain will be case sensetive)
+ dom = upper_dom.toUpperCase();
+ upper_user = username.substring(idx + 1);
+ // converts the domain to upper case (if it's not done,
the domain will be case sensetive)
+ usr = upper_user.toUpperCase();
+
+ } else {
+ dom = username.substring(0, idx);
+ usr = username.substring(idx + 1);
+ }
}
}
@@ -298,12 +349,18 @@
return principal;
}
try {
- principal = mAuthenticator.authenticateUser(usr,
- credentials != null ? credentials.toCharArray() :
null,
- dom);
+
+ if (usr.equals(guestId) && credentials.equals(guestPwd)) {
+ principal = mAuthenticator.authenticateUser();
+ } else {
+ principal = mAuthenticator.authenticateUser(usr,
+ credentials != null ? credentials.toCharArray()
: null,
+ dom);
+ }
mPrincipalCache.add(key, principal, credentials);
if (msLogger.isDebugEnabled())
msLogger.debug("Password checking of '"+username+"' is
successful.");
+
return principal;
} catch (URMAuthenticationFailsException e) {
mPrincipalCache.remove(key);
@@ -319,6 +376,9 @@
} catch (URMCloseConnectionException e) {
String err = "Closing conection failed by the password checking
of '"+username+"' ("+e.getMessage()+").";
msLogger.error(err);
+ } catch (URMException e) {
+ String err = "Guest logon fails("+e.getMessage()+").";
+ msLogger.error(err);
}
return null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
