From 4a193ffd0fd9b9c940980a3655ea6bb6d11ae5a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20A=2E=20S=C3=A1nchez=20L=C3=B3pez?=
 <esanchez@yaco.es>
Date: Tue, 25 Oct 2011 22:55:05 +0000
Subject: [PATCH] Allow to write htdigest files without using htdigest program
 that needs to be intereactive. Fixes #688  - Legacy-Id: 3518

---
 ietf/registration/forms.py | 18 ++++++++++++++++++
 ietf/registration/views.py |  2 --
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ietf/registration/forms.py b/ietf/registration/forms.py
index d5c98ecd6..1bb2d7626 100644
--- a/ietf/registration/forms.py
+++ b/ietf/registration/forms.py
@@ -1,3 +1,4 @@
+import subprocess
 import datetime
 import hashlib
 
@@ -75,6 +76,7 @@ class PasswordForm(forms.Form):
     password1 = forms.CharField(label=_("Password"), widget=forms.PasswordInput)
     password2 = forms.CharField(label=_("Password confirmation"), widget=forms.PasswordInput,
         help_text=_("Enter the same password as above, for verification."))
+    realm = 'IETF'
 
     def __init__(self, *args, **kwargs):
         self.username = kwargs.pop('username')
@@ -104,6 +106,21 @@ class PasswordForm(forms.Form):
     def get_user(self):
         return User.objects.get(username=self.username)
 
+    def save_password_file(self):
+        if settings.USE_PYTHON_HTDIGEST:
+            pass_file = settings.HTPASSWD_FILE
+            realm = settings.HTDIGEST_REALM
+            password = self.get_password()
+            username = self.username
+            prefix = '%s:%s:' % (username, realm)
+            key = hashlib.md5(prefix + password).hexdigest()
+            f = open(pass_file, 'w+')
+            f.write('%s%s\n' % (prefix, key))
+            f.close()
+        else:
+            p = subprocess.Popen([settings.HTPASSWD_COMMAND, "-b", settings.HTPASSWD_FILE, self.username, self.get_password()], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            stdout, stderr = p.communicate()
+
     def save(self):
         if self.update_user:
             user = self.get_user()
@@ -111,4 +128,5 @@ class PasswordForm(forms.Form):
             user = self.create_user()
         user.set_password(self.get_password())
         user.save()
+        self.save_password_file()
         return user
diff --git a/ietf/registration/views.py b/ietf/registration/views.py
index 981875caf..d0c35417b 100644
--- a/ietf/registration/views.py
+++ b/ietf/registration/views.py
@@ -40,7 +40,6 @@ def confirm_register_view(request, username, date, realm, registration_hash):
         form = PasswordForm(request.POST, username=username)
         if form.is_valid():
             form.save()
-            # TODO: Add the user in the htdigest file
             success = True
     else:
         form = PasswordForm(username=username)
@@ -74,7 +73,6 @@ def confirm_password_recovery(request, username, date, realm, recovery_hash):
         form = PasswordForm(request.POST, update_user=True, username=user.username)
         if form.is_valid():
             user = form.save()
-            # TODO: Update the user in the htdigest file
             success = True
     else:
         form = PasswordForm(username=user.username)