Przeglądaj źródła

fix null pointer on startup with no configuration

jrivard@gmail.com 6 lat temu
rodzic
commit
3777330227

+ 3 - 1
server/src/main/java/password/pwm/PwmApplication.java

@@ -676,7 +676,9 @@ public class PwmApplication
 
         if ( newInstanceID == null || newInstanceID.length() < 1 )
         {
-            newInstanceID = Long.toHexString( pwmApplication.getSecureService().pwmRandom().nextLong() ).toUpperCase();
+            final PwmRandom pwmRandom = PwmRandom.getInstance();
+            newInstanceID = Long.toHexString( pwmRandom.nextLong() ).toUpperCase();
+
             LOGGER.info( "generated new random instanceID " + newInstanceID );
 
             if ( localDB != null )

+ 1 - 5
server/src/main/java/password/pwm/http/PwmSession.java

@@ -29,7 +29,6 @@ import password.pwm.bean.LocalSessionStateBean;
 import password.pwm.bean.LoginInfoBean;
 import password.pwm.bean.SessionLabel;
 import password.pwm.bean.UserIdentity;
-import password.pwm.config.PwmSetting;
 import password.pwm.error.ErrorInformation;
 import password.pwm.error.PwmError;
 import password.pwm.error.PwmUnrecoverableException;
@@ -41,7 +40,6 @@ import password.pwm.ldap.auth.AuthenticationType;
 import password.pwm.svc.stats.Statistic;
 import password.pwm.svc.stats.StatisticsManager;
 import password.pwm.util.LocaleHelper;
-import password.pwm.util.PasswordData;
 import password.pwm.util.java.JavaHelper;
 import password.pwm.util.java.JsonUtil;
 import password.pwm.util.java.TimeDuration;
@@ -386,9 +384,7 @@ public class PwmSession implements Serializable
             nonce = random + prefix;
         }
 
-        final PasswordData configSecret = pwmRequest.getConfig().readSettingAsPassword( PwmSetting.PWM_SECURITY_KEY );
-        final String concatValue = configSecret.getStringValue() + nonce;
-        final String hashValue = pwmRequest.getPwmApplication().getSecureService().hash( concatValue );
+        final String hashValue = pwmRequest.getPwmApplication().getSecureService().hash( nonce );
         final PwmSecurityKey pwmSecurityKey = new PwmSecurityKey( hashValue );
 
         pwmRequest.setAttribute( PwmRequestAttribute.CookieNonce, nonce );