Merge branch 'master' of ssh://git.onelab.eu/git/plcapi

[plcapi.git] / PLC / Auth.py

diff --git a/PLC/Auth.py b/PLC/Auth.py
index 89e5ca1..a15bff2 100644 (file)
--- a/PLC/Auth.py
+++ b/PLC/Auth.py
@@ -132,7 +132,9 @@ class SessionAuth(Auth):
                 node = nodes[0]
 
                 if 'node' not in method.roles:
-                    raise PLCAuthenticationFailure, "SessionAuth: Not allowed to call method %s, missing 'node' role"%method.name
+                    # using PermissionDenied rather than AuthenticationFailure here because
+                    # if that fails we don't want to delete the session..
+                    raise PLCPermissionDenied, "SessionAuth: Not allowed to call method %s, missing 'node' role"%method.name
 
                 method.caller = node
 
@@ -214,7 +216,6 @@ class BootAuth(Auth):
             if node['key']:
                 key = node['key']
             else:
-                write_debug_line("BootAuth.check: could not get key")
                 raise PLCAuthenticationFailure, "BootAuth: No node key"
 
             # Yes, this is the "canonicalization" method used.