Merge lp:~camptocamp/openerp-web/7.0-fix-1157102 into lp:openerp-web/7.0

[Alexandre Fayolle - camptocamp]

[FIX] race condition in session directory creation

try to create the directory and handle the possible exception instead of doing
an unsafe 2 step check and creation.

The issues related to the naming of the directory mentioned in the bug report
are not handled.

[Nicolas Vanhoren (OpenERP) (niv-openerp)]

Seems ok to me.

review: Approve

=== modified file 'addons/web/http.py'
--- addons/web/http.py	2013-03-01 17:16:16 +0000
+++ addons/web/http.py	2013-03-19 10:27:24 +0000
@@ -20,6 +20,7 @@
 import urlparse
 import uuid
 import xmlrpclib
+import errno
 
 import babel.core
 import simplejson
@@ -477,8 +478,15 @@
     except Exception:
         username = "unknown"
     path = os.path.join(tempfile.gettempdir(), "oe-sessions-" + username)
-    if not os.path.exists(path):
+    try:
         os.mkdir(path, 0700)
+    except OSError as exc:
+        if exc.errno == errno.EEXIST:
+            # directory exists: ensure it has the correct permissions
+            # this will fail if the directory is not owned by the current user
+            os.chmod(path, 0700)
+        else:
+            raise
     return path
 
 class Root(object):