Merge lp:~anybox/openobject-addons/lp1040901 into lp:openobject-addons

Proposed by Georges Racinet
Status: Merged
Merged at revision: 7890
Proposed branch: lp:~anybox/openobject-addons/lp1040901
Merge into: lp:openobject-addons
Diff against target: 29 lines (+11/-1)
1 file modified
auth_openid/controllers/main.py (+11/-1)
To merge this branch: bzr merge lp:~anybox/openobject-addons/lp1040901
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+124359@code.launchpad.net

Description of the change

Change the name in TMPDIR of the created/used OpenID session store to depend on the system user. Still allows multiple processes sharing one (WSGI cases), provided they run under the same system user.

To post a comment you must log in.
Revision history for this message
Fabien (Open ERP) (fp-tinyerp) wrote :

I suggest to put this in a module.

Revision history for this message
Olivier Dony (Odoo) (odo-openerp) wrote :

The patch was merged some time ago in trunk[1], thanks a lot for the contribution :-)

[1] rev.7890 revid:gracinet@purity-20120914081101-4bx5yi8fxrlbav1r

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'auth_openid/controllers/main.py'
2--- auth_openid/controllers/main.py 2012-08-31 13:51:36 +0000
3+++ auth_openid/controllers/main.py 2012-09-14 08:22:23 +0000
4@@ -22,6 +22,7 @@
5 import logging
6 import os
7 import tempfile
8+import getpass
9 import urllib
10 from openerp import SUPERUSER_ID
11
12@@ -46,7 +47,16 @@
13 _logger = logging.getLogger(__name__)
14 oidutil.log = _logger.debug
15
16-_storedir = os.path.join(tempfile.gettempdir(), 'openerp-auth_openid-store')
17+def get_system_user():
18+ """Return system user info string, such as USERNAME-EUID"""
19+ info = getpass.getuser()
20+ euid = getattr(os, 'geteuid', None) # Non available on some platforms
21+ if euid is not None:
22+ info = '%s-%d' % (info, euid())
23+ return info
24+
25+_storedir = os.path.join(tempfile.gettempdir(),
26+ 'openerp-auth_openid-%s-store' % get_system_user())
27
28 class GoogleAppsAwareConsumer(consumer.GenericConsumer):
29 def complete(self, message, endpoint, return_to):

Subscribers

People subscribed via source and target branches

to all changes: