X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fviews.py;h=deb4fadbb429f72f0e763649c0774d89c6a70448;hb=995713033d9d1c87eb51cdcac1cd7f61d9cbe0d7;hp=c536322e732074ff4e36025c8f73160bf3d13d8d;hpb=67f6ffe4742ada4c7243b528891289304fc4016d;p=myslice.git diff --git a/portal/views.py b/portal/views.py index c536322e..deb4fadb 100644 --- a/portal/views.py +++ b/portal/views.py @@ -21,213 +21,34 @@ # this program; see the file COPYING. If not, write to the Free Software # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -import os.path, re import json -from django.views.generic.base import TemplateView -from django.shortcuts import render -from django.template.loader import render_to_string -from django.core.mail import send_mail -from django.utils.decorators import method_decorator -from django.contrib.auth.decorators import login_required - -from plugins.lists.simplelist import SimpleList -from plugins.hazelnut import Hazelnut -from plugins.pres_view import PresView -from portal.event import Event - -from portal import signals -from portal.forms import SliceRequestForm -from portal.util import RegistrationView, ActivationView -from portal.models import PendingUser, PendingSlice -from portal.actions import authority_get_pi_emails, get_request_by_authority, manifold_add_user, manifold_update_user -from manifold.manifoldapi import execute_query -from manifold.core.query import Query -from unfold.page import Page -from myslice.viewutils import topmenu_items, the_user -from django.http import HttpResponseRedirect, HttpResponse - - -def register_4m_f4f(request): - errors = [] - - authorities_query = Query.get('authority').filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc']).select('name', 'authority_hrn') - #authorities_query = Query.get('authority').select('authority_hrn') - authorities = execute_query(request, authorities_query) - - if request.method == 'POST': - # We shall use a form here - - #get_email = PendingUser.objects.get(email) - reg_fname = request.POST.get('firstname', '') - reg_lname = request.POST.get('lastname', '') - #reg_aff = request.POST.get('affiliation','') - reg_auth = request.POST.get('authority_hrn', '') - reg_email = request.POST.get('email','').lower() - - #POST value validation - if (re.search(r'^[\w+\s.@+-]+$', reg_fname)==None): - errors.append('First Name may contain only letters, numbers, spaces and @/./+/-/_ characters.') - #return HttpResponse("Only Letters, Numbers, - and _ allowd in First Name") - #return render(request, 'register_4m_f4f.html') - if (re.search(r'^[\w+\s.@+-]+$', reg_lname) == None): - errors.append('Last Name may contain only letters, numbers, spaces and @/./+/-/_ characters.') - #return HttpResponse("Only Letters, Numbers, - and _ is allowed in Last name") - #return render(request, 'register_4m_f4f.html') -# if (re.search(r'^[\w+\s.@+-]+$', reg_aff) == None): -# errors.append('Affiliation may contain only letters, numbers, spaces and @/./+/-/_ characters.') - #return HttpResponse("Only Letters, Numbers and _ is allowed in Affiliation") - #return render(request, 'register_4m_f4f.html') - # XXX validate authority hrn !! - if PendingUser.objects.filter(email__iexact=reg_email): - errors.append('Email already registered.Please provide a new email address.') - #return HttpResponse("Email Already exists") - #return render(request, 'register_4m_f4f.html') - if 'generate' in request.POST['question']: - # Generate public and private keys using SFA Library - from sfa.trust.certificate import Keypair - k = Keypair(create=True) - public_key = k.get_pubkey_string() - private_key = k.as_pem() - private_key = ''.join(private_key.split()) - public_key = "ssh-rsa " + public_key - # Saving to DB - keypair = '{"user_public_key":"'+ public_key + '", "user_private_key":"'+ private_key + '"}' -# keypair = re.sub("\r", "", keypair) -# keypair = re.sub("\n", "\\n", keypair) -# #keypair = keypair.rstrip('\r\n') -# keypair = ''.join(keypair.split()) - else: - up_file = request.FILES['user_public_key'] - file_content = up_file.read() - file_name = up_file.name - file_extension = os.path.splitext(file_name)[1] - allowed_extension = ['.pub','.txt'] - if file_extension in allowed_extension and re.search(r'ssh-rsa',file_content): - keypair = '{"user_public_key":"'+ file_content +'"}' - keypair = re.sub("\r", "", keypair) - keypair = re.sub("\n", "\\n",keypair) - keypair = ''.join(keypair.split()) - else: - errors.append('Please upload a valid RSA public key [.txt or .pub].') - - #b = PendingUser(first_name=reg_fname, last_name=reg_lname, affiliation=reg_aff, - # email=reg_email, password=request.POST['password'], keypair=keypair) - #b.save() - if not errors: - b = PendingUser( - first_name=reg_fname, - last_name=reg_lname, - #affiliation=reg_aff, - authority_hrn=reg_auth, - email=reg_email, - password=request.POST['password'], - keypair=keypair - ) - b.save() - - # Send email - ctx = { - first_name : reg_fname, - last_name : reg_lname, - #affiliation : reg_aff, - authority_hrn: reg_auth, - email : reg_email, - keypair : keypair, - cc_myself : True # form.cleaned_data['cc_myself'] - } +from django.http import HttpResponseRedirect, HttpResponse +from django.views.generic.base import TemplateView +from django.shortcuts import render +from django.template.loader import render_to_string - recipients = authority_get_pi_emails(authority_hrn) - if ctx['cc_myself']: - recipients.append(ctx['email']) - - msg = render_to_string('user_request_email.txt', ctx) - send_mail("Onelab New User request submitted", msg, email, recipients) - - return render(request, 'user_register_complete.html') - - return render(request, 'register_4m_f4f.html',{ - 'topmenu_items': topmenu_items('Register', request), - 'errors': errors, - 'firstname': request.POST.get('firstname', ''), - 'lastname': request.POST.get('lastname', ''), - #'affiliation': request.POST.get('affiliation', ''), - 'authority_hrn': request.POST.get('authority_hrn', ''), - 'email': request.POST.get('email', ''), - 'password': request.POST.get('password', ''), - 'authorities': authorities - }) - - -@login_required -def slice_request(request): - errors = [] - - authorities_query = Query.get('authority').filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc']).select('name', 'authority_hrn') - #authorities_query = Query.get('authority').select('authority_hrn') - authorities = execute_query(request, authorities_query) - - authority_hrn_tuple = [] - for authority in authorities: - authority_hrn_tuple.append((authority['authority_hrn'], authority['name'])) - authority_hrn_initial = {'authority_hrn': authority_hrn_tuple} - - # request.POST or None ? - if request.method == 'POST': - # The form has been submitted - form = SliceRequestForm(request.POST, initial=authority_hrn_initial) - - if form.is_valid(): - slice_name = form.cleaned_data['slice_name'] - authority_hrn = form.cleaned_data['authority_hrn'] - number_of_nodes = form.cleaned_data['number_of_nodes'] - type_of_nodes = form.cleaned_data['type_of_nodes'] - purpose = form.cleaned_data['purpose'] - - s = PendingSlice( - slice_name = slice_name, - authority_hrn = authority_hrn, - number_of_nodes = number_of_nodes, - type_of_nodes = type_of_nodes, - purpose = purpose - ) - s.save() - - # All validation rules pass; process data in form.cleaned_data - # slice_name, number_of_nodes, type_of_nodes, purpose - email = form.cleaned_data['email'] # email of the sender - cc_myself = form.cleaned_data['cc_myself'] - - # The recipients are the PI of the authority - recipients = authority_get_pi_emails(authority_hrn) - #recipients = ['yasin.upmc@gmail.com','jordan.auge@lip6.fr'] - if cc_myself: - recipients.append(email) - msg = render_to_string('slice_request_email.txt', form.cleaned_data) - send_mail("Onelab New Slice request form submitted", msg, email, recipients) - - return render(request,'slicereq_recvd.html') # Redirect after POST - else: - form = SliceRequestForm(initial=authority_hrn_initial) - -# template_env = {} -# template_env['form'] = form -# template_env['topmenu_items'] = topmenu_items('Request a slice', request) -# template_env['unfold1_main'] = render(request, 'slice_request_.html', { -# 'form': form, -# }) -# from django.shortcuts import render_to_response -# from django.template import RequestContext -# return render_to_response ('view-unfold1.html',template_env, -# context_instance=RequestContext(request)) - - return render(request, 'slice_request.html', { - 'form': form, - 'topmenu_items': topmenu_items('Request a slice', request), - 'username': the_user (request) - }) +from ui.topmenu import topmenu_items, the_user +from portal.event import Event +# presview is put in observation for now +#from plugins.pres_view import PresView +from plugins.raw import Raw +# these seem totally unused for now +#from portal.util import RegistrationView, ActivationView + +from portal.models import PendingUser, PendingSlice +from portal.actions import get_request_by_authority +from manifold.manifoldapi import execute_query +from manifold.core.query import Query +from unfold.page import Page + +# NOTE +# initially all the portal views were defined in this single file +# all the other ones have now migrated into separate classes/files for more convenience +# I'm leaving these ones here for now as I could not exactly figure what the purpose was +# (i.e. what the correct name should be, as presviewview was a bit cryptic) class PresViewView(TemplateView): template_name = "view-unfold1.html" @@ -235,7 +56,8 @@ class PresViewView(TemplateView): page = Page(self.request) - pres_view = PresView(page = page) +# pres_view = PresView(page = page) + pres_view = Raw(page = page,html="

