nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-01-21 07:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

config, dynamicdns, pagekite: Remove incorrect use of str

Browse Source 
This was used before to ensure the domain name was ASCII. However, str
does not convert to ASCII in Python 3.

Note that in config module, which sets the system domain name, the
domain is already restricted to alphanumerics, hyphen, and period.

Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
Reviewed-by: Veiko Aasa <veiko17@disroot.org>
This commit is contained in:
James Valleroy 2021-03-27 16:12:20 -04:00 committed by Veiko Aasa
parent 0b630037f9
commit 48d7f68ed5
No known key found for this signature in database
GPG Key ID: 478539CAE680674E
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plinth/modules/config/views.py
View File

@ -117,9 +117,6 @@ def set_domainname(domainname, old_domainname):
"""Sets machine domain name to domainname"""
old_domainname = config.get_domainname()
# Domain name should be ASCII. If it's unicode, convert to ASCII.
domainname = str(domainname)
# Domain name is not case sensitive, but Let's Encrypt certificate
# paths use lower-case domain name.
domainname = domainname.lower()

6
plinth/modules/dynamicdns/views.py
View File

@ -129,13 +129,9 @@ def _apply_changes(request, old_status, new_status):
if new_status.get('use_ipv6'):
use_ipv6 = "enabled"
# Domain name should be ASCII. If it's unicode, convert to
# ASCII.
new_domain_name = str(new_status['dynamicdns_domain'])
# Domain name is not case sensitive, but Let's Encrypt
# certificate paths use lower-case domain name.
new_domain_name = new_domain_name.lower()
new_domain_name = new_status['dynamicdns_domain'].lower()
_run([
'configure',

6
plinth/modules/pagekite/forms.py
View File

@ -67,12 +67,8 @@ class ConfigurationForm(forms.Form):
old = _filter(self.initial)
new = _filter(self.cleaned_data)
# Kite name should be ASCII. If it's unicode, convert to
# ASCII.
kite_name = str(new['kite_name'])
# Let's Encrypt certificate paths use lower-case kite name.
kite_name = kite_name.lower()
kite_name = new['kite_name'].lower()
if old != new:
frontend = f"{new['server_domain']}:{new['server_port']}"