Author: ajaquith
Date: Fri Mar 20 03:22:54 2009
New Revision: 756319
URL: http://svn.apache.org/viewvc?rev=756319&view=rev
Log:
Fixed bug in XMLUserDatabase that was preventing UIDs from being saved, which
generated tons of NPEs afterwards. Added unit tests to check for correct saving
of UIDs. Tightened input filtering on user profile fields to prohibit more
characters. [Forward-ported from 2.8.2-svn-14].
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPage.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/XMLUserDatabase.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/InputValidator.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=756319&r1=756318&r2=756319&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Fri Mar 20 03:22:54 2009
@@ -1,3 +1,13 @@
+2009-03-19 Andrew Jaquith <ajaquith AT apache DOT org>
+
+ * 3.0.0-svn-86
+
+ * Fixed bug in XMLUserDatabase that was preventing UIDs from being
+ saved, which generated tons of NPEs afterwards. Added unit tests
+ to check for correct saving of UIDs. Tightened input filtering on
+ user profile fields to prohibit more characters. [Forward-ported
+ from 2.8.2-svn-14].
+
2009-03-18 Andrew Jaquith <ajaquith AT apache DOT org>
* 3.0.0-svn-85
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=756319&r1=756318&r2=756319&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Fri Mar 20
03:22:54 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "85";
+ public static final String BUILD = "86";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPage.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPage.java?rev=756319&r1=756318&r2=756319&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPage.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPage.java Fri Mar
20 03:22:54 2009
@@ -66,7 +66,7 @@
public String getName();
/**
- * Returns the full, qualified, name of the WikiPage that includes the
wiki name.
+ * Returns the full, qualified, name of the WikiPage that includes the
wiki space.
* Used by the {...@link org.apache.wiki.ui.stripes.HandlerInfo} class and
* {...@link org.apache.wiki.ui.stripes.HandlerPermission} annotations.
* @return the qualified page name, for example <code>mywiki:Main</code>
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/XMLUserDatabase.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/XMLUserDatabase.java?rev=756319&r1=756318&r2=756319&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/XMLUserDatabase.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/XMLUserDatabase.java
Fri Mar 20 03:22:54 2009
@@ -546,6 +546,7 @@
}
}
+ setAttribute( user, UID, profile.getUid() );
setAttribute( user, LAST_MODIFIED, c_format.format( modDate ) );
setAttribute( user, LOGIN_NAME, profile.getLoginName() );
setAttribute( user, FULL_NAME, profile.getFullname() );
@@ -623,7 +624,7 @@
// Parse basic attributes
profile.setUid( user.getAttribute( UID ) );
- if ( profile.getUid() == null )
+ if ( profile.getUid() == null || profile.getUid().length() ==
0 )
{
profile.setUid( generateUid( this ) );
}
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/InputValidator.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/InputValidator.java?rev=756319&r1=756318&r2=756319&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/InputValidator.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/InputValidator.java Fri
Mar 20 03:22:54 2009
@@ -52,7 +52,7 @@
protected static final Pattern EMAIL_PATTERN = Pattern.compile(
"^[0-9a-zA-Z-_\\.\\+]+@([0-9a-zA-Z-_]+\\.)+[a-zA-Z]+$" );
- protected static final Pattern UNSAFE_PATTERN = Pattern.compile(
"[\\x00\\r\\n\\x0f\"':<>;&@\\xff{}\\$%\\\\]" );
+ protected static final Pattern UNSAFE_PATTERN = Pattern.compile(
"[\\x00\\r\\n\\x0f\"':<>\\[\\];#&@\\xff{}\\$%\\\\]" );
/** Used when checking against IDs such as a full name when saving groups.
* @since 2.4.82 */
@@ -147,7 +147,7 @@
valid = !matcher.find();
if ( !valid )
{
- Object[] args = { label, ""'<>;&\...@{}%$"
};
+ Object[] args = { label, ""'<>;&[]...@{}%$"
};
m_session.addMessage( m_form, MessageFormat.format(
rb.getString("validate.unsafechars"),
args ) );
}
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java?rev=756319&r1=756318&r2=756319&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java
(original)
+++
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java
Fri Mar 20 03:22:54 2009
@@ -437,6 +437,10 @@
assertNotNull( profile.getCreated() );
assertNotNull( profile.getLastModified() );
assertEquals( profile.getCreated(), profile.getLastModified() );
+
+ // Make sure we can find it by uid
+ String uid = profile.getUid();
+ assertNotNull( m_db.findByUid( uid ) );
}
catch( NoSuchPrincipalException e )
{
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java?rev=756319&r1=756318&r2=756319&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
(original)
+++
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
Fri Mar 20 03:22:54 2009
@@ -357,6 +357,10 @@
profile = m_db.findByEmail("[email protected]");
assertEquals("[email protected]", profile.getEmail());
assertTrue( CryptoUtil.verifySaltedPassword( "password".getBytes(),
profile.getPassword() ) );
+
+ // Make sure we can find it by uid
+ String uid = profile.getUid();
+ assertNotNull( m_db.findByUid( uid ) );
}
catch (NoSuchPrincipalException e)
{
