YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[enh] automatically migrate tsig done using md5 to sha512 when doing a dyndns update

Browse source
This commit is contained in:
Laurent Peuch 2017-09-21 06:56:11 +02:00
parent f5f813badb
commit 87a5759ca4
1 changed files with 44 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/yunohost/dyndns.py
View file

@ -182,6 +182,8 @@ def dyndns_update(dyn_host="dyndns.yunohost.org", domain=None, key=None,
if domain is None: if domain is None:
# Retrieve the first registered domain # Retrieve the first registered domain
for path in glob.iglob('/etc/yunohost/dyndns/K*.private'): for path in glob.iglob('/etc/yunohost/dyndns/K*.private'):
match = RE_DYNDNS_PRIVATE_KEY_SHA512.match(path)
if not match:
match = RE_DYNDNS_PRIVATE_KEY_MD5.match(path) match = RE_DYNDNS_PRIVATE_KEY_MD5.match(path)
if not match: if not match:
continue continue
@ -213,6 +215,11 @@ def dyndns_update(dyn_host="dyndns.yunohost.org", domain=None, key=None,
key = keys[0] key = keys[0]
# this mean that hmac-md5 is used
if "+157" in key:
print "detecting md5 key"
key = _migrate_from_md5_tsig_to_sha512_tsig(key, domain, dyn_host)
host = domain.split('.')[1:] host = domain.split('.')[1:]
host = '.'.join(host) host = '.'.join(host)
@ -269,6 +276,41 @@ def dyndns_update(dyn_host="dyndns.yunohost.org", domain=None, key=None,
f.write(ipv6) f.write(ipv6)
def _migrate_from_md5_tsig_to_sha512_tsig(private_key_path, domain, dyn_host):
public_key_path = private_key_path.rsplit(".private", 1)[0] + ".key"
public_key_md5 = open(public_key_path).read().strip().split(' ')[-1]
os.system('cd /etc/yunohost/dyndns && '
'dnssec-keygen -a hmac-sha512 -b 512 -r /dev/urandom -n USER %s' % domain)
os.system('chmod 600 /etc/yunohost/dyndns/*.key /etc/yunohost/dyndns/*.private')
# +165 means that this file store a hmac-sha512 key
new_key_path = glob.glob('/etc/yunohost/dyndns/*+165*.key')[0]
public_key_sha512 = open(new_key_path).read().strip().split(' ', 6)[-1]
try:
r = requests.put('https://%s/migrate_key_to_sha512/' % (dyn_host),
data={
'public_key_md5': base64.b64encode(public_key_md5),
'public_key_sha512': base64.b64encode(public_key_sha512),
})
except requests.ConnectionError:
raise MoulinetteError(errno.ENETUNREACH, m18n.n('no_internet_connection'))
if r.status_code != 201:
print r.text
error = json.loads(r.text)['error']
print "ERROR:", error
# raise MoulinetteError(errno.EPERM,
# m18n.n('dyndns_registration_failed', error=error))
# XXX print warning
os.system("mv /etc/yunohost/dyndns/*+165* /tmp")
return public_key_path
os.system("mv /etc/yunohost/dyndns/*+157* /tmp")
return new_key_path.rsplit(".key", 1)[0] + ".private"
def dyndns_installcron(): def dyndns_installcron():
""" """
Install IP update cron Install IP update cron