|
@@ -21,26 +21,15 @@
|
|
package password.pwm.config;
|
|
package password.pwm.config;
|
|
|
|
|
|
import lombok.Value;
|
|
import lombok.Value;
|
|
-import password.pwm.PwmConstants;
|
|
|
|
-import password.pwm.config.value.PasswordValue;
|
|
|
|
import password.pwm.config.value.StoredValue;
|
|
import password.pwm.config.value.StoredValue;
|
|
-import password.pwm.config.value.ValueFactory;
|
|
|
|
-import password.pwm.i18n.Config;
|
|
|
|
-import password.pwm.util.i18n.LocaleHelper;
|
|
|
|
import password.pwm.util.java.JavaHelper;
|
|
import password.pwm.util.java.JavaHelper;
|
|
-import password.pwm.util.java.LazySupplier;
|
|
|
|
import password.pwm.util.java.StringUtil;
|
|
import password.pwm.util.java.StringUtil;
|
|
-import password.pwm.util.java.XmlElement;
|
|
|
|
import password.pwm.util.logging.PwmLogger;
|
|
import password.pwm.util.logging.PwmLogger;
|
|
-import password.pwm.util.macro.MacroRequest;
|
|
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
import java.util.Collection;
|
|
import java.util.Collection;
|
|
import java.util.Collections;
|
|
import java.util.Collections;
|
|
import java.util.Comparator;
|
|
import java.util.Comparator;
|
|
-import java.util.EnumMap;
|
|
|
|
-import java.util.EnumSet;
|
|
|
|
import java.util.LinkedHashMap;
|
|
import java.util.LinkedHashMap;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Locale;
|
|
import java.util.Locale;
|
|
@@ -48,9 +37,7 @@ import java.util.Map;
|
|
import java.util.Optional;
|
|
import java.util.Optional;
|
|
import java.util.Set;
|
|
import java.util.Set;
|
|
import java.util.TreeSet;
|
|
import java.util.TreeSet;
|
|
-import java.util.function.Supplier;
|
|
|
|
import java.util.regex.Pattern;
|
|
import java.util.regex.Pattern;
|
|
-import java.util.regex.PatternSyntaxException;
|
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
@@ -1305,21 +1292,8 @@ public enum PwmSetting
|
|
private final String key;
|
|
private final String key;
|
|
private final PwmSettingSyntax syntax;
|
|
private final PwmSettingSyntax syntax;
|
|
private final PwmSettingCategory category;
|
|
private final PwmSettingCategory category;
|
|
|
|
+ private final PwmSettingMetaDataReader pwmSettingMetaDataReader;
|
|
|
|
|
|
- // cached values read from XML file
|
|
|
|
- private final Supplier<List<TemplateSetReference<StoredValue>>> defaultValues = new LazySupplier<>( () -> PwmSettingReader.readDefaultValue( PwmSetting.this ) );
|
|
|
|
- private final Supplier<List<TemplateSetReference<String>>> examples = new LazySupplier<>( () -> PwmSettingReader.readExamples( PwmSetting.this ) );
|
|
|
|
- private final Supplier<Map<String, String>> options = new LazySupplier<>( () -> PwmSettingReader.readOptions( PwmSetting.this ) );
|
|
|
|
- private final Supplier<Set<PwmSettingFlag>> flags = new LazySupplier<>( () -> PwmSettingReader.readFlags( PwmSetting.this ) );
|
|
|
|
- private final Supplier<Map<PwmSettingProperty, String>> properties = new LazySupplier<>( () -> PwmSettingReader.readProperties( PwmSetting.this ) );
|
|
|
|
- private final Supplier<Collection<LDAPPermissionInfo>> ldapPermissionInfo = new LazySupplier<>( () -> PwmSettingReader.readLdapPermissionInfo( PwmSetting.this ) );
|
|
|
|
- private final Supplier<Boolean> required = new LazySupplier<>( () -> PwmSettingReader.readRequired( PwmSetting.this ) );
|
|
|
|
- private final Supplier<Boolean> hidden = new LazySupplier<>( () -> PwmSettingReader.readHidden( PwmSetting.this ) );
|
|
|
|
- private final Supplier<Integer> level = new LazySupplier<>( () -> PwmSettingReader.readLevel( PwmSetting.this ) );
|
|
|
|
- private final Supplier<Pattern> pattern = new LazySupplier<>( () -> PwmSettingReader.readPattern( PwmSetting.this ) );
|
|
|
|
- private final Supplier<String> defaultLocaleLabel = new LazySupplier<>( () -> PwmSettingReader.readLabel( this, PwmConstants.DEFAULT_LOCALE ) );
|
|
|
|
- private final Supplier<String> defaultLocaleDescription = new LazySupplier<>( () -> PwmSettingReader.readDescription( this, PwmConstants.DEFAULT_LOCALE ) );
|
|
|
|
- private final Supplier<String> defaultMenuLocation = new LazySupplier<>( () -> PwmSettingReader.readMenuLocationDebugDefault( this ) );
|
|
|
|
|
|
|
|
|
|
|
|
PwmSetting(
|
|
PwmSetting(
|
|
@@ -1331,6 +1305,7 @@ public enum PwmSetting
|
|
this.key = key;
|
|
this.key = key;
|
|
this.syntax = syntax;
|
|
this.syntax = syntax;
|
|
this.category = category;
|
|
this.category = category;
|
|
|
|
+ this.pwmSettingMetaDataReader = new PwmSettingMetaDataReader( this );
|
|
}
|
|
}
|
|
|
|
|
|
public String getKey( )
|
|
public String getKey( )
|
|
@@ -1355,7 +1330,7 @@ public enum PwmSetting
|
|
|
|
|
|
private List<TemplateSetReference<StoredValue>> getDefaultValue()
|
|
private List<TemplateSetReference<StoredValue>> getDefaultValue()
|
|
{
|
|
{
|
|
- return defaultValues.get();
|
|
|
|
|
|
+ return pwmSettingMetaDataReader.getDefaultValue();
|
|
}
|
|
}
|
|
|
|
|
|
public StoredValue getDefaultValue( final PwmSettingTemplateSet templateSet )
|
|
public StoredValue getDefaultValue( final PwmSettingTemplateSet templateSet )
|
|
@@ -1379,63 +1354,52 @@ public enum PwmSetting
|
|
|
|
|
|
public Map<PwmSettingProperty, String> getProperties( )
|
|
public Map<PwmSettingProperty, String> getProperties( )
|
|
{
|
|
{
|
|
- return properties.get();
|
|
|
|
|
|
+ return pwmSettingMetaDataReader.getProperties();
|
|
}
|
|
}
|
|
|
|
|
|
public Set<PwmSettingFlag> getFlags( )
|
|
public Set<PwmSettingFlag> getFlags( )
|
|
{
|
|
{
|
|
- return flags.get();
|
|
|
|
|
|
+ return pwmSettingMetaDataReader.getFlags();
|
|
}
|
|
}
|
|
|
|
|
|
public Map<String, String> getOptions()
|
|
public Map<String, String> getOptions()
|
|
{
|
|
{
|
|
- return options.get();
|
|
|
|
|
|
+ return pwmSettingMetaDataReader.getOptions();
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
public String getLabel( final Locale locale )
|
|
public String getLabel( final Locale locale )
|
|
{
|
|
{
|
|
- if ( PwmConstants.DEFAULT_LOCALE.equals( locale ) )
|
|
|
|
- {
|
|
|
|
- return defaultLocaleLabel.get();
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- return PwmSettingReader.readLabel( this, locale );
|
|
|
|
|
|
+ return pwmSettingMetaDataReader.getLabel( locale );
|
|
}
|
|
}
|
|
|
|
|
|
public String getDescription( final Locale locale )
|
|
public String getDescription( final Locale locale )
|
|
{
|
|
{
|
|
- if ( PwmConstants.DEFAULT_LOCALE.equals( locale ) )
|
|
|
|
- {
|
|
|
|
- return defaultLocaleDescription.get();
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- return PwmSettingReader.readDescription( this, locale );
|
|
|
|
|
|
+ return pwmSettingMetaDataReader.getDescription( locale );
|
|
}
|
|
}
|
|
|
|
|
|
public String getExample( final PwmSettingTemplateSet template )
|
|
public String getExample( final PwmSettingTemplateSet template )
|
|
{
|
|
{
|
|
- return TemplateSetReference.referenceForTempleSet( examples.get(), template );
|
|
|
|
|
|
+ return pwmSettingMetaDataReader.getExample( template );
|
|
}
|
|
}
|
|
|
|
|
|
public boolean isRequired( )
|
|
public boolean isRequired( )
|
|
{
|
|
{
|
|
- return required.get();
|
|
|
|
- }
|
|
|
|
|
|
+ return pwmSettingMetaDataReader.isRequired();
|
|
|
|
+ }
|
|
|
|
|
|
public boolean isHidden( )
|
|
public boolean isHidden( )
|
|
{
|
|
{
|
|
- return hidden.get();
|
|
|
|
|
|
+ return pwmSettingMetaDataReader.isHidden();
|
|
}
|
|
}
|
|
|
|
|
|
public int getLevel( )
|
|
public int getLevel( )
|
|
{
|
|
{
|
|
- return level.get();
|
|
|
|
|
|
+ return pwmSettingMetaDataReader.getLevel();
|
|
}
|
|
}
|
|
|
|
|
|
public Pattern getRegExPattern( )
|
|
public Pattern getRegExPattern( )
|
|
{
|
|
{
|
|
- return pattern.get();
|
|
|
|
|
|
+ return pwmSettingMetaDataReader.getRegExPattern();
|
|
}
|
|
}
|
|
|
|
|
|
public static Optional<PwmSetting> forKey( final String key )
|
|
public static Optional<PwmSetting> forKey( final String key )
|
|
@@ -1448,19 +1412,12 @@ public enum PwmSetting
|
|
final Locale locale
|
|
final Locale locale
|
|
)
|
|
)
|
|
{
|
|
{
|
|
- if ( PwmConstants.DEFAULT_LOCALE.equals( locale ) && StringUtil.isEmpty( profileID ) )
|
|
|
|
- {
|
|
|
|
- return defaultMenuLocation.get();
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
- return PwmSettingReader.readMenuLocationDebug( this, profileID, locale );
|
|
|
|
- }
|
|
|
|
|
|
+ return pwmSettingMetaDataReader.toMenuLocationDebug( profileID, locale );
|
|
}
|
|
}
|
|
|
|
|
|
public Collection<LDAPPermissionInfo> getLDAPPermissionInfo()
|
|
public Collection<LDAPPermissionInfo> getLDAPPermissionInfo()
|
|
{
|
|
{
|
|
- return ldapPermissionInfo.get();
|
|
|
|
|
|
+ return pwmSettingMetaDataReader.getLDAPPermissionInfo();
|
|
}
|
|
}
|
|
|
|
|
|
public enum SettingStat
|
|
public enum SettingStat
|
|
@@ -1508,7 +1465,7 @@ public enum PwmSetting
|
|
private final T reference;
|
|
private final T reference;
|
|
private final Set<PwmSettingTemplate> settingTemplates;
|
|
private final Set<PwmSettingTemplate> settingTemplates;
|
|
|
|
|
|
- private static <T> T referenceForTempleSet(
|
|
|
|
|
|
+ static <T> T referenceForTempleSet(
|
|
final List<TemplateSetReference<T>> templateSetReferences,
|
|
final List<TemplateSetReference<T>> templateSetReferences,
|
|
final PwmSettingTemplateSet pwmSettingTemplate
|
|
final PwmSettingTemplateSet pwmSettingTemplate
|
|
)
|
|
)
|
|
@@ -1557,228 +1514,4 @@ public enum PwmSetting
|
|
return selfValue.compareTo( otherValue );
|
|
return selfValue.compareTo( otherValue );
|
|
};
|
|
};
|
|
}
|
|
}
|
|
-
|
|
|
|
- static class PwmSettingReader
|
|
|
|
- {
|
|
|
|
- private static Set<PwmSettingFlag> readFlags( final PwmSetting pwmSetting )
|
|
|
|
- {
|
|
|
|
- final Set<PwmSettingFlag> returnObj = EnumSet.noneOf( PwmSettingFlag.class );
|
|
|
|
- final XmlElement settingElement = PwmSettingXml.readSettingXml( pwmSetting );
|
|
|
|
- final List<XmlElement> flagElements = settingElement.getChildren( "flag" );
|
|
|
|
- for ( final XmlElement flagElement : flagElements )
|
|
|
|
- {
|
|
|
|
- final String value = flagElement.getTextTrim();
|
|
|
|
-
|
|
|
|
- try
|
|
|
|
- {
|
|
|
|
- final PwmSettingFlag flag = PwmSettingFlag.valueOf( value );
|
|
|
|
- returnObj.add( flag );
|
|
|
|
- }
|
|
|
|
- catch ( final IllegalArgumentException e )
|
|
|
|
- {
|
|
|
|
- LOGGER.error( () -> "unknown flag for setting " + pwmSetting.getKey() + ", error: unknown flag value: " + value );
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
- return Collections.unmodifiableSet( returnObj );
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- private static Map<String, String> readOptions( final PwmSetting pwmSetting )
|
|
|
|
- {
|
|
|
|
- final Map<String, String> returnList = new LinkedHashMap<>();
|
|
|
|
- final XmlElement settingElement = PwmSettingXml.readSettingXml( pwmSetting );
|
|
|
|
- final Optional<XmlElement> optionsElement = settingElement.getChild( PwmSettingXml.XML_ELEMENT_OPTIONS );
|
|
|
|
- if ( optionsElement.isPresent() )
|
|
|
|
- {
|
|
|
|
- final List<XmlElement> optionElements = optionsElement.get().getChildren( PwmSettingXml.XML_ELEMENT_OPTION );
|
|
|
|
- if ( optionElements != null )
|
|
|
|
- {
|
|
|
|
- for ( final XmlElement optionElement : optionElements )
|
|
|
|
- {
|
|
|
|
- if ( optionElement.getAttributeValue( PwmSettingXml.XML_ELEMENT_VALUE ) == null )
|
|
|
|
- {
|
|
|
|
- throw new IllegalStateException( "option element is missing 'value' attribute for key " + pwmSetting.getKey() );
|
|
|
|
- }
|
|
|
|
- returnList.put( optionElement.getAttributeValue( PwmSettingXml.XML_ELEMENT_VALUE ), optionElement.getText() );
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- final Map<String, String> finalList = Collections.unmodifiableMap( returnList );
|
|
|
|
- return Collections.unmodifiableMap( finalList );
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- private static Collection<LDAPPermissionInfo> readLdapPermissionInfo( final PwmSetting pwmSetting )
|
|
|
|
- {
|
|
|
|
- final XmlElement settingElement = PwmSettingXml.readSettingXml( pwmSetting );
|
|
|
|
- final List<XmlElement> permissionElements = settingElement.getChildren( PwmSettingXml.XML_ELEMENT_LDAP_PERMISSION );
|
|
|
|
- final List<LDAPPermissionInfo> returnObj = new ArrayList<>();
|
|
|
|
- if ( permissionElements != null )
|
|
|
|
- {
|
|
|
|
- for ( final XmlElement permissionElement : permissionElements )
|
|
|
|
- {
|
|
|
|
- final Optional<LDAPPermissionInfo.Actor> actor = JavaHelper.readEnumFromString(
|
|
|
|
- LDAPPermissionInfo.Actor.class,
|
|
|
|
- permissionElement.getAttributeValue( PwmSettingXml.XML_ATTRIBUTE_PERMISSION_ACTOR )
|
|
|
|
- );
|
|
|
|
- final Optional<LDAPPermissionInfo.Access> type = JavaHelper.readEnumFromString(
|
|
|
|
- LDAPPermissionInfo.Access.class,
|
|
|
|
- permissionElement.getAttributeValue( PwmSettingXml.XML_ATTRIBUTE_PERMISSION_ACCESS )
|
|
|
|
- );
|
|
|
|
- if ( actor.isPresent() && type.isPresent() )
|
|
|
|
- {
|
|
|
|
- final LDAPPermissionInfo permissionInfo = new LDAPPermissionInfo( type.get(), actor.get() );
|
|
|
|
- returnObj.add( permissionInfo );
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- return Collections.unmodifiableList( returnObj );
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- private static List<TemplateSetReference<String>> readExamples( final PwmSetting pwmSetting )
|
|
|
|
- {
|
|
|
|
- final List<TemplateSetReference<String>> returnObj = new ArrayList<>();
|
|
|
|
- final MacroRequest macroRequest = MacroRequest.forStatic();
|
|
|
|
- final XmlElement settingElement = PwmSettingXml.readSettingXml( pwmSetting );
|
|
|
|
- final List<XmlElement> exampleElements = settingElement.getChildren( PwmSettingXml.XML_ELEMENT_EXAMPLE );
|
|
|
|
- for ( final XmlElement exampleElement : exampleElements )
|
|
|
|
- {
|
|
|
|
- final Set<PwmSettingTemplate> definedTemplates = PwmSettingXml.parseTemplateAttribute( exampleElement );
|
|
|
|
- final String exampleString = macroRequest.expandMacros( exampleElement.getText() );
|
|
|
|
- returnObj.add( new TemplateSetReference<>( exampleString, Collections.unmodifiableSet( definedTemplates ) ) );
|
|
|
|
- }
|
|
|
|
- if ( returnObj.isEmpty() )
|
|
|
|
- {
|
|
|
|
- returnObj.add( new TemplateSetReference<>( "", Collections.emptySet() ) );
|
|
|
|
- }
|
|
|
|
- return Collections.unmodifiableList( returnObj );
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- private static Map<PwmSettingProperty, String> readProperties( final PwmSetting pwmSetting )
|
|
|
|
- {
|
|
|
|
- final Map<PwmSettingProperty, String> newProps = new EnumMap<>( PwmSettingProperty.class );
|
|
|
|
- final XmlElement settingElement = PwmSettingXml.readSettingXml( pwmSetting );
|
|
|
|
- final Optional<XmlElement> propertiesElement = settingElement.getChild( PwmSettingXml.XML_ELEMENT_PROPERTIES );
|
|
|
|
- if ( propertiesElement.isPresent() )
|
|
|
|
- {
|
|
|
|
- final List<XmlElement> propertyElements = propertiesElement.get().getChildren( PwmSettingXml.XML_ELEMENT_PROPERTY );
|
|
|
|
- if ( propertyElements != null )
|
|
|
|
- {
|
|
|
|
- for ( final XmlElement propertyElement : propertyElements )
|
|
|
|
- {
|
|
|
|
- if ( propertyElement.getAttributeValue( PwmSettingXml.XML_ATTRIBUTE_KEY ) == null )
|
|
|
|
- {
|
|
|
|
- throw new IllegalStateException( "property element is missing 'key' attribute for value " + pwmSetting.getKey() );
|
|
|
|
- }
|
|
|
|
- final PwmSettingProperty property = JavaHelper.readEnumFromString(
|
|
|
|
- PwmSettingProperty.class,
|
|
|
|
- null,
|
|
|
|
- propertyElement.getAttributeValue( PwmSettingXml.XML_ATTRIBUTE_KEY ) );
|
|
|
|
- if ( property == null )
|
|
|
|
- {
|
|
|
|
- throw new IllegalStateException( "property element has unknown 'key' attribute for value " + pwmSetting.getKey() );
|
|
|
|
- }
|
|
|
|
- newProps.put( property, propertyElement.getText() );
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- return Collections.unmodifiableMap( newProps );
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- private static List<TemplateSetReference<StoredValue>> readDefaultValue( final PwmSetting pwmSetting )
|
|
|
|
- {
|
|
|
|
- final List<TemplateSetReference<StoredValue>> returnObj = new ArrayList<>();
|
|
|
|
- final XmlElement settingElement = PwmSettingXml.readSettingXml( pwmSetting );
|
|
|
|
- final List<XmlElement> defaultElements = settingElement.getChildren( PwmSettingXml.XML_ELEMENT_DEFAULT );
|
|
|
|
- if ( pwmSetting.getSyntax() == PwmSettingSyntax.PASSWORD )
|
|
|
|
- {
|
|
|
|
- returnObj.add( new TemplateSetReference<>( new PasswordValue( null ), Collections.emptySet() ) );
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
- for ( final XmlElement defaultElement : defaultElements )
|
|
|
|
- {
|
|
|
|
- final Set<PwmSettingTemplate> definedTemplates = PwmSettingXml.parseTemplateAttribute( defaultElement );
|
|
|
|
- final StoredValue storedValue = ValueFactory.fromXmlValues( pwmSetting, defaultElement, null );
|
|
|
|
- returnObj.add( new TemplateSetReference<>( storedValue, definedTemplates ) );
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- if ( returnObj.isEmpty() )
|
|
|
|
- {
|
|
|
|
- throw new IllegalStateException( "no default value for setting " + pwmSetting.getKey() );
|
|
|
|
- }
|
|
|
|
- return Collections.unmodifiableList( returnObj );
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- private static boolean readRequired( final PwmSetting pwmSetting )
|
|
|
|
- {
|
|
|
|
- final XmlElement settingElement = PwmSettingXml.readSettingXml( pwmSetting );
|
|
|
|
- final String requiredAttribute = settingElement.getAttributeValue( PwmSettingXml.XML_ELEMENT_REQUIRED );
|
|
|
|
- return "true".equalsIgnoreCase( requiredAttribute );
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- private static boolean readHidden( final PwmSetting pwmSetting )
|
|
|
|
- {
|
|
|
|
- final XmlElement settingElement = PwmSettingXml.readSettingXml( pwmSetting );
|
|
|
|
- final String requiredAttribute = settingElement.getAttributeValue( PwmSettingXml.XML_ELEMENT_HIDDEN );
|
|
|
|
- return "true".equalsIgnoreCase( requiredAttribute ) || pwmSetting.getCategory().isHidden();
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- private static int readLevel( final PwmSetting pwmSetting )
|
|
|
|
- {
|
|
|
|
- final XmlElement settingElement = PwmSettingXml.readSettingXml( pwmSetting );
|
|
|
|
- final String levelAttribute = settingElement.getAttributeValue( PwmSettingXml.XML_ELEMENT_LEVEL );
|
|
|
|
- return JavaHelper.silentParseInt( levelAttribute, 0 );
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- private static Pattern readPattern( final PwmSetting pwmSetting )
|
|
|
|
- {
|
|
|
|
- final XmlElement settingNode = PwmSettingXml.readSettingXml( pwmSetting );
|
|
|
|
- final Optional<XmlElement> regexNode = settingNode.getChild( PwmSettingXml.XML_ELEMENT_REGEX );
|
|
|
|
- if ( regexNode.isPresent() )
|
|
|
|
- {
|
|
|
|
- try
|
|
|
|
- {
|
|
|
|
- return Pattern.compile( regexNode.get().getText() );
|
|
|
|
- }
|
|
|
|
- catch ( final PatternSyntaxException e )
|
|
|
|
- {
|
|
|
|
- final String errorMsg = "error compiling regex constraints for setting " + pwmSetting.toString() + ", error: " + e.getMessage();
|
|
|
|
- LOGGER.error( () -> errorMsg, e );
|
|
|
|
- throw new IllegalStateException( errorMsg, e );
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- return Pattern.compile( ".*", Pattern.DOTALL );
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- private static String readMenuLocationDebugDefault( final PwmSetting pwmSetting )
|
|
|
|
- {
|
|
|
|
- final Locale locale = PwmConstants.DEFAULT_LOCALE;
|
|
|
|
- final String separator = LocaleHelper.getLocalizedMessage( locale, Config.Display_SettingNavigationSeparator, null );
|
|
|
|
- return pwmSetting.getCategory().toMenuLocationDebug( null, locale ) + separator + pwmSetting.getLabel( locale );
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- private static String readMenuLocationDebug( final PwmSetting pwmSetting, final String profileID, final Locale locale )
|
|
|
|
- {
|
|
|
|
- final String separator = LocaleHelper.getLocalizedMessage( locale, Config.Display_SettingNavigationSeparator, null );
|
|
|
|
- return pwmSetting.getCategory().toMenuLocationDebug( profileID, locale ) + separator + pwmSetting.getLabel( locale );
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- private static String readLabel( final PwmSetting pwmSetting, final Locale locale )
|
|
|
|
- {
|
|
|
|
- return readStringProperty( password.pwm.i18n.PwmSetting.SETTING_LABEL_PREFIX + pwmSetting.getKey(), locale );
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- private static String readDescription( final PwmSetting pwmSetting, final Locale locale )
|
|
|
|
- {
|
|
|
|
- return readStringProperty( password.pwm.i18n.PwmSetting.SETTING_DESCRIPTION_PREFIX + pwmSetting.getKey(), locale );
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- private static String readStringProperty( final String key, final Locale locale )
|
|
|
|
- {
|
|
|
|
- final String storedText = LocaleHelper.getLocalizedMessage( locale, key, null, password.pwm.i18n.PwmSetting.class );
|
|
|
|
- final MacroRequest macroRequest = MacroRequest.forStatic();
|
|
|
|
- return macroRequest.expandMacros( storedText );
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
}
|
|
}
|