mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-22 15:53:58 +02:00
Code Issues Wiki Activity

just disable ssl if no ssl.properties file

Browse source
This commit is contained in:
David McKnight 2006-04-24 13:15:47 +00:00
parent f463e41fb7
commit b2caa10117
1 changed files with 43 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerSSLProperties.java
View file

@ -46,51 +46,61 @@ public class ServerSSLProperties implements ISSLProperties
try try
{ {
ResourceBundle properties = ResourceBundle.getBundle("ssl"); ResourceBundle properties = ResourceBundle.getBundle("ssl");
_enableSSL = properties.getString(ENABLE_SSL).equals("true"); if (properties != null)
if (_enableSSL)
{ {
try _enableSSL = properties.getString(ENABLE_SSL).equals("true");
{ if (_enableSSL)
_daemonKeyStorePath = properties.getString(DAEMON_KEYSTORE_FILE);
_daemonKeyStorePassword = properties.getString(DAEMON_KEYSTORE_PASSWORD);
}
catch (Exception e)
{
}
try
{
_serverKeyStorePath = properties.getString(SERVER_KEYSTORE_FILE);
_serverKeyStorePassword = properties.getString(SERVER_KEYSTORE_PASSWORD);
}
catch (Exception e)
{ {
try
{
_daemonKeyStorePath = properties.getString(DAEMON_KEYSTORE_FILE);
_daemonKeyStorePassword = properties.getString(DAEMON_KEYSTORE_PASSWORD);
}
catch (Exception e)
{
}
try
{
_serverKeyStorePath = properties.getString(SERVER_KEYSTORE_FILE);
_serverKeyStorePassword = properties.getString(SERVER_KEYSTORE_PASSWORD);
}
catch (Exception e)
{
}
if (_daemonKeyStorePath == null && _serverKeyStorePath != null)
{
_daemonKeyStorePath = _serverKeyStorePath;
_daemonKeyStorePassword = _serverKeyStorePassword;
}
if (_serverKeyStorePath == null && _daemonKeyStorePath != null)
{
_serverKeyStorePath = _daemonKeyStorePath;
_serverKeyStorePassword = _daemonKeyStorePassword;
}
} }
if (_daemonKeyStorePath == null && _serverKeyStorePath != null) if (_enableSSL)
{ {
_daemonKeyStorePath = _serverKeyStorePath; System.out.println("SSL Settings");
_daemonKeyStorePassword = _serverKeyStorePassword; System.out.println("[daemon keystore:\t"+_daemonKeyStorePath+"]");
System.out.println("[daemon keystore pw:\t"+_daemonKeyStorePassword+"]");
System.out.println("[server keystore:\t"+_serverKeyStorePath+"]");
System.out.println("[server keystore pw:\t"+_serverKeyStorePassword+"]");
} }
if (_serverKeyStorePath == null && _daemonKeyStorePath != null)
{
_serverKeyStorePath = _daemonKeyStorePath;
_serverKeyStorePassword = _daemonKeyStorePassword;
}
} }
else
if (_enableSSL)
{ {
System.out.println("SSL Settings"); _enableSSL = false;
System.out.println("[daemon keystore:\t"+_daemonKeyStorePath+"]");
System.out.println("[daemon keystore pw:\t"+_daemonKeyStorePassword+"]");
System.out.println("[server keystore:\t"+_serverKeyStorePath+"]");
System.out.println("[server keystore pw:\t"+_serverKeyStorePassword+"]");
} }
} }
catch (Exception e) catch (Exception e)
{ {
e.printStackTrace(); // no ssl properties...set to disabled
_enableSSL = false;
//e.printStackTrace();
} }
} }