X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fviews.py;h=2b2c3e5426df4aa4844f8321c2a23e2e0b075757;hb=6e47f897c357d6f2540e9ecd4644953da9f36369;hp=2aa68405fb7b061ade9bc83affdc592d0a0a8b7f;hpb=32c8b3cf9421ee4d260162913cc6ab2dadaaea8c;p=myslice.git diff --git a/portal/views.py b/portal/views.py index 2aa68405..2b2c3e54 100644 --- a/portal/views.py +++ b/portal/views.py @@ -30,7 +30,7 @@ from django.shortcuts import render from plugins.lists.simplelist import SimpleList -#from plugins.pres_view import PresView +from plugins.pres_view import PresView from portal.event import Event import json @@ -42,25 +42,29 @@ 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" def get_context_data(self, **kwargs): - user_hrn = 'ple.upmc.jordan_auge' - #user_hrn = 'iotlab.auge' + # We might have slices on different registries with different user accounts + # We note that this portal could be specific to a given registry, to which we register users, but i'm not sure that simplifies things + # Different registries mean different identities, unless we identify via SFA HRN or have associated the user email to a single hrn #messages.info(self.request, 'You have logged in') page = Page(self.request) # Slow... #slice_query = Query().get('slice').filter_by('user.user_hrn', 'contains', user_hrn).select('slice_hrn') - slice_query = Query().get('user').filter_by('user_hrn', '==', user_hrn).select('user_hrn', 'slice.slice_hrn') + slice_query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn') auth_query = Query().get('network').select('network_hrn') page.enqueue_query(slice_query) page.enqueue_query(auth_query) + page.expose_js_metadata() page.expose_queries() slicelist = SimpleList( @@ -487,7 +491,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] @@ -508,8 +512,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 @@ -533,9 +537,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) @@ -550,6 +555,7 @@ def acc_process(request): 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') @@ -560,7 +566,65 @@ def acc_process(request): message = 'You submitted an empty form.' return HttpResponse(message) - +def register_4m_f4f(request): + return render(request, 'register_4m_f4f.html') + +def reg_4m_f4f_process(request): + if 'submit' in request.POST: + #get_email = PendingUser.objects.get(email) + if PendingUser.objects.filter(email__iexact=request.POST['email']): + return HttpResponse("Email Already exist") + 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: + 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 public key.') + + b = PendingUser(first_name=request.POST['firstname'], last_name=request.POST['lastname'], affiliation=request.POST['affiliation'], + email=request.POST['email'], password=request.POST['password'], keypair=keypair) + b.save() + + return HttpResponse('Registration Successful. Please wait for account validation.') + + # view for contact form def contact(request):