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

Ability to set custom TTL values for custom DNS records #2043

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Ability to set custom TTL values for custom DNS records #2043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b0b2a1
Ability to set custom TTL values for custom DNS records (#28)
ddavness Sep 16, 2021
b3509e6
Fix merging deleting ttl's from some records
ddavness Sep 28, 2021
52d6bbc
Update form style to be consistent with the style of the rest of the …
ddavness Oct 2, 2021
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
32 changes: 24 additions & 8 deletions management/daemon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,12 +304,14 @@ def dns_get_records(qname=None, rtype=None):

# Make a better data structure.
records = [
{
"qname": r[0],
"rtype": r[1],
"value": r[2],
"sort-order": { },
} for r in records ]
{
"qname": r[0],
"rtype": r[1],
"value": r[2],
"ttl": r[3],
"sort-order": { },
}
for r in records ]

# To help with grouping by zone in qname sorting, label each record with which zone it is in.
# There's an inconsistency in how we handle zones in get_dns_zones and in sort_domains, so
Expand Down Expand Up @@ -349,7 +351,21 @@ def dns_set_record(qname, rtype="A"):

# Read the record value from the request BODY, which must be
# ASCII-only. Not used with GET.
value = request.stream.read().decode("ascii", "ignore").strip()
rec = request.form
value = ""
ttl = None

if isinstance(rec, dict):
value = request.form.get("value", "")
ttl = request.form.get("ttl", None)
else:
value = request.stream.read().decode("ascii", "ignore").strip()

if ttl is not None:
try:
ttl = int(ttl)
except Exception:
ttl = None

if request.method == "GET":
# Get the existing records matching the qname and rtype.
Expand Down Expand Up @@ -383,7 +399,7 @@ def dns_set_record(qname, rtype="A"):
pass
action = "remove"

if set_custom_dns_record(qname, rtype, value, action, env):
if set_custom_dns_record(qname, rtype, value, action, env, ttl = ttl):
return do_dns_update(env) or "Something isn't right."
return "OK"

Expand Down
Loading