taylor 2002/06/03 19:43:36
Modified: build Tag: security_14 build.xml
src/java/org/apache/jetspeed/services/security Tag:
security_14 PortalResource.java
src/java/org/apache/jetspeed/services/security/turbine Tag:
security_14 TurbineAuthentication.java
TurbineUserManagement.java
webapp/WEB-INF/conf Tag: security_14
JetspeedSecurity.default
JetspeedSecurity.properties
JetspeedSecurity.template
Added: src/java/org/apache/jetspeed/om/security/turbine Tag:
security_14 BaseTurbineUserPeer.java
Log:
extended BaseTurbineUser to populate hashmaps for JetspeedUser
Revision Changes Path
No revision
No revision
1.142.2.7 +23 -5 jakarta-jetspeed/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
retrieving revision 1.142.2.6
retrieving revision 1.142.2.7
diff -u -r1.142.2.6 -r1.142.2.7
--- build.xml 3 Jun 2002 04:30:44 -0000 1.142.2.6
+++ build.xml 4 Jun 2002 02:43:36 -0000 1.142.2.7
@@ -824,10 +824,6 @@
<test
name="org.apache.jetspeed.util.template.TestJetspeedLinkFactory"/>
<test name="org.apache.jetspeed.util.rewriter.FrameRewriterTest"/>
<test
name="org.apache.jetspeed.services.profiler.TestProfilerService"/>
-<!--
- <test
name="org.apache.jetspeed.services.security.TestPortalAuthentication"/>
--->
-
</junit>
</target>
@@ -858,7 +854,8 @@
<!-- =================================================================== -->
<!-- Run the client JUnit test cases (non-cactus) -->
<!-- =================================================================== -->
- <target name="unittest-security" depends="unittest-security-turbine"
+ <target name="unittest-security"
+ depends="unittest-security-turbine,unittest-security-user"
description="Security unit test for all implementations"/>
<!-- =================================================================== -->
@@ -889,6 +886,27 @@
</junit>
</target>
+
+ <target name="unittest-security-user" depends="compile"
+ description="User security unit test">
+
+ <junit printsummary="yes" haltonfailure="yes" haltonerror="yes" fork="yes">
+ <classpath>
+ <pathelement location="${build.dest.dir}"/>
+ <path refid="classpath"/>
+ <pathelement location="${junit.jar}"/>
+ <pathelement location="${hsql.jar}"/>
+ </classpath>
+
+ <formatter type="plain" usefile="false"/>
+
+ <!-- JUnit unit tests -->
+ <test
name="org.apache.jetspeed.services.security.TestPortalAuthentication"/>
+
+ </junit>
+ </target>
+
+
<!-- =================================================================== -->
<!-- Run the client JUnit test cases (non-cactus) -->
No revision
No revision
1.1.2.1 +673 -0
jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/turbine/Attic/BaseTurbineUserPeer.java
No revision
No revision
1.1.2.2 +3 -3
jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/Attic/PortalResource.java
Index: PortalResource.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/Attic/PortalResource.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PortalResource.java 1 Jun 2002 20:29:05 -0000 1.1.2.1
+++ PortalResource.java 4 Jun 2002 02:43:36 -0000 1.1.2.2
@@ -57,15 +57,15 @@
// Jetspeed imports
import org.apache.jetspeed.portal.Portlet;
import org.apache.jetspeed.om.profile.Entry;
-import org.apache.jetspeed.om.profile.Parameter;
-import org.apache.jetspeed.om.registry.Parameter;
+//import org.apache.jetspeed.om.profile.Parameter;
+//import org.apache.jetspeed.om.registry.Parameter;
import org.apache.jetspeed.om.registry.RegistryEntry;
/**
* PortalResource
*
* @author <a href="[EMAIL PROTECTED]">Paul Spencer</a>
- * @version $Id: PortalResource.java,v 1.1.2.1 2002/06/01 20:29:05 paulsp Exp $
+ * @version $Id: PortalResource.java,v 1.1.2.2 2002/06/04 02:43:36 taylor Exp $
*/
public class PortalResource {
public static final int TYPE_PORTLET = 100;
No revision
No revision
1.1.2.3 +2 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/Attic/TurbineAuthentication.java
Index: TurbineAuthentication.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/Attic/TurbineAuthentication.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TurbineAuthentication.java 30 May 2002 07:04:11 -0000 1.1.2.2
+++ TurbineAuthentication.java 4 Jun 2002 02:43:36 -0000 1.1.2.3
@@ -93,7 +93,7 @@
* This service does not use any of the Turbine security or user management classes.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
- * @version $Id: TurbineAuthentication.java,v 1.1.2.2 2002/05/30 07:04:11 taylor
Exp $
+ * @version $Id: TurbineAuthentication.java,v 1.1.2.3 2002/06/04 02:43:36 taylor
Exp $
*/
public class TurbineAuthentication extends TurbineBaseService
@@ -143,6 +143,7 @@
try
{
user = JetspeedUserManagement.getUser(new UserNamePrincipal(username));
+ // TODO: put user in context
}
catch (UnknownUserException e)
1.1.2.2 +4 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/Attic/TurbineUserManagement.java
Index: TurbineUserManagement.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/Attic/TurbineUserManagement.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TurbineUserManagement.java 30 May 2002 07:04:11 -0000 1.1.2.1
+++ TurbineUserManagement.java 4 Jun 2002 02:43:36 -0000 1.1.2.2
@@ -92,7 +92,7 @@
*
*
* @author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
- * @version $Id: TurbineUserManagement.java,v 1.1.2.1 2002/05/30 07:04:11 taylor
Exp $
+ * @version $Id: TurbineUserManagement.java,v 1.1.2.2 2002/06/04 02:43:36 taylor
Exp $
*/
public class TurbineUserManagement extends TurbineBaseService
@@ -136,7 +136,7 @@
Vector users;
try
{
- users = TurbineUserPeer.doSelect(criteria);
+ users = TurbineUserPeer.doSelectUsers(criteria);
}
catch(Exception e)
{
@@ -262,6 +262,8 @@
setInit(true);
}
+
+
}
No revision
No revision
1.1.2.2 +3 -2
jakarta-jetspeed/webapp/WEB-INF/conf/Attic/JetspeedSecurity.default
Index: JetspeedSecurity.default
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/Attic/JetspeedSecurity.default,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- JetspeedSecurity.default 3 Jun 2002 04:22:26 -0000 1.1.2.1
+++ JetspeedSecurity.default 4 Jun 2002 02:43:36 -0000 1.1.2.2
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: JetspeedSecurity.default,v 1.1.2.1 2002/06/03 04:22:26 paulsp Exp $
+# $Id: JetspeedSecurity.default,v 1.1.2.2 2002/06/04 02:43:36 taylor Exp $
#
# This is the configuration file for JetspeedSecurity
#
@@ -24,4 +24,5 @@
# User Management Service #
#########################################
-#
services.UserManagement.classname=org.apache.jetspeed.services.security.turbine.UserManagement
+services.UserManagement.classname=org.apache.jetspeed.services.security.turbine.TurbineUserManagement
+
1.1.2.4 +13 -129
jakarta-jetspeed/webapp/WEB-INF/conf/Attic/JetspeedSecurity.properties
Index: JetspeedSecurity.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/Attic/JetspeedSecurity.properties,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- JetspeedSecurity.properties 30 May 2002 07:04:11 -0000 1.1.2.3
+++ JetspeedSecurity.properties 4 Jun 2002 02:43:36 -0000 1.1.2.4
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: JetspeedSecurity.properties,v 1.1.2.3 2002/05/30 07:04:11 taylor Exp $
+# $Id: JetspeedSecurity.properties,v 1.1.2.4 2002/06/04 02:43:36 taylor Exp $
#
# This is the configuration file for JetspeedSecurity
#
@@ -8,137 +8,21 @@
#
# -------------------------------------------------------------------
-#
services.SecurityService.classname=org.apache.jetspeed.services.security.JetspeedDBSecurityService
-
-# -------------------------------------------------------------------
-#
-# Authentication Service
-#
-# -------------------------------------------------------------------
+#########################################
+# Authentication Service #
+#########################################
services.PortalAuthentication.classname=org.apache.jetspeed.services.security.turbine.TurbineAuthentication
-# -------------------------------------------------------------------
-#
-# Authorization, UserManagement Services
-#
-# -------------------------------------------------------------------
-
-services.PortalAccessController.classname=org.apache.jetspeed.services.security.turbine.TurbineAccessController
-
-# -------------------------------------------------------------------
-#
-# UserManagement Services
-#
-# -------------------------------------------------------------------
+#########################################
+# Authorization Service #
+#########################################
+
[EMAIL PROTECTED]@
+
+#########################################
+# User Management Service #
+#########################################
services.UserManagement.classname=org.apache.jetspeed.services.security.turbine.TurbineUserManagement
-
-#
-# User Class
-#
-services.JetspeedSecurity.user.class=org.apache.jetspeed.om.security.BaseJetspeedUser
-services.JetspeedSecurity.user.persisted.class=org.apache.jetspeed.om.security.turbine.TurbineUser
-
-#
-# This is used by the SecurityService to make the password checking
-# secure. When enabled, passwords are transformed by a one-way
-# function into a sequence of bytes that is base64 encoded.
-# It is impossible to guess the plain-text form of the password
-# from the representation. When user logs in, the entered password
-# is transformed the same way and then compared with stored value.
-#
-# Default: false
-#
-
-services.JetspeedSecurity.secure.passwords=false
-
-#
-# This property lets you choose what digest algorithm will be used
-# for encrypting passwords. Check documentation of your JRE for
-# available algorithms.
-#
-# Default: SHA
-#
-
-services.JetspeedSecurity.secure.passwords.algorithm=SHA
-
-# Role(s) to assign to new user. Multiple Role must be comma separated.
-services.JetspeedSecurity.newuser.roles=user
-
-# Default permission(s) when object have no permissions defined
-# The follow permissions are define in the default Jetspeed installation:
-# view, customize, minimize, maximize, close
-# * = All permissions
-services.JetspeedSecurity.permission.default.anonymous=view
-services.JetspeedSecurity.permission.default.loggedin=*
-
-# During logon, username and password can be case sensitive or case insensitive
-# This option configures the logon username and password to be case sensitive or
insensitive
-# if its case insensitive, then "logon.casesensitive.upper" controls whether the
username and
-# password or converted to upper or lower case before passing on to the database
-services.JetspeedSecurity.caseinsensitive.username=false
-services.JetspeedSecurity.caseinsensitive.password=false
-services.JetspeedSecurity.caseinsensitive.upper=true
-
-# Auto-Account-Disable Feature
-services.JetspeedSecurity.logon.auto.disable=false
-
-# 3 logon strikes per 300 seconds and your out
-services.JetspeedSecurity.logon.strike.count=3
-services.JetspeedSecurity.logon.strike.interval=300
-# dont allow more than 10 over any time period
-services.JetspeedSecurity.logon.strike.max=10
-
-# -------------------------------------------------------------------
-#
-# To Be Deleted soon...
-#
-# -------------------------------------------------------------------
-#
-# This is the class that implements the User interface.
-# You want to override this setting only if you want your User
-# implementation to provide application specific addtional
-# functionality.
-#
-# Default: org.apache.turbine.om.security.TurbineUser
-#
-
-# services.SecurityService.user.class=org.apache.turbine.om.security.TurbineUser
-#
services.SecurityService.user.class=org.apache.jetspeed.om.security.BaseTurbineUser
-
-#
-# This setting is DBSecurityService specific - this class is consulted for the names
-# of the columns in the users' tables for the purpose of creating join queries.
-# If you use your own User implementation in conjunction with DBSecurityService,
-# it's peer class must implement org.apache.turbine.om.security.peer.UserPeer
interface,
-# and you need to specify the name of the peer class here.
-#
-# Defalut: org.apache.turbine.om.security.peer.TurbineUserPeer
-#
-#
services.SecurityService.userPeer.class=org.apache.turbine.om.security.peer.TurbineUserPeer
-#
services.SecurityService.userPeer.class=org.apache.jetspeed.om.security.peer.TurbineUserPeerAdapter
-
-#
-# This is the class that implements UserManager interface.
-# Override this setting if you want your User information stored
-# on a different medium (LADP directory is a good example).
-# Default implementation uses Peers and a relational database .
-#
-#
services.SecurityService.user.manager=org.apache.turbine.services.security.db.DBUserManager
-
-# -------------------------------------------------------------------
-#
-# P E E R S
-#
-# -------------------------------------------------------------------
-# Supplies Turbine with information about the database schema, which
-# can simplify any required Peer classes.
-#
-# Default: org.apache.turbine.util.db.map.TurbineMapBuilder
-# -------------------------------------------------------------------
-
-# database.maps.builder=org.apache.turbine.util.db.map.TurbineMapBuilder
-#
database.maps.builder=org.apache.jetspeed.om.security.db.map.JetspeedMapBuilderAdapter
-#
database.maps.builder=org.apache.jetspeed.om.security.map.TurbineUserMapBuilderAdapter
1.1.2.2 +3 -2
jakarta-jetspeed/webapp/WEB-INF/conf/Attic/JetspeedSecurity.template
Index: JetspeedSecurity.template
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/Attic/JetspeedSecurity.template,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- JetspeedSecurity.template 3 Jun 2002 04:22:26 -0000 1.1.2.1
+++ JetspeedSecurity.template 4 Jun 2002 02:43:36 -0000 1.1.2.2
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: JetspeedSecurity.template,v 1.1.2.1 2002/06/03 04:22:26 paulsp Exp $
+# $Id: JetspeedSecurity.template,v 1.1.2.2 2002/06/04 02:43:36 taylor Exp $
#
# This is the configuration file for JetspeedSecurity
#
@@ -24,4 +24,5 @@
# User Management Service #
#########################################
-#
services.UserManagement.classname=org.apache.jetspeed.services.security.turbine.UserManagement
+services.UserManagement.classname=org.apache.jetspeed.services.security.turbine.TurbineUserManagement
+
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
