X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fviews.py;h=902759ee755c22f1d7d15d62db404d3ce8a63e57;hb=5fd00adcc131fc9fa2abc15e8586bb53992450c9;hp=0c5fcd99e13d53bd62e74181c2ddb511aa61683a;hpb=24efb592d00c990dbf065ac00dc60f738425deac;p=myslice.git diff --git a/portal/views.py b/portal/views.py index 0c5fcd99..902759ee 100644 --- a/portal/views.py +++ b/portal/views.py @@ -21,10 +21,10 @@ # this program; see the file COPYING. If not, write to the Free Software # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -from django.conf import settings -from django.contrib.sites.models import Site, RequestSite -from django.contrib import messages -from django.views.generic import View +import os.path, re +import json + +#from django.views.generic import View from django.views.generic.base import TemplateView from django.shortcuts import render from django.template.loader import render_to_string @@ -36,136 +36,18 @@ from plugins.lists.simplelist import SimpleList from plugins.hazelnut import Hazelnut from plugins.pres_view import PresView from portal.event import Event -import json from portal import signals from portal.forms import SliceRequestForm, ContactForm 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.core.query import Query 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 -from M2Crypto import Rand, RSA, BIO -import os, re - -# 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') - network_query = Query().get('local:platform').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 - - - -# View for 1 platform and its details -class PlatformView(TemplateView): - template_name = "platform.html" - - def get_context_data(self, **kwargs): - page = Page(self.request) - - for key, value in kwargs.iteritems(): - print "%s = %s" % (key, value) - if key == "platformname": - platformname=value - - network_query = Query().get('local:platform').filter_by('platform', '==', platformname).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(PlatformView, 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 - - - #class for my_account class AccountView(TemplateView): template_name = "my_account.html" @@ -229,7 +111,7 @@ class AccountView(TemplateView): context ['firstname'] = config.get('firstname',"?") context ['lastname'] = config.get('lastname',"?") context ['fullname'] = context['firstname'] +' '+ context['lastname'] - context ['affiliation'] = config.get('affiliation',"Unknown Affiliation") + context ['authority'] = config.get('authority',"Unknown Authority") #context['users'] = userlist.render(self.request) # XXX This is repeated in all pages @@ -243,71 +125,40 @@ class AccountView(TemplateView): #context.update(page.prelude_env()) 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] - get_user = PendingUser.objects.get(id='1') # here we will get the id/email from session e.g., person.email - # getting user info from manifold +def account_process(request): + user_query = Query().get('local:user').select('password','config') + user_details = execute_query(request, user_query) + if 'submit_name' in request.POST: edited_first_name = request.POST['fname'] edited_last_name = request.POST['lname'] - #email = 'test_email@gmail.com' - #password = 'test_pp' - #message = 'F_Name: %s L_name: %s dummy_pp: %s' % (first_name, last_name, password) - #site = None - # insert into DB [needed for registration page] - #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, last_name=edited_last_name) - #b.save() + config={} + for user_config in user_details: + #email = user_detail['email'] + if user_config['config']: + config = json.loads(user_config['config']) + config['firstname'] = edited_first_name + config['lastname'] = edited_last_name + config['authority'] = config.get('authority','Unknown Authority') + updated_config = json.dumps(config) - # select and update [will be used throughout this view] - # select the logged in user [for the moment hard coded] - #get_user = PendingUser.objects.get(id='1') # here we will get the id/email from session e.g., person.email - # update first and last name - #get_user.first_name = edited_first_name - #get_user.last_name = edited_last_name - #get_user.save() - #user_params = {'config':'hello'} - #query = Query.update('local:user').set(user_params).select('config') - #results = execute_query(request,query) - #if not results: - # raise Exception, "Failed to update user: %s" % user_params['config'] - #result, = results - #return result['config'] - # create user is working fine :) - #user_params = ({'config':'"firstname":"HELLO"'},{'password':'hello'}) - #user_params = { 'config':'{"firstname":"HEY"}'} - #user_params = {'email':'aa@aa.com','password':'demo'} - #manifold_add_user(request,user_params) - #manifold_update_user(request,user_params) - + # updating config local:user in manifold + user_params = { 'config': updated_config} + manifold_update_user(request,user_params) + # this will be depricated, we will show the success msg in same page return HttpResponse('Sucess: First Name and Last Name Updated!') elif 'submit_pass' in request.POST: edited_password = request.POST['password'] - # select the logged in user [for the moment hard coded] - #get_user = PendingUser.objects.get(id='1') # here we will get the id/email from session e.g., person.email - # update password - get_user.password = edited_password - get_user.save() + + for user_pass in user_details: + user_pass['password'] = edited_password + #updating password in local:user + user_params = { 'password': user_pass['password']} + manifold_update_user(request,user_params) + return HttpResponse('Success: Password Changed!!') elif 'generate' in request.POST: # Generate public and private keys using SFA Library @@ -315,28 +166,6 @@ def acc_process(request): 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 @@ -411,31 +240,6 @@ def register_4m_f4f(request): 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