Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[hostcfgd] hostcfgd will exit when set hostname in DEVICE_METADATA #3394

Merged
merged 2 commits into from
Sep 25, 2019
Merged

[hostcfgd] hostcfgd will exit when set hostname in DEVICE_METADATA #3394

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
883ed79
[hostcfgd] hostcfgd will exit when set hostname in DEVICE_METADATA
ouxlwhu Aug 29, 2019
c599e15
combine the conditional statements into one statement
ouxlwhu Sep 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions files/image_config/hostcfgd/hostcfgd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ TACPLUS_SERVER_TIMEOUT_DEFAULT = "5"
TACPLUS_SERVER_AUTH_TYPE_DEFAULT = "pap"


def is_valid_hostname(name):
def is_valid_hostname(hostname):
if hostname[-1] == ".":
hostname = hostname[:-1] # strip exactly one dot from the right, if present
return False
if len(hostname) > 253:
jleveque marked this conversation as resolved.
Show resolved Hide resolved
return False
allowed = re.compile("(?!-)[A-Z\d-]{1,63}(?<!-)$", re.IGNORECASE)
Expand Down Expand Up @@ -187,6 +187,7 @@ class HostConfigDaemon:
syslog.syslog(syslog.LOG_WARNING, "hostname key is missing")
return
if not is_valid_hostname(hostname):
syslog.syslog(syslog.LOG_WARNING, "hostname {} is invalid".format(hostname))
return
if hostname == self.hostname_cache:
return
Expand Down