X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fviews.py;h=9699f0a58969ce25a586332fbaa6fd7351379621;hb=b9a4e61ff89fea70d31a96e3f8238150fc5201bd;hp=ca248ab6d2fd5f04a88f619a027a9597a833d2fe;hpb=8ed8451797cc339919ab266626e028cbbb88350a;p=myslice.git diff --git a/portal/views.py b/portal/views.py index ca248ab6..9699f0a5 100644 --- a/portal/views.py +++ b/portal/views.py @@ -27,6 +27,8 @@ from django.contrib import messages from django.views.generic import View from django.views.generic.base import TemplateView from django.shortcuts import render +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 @@ -49,6 +51,11 @@ import os, re class DashboardView(TemplateView): template_name = "dashboard.html" + + #This view requires login + @method_decorator(login_required) + def dispatch(self, *args, **kwargs): + return super(DashboardView, self).dispatch(*args, **kwargs) def get_context_data(self, **kwargs): # We might have slices on different registries with different user accounts @@ -472,16 +479,6 @@ class DashboardView(TemplateView): # DEPRECATED # context.update(page.prelude_env()) # DEPRECATED # return context - - -# View for my_account form -def my_account(request): - return render(request, 'my_account.html', { - #'form': form, - 'topmenu_items': topmenu_items('My Account', request), - 'username': the_user (request) - }) - # View for platforms class PlatformsView(TemplateView): template_name = "platforms.html" @@ -489,7 +486,8 @@ class PlatformsView(TemplateView): def get_context_data(self, **kwargs): page = Page(self.request) - network_query = Query().get('local:platform').filter_by('disabled', '==', '0').select('platform','platform_longname','gateway_type') + #network_query = Query().get('local:platform').filter_by('disabled', '==', '0').select('platform','platform_longname','gateway_type') + network_query = Query().get('local:platform').select('platform','platform_longname','gateway_type') page.enqueue_query(network_query) page.expose_js_metadata() @@ -534,6 +532,8 @@ class PlatformsView(TemplateView): return context + + # View for 1 platform and its details class PlatformView(TemplateView): template_name = "platform.html" @@ -583,7 +583,7 @@ class PlatformView(TemplateView): # more general variables expected in the template context['title'] = 'Platforms connected to MySlice' # the menu items on the top - # context['topmenu_items'] = topmenu_items('Platforms', self.request) + context['topmenu_items'] = topmenu_items('Platforms', self.request) # so we can sho who is logged context['username'] = the_user(self.request) @@ -591,6 +591,18 @@ class PlatformView(TemplateView): return context + +@login_required +# View for my_account form +def my_account(request): + return render(request, 'my_account.html', { + #'form': form, + 'topmenu_items': topmenu_items('My Account', request), + 'username': the_user (request) + }) + + +@login_required #my_acc form value processing def acc_process(request): # getting the user_id from the session [now hardcoded] @@ -628,35 +640,41 @@ def acc_process(request): get_user.save() return HttpResponse('Success: Password Changed!!') elif 'generate' in request.POST: - #import os - #from M2Crypto import Rand, RSA, BIO - - KEY_LENGTH = 2048 - - def blank_callback(): - "Replace the default dashes" - return - - # Random seed - Rand.rand_seed (os.urandom (KEY_LENGTH)) - # Generate key pair - key = RSA.gen_key (KEY_LENGTH, 65537, blank_callback) - # Create memory buffers - pri_mem = BIO.MemoryBuffer() - pub_mem = BIO.MemoryBuffer() - # Save keys to buffers - key.save_key_bio(pri_mem, None) - key.save_pub_key_bio(pub_mem) - - # Get keys - public_key = pub_mem.getvalue() - private_key = pri_mem.getvalue() + # 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() + +# DEPRECATED +# KEY_LENGTH = 2048 +# +# def blank_callback(): +# "Replace the default dashes" +# return +# +# # Random seed +# Rand.rand_seed (os.urandom (KEY_LENGTH)) +# # Generate key pair +# key = RSA.gen_key (KEY_LENGTH, 65537, blank_callback) +# # Create memory buffers +# pri_mem = BIO.MemoryBuffer() +# pub_mem = BIO.MemoryBuffer() +# # Save keys to buffers +# key.save_key_bio(pri_mem, None) +# key.save_pub_key_bio(pub_mem) +# +# # Get keys +# public_key = pub_mem.getvalue() +# private_key = pri_mem.getvalue() + 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()) +# keypair = re.sub("\r", "", keypair) +# keypair = re.sub("\n", "\\n", keypair) +# #keypair = keypair.rstrip('\r\n') +# keypair = ''.join(keypair.split()) get_user.keypair = keypair get_user.save() return HttpResponse('Success: New Keypair Generated! %s' % keypair) @@ -684,11 +702,17 @@ def acc_process(request): 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': #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 @@ -704,40 +728,50 @@ def register_4m_f4f(request): 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']: - #import os - #from M2Crypto import Rand, RSA, BIO - - KEY_LENGTH = 2048 - - def blank_callback(): - "Replace the default dashes" - return - - # Random seed - Rand.rand_seed (os.urandom (KEY_LENGTH)) - # Generate key pair - key = RSA.gen_key (KEY_LENGTH, 65537, blank_callback) - # Create memory buffers - pri_mem = BIO.MemoryBuffer() - pub_mem = BIO.MemoryBuffer() - # Save keys to buffers - key.save_key_bio(pri_mem, None) - key.save_pub_key_bio(pub_mem) - # Get keys - public_key = pub_mem.getvalue() - private_key = pri_mem.getvalue() + # 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() + +# DEPRECATED +# #import os +# #from M2Crypto import Rand, RSA, BIO +# +# KEY_LENGTH = 2048 +# +# def blank_callback(): +# "Replace the default dashes" +# return +# +# # Random seed +# Rand.rand_seed (os.urandom (KEY_LENGTH)) +# # Generate key pair +# key = RSA.gen_key (KEY_LENGTH, 65537, blank_callback) +# # Create memory buffers +# pri_mem = BIO.MemoryBuffer() +# pub_mem = BIO.MemoryBuffer() +# # Save keys to buffers +# key.save_key_bio(pri_mem, None) +# key.save_pub_key_bio(pub_mem) +# # Get keys +# public_key = pub_mem.getvalue() +# private_key = pri_mem.getvalue() + + 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()) - #return HttpResponse(keypair) +# 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() @@ -757,6 +791,7 @@ def register_4m_f4f(request): #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() return render(request, 'user_register_complete.html') @@ -767,8 +802,10 @@ def register_4m_f4f(request): '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 }) @@ -803,7 +840,7 @@ def contact(request): }) - +@login_required def slice_request(request): if request.method == 'POST': # If the form has been submitted... form = SliceRequestForm(request.POST) # A form bound to the POST data @@ -1144,8 +1181,6 @@ class ValidatePendingView(TemplateView): for user in pending_users: auth_hrn = user.authority_hrn - if not auth_hrn: - auth_hrn = "ple.upmc" # XXX HARDCODED request = {} request['type'] = 'user'