IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Validate on the user-provided domain name in the installer.

Browse Source 
Wrap printing exceptions in unicode() to do Gettext conversion.

https://fedorahosted.org/freeipa/ticket/2196
This commit is contained in:
Rob Crittenden
2012-05-11 15:56:43 -04:00
committed by Martin Kosek
parent eef056165f
commit 13b51f3011
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
install/tools/ipa-server-install
View File

@@ -63,6 +63,7 @@ from ipapython.config import IPAOptionParser
from ipalib.dn import DN from ipalib.dn import DN
from ipalib.x509 import load_certificate_from_file, load_certificate_chain_from_file from ipalib.x509 import load_certificate_from_file, load_certificate_chain_from_file
from ipalib.constants import DNS_ZONE_REFRESH from ipalib.constants import DNS_ZONE_REFRESH
from ipalib.util import validate_domain_name
from ipapython import services as ipaservices from ipapython import services as ipaservices
from ipapython.ipa_log_manager import * from ipapython.ipa_log_manager import *
@@ -228,6 +229,12 @@ def parse_options():
if options.admin_password is not None and len(options.admin_password) < 8: if options.admin_password is not None and len(options.admin_password) < 8:
parser.error("Admin user password must be at least 8 characters long") parser.error("Admin user password must be at least 8 characters long")
if options.domain_name is not None:
try:
validate_domain_name(options.domain_name)
except ValueError, e:
parser.error("invalid domain: " + unicode(e))
if not options.setup_dns: if not options.setup_dns:
if options.forwarders: if options.forwarders:
parser.error("You cannot specify a --forwarder option without the --setup-dns option") parser.error("You cannot specify a --forwarder option without the --setup-dns option")
@@ -726,6 +733,10 @@ def main():
if not options.domain_name: if not options.domain_name:
domain_name = read_domain_name(host_name[host_name.find(".")+1:], options.unattended) domain_name = read_domain_name(host_name[host_name.find(".")+1:], options.unattended)
root_logger.debug("read domain_name: %s\n" % domain_name) root_logger.debug("read domain_name: %s\n" % domain_name)
try:
validate_domain_name(domain_name)
except ValueError, e:
sys.exit("Invalid domain name: %s" % unicode(e))
else: else:
domain_name = options.domain_name domain_name = options.domain_name
@@ -1111,9 +1122,9 @@ try:
except Exception, e: except Exception, e:
success = False success = False
if uninstalling: if uninstalling:
message = "Unexpected error - see ipaserver-uninstall.log for details:\n %s" % str(e) message = "Unexpected error - see ipaserver-uninstall.log for details:\n %s" % unicode(e)
else: else:
message = "Unexpected error - see ipaserver-install.log for details:\n %s" % str(e) message = "Unexpected error - see ipaserver-install.log for details:\n %s" % unicode(e)
print message print message
message = str(e) message = str(e)
for str in traceback.format_tb(sys.exc_info()[2]): for str in traceback.format_tb(sys.exc_info()[2]):