Session max age configuration in server and client. Removed hardcoded…

… value

src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java

@@ -42,7 +42,7 @@
 // TODO: Auto-generated Javadoc
 /**
  * The Class SignInAbstractPresenter.
- * 
+ *
  * @param <V>
  *          the value type
  * @param <Proxy_>
@@ -77,7 +77,7 @@ public abstract class SignInAbstractPresenter<V extends View, Proxy_ extends Pro
 
   /**
    * Instantiates a new sign in abstract presenter.
-   * 
+   *
    * @param eventBus
    *          the event bus
    * @param view
@@ -109,7 +109,7 @@ public SignInAbstractPresenter(final EventBus eventBus, final View view, final P
 
   /**
    * Gets the goto token on cancel.
-   * 
+   *
    * @return the goto token on cancel
    */
   public String getGotoTokenOnCancel() {
@@ -118,7 +118,7 @@ public String getGotoTokenOnCancel() {
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see com.gwtplatform.mvp.client.PresenterWidget#getView()
    */
   @Override
@@ -162,7 +162,7 @@ public void onClose() {
 
   /**
    * On sign in.
-   * 
+   *
    * @param userInfoDTO
    *          the user info dto
    * @param gotoHomePage
@@ -172,7 +172,7 @@ public void onClose() {
    */
   protected void onSignIn(final UserInfoDTO userInfoDTO, final boolean gotoHomePage, final String passwd) {
     final String userHash = userInfoDTO.getUserHash();
-    cookiesManager.setAuthCookie(userHash);
+    cookiesManager.setAuthCookie(userHash, session.getInitData().getCookieMaxAge());
     getView().reset();
     session.setUserHash(userHash);
     session.setCurrentUserInfo(userInfoDTO, passwd);
@@ -208,7 +208,7 @@ public void onChangeNotNeeded() {
 
   /**
    * Save autocomplete login data.
-   * 
+   *
    * @param nickOrEmail
    *          the nick or email
    * @param password
@@ -226,7 +226,7 @@ public void setAskForLanguageChange(final boolean askForLanguageChange) {
 
   /**
    * Sets the goto token on cancel.
-   * 
+   *
    * @param gotoTokenOnCancel
    *          the new goto token on cancel
    */
@@ -236,7 +236,7 @@ public void setGotoTokenOnCancel(final String gotoTokenOnCancel) {
 
   /**
    * Sets the goto token on success.
-   * 
+   *
    * @param gotoTokenOnSuccess
    *          the new goto token on success
    */

src/main/java/cc/kune/core/client/cookies/CookiesManager.java

@@ -68,7 +68,7 @@ public interface CookiesManager {
    * @param userHash
    *          the new auth cookie
    */
-  void setAuthCookie(String userHash);
+  void setAuthCookie(String userHashh, int cookieMaxAge);
 
   String getJettyCookie();
 

src/main/java/cc/kune/core/client/cookies/CookiesManagerImpl.java

@@ -121,9 +121,10 @@ public void setAnonCookie(final Boolean userRegister) {
    * cc.kune.core.client.cookies.CookiesManager#setAuthCookie(java.lang.String)
    */
   @Override
-  public void setAuthCookie(final String userHash) {
+  public void setAuthCookie(final String userHash, int cookieMaxAge) {
     // http://code.google.com/p/google-web-toolkit-incubator/wiki/LoginSecurityFAQ
-    final Date exp = new Date(System.currentTimeMillis() + SessionConstants.SESSION_DURATION);
+
+    final Date exp = cookieMaxAge <= 0 ? null : new Date(System.currentTimeMillis() + cookieMaxAge * 1000);
     boolean ssl = WindowUtils.isHttps();
 
     Log.info("Received userhash: " + userHash);

src/main/java/cc/kune/core/server/InitData.java

@@ -156,6 +156,16 @@ public class InitData {
   /** The user tools. */
   private List<ToolSimple> userTools;
 
+  private int cookieMaxAge;
+
+  public int getCookieMaxAge() {
+    return cookieMaxAge;
+  }
+
+  public void setCookieMaxAge(int cookieMaxAge) {
+    this.cookieMaxAge = cookieMaxAge;
+  }
+
   /**
    * Gets the avi embed object.
    *

src/main/java/cc/kune/core/server/UserSessionManagerImpl.java

@@ -46,7 +46,7 @@
 // @LogThis
 /**
  * The Class UserSessionManager.
- * 
+ *
  * @author [email protected] (Vicente J. Ruiz Jurado)
  */
 @Singleton
@@ -67,7 +67,7 @@ public class UserSessionManagerImpl implements UsersOnline, UserSessionManager {
 
   /**
    * Instantiates a new user session manager.
-   * 
+   *
    * @param userManager
    *          the manager
    * @param userSessionProv
@@ -91,6 +91,9 @@ public UserSessionManagerImpl(final UserManager userManager,
     final HashSessionManager hSessionManager = (HashSessionManager) jettySessionManager;
     hSessionManager.setMaxInactiveInterval(-1);
     hSessionManager.setSavePeriod(5);
+    // See @ServerModule in wave for setMaxAge (cookie max age) and
+    // "network.session_cookie_max_age" configuration parameter
+
     // Delete sessions with problems http://jira.codehaus.org/browse/JETTY-1484
     hSessionManager.setDeleteUnrestorableSessions(true);
     hSessionManager.addEventListener(userSessionMonitor);
@@ -102,7 +105,7 @@ public UserSessionManagerImpl(final UserManager userManager,
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see cc.kune.core.server.UserSessionManager#getHashFromSession()
    */
   @Override
@@ -132,7 +135,7 @@ private HttpSession getSessionFromHash(final String userHash) {
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see cc.kune.core.server.UserSessionManager#getUser()
    */
   @Override
@@ -148,12 +151,12 @@ public User getUser() {
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see cc.kune.core.server.notifier.UsersOnline#isOnline(java.lang.String)
    */
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see cc.kune.core.server.UserSessionManager#isOnline(java.lang.String)
    */
   @Override
@@ -169,7 +172,7 @@ public boolean isOnline(final String shortname) {
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see cc.kune.core.server.UserSessionManager#isUserLoggedIn()
    */
   @Override
@@ -184,7 +187,7 @@ public boolean isUserLoggedIn() {
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see
    * cc.kune.core.server.UserSessionManager#isUserNotLoggedIn(java.lang.String)
    */
@@ -195,7 +198,7 @@ public boolean isUserNotLoggedIn() {
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see cc.kune.core.server.UserSessionManager#login(java.lang.Long,
    * java.lang.String)
    */
@@ -208,7 +211,7 @@ public void login(final Long userId, final String newUserHash) {
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see cc.kune.core.server.UserSessionManager#logout()
    */
   @Override

src/main/java/cc/kune/core/server/manager/impl/SiteManagerDefault.java

@@ -36,6 +36,7 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import com.typesafe.config.Config;
 
 import cc.kune.core.client.errors.DefaultException;
 import cc.kune.core.server.InitData;
@@ -46,7 +47,6 @@
 import cc.kune.core.server.manager.I18nLanguageManager;
 import cc.kune.core.server.manager.LicenseManager;
 import cc.kune.core.server.manager.SiteManager;
-import cc.kune.core.server.manager.UserManager;
 import cc.kune.core.server.mapper.KuneMapper;
 import cc.kune.core.server.mbean.MBeanRegistry;
 import cc.kune.core.server.properties.ChatProperties;
@@ -119,6 +119,8 @@ public class SiteManagerDefault implements SiteManager, SiteManagerDefaultMBean
 
   private WaveIndexer waveIndexer;
 
+  private Config waveConfig;
+
   /**
    * Instantiates a new site rpc.
    *
@@ -152,7 +154,7 @@ public SiteManagerDefault(final UserSessionManager userSessionManager,
       final I18nLanguageManager languageManager, final I18nCountryManager countryManager,
       final ServerToolRegistry serverToolRegistry, final MBeanRegistry mbeanRegistry,
       final GroupManager groupManager, final I18nTranslationServiceMultiLang i18n, SiteManagers siteManagers,
-      WaveIndexer waveIndexer
+      WaveIndexer waveIndexer, Config waveConfig
       ) {
     this.userSessionManager = userSessionManager;
     this.userInfoService = userInfoService;
@@ -167,6 +169,7 @@ public SiteManagerDefault(final UserSessionManager userSessionManager,
     this.i18n = i18n;
     this.siteManagers = siteManagers;
     this.waveIndexer = waveIndexer;
+    this.waveConfig = waveConfig;
     // By default we don't collect which part of the client is untranslated
     storeUntranslatedStrings = false;
     mbeanRegistry.registerAsMBean(this, MBEAN_OBJECT_NAME);
@@ -297,7 +300,7 @@ private InitData loadInitData() {
     data.setTutorialLanguages(kuneProperties.getList(KuneProperties.KUNE_TUTORIALS_LANGS));
     data.setPublicSpaceVisible(kuneProperties.getBoolean(KuneProperties.PUBLIC_SPACE_VISIBLE));
     data.setShowInDevelFeatures(kuneProperties.getBoolean(KuneProperties.SHOW_DEVEL_FEATURES));
-
+    data.setCookieMaxAge(waveConfig.getInt("network.session_cookie_max_age"));
     return data;
   }
 

src/main/java/cc/kune/core/shared/SessionConstants.java

@@ -25,7 +25,7 @@
 // TODO: Auto-generated Javadoc
 /**
  * The Class SessionConstants.
- * 
+ *
  * @author [email protected] (Vicente J. Ruiz Jurado)
  */
 public final class SessionConstants {
@@ -64,10 +64,7 @@ public final class SessionConstants {
    * the user is viewed as a newbie (so, more help is needed)
    */
   public final static long MIN_SIGN_IN_FOR_NEWBIES = 10;
-  // session duration
-  /** The Constant SESSION_DURATION. */
-  public final static long SESSION_DURATION = A_DAY * 30; // four weeks login
-  // public final static long SESSION_DURATION = 10000; // For test
+
   /** The Constant USERHASH. */
   public final static String USERHASH = "k007userHash";
 

src/main/java/cc/kune/core/shared/dto/InitDataDTO.java

@@ -149,6 +149,16 @@ public class InitDataDTO implements IsSerializable {
   /** The user tools. */
   private List<ToolSimpleDTO> userTools;
 
+  private int cookieMaxAge;
+
+  public int getCookieMaxAge() {
+    return cookieMaxAge;
+  }
+
+  public void setCookieMaxAge(int cookieMaxAge) {
+    this.cookieMaxAge = cookieMaxAge;
+  }
+
   /**
    * Instantiates a new inits the data dto.
    */