Yair Zaslavsky has uploaded a new change for review. Change subject: core: Renaming ChangePasswordUrl to ChangePasswordMsg ......................................................................
core: Renaming ChangePasswordUrl to ChangePasswordMsg The bug description stays that in case of failed login, the user may get a URL to change the passord, or a custom message Bug-Url: https://bugzilla.redhat.com/1053601 Change-Id: I9f656f38f7f48e169ed01ad084d7f424e5c749f3 Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/authentication/provisional/ProvisionalAuthenticationResult.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ConfigurationProvider.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java M packaging/bin/engine-manage-domains.sh M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql 6 files changed, 13 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/99/23799/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/authentication/provisional/ProvisionalAuthenticationResult.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/authentication/provisional/ProvisionalAuthenticationResult.java index de476ce..ffe19d1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/authentication/provisional/ProvisionalAuthenticationResult.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/authentication/provisional/ProvisionalAuthenticationResult.java @@ -25,7 +25,7 @@ synchronized (ProvisionalAuthenticationResult.class) { if (passwordChangeUrlsPerDomain == null) { passwordChangeUrlsPerDomain = new HashMap<String, String>(); - String changePasswordUrl = Config.<String> getValue(ConfigValues.ChangePasswordUrl); + String changePasswordUrl = Config.<String> getValue(ConfigValues.ChangePasswordMsg); String[] pairs = changePasswordUrl.split(","); for (String pair : pairs) { // Split the pair in such a way that if the URL contains :, it will not be split to strings diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java index 5c66903..156861b 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java @@ -1619,7 +1619,7 @@ HotPlugCpuSupported, @TypeConverterAttribute(String.class) @DefaultValueAttribute("") - ChangePasswordUrl, + ChangePasswordMsg, Invalid; } diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ConfigurationProvider.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ConfigurationProvider.java index f519f6c..002d6f8 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ConfigurationProvider.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ConfigurationProvider.java @@ -3,7 +3,7 @@ import static org.ovirt.engine.core.common.config.ConfigValues.AdUserId; import static org.ovirt.engine.core.common.config.ConfigValues.AdUserName; import static org.ovirt.engine.core.common.config.ConfigValues.AdUserPassword; -import static org.ovirt.engine.core.common.config.ConfigValues.ChangePasswordUrl; +import static org.ovirt.engine.core.common.config.ConfigValues.ChangePasswordMsg; import static org.ovirt.engine.core.common.config.ConfigValues.DomainName; import static org.ovirt.engine.core.common.config.ConfigValues.LDAPProviderTypes; import static org.ovirt.engine.core.common.config.ConfigValues.LDAPSecurityAuthentication; @@ -44,7 +44,7 @@ configVals.put(AdUserId, adUserId); configVals.put(LDAPProviderTypes, ldapProviderTypes); configVals.put(LDAPServerPort, ldapServerPort); - configVals.put(ChangePasswordUrl, passwordChangeUrls); + configVals.put(ChangePasswordMsg, passwordChangeUrls); this.engineConfigExecutable = engineConfigExecutable; this.engineConfigProperties = engineConfigProperties; } diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java index 08c8a9a..2da30c7 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java @@ -257,7 +257,7 @@ ldapPort = DEFAULT_LDAP_SERVER_PORT; } String changePasswordUrl = - getConfigValue(engineConfigExecutable, engineConfigProperties, ConfigValues.ChangePasswordUrl); + getConfigValue(engineConfigExecutable, engineConfigProperties, ConfigValues.ChangePasswordMsg); if (changePasswordUrl == null) { changePasswordUrl = ""; } @@ -537,7 +537,7 @@ String currentAdUserIdEntry = configurationProvider.getConfigValue(ConfigValues.AdUserId); String currentLDAPProviderTypes = configurationProvider.getConfigValue(ConfigValues.LDAPProviderTypes); String ldapServerPort = configurationProvider.getConfigValue(ConfigValues.LDAPServerPort); - String currentChangePasswordUrl = configurationProvider.getConfigValue(ConfigValues.ChangePasswordUrl); + String currentChangePasswordUrl = configurationProvider.getConfigValue(ConfigValues.ChangePasswordMsg); DomainsConfigurationEntry adUserNameEntry = new DomainsConfigurationEntry(currentAdUserNameEntry, DOMAIN_SEPERATOR, VALUE_SEPERATOR); @@ -667,7 +667,7 @@ String currentAdUserIdEntry = configurationProvider.getConfigValue(ConfigValues.AdUserId); String currentLdapProviderTypeEntry = configurationProvider.getConfigValue(ConfigValues.LDAPProviderTypes); String ldapServerPort = configurationProvider.getConfigValue(ConfigValues.LDAPServerPort); - String currentChangePasswordUrl = configurationProvider.getConfigValue(ConfigValues.ChangePasswordUrl); + String currentChangePasswordUrl = configurationProvider.getConfigValue(ConfigValues.ChangePasswordMsg); DomainsConfigurationEntry adUserNameEntry = @@ -1006,7 +1006,7 @@ ldapProviderTypeEntry); if (changePasswordUrl) { - configurationProvider.setConfigValue(ConfigValues.ChangePasswordUrl, changePasswordUrlEntry); + configurationProvider.setConfigValue(ConfigValues.ChangePasswordMsg, changePasswordUrlEntry); } } @@ -1039,7 +1039,7 @@ String currentLdapServersEntry = configurationProvider.getConfigValue(ConfigValues.LdapServers); String currentAdUserId = configurationProvider.getConfigValue(ConfigValues.AdUserId); String ldapProviderType = configurationProvider.getConfigValue(ConfigValues.LDAPProviderTypes); - String changePasswordUrl = configurationProvider.getConfigValue(ConfigValues.ChangePasswordUrl); + String changePasswordUrl = configurationProvider.getConfigValue(ConfigValues.ChangePasswordMsg); DomainsConfigurationEntry adUserNameEntry = new DomainsConfigurationEntry(currentAdUserNameEntry, DOMAIN_SEPERATOR, VALUE_SEPERATOR); diff --git a/packaging/bin/engine-manage-domains.sh b/packaging/bin/engine-manage-domains.sh index 8519e21..bc99b7e 100755 --- a/packaging/bin/engine-manage-domains.sh +++ b/packaging/bin/engine-manage-domains.sh @@ -11,7 +11,7 @@ cat << __EOF__ engine-manage-domains: add/edit/delete/validate/list domains USAGE: - engine-manage-domains -action=ACTION [-domain=DOMAIN -provider=PROVIDER -user=USER -passwordFile=PASSWORD_FILE -interactive -configFile=PATH -addPermissions -forceDelete -ldapServers=LDAP_SERVERS -changePasswordUrl] -report + engine-manage-domains -action=ACTION [-domain=DOMAIN -provider=PROVIDER -user=USER -passwordFile=PASSWORD_FILE -interactive -configFile=PATH -addPermissions -forceDelete -ldapServers=LDAP_SERVERS -changePasswordMsg] -report Where: ACTION action to perform (add/edit/delete/validate/list). See details below. DOMAIN (mandatory for add, edit and delete) the domain you wish to perform the action on. @@ -21,7 +21,7 @@ interactive alternative for using -passwordFile - read the password interactively. PATH (optional) use the given alternate configuration file. LDAP_SERVERS (optional) a comma delimited list of LDAP servers to be set to the domain. - CHANGE_PASSWORD_URL (optional) a URL to be returned to the user in case the password has expired. + CHANGE_PASSWORD_MSG (optional) a URL or a message to be returned to the user in case the password has expired. Available actions: add @@ -101,7 +101,7 @@ LdapServers= LDAPProviderTypes= LDAPServerPort= -ChangePasswordUrl= +ChangePasswordMsg= __EOF__ # diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 42ae244..fe7c4ff 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -26,6 +26,7 @@ select fn_db_rename_config_key('PowerClientAutoRegistrationDefaultVdsGroupID','AutoRegistrationDefaultVdsGroupID','general'); select fn_db_rename_config_key('PowerClientAutoInstallCertificateOnApprove','AutoInstallCertificateOnApprove','general'); select fn_db_rename_config_key('UseSecureConnectionWithServers', 'EncryptHostCommunication', 'general'); +select fn_db_rename_config_key('ChangePasswordUrl', 'ChangePasswordMsg', 'general'); ------------------------------------------------------------------------------------ -- Add configuration values section -- To view, visit http://gerrit.ovirt.org/23799 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9f656f38f7f48e169ed01ad084d7f424e5c749f3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
