nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-20 10:34:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplified hostname name matching test.

Browse Source 
The first character must be a letter, and [A-z] is easier to manage
than 52 individual letters.
This commit is contained in:
Nick Daly 2013-10-27 10:49:53 -05:00
parent 065c25039a
commit 5e9f221ef5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/installed/system/config.py
View File

@ -40,7 +40,7 @@ def valid_hostname(name):
if not is_alphanumeric(name): if not is_alphanumeric(name):
message += "<br />Hostname must be alphanumeric" message += "<br />Hostname must be alphanumeric"
if not name[0] in "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ": if not bool(re.match("A-z", name[0])):
message += "<br />Hostname must start with a letter" message += "<br />Hostname must start with a letter"
return message return message
@ -53,18 +53,19 @@ def set_hostname(hostname):
cfg.log.info("Changing hostname to '%s'" % hostname) cfg.log.info("Changing hostname to '%s'" % hostname)
try: try:
privilegedaction_run("hostname-change", [hostname]) privilegedaction_run("hostname-change", [hostname])
except OSError, e:
raise cherrypy.HTTPError(500, "Updating hostname failed: %s" % e)
else:
# don't persist/cache change unless it was saved successfuly # don't persist/cache change unless it was saved successfuly
sys_store = filedict_con(cfg.store_file, 'sys') sys_store = filedict_con(cfg.store_file, 'sys')
sys_store['hostname'] = hostname sys_store['hostname'] = hostname
except OSError, e:
raise cherrypy.HTTPError(500, "Updating hostname failed: %s" % e)
class general(FormPlugin, PagePlugin): class general(FormPlugin, PagePlugin):
url = ["/sys/config"] url = ["/sys/config"]
order = 30 order = 30
def help(self, *args, **kwargs): def help(self, *args, **kwargs):
return _(#"""<strong>Time Zone</strong> return _(#"""<strong>Time Zone</strong>
"""<p>Set your timezone to get accurate """<p>Set your timezone to get accurate
timestamps. %(product)s will use this information to set your timestamps. %(product)s will use this information to set your
%(box)s's systemwide timezone.</p> %(box)s's systemwide timezone.</p>
@ -108,8 +109,8 @@ class general(FormPlugin, PagePlugin):
raise cherrypy.HTTPError(500, "Unknown Time Zone: %s" % kwargs['time_zone']) raise cherrypy.HTTPError(500, "Unknown Time Zone: %s" % kwargs['time_zone'])
## And now, the form. ## And now, the form.
form = Form(title=_("General Config"), form = Form(title=_("General Config"),
action="/sys/config/general/index", action="/sys/config/general/index",
name="config_general_form", name="config_general_form",
message=message ) message=message )
form.html(self.help()) form.html(self.help())
@ -141,4 +142,3 @@ class general(FormPlugin, PagePlugin):
privilegedaction_run("timezone-change", [time_zone]) privilegedaction_run("timezone-change", [time_zone])
sys_store['time_zone'] = time_zone sys_store['time_zone'] = time_zone
return message or "Settings updated." return message or "Settings updated."