remove tls 1.0/1.1 from https default

jrivard · jrivard · commit 945a432e60f0 · 2018-03-22T08:37:21.000-04:00
diff --git a/onejar/src/main/java/password/pwm/Resource.java b/onejar/src/main/java/password/pwm/Resource.java
@@ -26,6 +26,7 @@
 
 enum Resource
 {
+    envVarPrefix,
     defaultContext,
     defaultWorkPathName,
     defaultPort,
diff --git a/onejar/src/main/java/password/pwm/TomcatOneJarMain.java b/onejar/src/main/java/password/pwm/TomcatOneJarMain.java
@@ -279,9 +279,10 @@ static void generatePwmKeystore( final TomcatConfig tomcatConfig )
 
     static void setupEnv( final TomcatConfig tomcatConfig )
     {
-        System.setProperty( "PWM_APPLICATIONPATH", tomcatConfig.getApplicationPath().getAbsolutePath() );
-        System.setProperty( "PWM_APPLICATIONFLAGS", "ManageHttps" );
-        System.setProperty( "PWM_APPLICATIONPARAMFILE", getPwmAppPropertiesFile( tomcatConfig ).getAbsolutePath() );
+        final String envVarPrefix = Resource.envVarPrefix.getValue();
+        System.setProperty( envVarPrefix + "_APPLICATIONPATH", tomcatConfig.getApplicationPath().getAbsolutePath() );
+        System.setProperty( envVarPrefix + "_APPLICATIONFLAGS", "ManageHttps" );
+        System.setProperty( envVarPrefix + "_APPLICATIONPARAMFILE", getPwmAppPropertiesFile( tomcatConfig ).getAbsolutePath() );
     }
 
     static void outputPwmAppProperties( final TomcatConfig tomcatConfig ) throws IOException
diff --git a/onejar/src/main/resources/password/pwm/Resource.properties b/onejar/src/main/resources/password/pwm/Resource.properties
@@ -20,6 +20,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
+envVarPrefix=PWM
 defaultContext=pwm
 defaultWorkPathName=.pwm-workpath
 defaultPort=8443
diff --git a/server/src/main/resources/password/pwm/config/PwmSetting.xml b/server/src/main/resources/password/pwm/config/PwmSetting.xml
@@ -3881,8 +3881,6 @@
     </setting>
     <setting hidden="false" key="https.server.tls.protocols" level="1">
         <default>
-            <value>TLS_1_0</value>
-            <value>TLS_1_1</value>
             <value>TLS_1_2</value>
         </default>
         <options>

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`
`27`	`27`	`enum Resource`
`28`	`28`	`{`
	`29`	`+ envVarPrefix,`
`29`	`30`	`defaultContext,`
`30`	`31`	`defaultWorkPathName,`
`31`	`32`	`defaultPort,`
Original file line number	Diff line number	Diff line change
`@@ -279,9 +279,10 @@ static void generatePwmKeystore( final TomcatConfig tomcatConfig )`
`279`	`279`
`280`	`280`	`static void setupEnv( final TomcatConfig tomcatConfig )`
`281`	`281`	`{`
`282`		`- System.setProperty( "PWM_APPLICATIONPATH", tomcatConfig.getApplicationPath().getAbsolutePath() );`
`283`		`- System.setProperty( "PWM_APPLICATIONFLAGS", "ManageHttps" );`
`284`		`- System.setProperty( "PWM_APPLICATIONPARAMFILE", getPwmAppPropertiesFile( tomcatConfig ).getAbsolutePath() );`
	`282`	`+ final String envVarPrefix = Resource.envVarPrefix.getValue();`
	`283`	`+ System.setProperty( envVarPrefix + "_APPLICATIONPATH", tomcatConfig.getApplicationPath().getAbsolutePath() );`
	`284`	`+ System.setProperty( envVarPrefix + "_APPLICATIONFLAGS", "ManageHttps" );`
	`285`	`+ System.setProperty( envVarPrefix + "_APPLICATIONPARAMFILE", getPwmAppPropertiesFile( tomcatConfig ).getAbsolutePath() );`
`285`	`286`	`}`
`286`	`287`
`287`	`288`	`static void outputPwmAppProperties( final TomcatConfig tomcatConfig ) throws IOException`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA`
`21`	`21`	`#`
`22`	`22`
	`23`	`+envVarPrefix=PWM`
`23`	`24`	`defaultContext=pwm`
`24`	`25`	`defaultWorkPathName=.pwm-workpath`
`25`	`26`	`defaultPort=8443`