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 remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch
[plcapi.git]
/
PLC
/
Auth.py
diff --git
a/PLC/Auth.py
b/PLC/Auth.py
index
f71b634
..
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.13 2007/01/30 23:09:55 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
@@
-92,7
+93,7
@@
class GPGAuth(Auth):
for key in keys:
try:
from PLC.GPG import gpg_verify
for key in keys:
try:
from PLC.GPG import gpg_verify
- gpg_verify(
method.name, args, auth['signature'], key
)
+ gpg_verify(
args, key, auth['signature'], method.name
)
return
except PLCAuthenticationFailure, fault:
pass
return
except PLCAuthenticationFailure, fault:
pass
@@
-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]
@@
-295,7
+296,7
@@
class PasswordAuth(Auth):
assert auth.has_key('Username')
# Get record (must be enabled)
assert auth.has_key('Username')
# Get record (must be enabled)
- persons = Persons(method.api, {'email': auth['Username'], 'enabled': True, 'peer_id': None})
+ persons = Persons(method.api, {'email': auth['Username']
.lower()
, 'enabled': True, 'peer_id': None})
if len(persons) != 1:
raise PLCAuthenticationFailure, "No such account"
if len(persons) != 1:
raise PLCAuthenticationFailure, "No such account"
@@
-326,6
+327,6
@@
class PasswordAuth(Auth):
raise PLCAuthenticationFailure, "Password verification failed"
if not set(person['roles']).intersection(method.roles):
raise PLCAuthenticationFailure, "Password verification failed"
if not set(person['roles']).intersection(method.roles):
-
raise PLCAuthenticationFailure, "Not allowed to call method"
+ raise PLCAuthenticationFailure, "Not allowed to call method"
method.caller = person
method.caller = person