PresView needs to be integrated

") context = super(PresViewView, self).get_context_data(**kwargs) @@ -449,26 +271,44 @@ class ValidatePendingView(TemplateView): all_authorities.append(auth) platform_ids.append(sfa_platform['platform_id']) + print "W: Hardcoding platform myslice" + # There has been a tweak on how new platforms are referencing a + # so-called 'myslice' platform for storing authentication tokens. + # XXX This has to be removed in final versions. + myslice_platforms_query = Query().get('local:platform').filter_by('platform', '==', 'myslice').select('platform_id') + myslice_platforms = execute_query(self.request, myslice_platforms_query) + if myslice_platforms: + myslice_platform, = myslice_platforms + platform_ids.append(myslice_platform['platform_id']) + # We can check on which the user has authoritity credentials = PI rights credential_authorities = set() credential_authorities_expired = set() # User account on these registries - user_accounts_query = Query.get('local:account').filter_by('user_id', '==', user_id).filter_by('platform_id', 'included', platform_ids).select('config') + user_accounts_query = Query.get('local:account').filter_by('user_id', '==', user_id).filter_by('platform_id', 'included', platform_ids).select('auth_type', 'config') user_accounts = execute_query(self.request, user_accounts_query) #print "=" * 80 #print user_accounts #print "=" * 80 for user_account in user_accounts: + + print "USER ACCOUNT", user_account + if user_account['auth_type'] == 'reference': + continue # we hardcoded the myslice platform... + config = json.loads(user_account['config']) creds = [] + print "CONFIG KEYS", config.keys() if 'authority_credentials' in config: + print "***", config['authority_credentials'].keys() for authority_hrn, credential in config['authority_credentials'].items(): #if credential is not expired: credential_authorities.add(authority_hrn) #else # credential_authorities_expired.add(authority_hrn) if 'delegated_authority_credentials' in config: + print "***", config['delegated_authority_credentials'].keys() for authority_hrn, credential in config['delegated_authority_credentials'].items(): #if credential is not expired: credential_authorities.add(authority_hrn) @@ -553,7 +393,7 @@ class ValidatePendingView(TemplateView): # more general variables expected in the template context['title'] = 'Test view that combines various plugins' # the menu items on the top - context['topmenu_items'] = topmenu_items('Dashboard', self.request) + context['topmenu_items'] = topmenu_items('Validation', self.request) # so we can sho who is logged context['username'] = the_user(self.request)