From a5b84c62a3c179e542ef8fdfb2f965181dbf0a7c Mon Sep 17 00:00:00 2001 From: Nikolai R Kristiansen Date: Sun, 15 Mar 2015 23:29:53 +0100 Subject: [PATCH] Radius dry run --- neuf_radius/utils.py | 13 +++++++++++-- neuf_userinfo/utils.py | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/neuf_radius/utils.py b/neuf_radius/utils.py index b28169f..e8de51f 100644 --- a/neuf_radius/utils.py +++ b/neuf_radius/utils.py @@ -1,7 +1,12 @@ +# coding: utf-8 +from __future__ import unicode_literals +import logging from passlib.hash import nthash from neuf_radius.models import Radcheck +logger = logging.getLogger(__name__) + def radius_create(raw_password): return nthash.encrypt(raw_password) @@ -26,6 +31,10 @@ def set_radius_password(username, raw_password): radius_user.save() -def radius_create_user(username, password): - set_radius_password(username, password) +def radius_create_user(username, password, dry_run=False): + if not dry_run: + set_radius_password(username, password) + else: + logger.debug('Setting radius password for \'{}\''.format(username)) + return True \ No newline at end of file diff --git a/neuf_userinfo/utils.py b/neuf_userinfo/utils.py index a975c38..609e2b0 100644 --- a/neuf_userinfo/utils.py +++ b/neuf_userinfo/utils.py @@ -30,7 +30,7 @@ def add_new_user(user, dry_run=False): # Needs raw password if user.get('password'): # kerberos_create_principal(user['username'], user['password']), # FIXME disabled - radius_create_user(user['username'], user['password']) + radius_create_user(user['username'], user['password'], dry_run=dry_run) """ Rijndael stuff, thank you SO!