portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r406607 - in /portals/jetspeed-1/trunk/src: java/org/apache/jetspeed/om/security/ldap/LDAPUser.java ldap/LDAP-JetspeedSecurity.properties ldap/ldap-notes.txt
Date Mon, 15 May 2006 10:43:31 GMT
Author: ate
Date: Mon May 15 03:43:25 2006
New Revision: 406607

URL: http://svn.apache.org/viewcvs?rev=406607&view=rev
Log:
Fixes to ldap implementation:
- Correcting NPE conditions in LDAPUser.
- Added required JetspeedSecurity service properties values for provided sample LDAP (especially
for secure.passwords=true) in LDAP-JetspeedSecurity.properties (to merge).
- Mention (optional) openldap index definitions in ldap-notes (here).
- Tested with OpenLDAP slapd 2.3.20.

Modified:
    portals/jetspeed-1/trunk/src/java/org/apache/jetspeed/om/security/ldap/LDAPUser.java
    portals/jetspeed-1/trunk/src/ldap/LDAP-JetspeedSecurity.properties
    portals/jetspeed-1/trunk/src/ldap/ldap-notes.txt

Modified: portals/jetspeed-1/trunk/src/java/org/apache/jetspeed/om/security/ldap/LDAPUser.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-1/trunk/src/java/org/apache/jetspeed/om/security/ldap/LDAPUser.java?rev=406607&r1=406606&r2=406607&view=diff
==============================================================================
--- portals/jetspeed-1/trunk/src/java/org/apache/jetspeed/om/security/ldap/LDAPUser.java (original)
+++ portals/jetspeed-1/trunk/src/java/org/apache/jetspeed/om/security/ldap/LDAPUser.java Mon
May 15 03:43:25 2006
@@ -296,7 +296,7 @@
         try
         {
             tmp = (String) getPerm (JetspeedUser.USER_ID);
-            if ( tmp.length() == 0 )
+            if ( tmp != null && tmp.length() == 0 )
             {
                 tmp = null;
             }
@@ -500,7 +500,7 @@
         try
         {
             tmp = (String) getPerm (User.USERNAME);
-            if ( tmp.length() == 0 )
+            if ( tmp != null && tmp.length() == 0 )
             {
                 tmp = null;
             }
@@ -526,7 +526,7 @@
         try
         {
             tmp = (String) getPerm (User.FIRST_NAME);
-            if (tmp.length() == 0)
+            if (tmp != null && tmp.length() == 0)
             {
                 tmp = null;
             }
@@ -551,7 +551,7 @@
         try
         {
             tmp = (String) getPerm (User.LAST_NAME);
-            if (tmp.length() == 0) tmp = null;
+            if (tmp != null && tmp.length() == 0) tmp = null;
         }
         catch (Exception e)
         {

Modified: portals/jetspeed-1/trunk/src/ldap/LDAP-JetspeedSecurity.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-1/trunk/src/ldap/LDAP-JetspeedSecurity.properties?rev=406607&r1=406606&r2=406607&view=diff
==============================================================================
--- portals/jetspeed-1/trunk/src/ldap/LDAP-JetspeedSecurity.properties (original)
+++ portals/jetspeed-1/trunk/src/ldap/LDAP-JetspeedSecurity.properties Mon May 15 03:43:25
2006
@@ -12,6 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+services.JetspeedSecurity.secure.passwords=true
+services.JetspeedSecurity.secure.passwords.algorithm=crypt
+services.JetspeedSecurity.secure.passwords.prefix={CRYPT}
+
 services.JetspeedSecurity.classname=org.apache.jetspeed.services.security.JetspeedDBSecurityService
 services.SecurityCache.classname=org.apache.jetspeed.services.security.SecurityCacheImpl
 

Modified: portals/jetspeed-1/trunk/src/ldap/ldap-notes.txt
URL: http://svn.apache.org/viewcvs/portals/jetspeed-1/trunk/src/ldap/ldap-notes.txt?rev=406607&r1=406606&r2=406607&view=diff
==============================================================================
--- portals/jetspeed-1/trunk/src/ldap/ldap-notes.txt (original)
+++ portals/jetspeed-1/trunk/src/ldap/ldap-notes.txt Mon May 15 03:43:25 2006
@@ -38,6 +38,10 @@
  rootdn          "cn=ldapadmin,ou=jetspeed,o=apache"
  rootpw          secret
 
+... optionally adding the following index definitions
+index	default pres,eq
+index	uid
+
 ... and the following entry to "ldap.conf" configuration file:
 
  BASE ou=jetspeed,o=apache
@@ -89,5 +93,10 @@
             "BaseLDAPObject.java". 
 2003/01/20: Overall code cleanup performed (still a lot to do though).
             Extraneous imports removed. 
+2006/05/15: Correcting NPE conditions in LDAPUser.
+            Added required JetspeedSecurity service properties values for
+            provided sample LDAP (especially for secure.passwords=true)
+            in LDAP-JetspeedSecurity.properties (to merge).
+            Mention (optional) openldap index definitions in ldap-notes (here).
+            Tested with OpenLDAP slapd 2.3.20.
   
-  
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message