|
@@ -54,23 +54,22 @@ import password.pwm.ldap.search.UserSearchEngine;
|
|
|
import password.pwm.svc.stats.Statistic;
|
|
|
import password.pwm.util.FormMap;
|
|
|
import password.pwm.util.PasswordData;
|
|
|
-import password.pwm.util.password.RandomPasswordGenerator;
|
|
|
import password.pwm.util.form.FormUtility;
|
|
|
import password.pwm.util.java.JavaHelper;
|
|
|
+import password.pwm.util.java.PwmDateFormat;
|
|
|
import password.pwm.util.logging.PwmLogger;
|
|
|
import password.pwm.util.macro.MacroMachine;
|
|
|
import password.pwm.util.operations.ActionExecutor;
|
|
|
import password.pwm.util.password.PasswordUtility;
|
|
|
+import password.pwm.util.password.RandomPasswordGenerator;
|
|
|
|
|
|
import javax.servlet.ServletException;
|
|
|
import javax.servlet.annotation.WebServlet;
|
|
|
import java.io.IOException;
|
|
|
import java.text.ParseException;
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
import java.time.Instant;
|
|
|
import java.util.Collection;
|
|
|
import java.util.Collections;
|
|
|
-import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.HashSet;
|
|
|
import java.util.LinkedHashMap;
|
|
@@ -541,10 +540,10 @@ public class GuestRegistrationServlet extends AbstractPwmServlet
|
|
|
|
|
|
final String expirationDateStr = pwmRequest.readParameterAsString( HTTP_PARAM_EXPIRATION_DATE );
|
|
|
|
|
|
- final Date expirationDate;
|
|
|
+ final Instant expirationDate;
|
|
|
try
|
|
|
{
|
|
|
- expirationDate = new SimpleDateFormat( "yyyy-MM-dd" ).parse( expirationDateStr );
|
|
|
+ expirationDate = PwmDateFormat.parse( "yyyy-MM-dd", expirationDateStr );
|
|
|
}
|
|
|
catch ( final ParseException e )
|
|
|
{
|
|
@@ -556,7 +555,7 @@ public class GuestRegistrationServlet extends AbstractPwmServlet
|
|
|
) );
|
|
|
}
|
|
|
|
|
|
- if ( expirationDate.before( new Date() ) )
|
|
|
+ if ( expirationDate.isBefore( Instant.now() ) )
|
|
|
{
|
|
|
final String errorMsg = "expiration date must be in the future";
|
|
|
throw new PwmOperationalException( new ErrorInformation( PwmError.ERROR_FIELD_REQUIRED, errorMsg ) );
|
|
@@ -566,14 +565,14 @@ public class GuestRegistrationServlet extends AbstractPwmServlet
|
|
|
final long futureDateMs = System.currentTimeMillis() + durationValueMs;
|
|
|
final Instant futureDate = Instant.ofEpochMilli( futureDateMs );
|
|
|
|
|
|
- if ( expirationDate.after( Date.from( futureDate ) ) )
|
|
|
+ if ( expirationDate.isAfter( futureDate ) )
|
|
|
{
|
|
|
final String errorMsg = "expiration date must be sooner than " + futureDate.toString();
|
|
|
throw new PwmOperationalException( new ErrorInformation( PwmError.ERROR_FIELD_REQUIRED, errorMsg ) );
|
|
|
}
|
|
|
|
|
|
LOGGER.trace( pwmRequest, () -> "read expiration date as " + expirationDate.toString() );
|
|
|
- return expirationDate.toInstant();
|
|
|
+ return expirationDate;
|
|
|
}
|
|
|
|
|
|
private static String determineUserDN( final Map<FormConfiguration, String> formValues, final Configuration config )
|
|
@@ -687,7 +686,7 @@ public class GuestRegistrationServlet extends AbstractPwmServlet
|
|
|
|
|
|
private void calculateFutureDateFlags( final PwmRequest pwmRequest, final GuestRegistrationBean guestRegistrationBean )
|
|
|
{
|
|
|
- final SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd" );
|
|
|
+ final PwmDateFormat dateFormat = PwmDateFormat.newPwmDateFormat( "yyyy-MM-dd" );
|
|
|
|
|
|
final long maxValidDays = pwmRequest.getConfig().readSettingAsLong( PwmSetting.GUEST_MAX_VALID_DAYS );
|
|
|
pwmRequest.setAttribute( PwmRequestAttribute.GuestMaximumValidDays, String.valueOf( maxValidDays ) );
|
|
@@ -698,7 +697,7 @@ public class GuestRegistrationServlet extends AbstractPwmServlet
|
|
|
if ( maxValidDays > 0 )
|
|
|
{
|
|
|
final long futureMS = maxValidDays * 24 * 60 * 60 * 1000;
|
|
|
- final Date maxValidDate = new Date( new Date().getTime() + ( futureMS ) );
|
|
|
+ final Instant maxValidDate = Instant.ofEpochMilli( System.currentTimeMillis() + futureMS );
|
|
|
maxExpirationDate = dateFormat.format( maxValidDate );
|
|
|
}
|
|
|
else
|
|
@@ -725,7 +724,7 @@ public class GuestRegistrationServlet extends AbstractPwmServlet
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- currentExpirationDate = dateFormat.format( new Date() );
|
|
|
+ currentExpirationDate = dateFormat.format( Instant.now() );
|
|
|
}
|
|
|
}
|
|
|
|