svn commit: r1424222 - in /archiva/redback/redback-core/trunk: redback-configuration/src/main/java/org/apache/archiva/redback/configuration/ redback-configuration/src/main/resources/org/apache/archiva/redback/ redback-policy/src/main/java/org/apache/ar...

[olamy]

Author: olamy
Date: Wed Dec 19 23:32:52 2012
New Revision: 1424222

URL: http://svn.apache.org/viewvc?rev=1424222&view=rev
Log:
add a secure cookie property for rememberme

Modified:
    
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java
    
archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties
    
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java

Modified: 
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java?rev=1424222&r1=1424221&r2=1424222&view=diff
==============================================================================
--- 
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java
 (original)
+++ 
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java
 Wed Dec 19 23:32:52 2012
@@ -38,7 +38,6 @@ public interface UserConfigurationKeys
 
     String PASSWORD_ENCODER = "security.policy.password.encoder";
 
-
     String EMAIL_VALIDATION_SUBJECT = "email.validation.subject";
 
     String REMEMBER_ME_PATH = "security.rememberme.path";
@@ -47,6 +46,10 @@ public interface UserConfigurationKeys
 
     String REMEMBER_ME_ENABLED = "security.rememberme.enabled";
 
+    String REMEMBERME_TIMEOUT = "security.rememberme.timeout";
+
+    String REMEMBERME_SECURE = "security.rememberme.secure";
+
     String SIGNON_DOMAIN = "security.signon.domain";
 
     String SIGNON_PATH = "security.signon.path";
@@ -105,8 +108,6 @@ public interface UserConfigurationKeys
 
     String EMAIL_VALIDATION_REQUIRED = "email.validation.required";
 
-    String REMEMBERME_TIMEOUT = "security.rememberme.timeout";
-
     String ALPHA_COUNT_MIN = 
"security.policy.password.rule.alphacount.minimum";
 
     String ALPHA_COUNT_VIOLATION = "user.password.violation.alpha";

Modified: 
archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties?rev=1424222&r1=1424221&r2=1424222&view=diff
==============================================================================
--- 
archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties
 (original)
+++ 
archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties
 Wed Dec 19 23:32:52 2012
@@ -72,6 +72,9 @@ email.validation.subject=Welcome
 security.rememberme.enabled=true
 # Timeout in days ( 365 days = 1 year )
 security.rememberme.timeout=365
+security.rememberme.path=/
+security.rememberme.domain=
+security.rememberme.secure=false
 
 # Single Sign On
 # Timeout in minutes

Modified: 
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java?rev=1424222&r1=1424221&r2=1424222&view=diff
==============================================================================
--- 
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java
 (original)
+++ 
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java
 Wed Dec 19 23:32:52 2012
@@ -48,5 +48,6 @@ public class RememberMeCookieSettings
         this.domain = config.getString( 
UserConfigurationKeys.REMEMBER_ME_DOMAIN );
         this.path = config.getString( UserConfigurationKeys.REMEMBER_ME_PATH );
         this.enabled = config.getBoolean( 
UserConfigurationKeys.REMEMBER_ME_ENABLED );
+        config.getBoolean( UserConfigurationKeys.REMEMBERME_SECURE );
     }
 }