jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ajaqu...@apache.org
Subject svn commit: r656388 - /incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java
Date Wed, 14 May 2008 19:58:35 GMT
Author: ajaquith
Date: Wed May 14 12:58:35 2008
New Revision: 656388

URL: http://svn.apache.org/viewvc?rev=656388&view=rev
Log:
The sort-of-secret "share container user accounts with JDBCUserDatabase" option has been permanently
removed, and will not be replaced. This was previously added to make it easier for users to
add themselves to JDBC-based container realms. However, the switch to salted passwords precludes
the continued use of this option. So it's gone and won't come back.

Modified:
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java?rev=656388&r1=656387&r2=656388&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java Wed May 14
12:58:35 2008
@@ -215,7 +215,7 @@
         {
             throw new IllegalStateException( "FATAL: database does not exist" );
         }
-        SortedSet principals = new TreeSet();
+        SortedSet<Principal> principals = new TreeSet<Principal>();
         NodeList users = c_dom.getElementsByTagName( USER_TAG );
         for( int i = 0; i < users.getLength(); i++ )
         {
@@ -410,16 +410,6 @@
             }
         }
     }
-    
-    /**
-     * Determines whether the user database shares user/password data with the
-     * web container; always returns <code>false</code>.
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#isSharedWithContainer()
-     */
-    public boolean isSharedWithContainer()
-    {
-        return false;
-    }
 
     /**
      * @see com.ecyrd.jspwiki.auth.user.UserDatabase#rename(String, String)
@@ -524,7 +514,7 @@
             String oldPassword = user.getAttribute( PASSWORD );
             if ( !oldPassword.equals( newPassword ) )
             {
-                setAttribute( user, PASSWORD, SHA_PREFIX + getHash( newPassword ) );
+                setAttribute( user, PASSWORD, getHash( newPassword ) );
             }
         }
 



Mime
View raw message