Changeset 1729

Timestamp:

12/22/06 05:55:49 (2 years ago)

Author:

wkornew

Message:

DbAuthPlugin:

Fixed typo.
Changed SQL style to match Trac.
Removed "Cancel" buttons from interface.

Files:

• dbauthplugin/simple/dbauth/auth.py (modified) (14 diffs)
• dbauthplugin/simple/dbauth/templates/login.cs (modified) (1 diff)
• dbauthplugin/simple/dbauth/templates/password.cs (modified) (1 diff)

dbauthplugin/simple/dbauth/auth.py

@@ -52 +52 @@
-    password_changeable = BoolOption('dbauth', 'password_changeable', 'false',
-        """Allow user to change his password.""")
-md5
+sha
-        """Choose which hash algorithm to use. Possible options:
-        md5, sha""")
@@ -98 +98 @@
-                yield 'metanav', 'password', \
-                    Markup('<a href="%s">Password</a>' \
-self.env
+req
-            yield 'metanav', 'logout', Markup('<b><a href="%s">Logout</a></b>' \
-self.env
+req
-        else:
-            yield 'metanav', 'login', Markup('<b><a href="%s">Login</a></b>' \
-self.env
+req
-
-    # IRequestHandler methods
@@ -119 +119 @@
-                referer = req.args.get('referer')
-                if not referer or len(referer) == 0:
-selv.env
+req
-                if self._check_login(uid, pwd):
-                    self._do_login(req, uid)
@@ -141 +141 @@
-        if not referer or referer.endswith('/login') or \
-                referer.endswith('/settings') or len(referer) == 0:
-self.env
+req
-
-        if req.path_info.startswith('/login'):
@@ -174 +174 @@
-        db = get_db(self.env)
-        cursor = db.cursor()
-'SELECT %s FROM %s WHERE %s = %%s'
+"SELECT %s FROM %s WHERE LOWER(%s) = LOWER(%%s)"
-              (self.users['password'], self.users['table'],
-               self.users['username'])
@@ -191 +191 @@
-        db = self.env.get_db_cnx()
-        cursor = db.cursor()
-'INSERT INTO auth_cookie ' \
-'(cookie ,name ,ipnr ,time) ' \
-'VALUES (%s, %s, %s, %s)'
+"INSERT INTO auth_cookie "
+"(cookie ,name ,ipnr ,time) "
+"VALUES (%s, %s, %s, %s)"
-                       (cookie, remote_user, req.remote_addr,
-                        int(time.time())))
@@ -199 +199 @@
-
-        req.outcookie['db_auth'] = cookie
-self.env
+req
-        req.outcookie['db_auth']['expires'] = 100000000
-
@@ -215 +215 @@
-        db = self.env.get_db_cnx()
-        cursor = db.cursor()
-'DELETE FROM auth_cookie ' \
-'WHERE name = %s OR time < %s'
+"DELETE FROM auth_cookie "
+"WHERE LOWER(name) = LOWER(%s) OR time < %s"
-                       (req.authname, int(time.time()) - self.session_lifetime))
-        db.commit()
@@ -225 +225 @@
-        "expires" property to a date in the past."""
-        req.outcookie['db_auth'] = ''
-self.env
+req
-        req.outcookie['db_auth']['expires'] = -10000
-
@@ -234 +234 @@
-        db = self.env.get_db_cnx()
-        cursor = db.cursor()
-'SELECT name, time FROM auth_cookie ' \
-'WHERE cookie = %s'
+"SELECT name, time FROM auth_cookie "
+"WHERE cookie = %s"
-                       (cookie,))
-        row = cursor.fetchone()
-        if not row or row[1] < int(time.time()) - self.session_lifetime:
-            # the cookie has become invalid
-'DELETE FROM auth_cookie ' \
-'WHERE time < %s'
+"DELETE FROM auth_cookie "
+"WHERE time < %s"
-                           (int(time.time()) - self.session_lifetime,))
-            db.commit()
@@ -248 +248 @@
-        elif row[1] < int(time.time()) - 60 * 60:
-            # refresh session
-'UPDATE auth_cookie ' \
-'SET time = %s, ipnr = %s ' \
-'WHERE cookie = %s'
+"UPDATE auth_cookie "
+"SET time = %s, ipnr = %s "
+"WHERE cookie = %s"
-                           (int(time.time()), req.remote_addr, cookie))
-            db.commit()
-            req.outcookie['db_auth'] = cookie
-self.env
+req
-            req.outcookie['db_auth']['expires'] = 100000000
-            # Don't forget to check whether we have a new email address.
@@ -267 +267 @@
-        db = get_db(self.env)
-        cursor = db.cursor()
-'SELECT %s FROM %s WHERE %s = %%s'
+"SELECT %s FROM %s WHERE %s = %%s"
-              (email_field, self.users['table'],
-               self.users['username'])
@@ -277 +277 @@
-        db = self.env.get_db_cnx()
-        cursor = db.cursor()
-'DELETE FROM session_attribute ' \
-'WHERE name="email" AND sid=%s AND authenticated=1'
+"DELETE FROM session_attribute "
+"WHERE name='email' AND sid=%s AND authenticated=1"
-                       (user,))
-'INSERT INTO session_attribute ' \
-'(sid, authenticated, name, value) ' \
-'VALUES (%s, 1, "email", %s)'
+"INSERT INTO session_attribute "
+"(sid, authenticated, name, value) "
+"VALUES (%s, 1, 'email', %s)"
-                       (user, email))
-        db.commit()
@@ -295 +295 @@
-        db = get_db(self.env)
-        cursor = db.cursor()
-'UPDATE %s SET %s = %%s WHERE %s = %%s'
+"UPDATE %s SET %s = %%s WHERE LOWER(%s) = LOWER(%%s)"
-              (self.users['table'], self.users['password'],
-               self.users['username'])

dbauthplugin/simple/dbauth/templates/login.cs

@@ -22 +22 @@
-    <input type="hidden" name="referer" value="<?cs var:referer ?>">
-    <input type="submit" name="login" value="Login" />
-    <input type="submit" name="cancel" value="Cancel" />
-  </div>
-</form>

dbauthplugin/simple/dbauth/templates/password.cs

@@ -23 +23 @@
-  <div class="buttons">
-    <input type="submit" name="password" value="Change" />
-    <input type="submit" name="cancel" value="Cancel" />
-  </div>
-</form>