inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
68142: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67640: MNT-11096: Merged DEV to V4.2-BUG-FIX (4.2.3)
         67391: MNT-11096: org.alfresco.error.AlfrescoRuntimeException Session timeout out of range (0 - 3600)
            - Do sessionTimeout validation in the CIFSConfigBean setter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68426 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-04-30 16:15:52 +00:00
parent b60c0421ad
commit df7594460a
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/filesys/AbstractServerConfigurationBean.java
View File

@@ -130,7 +130,7 @@ public abstract class AbstractServerConfigurationBean extends ServerConfiguratio
// Maximum session timeout // Maximum session timeout
protected static final int MaxSessionTimeout = 60 * 60; // 1 hour public static final int MaxSessionTimeout = 60 * 60; // 1 hour
// Disk interface to use for shared filesystems // Disk interface to use for shared filesystems

16
source/java/org/alfresco/filesys/config/CIFSConfigBean.java
View File

@@ -18,9 +18,12 @@
*/ */
package org.alfresco.filesys.config; package org.alfresco.filesys.config;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.jlan.server.auth.ICifsAuthenticator; import org.alfresco.jlan.server.auth.ICifsAuthenticator;
import org.alfresco.jlan.smb.server.VirtualCircuitList; import org.alfresco.jlan.smb.server.VirtualCircuitList;
import static org.alfresco.filesys.AbstractServerConfigurationBean.MaxSessionTimeout;
// TODO: Auto-generated Javadoc // TODO: Auto-generated Javadoc
/** /**
* The Class CIFSConfigBean. * The Class CIFSConfigBean.
@@ -520,9 +523,22 @@ public class CIFSConfigBean
*/ */
public void setSessionTimeout(Integer sessionTimeout) public void setSessionTimeout(Integer sessionTimeout)
{ {
validateSessionTimeout(sessionTimeout);
this.sessionTimeout = sessionTimeout; this.sessionTimeout = sessionTimeout;
} }
/**
* Validates the session timeout.
*
* @param sessionTimeout
* the session timeout to validate
*/
public void validateSessionTimeout(Integer sessionTimeout)
{
if (sessionTimeout < 0 || sessionTimeout > MaxSessionTimeout)
throw new AlfrescoRuntimeException("Session timeout out of range (0 - " + MaxSessionTimeout + ")");
}
/** /**
* Set the maximum virtual circuits per session * Set the maximum virtual circuits per session
* *

3
source/java/org/alfresco/filesys/config/ServerConfigurationBean.java
View File

@@ -1123,8 +1123,7 @@ public class ServerConfigurationBean extends AbstractServerConfigurationBean imp
// Validate the session timeout value // Validate the session timeout value
if (tmo < 0 || tmo > MaxSessionTimeout) cifsConfigBean.validateSessionTimeout(tmo);
throw new AlfrescoRuntimeException("Session timeout out of range (0 - " + MaxSessionTimeout + ")");
// Convert the session timeout to milliseconds // Convert the session timeout to milliseconds