shuber 2004/08/17 18:16:24 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
etc/config jahia.skeleton
src/java/org/jahia/engines/login Login_Engine.java
src/java/org/jahia/settings SettingsBean.java
src/views/jsp/jahia/engines/login login.jsp
Log:
Added configuration property to deactivate cookie login
Revision Changes Path
1.58.2.2 +3 -0 jahia/etc/config/jahia.skeleton
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/etc/config/jahia.skeleton.diff?r1=1.58.2.1&r2=1.58.2.2&f=h
1.19.4.3 +1 -0 jahia/src/java/org/jahia/engines/login/Login_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/engines/login/Login_Engine.java.diff?r1=1.19.4.2&r2=1.19.4.3&f=h
1.35.2.3 +6 -1 jahia/src/java/org/jahia/settings/SettingsBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/settings/SettingsBean.java.diff?r1=1.35.2.2&r2=1.35.2.3&f=h
1.7.4.2 +8 -2 jahia/src/views/jsp/jahia/engines/login/login.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/engines/login/login.jsp.diff?r1=1.7.4.1&r2=1.7.4.2&f=h
Index: jahia.skeleton
===================================================================
RCS file: /home/cvs/repository/jahia/etc/config/Attic/jahia.skeleton,v
retrieving revision 1.58.2.1
retrieving revision 1.58.2.2
diff -u -r1.58.2.1 -r1.58.2.2
--- jahia.skeleton 28 May 2004 15:33:04 -0000 1.58.2.1
+++ jahia.skeleton 17 Aug 2004 16:16:23 -0000 1.58.2.2
@@ -233,6 +233,9 @@
# an identifier corresponding to a specific Jahia user, when he selects the
# "remember me" option in the login engine.
#
+# Should we use cookie authentification for login ?
+cookieAuthActivated = true
+#
# length of cookie identifier key for user. This is the actual value
# stored in the cookie, so make sure it is long enough to improve security.
cookieAuthIDLength = 40
Index: Login_Engine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/engines/login/Attic/Login_Engine.java,v
retrieving revision 1.19.4.2
retrieving revision 1.19.4.3
diff -u -r1.19.4.2 -r1.19.4.3
--- Login_Engine.java 6 Aug 2004 17:59:38 -0000 1.19.4.2
+++ Login_Engine.java 17 Aug 2004 16:16:23 -0000 1.19.4.3
@@ -327,6 +327,7 @@
engineMap.put ("javascriptUrl", jParams.settings ().getJsHttpPath ());
// JSP Attribute
+ jParams.getRequest().setAttribute("cookieAuthActivated", new
Boolean(jParams.settings().isCookieAuthActivated()));
jParams.getRequest ().setAttribute ("engineTitle", "Login");
//jParams.getRequest().setAttribute( "engineMap", engineMap );
}
Index: SettingsBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/settings/Attic/SettingsBean.java,v
retrieving revision 1.35.2.2
retrieving revision 1.35.2.3
diff -u -r1.35.2.2 -r1.35.2.3
--- SettingsBean.java 16 Jul 2004 17:07:16 -0000 1.35.2.2
+++ SettingsBean.java 17 Aug 2004 16:16:23 -0000 1.35.2.3
@@ -1,4 +1,4 @@
-// $Id: SettingsBean.java,v 1.35.2.2 2004/07/16 17:07:16 shuber Exp $
+// $Id: SettingsBean.java,v 1.35.2.3 2004/08/17 16:16:23 shuber Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -214,6 +214,7 @@
private boolean cookieAuthRenewalActivated;
private String authPipelineFileName;
private String authPipelineClassName;
+ private boolean cookieAuthActivated;
/**
* Default constructor.
@@ -450,6 +451,7 @@
transformFilenames = getBoolean("transformFilenames", false);
transformDirnames = getBoolean("transformDirnames", true);
+ cookieAuthActivated = getBoolean("cookieAuthActivated", true);
cookieAuthIDLength = getInt("cookieAuthIDLength", 30);
cookieAuthUserPropertyName = getString("cookieAuthUserPropertyName",
"org.jahia.user.cookieauth.id");
cookieAuthCookieName = getString("cookieAuthCookieName", "jid");
@@ -1240,5 +1242,8 @@
public PathResolver getPathResolver() {
return pathResolver;
}
+ public boolean isCookieAuthActivated() {
+ return cookieAuthActivated;
+ }
}
Index: login.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/engines/login/Attic/login.jsp,v
retrieving revision 1.7.4.1
retrieving revision 1.7.4.2
diff -u -r1.7.4.1 -r1.7.4.2
--- login.jsp 28 May 2004 15:34:12 -0000 1.7.4.1
+++ login.jsp 17 Aug 2004 16:16:24 -0000 1.7.4.2
@@ -15,6 +15,10 @@
String engineUrl = (String) engineMap.get( "engineUrl" );
String username = request.getParameter( "username" );
username = (username == null) ? "" : username;
+ Boolean cookieAuthActivated = (Boolean)
request.getAttribute("cookieAuthActivated");
+ if (cookieAuthActivated == null) {
+ cookieAuthActivated = new Boolean(false);
+ }
%>
@@ -41,7 +45,7 @@
}
}
-document.onkeydown = keyDown;
+document.onkeydown = keyDown;
function keyDown() {
if (document.all) {
var ieKey = event.keyCode;
@@ -90,6 +94,7 @@
</select>
</td>
</tr>
+<% if (cookieAuthActivated.booleanValue()) { %>
<tr>
<td width="100%" class="text" colspan="2" align="left">
<br>
@@ -97,6 +102,7 @@
<jahia:engineResourceBundle
resourceName="org.jahia.engines.login.Login_Engine.rememberMe.label"/>
</td>
</tr>
+<% } %>
<tr>
<td colspan="2" align="right">
<br><br>
@@ -111,4 +117,4 @@
<!--
autoFocus();
//-->
-</script>
\ No newline at end of file
+</script>
