--- java/org/apache/catalina/session/ManagerBase.java (revision 1381037)
+++ java/org/apache/catalina/session/ManagerBase.java (working copy)
@@ -75,8 +75,20 @@
// ----------------------------------------------------- Instance Variables
+ private static final String devRandomSourceDefault;
+ static {
+ // - Use the default value only if it is a Unix-like system
+ // - Check that it exists
+ File f = new File("/dev/urandom");
+ if (f.isAbsolute() && f.exists()) {
+ devRandomSourceDefault = f.getPath();
+ } else {
+ devRandomSourceDefault = null;
+ }
+ }
+
protected DataInputStream randomIS=null;
- protected String devRandomSource="/dev/urandom";
+ protected String devRandomSource = devRandomSourceDefault;
/**
* The default message digest algorithm to use if we cannot use
@@ -238,34 +250,17 @@
private class PrivilegedSetRandomFile
- implements PrivilegedAction{
-
+ implements PrivilegedAction{
+
+ private final String s;
+
public PrivilegedSetRandomFile(String s) {
- devRandomSource = s;
+ this.s = s;
}
-
- public DataInputStream run(){
- try {
- File f=new File( devRandomSource );
- if( ! f.exists() ) return null;
- randomIS= new DataInputStream( new FileInputStream(f));
- randomIS.readLong();
- if( log.isDebugEnabled() )
- log.debug( "Opening " + devRandomSource );
- return randomIS;
- } catch (IOException ex){
- log.warn("Error reading " + devRandomSource, ex);
- if (randomIS != null) {
- try {
- randomIS.close();
- } catch (Exception e) {
- log.warn("Failed to close randomIS.");
- }
- }
- devRandomSource = null;
- randomIS=null;
- return null;
- }
+
+ public Void run(){
+ doSetRandomFile(s);
+ return null;
}
}
@@ -544,28 +539,50 @@
// as a hack, you can use a static file - and generate the same
// session ids ( good for strange debugging )
if (Globals.IS_SECURITY_ENABLED){
- randomIS = AccessController.doPrivileged(new PrivilegedSetRandomFile(s));
+ AccessController.doPrivileged(new PrivilegedSetRandomFile(s));
} else {
- try{
- devRandomSource=s;
- File f=new File( devRandomSource );
- if( ! f.exists() ) return;
- randomIS= new DataInputStream( new FileInputStream(f));
- randomIS.readLong();
- if( log.isDebugEnabled() )
- log.debug( "Opening " + devRandomSource );
- } catch( IOException ex ) {
- log.warn("Error reading " + devRandomSource, ex);
- if (randomIS != null) {
- try {
- randomIS.close();
- } catch (Exception e) {
- log.warn("Failed to close randomIS.");
- }
+ doSetRandomFile(s);
+ }
+ }
+
+ private void doSetRandomFile(String s) {
+ DataInputStream is = null;
+ try {
+ if (s == null || s.length() == 0) {
+ return;
+ }
+ File f = new File(s);
+ if( ! f.exists() ) return;
+ if( log.isDebugEnabled() ) {
+ log.debug( "Opening " + s );
+ }
+ is = new DataInputStream( new FileInputStream(f));
+ is.readLong();
+ } catch( IOException ex ) {
+ log.warn("Error reading " + s, ex);
+ if (is != null) {
+ try {
+ is.close();
+ } catch (Exception ex2) {
+ log.warn("Failed to close " + s, ex2);
}
+ is = null;
+ }
+ } finally {
+ DataInputStream oldIS = randomIS;
+ if (is != null) {
+ devRandomSource = s;
+ } else {
devRandomSource = null;
- randomIS=null;
}
+ randomIS = is;
+ if (oldIS != null) {
+ try {
+ oldIS.close();
+ } catch (Exception ex) {
+ log.warn("Failed to close RandomIS", ex);
+ }
+ }
}
}
--- webapps/docs/config/manager.xml (revision 1381037)
+++ webapps/docs/config/manager.xml (working copy)
@@ -157,6 +157,13 @@
java.security.SecureRandom
.
+
+ Name of a file that provides random data that are used to generate
+ session ids. If not specified, the default value is
+ /dev/urandom
on Unix-like systems (those where such
+ file path is absolute) and empty on others.
+
+
The length of session ids created by this Manager, measured in bytes,
excluding subsequent conversion to a hexadecimal string and
@@ -265,6 +272,13 @@
java.security.SecureRandom
.
+
+ Name of a file that provides random data that are used to generate
+ session ids. If not specified, the default value is
+ /dev/urandom
on Unix-like systems (those where such
+ file path is absolute) and empty on others.
+
+
Should all sessions be persisted and reloaded when Tomcat is shut
down and restarted (or when this application is reloaded)? By default,