request.log was removed in Moinmoin 1.9. This also deprecates the
verbose setting, which is no longer needed.
import md5
from MoinMoin import user
from MoinMoin.auth import BaseAuth, ContinueLogin
import md5
from MoinMoin import user
from MoinMoin.auth import BaseAuth, ContinueLogin
+from MoinMoin import log
+logging = log.getLogger(__name__)
class mysql_login(BaseAuth):
logout_possible = True
login_inputs = ['username', 'password']
class mysql_login(BaseAuth):
logout_possible = True
login_inputs = ['username', 'password']
- def __init__(self, name='mysql', dbhost=None, dbuser=None, dbpass=None, dbname=None, dbport=None, verbose=False, hint=None):
+ def __init__(self, name='mysql', dbhost=None, dbuser=None, dbpass=None, dbname=None, dbport=None, hint=None):
"""
Authenticate using credentials from a mysql database
"""
Authenticate using credentials from a mysql database
The hint parameter is a snippet of HTML that is displayed below the login form.
"""
The hint parameter is a snippet of HTML that is displayed below the login form.
"""
self.dbhost = dbhost
self.dbuser = dbuser
self.dbpass = dbpass
self.dbhost = dbhost
self.dbuser = dbuser
self.dbpass = dbpass
import sys
import traceback
info = sys.exc_info()
import sys
import traceback
info = sys.exc_info()
- request.log("mysql_login: authentication failed due to exception connecting to DB, traceback follows...")
- request.log(''.join(traceback.format_exception(*info)))
+ logging.error("mysql_login: authentication failed due to exception connecting to DB, traceback follows...")
+ logging.error(''.join(traceback.format_exception(*info)))
username = kw.get('username')
password = kw.get('password')
username = kw.get('username')
password = kw.get('password')
- if self.verbose: request.log("mysql_login: Trying to log in, username=%r " % (username))
+ logging.debug("mysql_login: Trying to log in, username=%r " % (username))
# simply continue if something else already logged in
# successfully
# simply continue if something else already logged in
# successfully
# Login incorrect
if (not email):
# Login incorrect
if (not email):
- if self.verbose: request.log("mysql_login: authentication failed for %s" % (username))
+ logging.debug("mysql_login: authentication failed for %s" % (username))
return ContinueLogin(user_obj)
return ContinueLogin(user_obj)
- if self.verbose: request.log("mysql_login: authenticated %s (email %s)" % (username, email))
+ logging.debug("mysql_login: authenticated %s (email %s)" % (username, email))
u = user.User(request, auth_username=username, auth_method=self.name, auth_attribs=('name', 'password', 'email'))
u.email = email
u = user.User(request, auth_username=username, auth_method=self.name, auth_attribs=('name', 'password', 'email'))
u.email = email
import sys
import traceback
info = sys.exc_info()
import sys
import traceback
info = sys.exc_info()
- request.log("mysql_login: authentication failed due to unexpected exception, traceback follows...")
- request.log(''.join(traceback.format_exception(*info)))
+ logging.error("mysql_login: authentication failed due to unexpected exception, traceback follows...")
+ logging.error(''.join(traceback.format_exception(*info)))
return ContinueLogin(user_obj)
def login_hint(self, request):
return ContinueLogin(user_obj)
def login_hint(self, request):
from dbsettings import phpbb_dbhost, phpbb_dbuser, phpbb_dbpass, phpbb_dbname
phpbb = mysql_login(
name = 'phpbb',
from dbsettings import phpbb_dbhost, phpbb_dbuser, phpbb_dbpass, phpbb_dbname
phpbb = mysql_login(
name = 'phpbb',
dbhost = phpbb_dbhost,
dbuser = phpbb_dbuser,
dbpass = phpbb_dbpass,
dbhost = phpbb_dbhost,
dbuser = phpbb_dbuser,
dbpass = phpbb_dbpass,