git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge from trunk
[plcapi.git]
/
PLC
/
Auth.py
diff --git
a/PLC/Auth.py
b/PLC/Auth.py
index
a062b3a
..
498acc5
100644
(file)
--- a/
PLC/Auth.py
+++ b/
PLC/Auth.py
@@
-4,7
+4,7
@@
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: Auth.py
,v 1.15 2007/02/01 22:28:48 mlhuang Exp
$
+# $Id: Auth.py
5574 2007-10-25 20:33:17Z thierry
$
#
import crypt
#
import crypt
@@
-16,6
+16,7
@@
from PLC.Faults import *
from PLC.Parameter import Parameter, Mixed
from PLC.Persons import Persons
from PLC.Nodes import Node, Nodes
from PLC.Parameter import Parameter, Mixed
from PLC.Persons import Persons
from PLC.Nodes import Node, Nodes
+from PLC.NodeNetworks import NodeNetwork, NodeNetworks
from PLC.Sessions import Session, Sessions
from PLC.Peers import Peer, Peers
from PLC.Boot import notify_owners
from PLC.Sessions import Session, Sessions
from PLC.Peers import Peer, Peers
from PLC.Boot import notify_owners
@@
-146,7
+147,7
@@
class SessionAuth(Auth):
person = persons[0]
if not set(person['roles']).intersection(method.roles):
person = persons[0]
if not set(person['roles']).intersection(method.roles):
- raise PLC
AuthenticationFailure
, "Not allowed to call method"
+ raise PLC
PermissionDenied
, "Not allowed to call method"
method.caller = persons[0]
method.caller = persons[0]