from django.http import HttpResponse
from manifold.core.query import Query
-from manifold.manifoldapi import execute_query,execute_admin_query
-from portal.models import PendingUser, PendingSlice
+from manifoldapi.manifoldapi import execute_query,execute_admin_query
+from portal.models import PendingUser, PendingSlice, PendingAuthority
import json
+from django.contrib.auth.models import User
+from django.template.loader import render_to_string
+from django.core.mail import send_mail
+
# Thierry: moving this right into the code so
# most people can use myslice without having to install sfa
# XXX tmp sfa dependency, should be moved to SFA gateway
def authority_get_pis(request, authority_hrn):
query = Query.get('authority').filter_by('authority_hrn', '==', authority_hrn).select('pi_users')
- results = execute_query(request, query)
+ results = execute_admin_query(request, query)
# NOTE: temporarily commented. Because results is giving empty list.
# Needs more debugging
#if not results:
return results
def authority_get_pi_emails(request, authority_hrn):
- return ['jordan.auge@lip6.fr', 'loic.baron@lip6.fr']
-
pi_users = authority_get_pis(request,authority_hrn)
- pi_user_hrns = [ hrn for x in pi_users for hrn in x['pi_users'] ]
- query = Query.get('user').filter_by('user_hrn', 'included', pi_user_hrns).select('email')
- results = execute_query(request, query)
- print "mails", [result['email'] for result in results]
- return [result['email'] for result in results]
+ if any(d['pi_users'] == None for d in pi_users):
+ return ['support@myslice.info']
+ else:
+ pi_user_hrns = [ hrn for x in pi_users for hrn in x['pi_users'] ]
+ query = Query.get('user').filter_by('user_hrn', 'included', pi_user_hrns).select('user_email')
+ results = execute_admin_query(request, query)
+ return [result['user_email'] for result in results]
-# SFA add record (user, slice)
+def is_pi(wsgi_request, user_hrn, authority_hrn):
+ # XXX could be done in a single query !
-def sfa_add_user(request, user_params):
- query = Query.create('user').set(user_params).select('user_hrn')
+ # select pi_authorities from user where user_hrn == "ple.upmc.jordan_auge"
+ query = Query.get('user').filter_by('user_hrn', '==', user_hrn).select('pi_authorities')
+ results = execute_admin_query(wsgi_request, query)
+ if not results:
+ # XXX Warning ?
+ return False
+ result = results[0]
+ user_authority_hrns = result.get('pi_authorities', [])
+ return authority_hrn in user_authority_hrns
+
+# SFA get record
+
+def sfa_get_user(request, user_hrn, pub):
+ query_sfa_user = Query.get('user').filter_by('user_hrn', '==', user_hrn)
+ result_sfa_user = execute_query(request, query_sfa_user)
+ return result_sfa_user
+
+def sfa_update_user(request, user_hrn, user_params):
+ # user_params: keys [public_key]
+ if 'email' in user_params:
+ user_params['user_email'] = user_params['email']
+ query = Query.update('user').filter_by('user_hrn', '==', user_hrn).set(user_params).select('user_hrn')
+ results = execute_query(request,query)
+ return results
+
+def sfa_add_authority(request, authority_params):
+ query = Query.create('authority').set(authority_params).select('authority_hrn')
results = execute_query(request, query)
+ print "sfa_add_auth results=",results
if not results:
- raise Exception, "Could not create %s. Already exists ?" % user_params['hrn']
+ raise Exception, "Could not create %s. Already exists ?" % authority_params['hrn']
return results
-def sfa_add_slice(request, slice_params):
- query = Query.create('slice').set(slice_params).select('slice_hrn')
+def sfa_add_user_to_slice(request, user_hrn, slice_params):
+# UPDATE myslice:slice SET researcher=['ple.upmc.jordan_auge','ple.inria.thierry_parmentelat','ple.upmc.loic_baron','ple.upmc.ciro_scognamiglio','ple.upmc.mohammed-yasin_rahman','ple.upmc.azerty'] where slice_hrn=='ple.upmc.myslicedemo'
+ query_current_users = Query.get('slice').select('user').filter_by('slice_hrn','==',slice_params['hrn'])
+ results_current_users = execute_query(request, query_current_users)
+ slice_params['researcher'] = slice_params['researcher'] | results_current_users
+ query = Query.update('slice').filter_by('user_hrn', '==', user_hrn).set(slice_params).select('slice_hrn')
results = execute_query(request, query)
+# Also possible but not supported yet
+# UPDATE myslice:user SET slice=['ple.upmc.agent','ple.upmc.myslicedemo','ple.upmc.tophat'] where user_hrn=='ple.upmc.azerty'
if not results:
raise Exception, "Could not create %s. Already exists ?" % slice_params['hrn']
return results
# Propose hrn
-def manifold_add_user(request, user_params):
- # user_params: email, password e.g., user_params = {'email':'aa@aa.com','password':'demo'}
+def manifold_add_user(wsgi_request, request):
+ """Add a Manifold user corresponding to a user request.
+
+ Args:
+ wsgi_request: a WSGIRequest instance
+ request (dict): a dictionary containing the user request built from the
+ form.
+
+ Returns:
+ The user_id of the inserted user.
+
+ Raises:
+ ?
+
+ """
+ USER_CONFIG = '{"firstname": "%(first_name)s", "lastname": "%(last_name)s", "authority": "%(authority_hrn)s"}'
+
+ user_params = {
+ 'email' : request['email'],
+ 'password' : request['password'],
+ 'config' : USER_CONFIG % request,
+ 'status' : 1,
+ }
+
query = Query.create('local:user').set(user_params).select('email')
results = execute_admin_query(request, query)
if not results:
raise Exception, "Failed creating manifold user: %s" % user_params['email']
- result, = results
+ result = results[0]
return result['email']
-def manifold_update_user(request, user_params):
+def manifold_update_user(request, email, user_params):
# user_params: password, config e.g.,
- query = Query.update('local:user').filter_by('email', '==', request.user.email).set(user_params).select('email')
- results = execute_query(request,query)
+ query = Query.update('local:user').filter_by('email', '==', email).set(user_params).select('email')
+ results = execute_admin_query(request,query)
# NOTE: results remains empty and goes to Exception. However, it updates the manifold DB.
# That's why I commented the exception part. -- Yasin
#if not results:
result, = results
return result['user_id']
-def manifold_update_account(request,account_params):
+def manifold_update_account(request,user_id,account_params):
# account_params: config
- query = Query.update('local:account').filter_by('platform', '==', 'myslice').set(account_params).select('user_id')
- results = execute_query(request,query)
- # NOTE: results remains empty and goes to Exception. However, it updates the manifold DB.
- # That's why I commented the exception part. -- Yasin
- #if not results:
- # raise Exception, "Failed updating manifold account: config %s" % account_params['config']
- #result, = results
+ query = Query.update('local:account').filter_by('platform', '==', 'myslice').filter_by('user_id', '==', user_id).set(account_params).select('user_id')
+ results = execute_admin_query(request,query)
return results
+#explicitly mention the platform_id
+def manifold_delete_account(request, platform_id, user_id, account_params):
+ query = Query.delete('local:account').filter_by('platform_id', '==', platform_id).filter_by('user_id', '==', user_id).set(account_params).select('user_id')
+ results = execute_admin_query(request,query)
+ return results
+
+#not tested
def manifold_add_platform(request, platform_params):
- query = Query.create('local:platform').set(account_params).select(['user', 'platform'])
+ query = Query.create('local:platform').set(platform_params).select(['user', 'platform'])
results = execute_admin_query(request,query)
if not results:
raise Exception, "Failed creating manifold platform %s for user: %s" % (platform_params['platform'], platform_params['user'])
request['last_name'] = user.last_name
request['email'] = user.email
request['login'] = user.login
- request['keypair'] = user.keypair
+ request['user_hrn'] = user.user_hrn
+ request['public_key'] = user.public_key
+ request['private_key'] = user.private_key
return request
def make_request_slice(slice):
request = {}
request['type'] = 'slice'
request['id'] = slice.id
+ request['user_hrn'] = slice.user_hrn
request['timestamp'] = slice.created
request['authority_hrn'] = slice.authority_hrn
request['slice_name'] = slice.slice_name
request['purpose'] = slice.purpose
return request
-def make_requests(pending_users, pending_slices):
- print "pending users =", pending_users
- print "pending slices =", pending_slices
+def make_request_authority(authority):
+ request = {}
+ request['type'] = 'authority'
+ request['id'] = authority.id
+ request['site_name'] = authority.site_name
+ request['site_latitude'] = authority.site_latitude
+ request['site_longitude'] = authority.site_longitude
+ request['site_url'] = authority.site_url
+ request['site_authority'] = authority.site_authority
+ request['site_abbreviated_name'] = authority.site_abbreviated_name
+ request['address_line1'] = authority.address_line1
+ request['address_line2'] = authority.address_line2
+ request['address_line3'] = authority.address_line3
+ request['address_city'] = authority.address_city
+ request['address_postalcode'] = authority.address_postalcode
+ request['address_state'] = authority.address_state
+ request['address_country'] = authority.address_country
+ request['authority_hrn'] = authority.authority_hrn
+ request['timestamp'] = authority.created
+ return request
+def make_requests(pending_users, pending_slices, pending_authorities):
requests = []
for user in pending_users:
requests.append(make_request_user(user))
for slice in pending_slices:
requests.append(make_request_slice(slice))
+ for authority in pending_authorities:
+ requests.append(make_request_authority(authority))
return requests
def get_request_by_id(ids):
- sorted_ids = { 'user': [], 'slice': [] }
+ sorted_ids = { 'user': [], 'slice': [], 'authority': [] }
for type__id in ids:
type, id = type__id.split('__')
sorted_ids[type].append(id)
if not ids:
pending_users = PendingUser.objects.all()
pending_slices = PendingSlice.objects.all()
+ pending_authorities = PendingAuthority.objects.all()
else:
pending_users = PendingUser.objects.filter(id__in=sorted_ids['user']).all()
pending_slices = PendingSlice.objects.filter(id__in=sorted_ids['slice']).all()
+ pending_authorities = PendingAuthority.objects.filter(id__in=sorted_ids['authority']).all()
- return make_requests(pending_users, pending_slices)
+ return make_requests(pending_users, pending_slices, pending_authorities)
-def get_request_by_authority(authority_hrns):
+def get_requests(authority_hrns=None):
+ print "get_request_by_authority auth_hrns = ", authority_hrns
if not authority_hrns:
pending_users = PendingUser.objects.all()
pending_slices = PendingSlice.objects.all()
+ pending_authorities = PendingAuthority.objects.all()
else:
pending_users = PendingUser.objects.filter(authority_hrn__in=authority_hrns).all()
pending_slices = PendingSlice.objects.filter(authority_hrn__in=authority_hrns).all()
+ pending_authorities = PendingAuthority.objects.filter(authority_hrn__in=authority_hrns).all()
+
+ return make_requests(pending_users, pending_slices, pending_authorities)
- return make_requests(pending_users, pending_slices)
-
# XXX Is it in sync with the form fields ?
def portal_validate_request(wsgi_request, request_ids):
request_status = {}
- print "REQUEST", request
if request['type'] == 'user':
try:
- hrn = "%s.%s" % (request['authority_hrn'], request['login'])
- # XXX tmp sfa dependency
- from sfa.util.xrn import Xrn
- urn = Xrn(hrn, request['type']).get_urn()
-
- sfa_user_params = {
- 'hrn' : hrn,
- 'urn' : urn,
- 'type' : request['type'],
- 'keys' : [json.loads(request['keypair'])['user_public_key']],
- 'first_name' : request['first_name'],
- 'last_name' : request['last_name'],
- 'email' : request['email'],
- #'slices' : None,
- #'researcher': None,
- #'pi' : None,
- 'enabled' : True
- }
- # ignored in request: id, timestamp, password
-
- sfa_add_user(wsgi_request, sfa_user_params)
-
- # XXX Remove from database
-
-
+ create_user(wsgi_request, request)
request_status['SFA user'] = {'status': True }
except Exception, e:
- request_status['SFA user'] = {'status': False, 'description': str(e)}
+ request_status['SFA user'] = {'status': False, 'description': str(e)}
+
+# user_params = {'status':2}
+# manifold_update_user(request, request['email'], user_params)
# MANIFOLD user should be added beforehand, during registration
#try:
elif request['type'] == 'slice':
try:
- hrn = "%s.%s" % (request['authority_hrn'], request['slice_name'])
+ create_slice(wsgi_request, request)
+ request_status['SFA slice'] = {'status': True }
+
+ except Exception, e:
+ request_status['SFA slice'] = {'status': False, 'description': str(e)}
+
+ elif request['type'] == 'authority':
+ try:
+ #hrn = "%s.%s" % (request['authority_hrn'], request['site_authority'])
+ hrn = request['site_authority']
# XXX tmp sfa dependency
from sfa.util.xrn import Xrn
urn = Xrn(hrn, request['type']).get_urn()
- sfa_slice_params = {
- 'hrn' : hrn,
+ sfa_authority_params = {
+ 'hrn' : hrn,
'urn' : urn,
'type' : request['type'],
- #'slices' : None,
- #'researcher': None,
#'pi' : None,
'enabled' : True
}
- # ignored in request: id, timestamp, number_of_nodes, type_of_nodes, purpose
-
- sfa_add_slice(wsgi_request, sfa_slice_params)
-
- # XXX Remove from database
-
-
- request_status['SFA slice'] = {'status': True }
+ print "ADD Authority"
+ sfa_add_authority(wsgi_request, sfa_authority_params)
+ request_status['SFA authority'] = {'status': True }
except Exception, e:
- request_status['SFA slice'] = {'status': False, 'description': str(e)}
+ request_status['SFA authority'] = {'status': False, 'description': str(e)}
+
+ # XXX Remove from Pendings in database
status['%s__%s' % (request['type'], request['id'])] = request_status
# Django and ajax
# http://djangosnippets.org/snippets/942/
+
+
+
+#-------------------------------------------------------------------------------
+# REQUESTS - Slices
+#-------------------------------------------------------------------------------
+
+def create_slice(wsgi_request, request):
+ """
+ Arguments:
+ wsgi_request (~ WSGIRequest) :
+ request (dict) : the slice request in our own dict format
+
+ Raises:
+ Exception
+ """
+ hrn = "%s.%s" % (request['authority_hrn'], request['slice_name'])
+ # XXX tmp sfa dependency
+ from sfa.util.xrn import Xrn
+ urn = Xrn(hrn, request['type']).get_urn()
+
+ # Add User to Slice if we have the user_hrn in pendingslice table
+ user_hrn = request.get('user_hrn', None)
+ user_hrns = list([user_hrn]) if user_hrn else list()
+
+ # XXX We should create a slice with Manifold terminology
+ slice_params = {
+ 'slice_hrn' : hrn,
+ 'slice_urn' : urn,
+ 'slice_type' : request['type'],
+ 'users' : user_hrns,
+ 'slice_enabled' : True
+ }
+ # ignored in request: id, timestamp, number_of_nodes, type_of_nodes, purpose
+
+ query = Query.create('slice').set(slice_params).select('slice_hrn')
+ results = execute_query(wsgi_request, query)
+ if not results:
+ raise Exception, "Could not create %s. Already exists ?" % slice_params['hrn']
+ return results
+
+def create_pending_slice(wgsi_request, request):
+ """
+ """
+
+ # Insert an entry in the PendingSlice table
+ s = PendingSlice(
+ slice_name = request['slice_name'],
+ user_hrn = request['user_hrn'],
+ authority_hrn = request['authority_hrn'],
+ number_of_nodes = request['number_of_nodes'],
+ purpose = request['purpose'],
+ )
+ s.save()
+
+ # Send an email: the recipients are the PI of the authority
+ recipients = authority_get_pi_emails(wsgi_request, authority_hrn)
+ msg = render_to_string('slice-request-email.txt', request)
+ send_mail("Onelab user %(email)s requested a slice" % request, msg, email, recipients)
+
+#-------------------------------------------------------------------------------
+# REQUESTS - Users
+#-------------------------------------------------------------------------------
+
+def manifold_add_reference_user_accounts(wsgi_request, request):
+ """When a new user is created, add reference accounts to the reference platform.
+ """
+ # XXX XXX XXX The rest of this function has to be checked XXX XXX XXX
+
+ # Retrieve user information
+ user_query = Query().get('local:user') \
+ .select('user_id', 'config', 'email', 'status') \
+ .filter_by('email', '==', request['email'])
+ user_details = execute_admin_query(wsgi_request, user_query)
+
+ # USER MAIN ACCOUNT != reference
+ #print 'USER MAIN ACCOUNT != reference'
+ list_accounts_query = Query().get('local:account') \
+ .select('user_id', 'platform_id', 'auth_type', 'config') \
+ .filter_by('user_id', '==', user_details[0]['user_id']) \
+ .filter_by('auth_type', '!=', 'reference')
+ list_accounts = execute_admin_query(wsgi_request, list_accounts_query)
+
+ # XXX main_platform is being erased several times ???
+ for account in list_accounts:
+ main_platform_query = Query().get('local:platform') \
+ .select('platform_id', 'platform') \
+ .filter_by('platform_id', '==', account['platform_id'])
+ main_platform = execute_admin_query(wsgi_request, main_platform_query)
+
+ # Add reference accounts on SFA enabled platforms
+ platforms_query = Query().get('local:platform') \
+ .filter_by('disabled', '==', '0') \
+ .filter_by('gateway_type', '==', 'sfa') \
+ .select('platform_id', 'gateway_type')
+ platforms = execute_admin_query(wsgi_request, platforms_query)
+ for platform in platforms:
+ #print "add reference to platform ",platform
+ manifold_account_params = {
+ 'user_id' : user_details[0]['user_id'],
+ 'platform_id' : platform['platform_id'],
+ 'auth_type' : 'reference',
+ 'config' : '{"reference_platform": "' + main_platform[0]['platform'] + '"}',
+ }
+ manifold_add_account(wsgi_request, manifold_account_params)
+
+def sfa_create_user(wsgi_request, request):
+ """
+ Arguments:
+ wsgi_request (~ WSGIRequest) :
+ request (dict) : the user request in our own dict format
+
+ Raises:
+ Exception
+ """
+ from sfa.util.xrn import Xrn
+
+ auth_pi = request.get('pi', None)
+ auth_pi = list([auth_pi]) if auth_pi else list()
+
+ # We create a slice request with Manifold terminology
+ sfa_user_params = {
+ 'user_hrn' : request['user_hrn'],
+ 'user_email' : request['email'],
+ 'urn' : Xrn(request['user_hrn'], request['type']).get_urn(),
+ 'type' : request['type'],
+ 'keys' : request['public_key'],
+ 'first_name' : request['first_name'],
+ 'last_name' : request['last_name'],
+ #'slices' : None,
+ #'researcher': None,
+ 'pi' : auth_pi,
+ 'enabled' : True
+ }
+
+ query = Query.create('user').set(sfa_user_params).select('user_hrn')
+ results = execute_query(wsgi_request, query)
+ if not results:
+ raise Exception, "Could not create %s. Already exists ?" % user_params['user_hrn']
+ return results
+
+def create_user(wsgi_request, request):
+
+ # XXX This has to be stored centrally
+ USER_STATUS_ENABLED = 2
+
+ # NOTE : if we were to create a user directly (just like we create slices,
+ # we would have to perform the steps in create_pending_user too
+
+ # Add the user to the SFA registry
+ sfa_create_user(wsgi_request, request)
+
+ # Update Manifold user status
+ manifold_update_user(wsgi_request, request['email'], {'status': USER_STATUS_ENABLED})
+
+ # Add reference accounts for platforms
+ manifold_add_reference_user_accounts(wsgi_request, request)
+
+def create_pending_user(wsgi_request, request, user_detail):
+ """
+ """
+
+ # Insert an entry in the PendingUser table
+ b = PendingUser(
+ first_name = request['first_name'],
+ last_name = request['last_name'],
+ authority_hrn = request['authority_hrn'],
+ email = request['email'],
+ password = request['password'],
+ public_key = request['public_key'],
+ private_key = request['private_key'],
+ user_hrn = request['user_hrn'],
+ pi = '', # XXX Why not None ?
+ )
+ b.save()
+
+ # saves the user to django auth_user table [needed for password reset]
+ user = User.objects.create_user(request['email'], request['email'], request['password'])
+
+ # Creating a manifold user
+ user_id = manifold_add_user(wsgi_request, request)
+
+ # Creating a Manifold account on the MySlice platform
+ # Note the JSON representation of public and private keys already includes quotes
+ account_config = {
+ 'user_hrn' : request['user_hrn'],
+ 'user_public_key' : request['public_key'],
+ }
+ if request['private_key']:
+ account_config['user_private_key'] = request['private_key']
+
+ user_id = user_detail['user_id'] + 1 # the user_id for the newly created user in local:user
+ account_params = {
+ 'platform_id' : 5, # XXX ALERT !!
+ 'user_id' : user_id,
+ 'auth_type' : request['auth_type'],
+ 'config' : json.dumps(account_config),
+ }
+ manifold_add_account(wsgi_request, account_params)
+
+ # Send an email: the recipients are the PI of the authority
+ recipients = authority_get_pi_emails(wsgi_request, request['authority_hrn'])
+ msg = render_to_string('user_request_email.txt', request)
+ send_mail("Onelab New User request for %(email)s submitted" % request, msg, 'support@myslice.info', recipients)
git://git.onelab.eu / myslice.git / blobdiff