Author: agilliland
Date: Wed May 30 14:58:04 2007
New Revision: 542946
URL: http://svn.apache.org/viewvc?view=rev&rev=542946
Log:
fixing scheme enforcment settings to work properly with struts2 urls.
Modified:
roller/trunk/apps/weblogger/web/WEB-INF/classes/roller.properties
roller/trunk/apps/weblogger/web/WEB-INF/security.xml
Modified: roller/trunk/apps/weblogger/web/WEB-INF/classes/roller.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/classes/roller.properties?view=diff&rev=542946&r1=542945&r2=542946
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/classes/roller.properties (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/classes/roller.properties Wed May
30 14:58:04 2007
@@ -263,15 +263,13 @@
# URL patterns that require HTTPS
schemeenforcement.https.urls=/roller_j_security_check,\
/roller-ui/login-redirect.jsp,\
-/roller-ui/login.do,\
-/roller-ui/user.do,\
-/roller-ui/yourProfile.do,\
-/roller-ui/admin/user.do,\
+/roller-ui/login.rol,\
+/roller-ui/register.rol,/roller-ui/register!save.rol,\
+/roller-ui/profile.rol,/roller-ui/profile!save.rol,\
+/roller-ui/admin/userAdmin.rol,\
+/roller-ui/admin/createUser.rol,/roller-ui/admin/createUser!save.rol,\
/roller-ui/authoring/userdata,\
-/roller-ui/login,\
-/roller-ui/register,\
-/roller-ui/profile,\
-/roller-ui/login-redirect
+/roller-ui/authoring/membersInvite.rol,/roller-ui/authoring/membersInvite!save.rol
# Password security settings
passwds.encryption.enabled=false
Modified: roller/trunk/apps/weblogger/web/WEB-INF/security.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/security.xml?view=diff&rev=542946&r1=542945&r2=542946
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/security.xml (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/security.xml Wed May 30 14:58:04
2007
@@ -43,17 +43,13 @@
<property name="objectDefinitionSource">
<value>
PATTERN_TYPE_APACHE_ANT
- /roller-ui/login-redirect.jsp=admin,editor
- /roller-ui/yourProfile**=admin,editor
- /roller-ui/createWebsite**=admin,editor
- /roller-ui/yourWebsites**=admin,editor
- /roller-ui/authoring/**=admin,editor
- /roller-ui/admin/**=admin
- /rewrite-status*=admin
- /roller-ui/login-redirect=admin,editor
+ /roller-ui/login-redirect**=admin,editor
/roller-ui/profile**=admin,editor
/roller-ui/createWeblog**=admin,editor
/roller-ui/menu**=admin,editor
+ /roller-ui/authoring/**=admin,editor
+ /roller-ui/admin/**=admin
+ /rewrite-status*=admin
</value>
<!-- Add this to above list for LDAP/SSO configuration -->
<!-- /roller-ui/user.do*=register -->
