X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fviews.py;h=20710f4c4afbd1a4f46652b5a1583a95fa534a84;hb=f1df689da513b1523ce89f0ba32728592999c1f2;hp=2dc5324733238710a82ff3db4776fc65a8576343;hpb=aad5c1260c158966703bc58338d327bc512a8634;p=myslice.git diff --git a/portal/views.py b/portal/views.py index 2dc53247..20710f4c 100644 --- a/portal/views.py +++ b/portal/views.py @@ -29,7 +29,7 @@ from django.views.generic.base import TemplateView from django.shortcuts import render from plugins.lists.simplelist import SimpleList - +from plugins.hazelnut import Hazelnut from plugins.pres_view import PresView from portal.event import Event import json @@ -42,7 +42,9 @@ 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 -import os.path, re + +from M2Crypto import Rand, RSA, BIO +import os, re class DashboardView(TemplateView): template_name = "dashboard.html" @@ -62,6 +64,7 @@ class DashboardView(TemplateView): page.enqueue_query(slice_query) page.enqueue_query(auth_query) + page.expose_js_metadata() page.expose_queries() slicelist = SimpleList( @@ -470,7 +473,63 @@ class UserValidateView(ActivationView): # View for my_account form def my_account(request): - return render(request, 'my_account.html') + 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" + + 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') + page.enqueue_query(network_query) + + page.expose_js_metadata() + page.expose_queries() + networklist = Hazelnut( + page = page, + title = 'List', + domid = 'checkboxes', + # this is the query at the core of the slice list + query = network_query, + query_all = network_query, + checkboxes = False, + datatables_options = { + # for now we turn off sorting on the checkboxes columns this way + # this of course should be automatic in hazelnut + 'aoColumns' : [None, None, None, None, {'bSortable': False}], + 'iDisplayLength' : 25, + 'bLengthChange' : True, + }, + ) +# +# networklist = SimpleList( +# title = None, +# page = page, +# key = 'platform', +# query = network_query, +# ) + + context = super(PlatformsView, self).get_context_data(**kwargs) + context['person'] = self.request.user + context['networks'] = networklist.render(self.request) + + # XXX This is repeated in all pages + # 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) + # so we can sho who is logged + context['username'] = the_user(self.request) + + context.update(page.prelude_env()) + + return context #my_acc form value processing def acc_process(request): @@ -488,7 +547,7 @@ def acc_process(request): #approach borrowed from register view #new_user = PendingUser.objects.create_inactive_user(edited_first_name, edited_last_name, email, password, site) #conventional approach - #b = PendingUser(first_name=edited_first_name, edited_last_name=last_name) + #b = PendingUser(first_name=edited_first_name, last_name=edited_last_name) #b.save() # select and update [will be used throughout this view] @@ -509,8 +568,8 @@ 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 + #import os + #from M2Crypto import Rand, RSA, BIO KEY_LENGTH = 2048 @@ -534,9 +593,10 @@ def acc_process(request): private_key = pri_mem.getvalue() # 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 = 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) @@ -547,22 +607,100 @@ def acc_process(request): file_name = up_file.name file_extension = os.path.splitext(file_name)[1] allowed_extension = ['.pub','.txt'] - if file_extension in allowed_extension: + if file_extension in allowed_extension and re.search(r'ssh-rsa',file_content): file_content = '{"user_public_key":"'+ file_content +'"}' file_content = re.sub("\r", "", file_content) file_content = re.sub("\n", "\\n",file_content) + file_content = ''.join(file_content.split()) get_user.keypair = file_content get_user.save() return HttpResponse('Success: Publickey uploaded! Old records overwritten') else: - return HttpResponse('Please upload a valid public key.') + return HttpResponse('Please upload a valid RSA public key [.txt or .pub].') else: message = 'You submitted an empty form.' return HttpResponse(message) def register_4m_f4f(request): - return render(request, 'register_4m_f4f.html') + #return render(request, 'register_4m_f4f.html') + +#def reg_4m_f4f_process(request): + if 'submit' in request.POST: + #get_email = PendingUser.objects.get(email) + reg_fname = request.POST['firstname'] + reg_lname = request.POST['lastname'] + reg_aff = request.POST['affiliation'] + reg_email = request.POST['email'].lower() + + #POST value validation + if (re.search(r'^[\w+\s.@+-]+$', reg_fname)==None): + messages.error(request, '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): + messages.error(request, '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): + messages.error(request, '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') + if PendingUser.objects.filter(email__iexact=reg_email): + messages.error(request, '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() + # 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) + 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: + return HttpResponse('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() + + return render(request, 'user_register_complete.html') + return render(request, 'register_4m_f4f.html') + # view for contact form def contact(request): @@ -587,9 +725,12 @@ def contact(request): return render(request,'contact_sent.html') # Redirect after POST else: form = ContactForm() # An unbound form - + return render(request, 'contact.html', { 'form': form, + 'topmenu_items': topmenu_items('Contact Us', request), + 'username': the_user (request) + })