incubator-jspwiki-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Janne Jalkanen <Janne.Jalka...@ecyrd.com>
Subject Re: svn commit: r712042 - in /incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH: ./ lib/ src/com/ecyrd/jspwiki/ tests/com/ecyrd/jspwiki/auth/ tests/etc/
Date Sat, 08 Nov 2008 16:48:59 GMT

Does this close JSPWIKI-345 or is there something still missing?

/Janne

On Nov 7, 2008, at 04:35 , ajaquith@apache.org wrote:

> Author: ajaquith
> Date: Thu Nov  6 18:35:07 2008
> New Revision: 712042
>
> URL: http://svn.apache.org/viewvc?rev=712042&view=rev
> Log:
> [JSPWIKI-345]: Upgraded freshcookies-security to 0.60, which fixes  
> an issue causing generic (non-class-specific) Principal entries in  
> security policies to be ignored.
>
> Added:
>     incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/lib/freshcookies- 
> security-0.60.jar   (with props)
> Removed:
>     incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/lib/freshcookies- 
> security-0.54.jar
> Modified:
>     incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/.classpath
>     incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
>     incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/LICENSE
>     incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/ 
> jspwiki/Release.java
>     incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/ 
> jspwiki/auth/AuthorizationManagerTest.java
>     incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/etc/jspwiki- 
> testUserPolicy.policy
>
> Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/.classpath
> URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/ 
> JSPWIKI_2_8_BRANCH/.classpath?rev=712042&r1=712041&r2=712042&view=diff
> ====================================================================== 
> ========
> --- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/.classpath  
> (original)
> +++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/.classpath Thu  
> Nov  6 18:35:07 2008
> @@ -25,7 +25,7 @@
>  	<classpathentry kind="lib" path="lib/mail.jar"/>
>  	<classpathentry kind="lib" path="lib/activation.jar"/>
>  	<classpathentry kind="lib" path="etc/i18n"/>
> -	<classpathentry kind="lib" path="lib/freshcookies- 
> security-0.54.jar"/>
> +	<classpathentry kind="lib" path="lib/freshcookies- 
> security-0.60.jar"/>
>  	<classpathentry kind="lib" path="lib/commons-httpclient-3.0.1.jar"/>
>  	<classpathentry kind="lib" path="lib/jakarta-taglibs- 
> jstl-1.1.2.jar"/>
>  	<classpathentry kind="lib" path="lib/jakarta-tablibs- 
> standard-1.1.2.jar"/>
>
> Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
> URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/ 
> JSPWIKI_2_8_BRANCH/ChangeLog?rev=712042&r1=712041&r2=712042&view=diff
> ====================================================================== 
> ========
> --- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
> +++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Thu  
> Nov  6 18:35:07 2008
> @@ -1,3 +1,11 @@
> +2008-11-06  Andrew Jaquith <ajaquith AT apache DOT org>
> +
> +        * 2.8.1-svn-10
> +
> +        * [JSPWIKI-345]: Upgraded freshcookies-security to 0.60,  
> which fixes an issue
> +        causing generic (non-class-specific) Principal entries in  
> security policies
> +        to be ignored.
> +
>  2008-11-06  Janne Jalkanen <jalkanen@apache.org>
>
>          * 2.8.1-svn-9
>
> Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/LICENSE
> URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/ 
> JSPWIKI_2_8_BRANCH/LICENSE?rev=712042&r1=712041&r2=712042&view=diff
> ====================================================================== 
> ========
> --- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/LICENSE (original)
> +++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/LICENSE Thu Nov   
> 6 18:35:07 2008
> @@ -216,7 +216,7 @@
>  commons-lang-2.3.jar						LICENSE
>  commons-logging-api.jar						LICENSE
>  ecs.jar										LICENSE
> -freshcookies-security-0.54.jar				LICENSE
> +freshcookies-security-0.60.jar				LICENSE
>  jakarta-taglibs-standard-1.1.2.jar			LICENSE
>  jakarta-taglibs-jstl-1.1.2.jar				LICENSE
>  jaxen.jar									doc/LICENSE.jaxen
>
> Added: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/lib/ 
> freshcookies-security-0.60.jar
> URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/ 
> JSPWIKI_2_8_BRANCH/lib/freshcookies-security-0.60.jar? 
> rev=712042&view=auto
> ====================================================================== 
> ========
> Binary file - no diff available.
>
> Propchange: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/lib/ 
> freshcookies-security-0.60.jar
> ---------------------------------------------------------------------- 
> --------
>     svn:mime-type = application/octet-stream
>
> Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ 
> ecyrd/jspwiki/Release.java
> URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/ 
> JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java? 
> rev=712042&r1=712041&r2=712042&view=diff
> ====================================================================== 
> ========
> --- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/ 
> jspwiki/Release.java (original)
> +++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/ 
> jspwiki/Release.java Thu Nov  6 18:35:07 2008
> @@ -77,7 +77,7 @@
>       *  <p>
>       *  If the build identifier is empty, it is not added.
>       */
> -    public static final String     BUILD         = "9";
> +    public static final String     BUILD         = "10";
>
>      /**
>       *  This is the generic version string you should use
>
> Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ 
> ecyrd/jspwiki/auth/AuthorizationManagerTest.java
> URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/ 
> JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/auth/ 
> AuthorizationManagerTest.java?rev=712042&r1=712041&r2=712042&view=diff
> ====================================================================== 
> ========
> --- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/ 
> jspwiki/auth/AuthorizationManagerTest.java (original)
> +++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/ 
> jspwiki/auth/AuthorizationManagerTest.java Thu Nov  6 18:35:07 2008
> @@ -707,12 +707,12 @@
>
>          s = WikiSessionTest.authenticatedSession( m_engine,  
> Users.BOB, Users.BOB_PASS );
>          assertTrue( "Bob  view", m_auth.checkStaticPermission( s,  
> PagePermission.VIEW ) );
> -        assertFalse( "Bob edit", m_auth.checkStaticPermission( s,  
> PagePermission.EDIT ) );
> -        assertFalse( "Bob comment", m_auth.checkStaticPermission 
> ( s, PagePermission.COMMENT ) );
> -        assertFalse( "Bob modify", m_auth.checkStaticPermission 
> ( s, PagePermission.MODIFY ) );
> -        assertFalse( "Bob upload", m_auth.checkStaticPermission 
> ( s, PagePermission.UPLOAD ) );
> +        assertTrue( "Bob edit", m_auth.checkStaticPermission( s,  
> PagePermission.EDIT ) );
> +        assertTrue( "Bob comment", m_auth.checkStaticPermission 
> ( s, PagePermission.COMMENT ) );
> +        assertTrue( "Bob modify", m_auth.checkStaticPermission( s,  
> PagePermission.MODIFY ) );
> +        assertTrue( "Bob upload", m_auth.checkStaticPermission( s,  
> PagePermission.UPLOAD ) );
>          assertFalse( "Bob rename", m_auth.checkStaticPermission 
> ( s, PagePermission.RENAME ) );
> -        assertFalse( "Bob delete", m_auth.checkStaticPermission 
> ( s, PagePermission.DELETE ) );
> +        assertTrue( "Bob delete", m_auth.checkStaticPermission( s,  
> PagePermission.DELETE ) );
>          assertFalse( "Bob prefs", m_auth.checkStaticPermission( s,  
> WikiPermission.EDIT_PREFERENCES ) );
>          assertFalse( "Bob profile", m_auth.checkStaticPermission 
> ( s, WikiPermission.EDIT_PROFILE ) );
>          assertFalse( "Bob pages", m_auth.checkStaticPermission( s,  
> WikiPermission.CREATE_PAGES ) );
>
> Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/etc/ 
> jspwiki-testUserPolicy.policy
> URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/ 
> JSPWIKI_2_8_BRANCH/tests/etc/jspwiki-testUserPolicy.policy? 
> rev=712042&r1=712041&r2=712042&view=diff
> ====================================================================== 
> ========
> --- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/etc/jspwiki- 
> testUserPolicy.policy (original)
> +++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/etc/jspwiki- 
> testUserPolicy.policy Thu Nov  6 18:35:07 2008
> @@ -9,3 +9,7 @@
>  grant principal com.ecyrd.jspwiki.auth.WikiPrincipal "Janne  
> Jalkanen" {
>      permission com.ecyrd.jspwiki.auth.permissions.PagePermission  
> "*:*", "edit,delete";
>  };
> +
> +grant principal "Bob" {
> +    permission com.ecyrd.jspwiki.auth.permissions.PagePermission  
> "*:*", "edit,delete";
> +};
>


Mime
View raw message