Bläddra i källkod

Update cef branch removing all extra code from previous check ins.

rkeil 7 år sedan
förälder
incheckning
662acceeed

+ 1 - 0
server/src/main/java/password/pwm/config/PwmSetting.java

@@ -275,6 +275,7 @@ public enum PwmSetting {
     LDAP_ENABLE_WIRE_TRACE(
             "ldap.wireTrace.enable", PwmSettingSyntax.BOOLEAN, PwmSettingCategory.LDAP_GLOBAL),
 
+
     // email settings
     EMAIL_SERVER_ADDRESS(
             "email.smtp.address", PwmSettingSyntax.STRING, PwmSettingCategory.EMAIL_SETTINGS),

+ 2 - 1
server/src/main/java/password/pwm/svc/event/SyslogAuditService.java

@@ -75,10 +75,12 @@ public class SyslogAuditService {
     private static final String SYSLOG_INSTANCE_NAME = "syslog-audit";
     private static final int LENGTH_OVERSIZE = 1024;
 
+
     private SyslogIF syslogInstance = null;
     private ErrorInformation lastError = null;
     private List<X509Certificate> certificates = null;
     private WorkQueueProcessor<String> workQueueProcessor;
+
     private List<SyslogIF> syslogInstances = new ArrayList<>();
 
     private final Configuration configuration;
@@ -91,7 +93,6 @@ public class SyslogAuditService {
         cefEnabled = pwmApplication.getConfig().readSettingAsBoolean(PwmSetting.AUDIT_COMMONEVENTFORMAT_ENABLE);
         this.pwmApplication = pwmApplication;
         this.configuration = pwmApplication.getConfig();
-
         this.certificates = configuration.readSettingAsCertificate(PwmSetting.AUDIT_SYSLOG_CERTIFICATES);
 
         final List<String> syslogConfigStringArray = configuration.readSettingAsStringArray(PwmSetting.AUDIT_SYSLOG_SERVERS);

+ 1 - 2
server/src/main/resources/password/pwm/i18n/PwmSetting.properties

@@ -589,7 +589,6 @@ Setting_Description_pwm.seedlist.location=Specify the location of the seed list
 Setting_Description_pwm.selfURL=<p>The URL to this application, as seen by users. @PwmAppName@ uses the value in email macros and other user-facing communications.</p><p>The URL must use a valid fully qualified hostname. Do not use a network address.</p><p>In simple environments, the URL will be the base of the URL in the browser you are currently using to view this page, however in more complex environments the URL will typically be an upstream proxy, gateway or network device.</p><p>The URL should include the path to the base application, typically <code>/@Case:lower:[[@PwmAppName@]]@</code>.</p>
 Setting_Description_pwm.wordlist.location=Specify a word list file URL for dictionary checking to prevent users from using commonly used words as passwords.   Using word lists is an important part of password security.  Word lists are used by intruders to guess common passwords.   The default word list included contains commonly used English passwords.  <br/><br/>The first time a startup occurs with a new word list setting, it takes some time to compile the word list into a database.  See the status screen and logs for progress information.  The word list file format is one or more text files containing a single word per line, enclosed in a ZIP file.  The String <i>\!\#comment\:</i> at the beginning of a line indicates a comment. <br/><br/>The value must be a valid URL, using the protocol "file" (local file system), "http", or "https".
 Setting_Description_recovery.action=Add actions to take when the user completes the forgotten password process.
-Setting_Description_recovery.allowChangePwWithinMinLifetime=After identity verification, this setting controls if the user can elect to change their password if the time since the last password change is within the minimum password lifetime policy of the user.   See also: <code>@PwmSettingReference\:challenge.enforceMinimumPasswordLifetime@</code>.
 Setting_Description_recovery.allowWhenLocked=Enable this option to allow users to use the forgotten password feature when the account is intruder locked in LDAP.  This feature is not available when a user is using NMAS stored responses.
 Setting_Description_recovery.enable=Enable this option to have the forgotten password recovery available to users.
 Setting_Description_recovery.form=Specify the form fields for the activate user module. @PwmAppName@ requires the users to enter each attribute. Ideally, @PwmAppName@ requires the users to enter some personal data that is not publicly known.
@@ -1174,4 +1173,4 @@ Setting_Label_webservices.healthStats.makePublic=Enable Public Health and Statis
 Setting_Label_webservices.queryMatch=Web Services LDAP Authentication Permissions
 Setting_Label_webservices.thirdParty.queryMatch=Web Services LDAP Third Party Permissions
 Setting_Label_webservice.userAttributes=Web Service User Attributes
-Setting_Label_wordlistCaseSensitive=Word List Case Sensitivity
+Setting_Label_wordlistCaseSensitive=Word List Case Sensitivity