Changeset 132

Timestamp:

11/02/05 22:48:48 (3 years ago)

Author:

mgood

Message:

AccountManagerPlugin:

re #70: add a form-based authentication handler (requires disabling the component trac.web.auth.LoginModule in trac.ini)

Files:

• accountmanagerplugin/0.9/acct_mgr/api.py (modified) (2 diffs)
• accountmanagerplugin/0.9/acct_mgr/htfile.py (modified) (3 diffs)
• accountmanagerplugin/0.9/acct_mgr/web_ui.py (modified) (2 diffs)

accountmanagerplugin/0.9/acct_mgr/api.py

@@ -36 +36 @@
-        Returns True if a new account was created, False if an existing account
-        was updated.
+        """
+
+    def check_password(self, user, password):
+        """Checks if the password is valid for the user.
-        """
-
@@ -87 +91 @@
-            self._notify('password_changed', user, password)
-
+    def check_password(self, user, password):
+        return self.password_store.check_password(user, password)
+
-    def delete_user(self, user):
-        if self.password_store.delete_user(user):

accountmanagerplugin/0.9/acct_mgr/htfile.py

@@ -53 +53 @@
-        return self._update_file(self.prefix(user), None)
-
+    def check_password(self, user, password):
+        filename = self._get_filename()
+        if not os.path.exists(filename):
+            return False
+        prefix = self.prefix(user)
+        fd = file(filename)
+        try:
+            for line in fd:
+                if line.startswith(prefix):
+                    return self._check_userline(password, prefix,
+                                                line[len(prefix):-1])
+        finally:
+            fd.close()
+        return False
+
-    def _get_filename(self):
-        return self.config.get('account-manager', 'password_file')
@@ -105 +120 @@
-
-    def userline(self, user, password):
-
-
+
+
+
+
+
+
-
-    def _get_users(self, filename):
@@ -144 +163 @@
-        return p + md5.new(p + password).hexdigest()
-
+    def _check_userline(self, password, prefix, suffix):
+        return suffix == md5.new(prefix + password).hexdigest()
+
-    def _get_users(self, filename):
-        f = open(filename)

accountmanagerplugin/0.9/acct_mgr/web_ui.py

@@ -14 +14 @@
-from trac import perm, util
-from trac.core import *
+from trac.web import auth
+from trac.web.api import IAuthenticator
-from trac.web.main import IRequestHandler
-from trac.web.chrome import INavigationContributor, ITemplateProvider
@@ -151 +153 @@
-        return [resource_filename(__name__, 'templates')]
-
+def if_enabled(func):
+    def wrap(self, *args, **kwds):
+        if not self.enabled:
+            return None
+        return func(self, *args, **kwds)
+    return wrap
+
+class LoginModule(auth.LoginModule):
+
+    def authenticate(self, req):
+        if req.method == 'POST' and req.path_info.startswith('/login'):
+            req.remote_user = self._remote_user(req)
+        return auth.LoginModule.authenticate(self, req)
+    authenticate = if_enabled(authenticate)
+
+    match_request = if_enabled(auth.LoginModule.match_request)
+
+    def process_request(self, req):
+        if req.path_info.startswith('/login') and req.authname == 'anonymous':
+            req.hdf['referer'] = self._referer(req)
+            if req.method == 'POST':
+                req.hdf['login.error'] = 'Invalid username or password'
+            return 'login.cs', None
+        return auth.LoginModule.process_request(self, req)
+
+    def _do_login(self, req):
+        if not req.remote_user:
+            req.redirect(self.env.abs_href())
+        return auth.LoginModule._do_login(self, req)
+
+    def _remote_user(self, req):
+        user = req.args.get('user')
+        if AccountManager(self.env).check_password(user,
+                req.args.get('password')):
+            return user
+        return None
+
+    def _redirect_back(self, req):
+        """Redirect the user back to the URL she came from."""
+        referer = self._referer(req)
+        if referer and not referer.startswith(req.base_url):
+            # don't redirect to external sites
+            referer = None
+        req.redirect(referer or self.env.abs_href())
+
+    def _referer(self, req):
+        return req.args.get('referer') or req.get_header('Referer')
+
+    def enabled(self):
+        # Users should disable the built-in authentication to use this one
+        return not self.env.is_component_enabled(auth.LoginModule)
+    enabled = property(enabled)
+