Author: metskem
Date: Sat May 8 12:12:54 2010
New Revision: 942374
URL: http://svn.apache.org/viewvc?rev=942374&view=rev
Log:
3.0.0-svn-218
* JSPWIKI-392 and JSPWIKI-442 invalid asserted usernames
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/doc/2.8 Auth Changes
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserPreferencesActionBean.java
incubator/jspwiki/trunk/src/wikipages/pt_BR/FullRecentChanges.txt
incubator/jspwiki/trunk/src/wikipages/pt_BR/RecentChanges.txt
incubator/jspwiki/trunk/src/wikipages/pt_BR/UndefinedPages.txt
incubator/jspwiki/trunk/src/wikipages/pt_BR/UnusedPages.txt
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=942374&r1=942373&r2=942374&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sat May 8 12:12:54 2010
@@ -1,3 +1,9 @@
+2010-05-08 Harry Metske <[email protected]>
+
+ * 3.0.0-svn-218
+
+ * JSPWIKI-392 and JSPWIKI-442 invalid asserted usernames
+
2010-03-27 Andrew Jaquith <ajaquith AT apache DOT org>
* 3.0.0-svn-217
Modified: incubator/jspwiki/trunk/doc/2.8 Auth Changes
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/doc/2.8%20Auth%20Changes?rev=942374&r1=942373&r2=942374&view=diff
==============================================================================
--- incubator/jspwiki/trunk/doc/2.8 Auth Changes (original)
+++ incubator/jspwiki/trunk/doc/2.8 Auth Changes Sat May 8 12:12:54 2010
@@ -99,7 +99,7 @@ Observations
UserDatabaseLoginModule will be the only remaining JAAS LoginModule, unless
substituted by the admin at runtime
Recommended strategy & config:
-loginModule.class=(class name). This class MUST have a zero-argument
constructor (as noted in LoginModule API). Default value will be
com.ecyrd.jspwiki.auth.login.UserDatabaseLoginModule.
+loginModule.class=(class name). This class MUST have a zero-argument
constructor (as noted in LoginModule API). Default value will be
org.apache.wiki.auth.login.UserDatabaseLoginModule.
Other parameters will be loaded into an options Map. Params may be specified
this way:
loginModule.options.param1=value1
loginModule.options.param2=value2
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=942374&r1=942373&r2=942374&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sat May 8
12:12:54 2010
@@ -77,7 +77,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "217";
+ public static final String BUILD = "218";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserPreferencesActionBean.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserPreferencesActionBean.java?rev=942374&r1=942373&r2=942374&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserPreferencesActionBean.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserPreferencesActionBean.java
Sat May 8 12:12:54 2010
@@ -53,6 +53,13 @@ public class UserPreferencesActionBean e
{
private static final Logger log = LoggerFactory.getLogger( "JSPWiki" );
+ /*
+ * not start with a blank or colon : ^[^( |:)]
+ * no colons : [^:]*
+ * Stripes requires a constant expression, so here is the combination of
the above :
+ */
+ private static final String VALID_USER_PATTERN = "^[^( |:)][^:]*" ;
+
private String m_assertedName = null;
private String m_editor = null;
@@ -242,7 +249,7 @@ public class UserPreferencesActionBean e
*
* @param name the asserted name
*/
- @Validate( required = false, on = "save", minlength = 1, maxlength = 128 )
+ @Validate( required = false, on = "save", minlength = 1, maxlength = 128 ,
mask=VALID_USER_PATTERN)
public void setAssertedName( String name )
{
m_assertedName = name;
Modified: incubator/jspwiki/trunk/src/wikipages/pt_BR/FullRecentChanges.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/pt_BR/FullRecentChanges.txt?rev=942374&r1=942373&r2=942374&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/pt_BR/FullRecentChanges.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/pt_BR/FullRecentChanges.txt Sat May
8 12:12:54 2010
@@ -1,3 +1,3 @@
Estas são todas as alterações feitas à essas páginas. Uma lista bem menor
está disponível em [Mudanças Recentes|RecentChanges].
-[{INSERT com.ecyrd.jspwiki.plugin.RecentChangesPlugin}]
+[{INSERT org.apache.wiki.plugin.RecentChangesPlugin}]
Modified: incubator/jspwiki/trunk/src/wikipages/pt_BR/RecentChanges.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/pt_BR/RecentChanges.txt?rev=942374&r1=942373&r2=942374&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/pt_BR/RecentChanges.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/pt_BR/RecentChanges.txt Sat May 8
12:12:54 2010
@@ -2,4 +2,4 @@ Estas são as alterações feitas à ess
Este servidor está em [{INSERT CurrentTimePlugin format=zzzz}] e a hora aqui é
[{INSERT CurrentTimePlugin format='HH:mm \'on\' dd-MMM-yyyy'}].
-[{INSERT com.ecyrd.jspwiki.plugin.RecentChangesPlugin since=30}]
+[{INSERT org.apache.wiki.plugin.RecentChangesPlugin since=30}]
Modified: incubator/jspwiki/trunk/src/wikipages/pt_BR/UndefinedPages.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/pt_BR/UndefinedPages.txt?rev=942374&r1=942373&r2=942374&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/pt_BR/UndefinedPages.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/pt_BR/UndefinedPages.txt Sat May 8
12:12:54 2010
@@ -1,5 +1,5 @@
Aqui estão as páginas que ainda não foram criadas. Por que você não cria
algumas?
-[{INSERT com.ecyrd.jspwiki.plugin.UndefinedPagesPlugin}]
+[{INSERT org.apache.wiki.plugin.UndefinedPagesPlugin}]
(Voltar para [Home]).
Modified: incubator/jspwiki/trunk/src/wikipages/pt_BR/UnusedPages.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/pt_BR/UnusedPages.txt?rev=942374&r1=942373&r2=942374&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/pt_BR/UnusedPages.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/pt_BR/UnusedPages.txt Sat May 8
12:12:54 2010
@@ -1,3 +1,3 @@
Estas páginas estão isoladas, ou seja, não possuem ligação com nenhuma outra
página da wiki (exceto aquelas que são geradas automaticamente).
-[{INSERT com.ecyrd.jspwiki.plugin.UnusedPagesPlugin}]
+[{INSERT org.apache.wiki.plugin.UnusedPagesPlugin}]
