Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: setup - do not accept non-alphanumeric iso domain name ......................................................................
packaging: setup - do not accept non-alphanumeric iso domain name ISO Domain name must contian only alphanumeric characters. Change-Id: If4caf14c80ebbabef6d565b832e725c7cf88c27c Bug-Url: https://bugzilla.redhat.com/1064373 Signed-off-by: Ofer Schreiber <oschr...@redhat.com> (cherry picked from commit d34f1bf9d9389cfd2f80f70f882835bc6d500a6d) --- M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py 1 file changed, 27 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/38/25438/1 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py index 166addf..f68fe6a 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py @@ -24,6 +24,7 @@ import gettext import hashlib import os +import re import uuid _ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') @@ -62,6 +63,7 @@ 'VERSION': 0, 'MASTER_VERSION': 0, } + RE_NOT_ALPHANUMERIC = re.compile(r"[^-\w]") def _generate_md_content(self, sdUUID, description): self.logger.debug('Generating ISO Domain metadata') @@ -375,15 +377,31 @@ if self.environment[ osetupcons.ConfigEnv.ISO_DOMAIN_NAME ] is None: - self.environment[ - osetupcons.ConfigEnv.ISO_DOMAIN_NAME - ] = self.dialog.queryString( - name='ISO_DOMAIN_NAME', - note=_('Local ISO domain name [@DEFAULT@]: '), - prompt=True, - caseSensitive=True, - default=osetupcons.Defaults.DEFAULT_ISO_DOMAIN_NAME, - ) + validName = False + while not validName: + self.environment[ + osetupcons.ConfigEnv.ISO_DOMAIN_NAME + ] = self.dialog.queryString( + name='ISO_DOMAIN_NAME', + note=_('Local ISO domain name [@DEFAULT@]: '), + prompt=True, + caseSensitive=True, + default=osetupcons.Defaults.DEFAULT_ISO_DOMAIN_NAME, + ) + + if self.RE_NOT_ALPHANUMERIC.search( + self.environment[ + osetupcons.ConfigEnv.ISO_DOMAIN_NAME + ] + ): + self.logger.error( + _( + 'Domain name can only consist of alphanumeric ' + 'characters.' + ) + ) + else: + validName = True @plugin.event( stage=plugin.Stages.STAGE_MISC, -- To view, visit http://gerrit.ovirt.org/25438 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If4caf14c80ebbabef6d565b832e725c7cf88c27c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com> Gerrit-Reviewer: Ofer Schreiber <oschr...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
