Author: olamy
Date: Wed Dec 19 23:47:13 2012
New Revision: 1424231
URL: http://svn.apache.org/viewvc?rev=1424231&view=rev
Log:
more options for rememberme cookie settings
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1424231&r1=1424230&r2=1424231&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
Wed Dec 19 23:47:13 2012
@@ -566,7 +566,10 @@ ldap.config.max.result.count.help.conten
security.policy.password.rule.numericalcount.enabled.help.content=Minimum of
number characters in the password.
security.policy.allowed.login.attempt.help.content=Maximum number of login
attempt before loking account.
security.rememberme.enabled.help.content=Enable rememberme on login.
-security.rememberme.timeout.help.content=Timeout in minutes for rememberme
cookie.
+security.rememberme.timeout.help.content=Timeout in days for rememberme cookie.
+security.rememberme.path.help.content=Path for rememberme cookie.
+security.rememberme.secure.help.content=rememberme cookie secured.
+security.rememberme.domain.help.content=rememberme cookie domain.
security.policy.unlockable.accounts.help.content=Non lockable accounts.
ldap.config.mapper.attribute.fullname.help.content=The name of the attribute
on a user that contains the users fullName.
security.policy.password.rule.characterlength.enabled.help.content=Character
length password rule enabled.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1424231&r1=1424230&r2=1424231&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
Wed Dec 19 23:47:13 2012
@@ -28,7 +28,20 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
* @param user see user.js
*/
reccordLoginCookie=function(user) {
- $.cookie('archiva_login', ko.toJSON(user),{ expires: 7, path: '/' });
+ var path =
window.redbackRuntimeConfiguration.findPropertyValue("security.rememberme.timeout");
+ path = path ? path : "/";
+
+ var domain =
window.redbackRuntimeConfiguration.findPropertyValue("security.rememberme.domain");
+ var secure =
window.redbackRuntimeConfiguration.findPropertyValue("security.rememberme.secure");
+
+ $.cookie('archiva_login', ko.toJSON(user),
+ {
+ expires:
Number(window.redbackRuntimeConfiguration.findPropertyValue("security.rememberme.timeout")),
+ path: path,
+ domain: domain,
+ secure: secure
+ }
+ );
};
getUserFromLoginCookie=function(){
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js?rev=1424231&r1=1424230&r2=1424231&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
Wed Dec 19 23:47:13 2012
@@ -421,11 +421,11 @@ function(jquery,utils,i18n,jqueryValidat
changePasswordBox(true,false,user);
return;
}
- // not really needed as an exception is returned but "ceintures et
bretelles" as we said in French :-)
+ // not really needed as an exception is returned but "ceintures et
bretelles" as we say in French :-)
if (user.locked()==true){
$.log("user locked");
displayErrorMessage($.i18n.prop("account.locked"));
- return
+ return;
}
// FIXME check validated
@@ -435,6 +435,7 @@ function(jquery,utils,i18n,jqueryValidat
}
$.log("user.rememberme:"+(user.rememberme));
reccordLoginCookie(user);
+ window.user=user;
$("#login-link").hide();
$("#logout-link").show();
$("#register-link").hide();
@@ -582,11 +583,9 @@ function(jquery,utils,i18n,jqueryValidat
}
$("#modal-login-ok").button("loading");
- //#modal-login-footer
$('#modal-login-footer').append(smallSpinnerImg());
var rememberme=($("#user-login-form-rememberme"
).attr('checked')=='checked');
- $.log("rememberme:"+rememberme);
window.redbackModel.rememberme=rememberme;
window.redbackModel.password=$("#user-login-form-password").val();
