Browse Source

Fix SQL error when an user logs in twice during a transaction

pull/144/head
Matthieu Dietrich 10 years ago
parent
commit
ca48be15ab
  1. 22
      base_login_date_improvement/__init__.py
  2. 38
      base_login_date_improvement/__openerp__.py
  3. 108
      base_login_date_improvement/res_users.py

22
base_login_date_improvement/__init__.py

@ -0,0 +1,22 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Author: Matthieu Dietrich
# Copyright 2015 Camptocamp SA
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from . import res_users

38
base_login_date_improvement/__openerp__.py

@ -0,0 +1,38 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Author: Matthieu Dietrich
# Copyright 2015 Camptocamp SA
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
{"name": "Base Login Date Improvement",
"version": "1.0",
"author": "Camptocamp,Odoo Community Association (OCA)",
"category": "Specific Module",
"description": """
Module to separate the login date from res.users; on long transactions,
"re-logging" by opening a new tab changes the current res.user row,
which creates concurrency issues with PostgreSQL in the first transaction.
This creates a new table and a function field to avoid this.
""",
"website": "http://camptocamp.com",
"depends": ['base'],
"data": [],
"auto_install": False,
"installable": True
}

108
base_login_date_improvement/res_users.py

@ -0,0 +1,108 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Author: Matthieu Dietrich
# Copyright 2015 Camptocamp SA
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import logging
import openerp.exceptions
from openerp import pooler, SUPERUSER_ID
from openerp.osv import orm, fields
_logger = logging.getLogger(__name__)
# New class to store the login date
class ResUsersLogin(orm.Model):
_name = 'res.users.login'
_columns = {
'user_id': fields.many2one('res.users', 'User', required=True),
'login_dt': fields.date('Latest connection'),
}
class ResUsers(orm.Model):
_inherit = 'res.users'
# Function to retrieve the login date from the res.users object
# (used in some functions, and the user state)
def _get_login_date(self, cr, uid, ids, name, args, context=None):
res = {}
user_login_obj = self.pool['res.users.login']
for user_id in ids:
login_ids = user_login_obj.search(
cr, uid, [('user_id', '=', user_id)], limit=1,
context=context)
if len(login_ids) == 0:
res[user_id] = False
else:
login = user_login_obj.browse(cr, uid, login_ids[0],
context=context)
res[user_id] = login.login_dt
return res
_columns = {
'login_date': fields.function(_get_login_date,
string='Latest connection',
type='date', select=1,
readonly=True, store=False),
}
# Re-defining the login function in order to use the new table
def login(self, db, login, password):
if not password:
return False
user_id = False
cr = pooler.get_db(db).cursor()
try:
cr.autocommit(True)
# check if user exists
res = self.search(cr, SUPERUSER_ID, [('login', '=', login)])
if res:
user_id = res[0]
# check credentials
self.check_credentials(cr, user_id, password)
try:
update_clause = ('NO KEY UPDATE'
if cr._cnx.server_version >= 90300
else 'UPDATE')
cr.execute("SELECT login_dt "
"FROM res_users_login "
"WHERE user_id=%%s "
"FOR %s NOWAIT" % update_clause,
(user_id,), log_exceptions=False)
# create login line if not existing
result = cr.fetchone()
if not result:
cr.execute("INSERT INTO res_users_login "
"(user_id) VALUES (%s)", (user_id,))
cr.execute("UPDATE res_users_login "
"SET login_dt = now() AT TIME ZONE 'UTC' "
"WHERE user_id=%s", (user_id,))
except Exception:
_logger.debug("Failed to update last_login "
"for db:%s login:%s",
db, login, exc_info=True)
except openerp.exceptions.AccessDenied:
_logger.info("Login failed for db:%s login:%s", db, login)
user_id = False
finally:
cr.close()
return user_id
Loading…
Cancel
Save