X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fviews.py;h=e554f1bdfc4484be246e70d673c165d3353c0bd5;hb=2f0ca597d050216c92df1ba6bf472d2c937fe7ef;hp=be1b77c9b94d6d7b0c2eb21d92350da3e06252c2;hpb=cd06fa4f83e017abe561dafcfea0c07b9e1beda3;p=myslice.git
diff --git a/portal/views.py b/portal/views.py
index be1b77c9..e554f1bd 100644
--- a/portal/views.py
+++ b/portal/views.py
@@ -21,642 +21,83 @@
# 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
+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
-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 manifold.core.query import Query
+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
-from M2Crypto import Rand, RSA, BIO
-import os, re
-
-class DashboardView(TemplateView):
- template_name = "dashboard.html"
-
- def get_context_data(self, **kwargs):
- # 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')
- auth_query = Query().get('network').select('network_hrn')
- print "AUTH QUERY =====================", auth_query
- print "filter", auth_query.filters
- page.enqueue_query(slice_query)
- page.enqueue_query(auth_query)
-
- page.expose_js_metadata()
- page.expose_queries()
-
- slicelist = SimpleList(
- title = None,
- page = page,
- key = 'slice.slice_hrn',
- query = slice_query,
- )
-
- authlist = SimpleList(
- title = None,
- page = page,
- key = 'network_hrn',
- query = auth_query,
- )
-
- context = super(DashboardView, self).get_context_data(**kwargs)
- context['person'] = self.request.user
- context['networks'] = authlist.render(self.request)
- context['slices'] = slicelist.render(self.request)
-
- # XXX This is repeated in all pages
- # 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)
- # so we can sho who is logged
- context['username'] = the_user(self.request)
-
- context.update(page.prelude_env())
-
- return context
-
-# DEPRECATED #class UserRegisterView(RegistrationView):
-# DEPRECATED # """
-# DEPRECATED # A registration backend which follows a simple workflow:
-# DEPRECATED #
-# DEPRECATED # 1. User signs up, inactive account is created.
-# DEPRECATED #
-# DEPRECATED # 2. Email is sent to user with activation link.
-# DEPRECATED #
-# DEPRECATED # 3. User clicks activation link, account is now active.
-# DEPRECATED #
-# DEPRECATED # Using this backend requires that
-# DEPRECATED #
-# DEPRECATED # * ``registration`` be listed in the ``INSTALLED_APPS`` setting
-# DEPRECATED # (since this backend makes use of models defined in this
-# DEPRECATED # application).
-# DEPRECATED #
-# DEPRECATED # * The setting ``ACCOUNT_ACTIVATION_DAYS`` be supplied, specifying
-# DEPRECATED # (as an integer) the number of days from registration during
-# DEPRECATED # which a user may activate their account (after that period
-# DEPRECATED # expires, activation will be disallowed).
-# DEPRECATED #
-# DEPRECATED # * The creation of the templates
-# DEPRECATED # ``registration/activation_email_subject.txt`` and
-# DEPRECATED # ``registration/activation_email.txt``, which will be used for
-# DEPRECATED # the activation email. See the notes for this backends
-# DEPRECATED # ``register`` method for details regarding these templates.
-# DEPRECATED #
-# DEPRECATED # Additionally, registration can be temporarily closed by adding the
-# DEPRECATED # setting ``REGISTRATION_OPEN`` and setting it to
-# DEPRECATED # ``False``. Omitting this setting, or setting it to ``True``, will
-# DEPRECATED # be interpreted as meaning that registration is currently open and
-# DEPRECATED # permitt ed.
-# DEPRECATED #
-# DEPRECATED # Internally, this is accomplished via storing an activation key in
-# DEPRECATED # an instance of ``registration.models.RegistrationProfile``. See
-# DEPRECATED # that model and its custom manager for full documentation of its
-# DEPRECATED # fields and supported operations.
-# DEPRECATED #
-# DEPRECATED # """
-# DEPRECATED ## DEPRECATED # form_class = UserRegisterForm
-# DEPRECATED #
-# DEPRECATED # def register(self, request, **cleaned_data):
-# DEPRECATED # """
-# DEPRECATED # Given a username, email address and password, register a new
-# DEPRECATED # user account, which will initially be inactive.
-# DEPRECATED #
-# DEPRECATED # Along with the new ``User`` object, a new
-# DEPRECATED # ``registration.models.RegistrationProfile`` will be created,
-# DEPRECATED # tied to that ``User``, containing the activation key which
-# DEPRECATED # will be used for this account.
-# DEPRECATED #
-# DEPRECATED # An email will be sent to the supplied email address; this
-# DEPRECATED # email should contain an activation link. The email will be
-# DEPRECATED # rendered using two templates. See the documentation for
-# DEPRECATED # ``RegistrationProfile.send_activation_email()`` for
-# DEPRECATED # information about these templates and the contexts provided to
-# DEPRECATED # them.
-# DEPRECATED #
-# DEPRECATED # After the ``User`` and ``RegistrationProfile`` are created and
-# DEPRECATED # the activation email is sent, the signal
-# DEPRECATED # ``registration.signals.user_registered`` will be sent, with
-# DEPRECATED # the new ``User`` as the keyword argument ``user`` and the
-# DEPRECATED # class of this backend as the sender.
-# DEPRECATED #
-# DEPRECATED # """
-# DEPRECATED # first_name = cleaned_data['first_name']
-# DEPRECATED # last_name = cleaned_data['last_name']
-# DEPRECATED # affiliation= cleaned_data['affiliation']
-# DEPRECATED # email = cleaned_data['email']
-# DEPRECATED # password = cleaned_data['password1']
-# DEPRECATED #
-# DEPRECATED # #password2 = cleaned_data['password2']
-# DEPRECATED # keypair = cleaned_data['keypair']
-# DEPRECATED #
-# DEPRECATED # #if Site._meta.installed:
-# DEPRECATED # # site = Site.objects.get_current()
-# DEPRECATED # #else:
-# DEPRECATED # # site = RequestSite(request)
-# DEPRECATED # site = None
-# DEPRECATED #
-# DEPRECATED # new_user = PendingUser.objects.create_inactive_user(first_name, last_name, email, password, site)
-# DEPRECATED # signals.user_registered.send(sender=self.__class__,
-# DEPRECATED # user=new_user,
-# DEPRECATED # request=request)
-# DEPRECATED # return new_user
-# DEPRECATED #
-# DEPRECATED # def get_context_data(self, **kwargs):
-# DEPRECATED # context = super(UserRegisterView, self).get_context_data(**kwargs)
-# DEPRECATED # context['topmenu_items'] = topmenu_items('Register', self.request)
-# DEPRECATED # context['username'] = the_user (self.request)
-# DEPRECATED # return context
-# DEPRECATED #
-# DEPRECATED # def registration_allowed(self, request):
-# DEPRECATED # """
-# DEPRECATED # Indicate whether account registration is currently permitted,
-# DEPRECATED # based on the value of the setting ``REGISTRATION_OPEN``. This
-# DEPRECATED # is determined as follows:
-# DEPRECATED #
-# DEPRECATED # * If ``REGISTRATION_OPEN`` is not specified in settings, or is
-# DEPRECATED # set to ``True``, registration is permitted.
-# DEPRECATED #
-# DEPRECATED # * If ``REGISTRATION_OPEN`` is both specified and set to
-# DEPRECATED # ``False``, registration is not permitted.
-# DEPRECATED #
-# DEPRECATED # """
-# DEPRECATED # return getattr(settings, 'REGISTRATION_OPEN', True)
-# DEPRECATED #
-# DEPRECATED # def get_success_url(self, request, user):
-# DEPRECATED # """
-# DEPRECATED # Return the name of the URL to redirect to after successful
-# DEPRECATED # user registration.
-# DEPRECATED #
-# DEPRECATED # """
-# DEPRECATED # return ('user_register_complete', (), {})
-# DEPRECATED #
-# DEPRECATED #
-# DEPRECATED #class UserValidateView(ActivationView):
-# DEPRECATED # def activate(self, request, activation_key):
-# DEPRECATED # """
-# DEPRECATED # Given an an activation key, look up and activate the user
-# DEPRECATED # account corresponding to that key (if possible).
-# DEPRECATED #
-# DEPRECATED # After successful activation, the signal
-# DEPRECATED # ``registration.signals.user_activated`` will be sent, with the
-# DEPRECATED # newly activated ``User`` as the keyword argument ``user`` and
-# DEPRECATED # the class of this backend as the sender.
-# DEPRECATED #
-# DEPRECATED # """
-# DEPRECATED # activated_user = RegistrationProfile.objects.activate_user(activation_key)
-# DEPRECATED # if activated_user:
-# DEPRECATED # signals.user_activated.send(sender=self.__class__,
-# DEPRECATED # user=activated_user,
-# DEPRECATED # request=request)
-# DEPRECATED # return activated_user
-# DEPRECATED #
-# DEPRECATED # def get_success_url(self, request, user):
-# DEPRECATED # return ('registration_activation_complete', (), {})
-# DEPRECATED #
-# DEPRECATED #
-# DEPRECATED #from portal.portalpage import PortalPage
-# DEPRECATED #from plugins.wizard import Wizard
-# DEPRECATED #from plugins.form import CreateForm
-# DEPRECATED #from plugins.raw.raw import Raw # XXX
-# DEPRECATED #
-# DEPRECATED #from myslice.viewutils import the_user
-# DEPRECATED #
-# DEPRECATED #from django.template.loader import render_to_string
-# DEPRECATED #from django.template import RequestContext
-# DEPRECATED #from django.views import generic
-# DEPRECATED #
-# DEPRECATED #from django.contrib.formtools.wizard.views import NamedUrlSessionWizardView
-# DEPRECATED ##from django.core.files.storage import FileSystemStorage
-# DEPRECATED #from django.core.files.storage import default_storage
-# DEPRECATED #
-# DEPRECATED ##class MerlinWizard(NamedUrlSessionWizardView):
-# DEPRECATED ##
-# DEPRECATED ## ...
-# DEPRECATED ## ...
-# DEPRECATED ##
-# DEPRECATED ## @classonlymethod
-# DEPRECATED ## def as_view(cls, *args, **kwargs):
-# DEPRECATED ## kwargs.update({
-# DEPRECATED ## 'form_list': [
-# DEPRECATED ## NameForm,
-# DEPRECATED ## QuestForm,
-# DEPRECATED ## ColorForm,
-# DEPRECATED ## ],
-# DEPRECATED ## 'url_name': 'merlin_wizard'
-# DEPRECATED ## })
-# DEPRECATED ## return super(MerlinWizard, cls).as_view(*args, **kwargs)
-# DEPRECATED #
-# DEPRECATED #class UserRegisterWizardView(NamedUrlSessionWizardView):
-# DEPRECATED ##class UserRegisterWizardView(LoginRequiredMixin, NamedUrlSessionWizardView):
-# DEPRECATED # # Notice that I specify a file storage instance. If you don't specify this,
-# DEPRECATED # # and you need to support FileField or ImageField in your forms, you'll get
-# DEPRECATED # # errors from Django. This is something else I think could be handled by
-# DEPRECATED # # the views better. Seems to me that it should just use whatever the
-# DEPRECATED # # default/specified storage is for the rest of your project/application.
-# DEPRECATED # file_storage = default_storage # FileSystemStorage()
-# DEPRECATED # template_name = "register_user_wizard.html"
-# DEPRECATED #
-# DEPRECATED # def done(self, form_list, **kwargs):
-# DEPRECATED # step1_form = form_list[0]
-# DEPRECATED # step2_form = form_list[1]
-# DEPRECATED #
-# DEPRECATED # productext = self.create_product(product_form)
-# DEPRECATED # shippings = self.create_shippings(productext, shipping_forms)
-# DEPRECATED # images = self.create_images(productext, image_forms)
-# DEPRECATED #
-# DEPRECATED # if all([productext, shippings, images]):
-# DEPRECATED # del self.request.session["wizard_product_wizard_view"]
-# DEPRECATED #
-# DEPRECATED # messages.success(self.request,
-# DEPRECATED # _("Your product has been created."))
-# DEPRECATED # return HttpResponseRedirect(self.get_success_url(productext))
-# DEPRECATED #
-# DEPRECATED # messages.error(self.request, _("Something went wrong creating your "
-# DEPRECATED # "product. Please try again or contact support."))
-# DEPRECATED # return HttpResponseRedirect(reverse("register_wizard"))
-# DEPRECATED #
-# DEPRECATED # #def get_form_kwargs(self, step):
-# DEPRECATED # # if step == "product":
-# DEPRECATED # # return {"user": self.request.user}
-# DEPRECATED # # return {}
-# DEPRECATED #
-# DEPRECATED ## The portal should hook the slice and user creation pages
-# DEPRECATED #
-# DEPRECATED #def register_user(request):
-# DEPRECATED #
-# DEPRECATED # if request.method == 'POST':
-# DEPRECATED # form = UserRegisterForm(request.POST) # Nous reprenons les données
-# DEPRECATED # if form.is_valid():
-# DEPRECATED # first_name = form.cleaned_data['first_name']
-# DEPRECATED # last_name = form.cleaned_data['last_name']
-# DEPRECATED # email = form.cleaned_data['email']
-# DEPRECATED # password = form.cleaned_data['password']
-# DEPRECATED # password2 = form.cleaned_data['password2']
-# DEPRECATED # keypair = form.cleaned_data['keypair']
-# DEPRECATED # ## Ici nous pouvons traiter les données du formulaire
-# DEPRECATED # #sujet = form.cleaned_data['sujet']
-# DEPRECATED # #message = form.cleaned_data['message']
-# DEPRECATED # #envoyeur = form.cleaned_data['envoyeur']
-# DEPRECATED # #renvoi = form.cleaned_data['renvoi']
-# DEPRECATED # ## Nous pourrions ici envoyer l'e-mail grâce aux données que nous venons de récupérer
-# DEPRECATED # #envoi = True
-# DEPRECATED # else:
-# DEPRECATED # form = UserRegisterForm()
-# DEPRECATED # return render(request, 'register_user.html', locals())
-# DEPRECATED #
-# DEPRECATED #def index(request):
-# DEPRECATED #
-# DEPRECATED # WIZARD_TITLE = 'User registration'
-# DEPRECATED # STEP1_TITLE = 'Enter your details'
-# DEPRECATED # STEP2_TITLE = 'Select your institution'
-# DEPRECATED # STEP3_TITLE = 'Authentication'
-# DEPRECATED # STEP4_TITLE = 'Request a slice (optional)'
-# DEPRECATED # STEP5_TITLE = 'Waiting for validation'
-# DEPRECATED # STEP6_TITLE = 'Account validated'
-# DEPRECATED #
-# DEPRECATED # STEP0 = render_to_string('account_validated.html', context_instance=RequestContext(request))
-# DEPRECATED # STEP2_HTML = """
-# DEPRECATED # coucou
-# DEPRECATED # """
-# DEPRECATED # STEP4 = """
-# DEPRECATED # mede
-# DEPRECATED # """
-# DEPRECATED # STEP5 = render_to_string('account_validated.html', context_instance=RequestContext(request))
-# DEPRECATED #
-# DEPRECATED # p = PortalPage(request)
-# DEPRECATED #
-# DEPRECATED # # This is redundant with the Wizard title
-# DEPRECATED # p << "
User registration
"
-# DEPRECATED #
-# DEPRECATED # sons = []
-# DEPRECATED # start_step = 1
-# DEPRECATED #
-# DEPRECATED # # STEP 1
-# DEPRECATED # # If the user already exists (is logged), let's display a summary of his account details
-# DEPRECATED # # Otherwise propose a form to fill in
-# DEPRECATED # if the_user(request):
-# DEPRECATED # # Fill a disabled form with user info
-# DEPRECATED # # Please logout to register another user
-# DEPRECATED # sons.append(Raw(page=p, title=STEP1_TITLE, togglable=False, html=STEP0))
-# DEPRECATED # start_step += 1
-# DEPRECATED # else:
-# DEPRECATED # # We could pass a list of fields also, instead of retrieving them from metadata
-# DEPRECATED # # Otherwise we need some heuristics to display nice forms
-# DEPRECATED # # XXX Could we log the user in after the form is validated ?
-# DEPRECATED # # XXX Explain the password is for XXX
-# DEPRECATED # field_list = [{
-# DEPRECATED # 'name' : 'First name',
-# DEPRECATED # 'field' : 'firstname',
-# DEPRECATED # 'type' : 'text',
-# DEPRECATED # 'validate_rx' : '^[a-zA-Z -]+$',
-# DEPRECATED # 'validate_err': 'Your first name must be comprised of letters only',
-# DEPRECATED # 'description' : 'Enter your first name',
-# DEPRECATED # }, {
-# DEPRECATED # 'name' : 'Last name',
-# DEPRECATED # 'field' : 'lastname',
-# DEPRECATED # 'type' : 'text',
-# DEPRECATED # 'validate_rx' : '^[a-zA-Z -]+$',
-# DEPRECATED # 'validate_err': 'Your last name must be comprised of letters only',
-# DEPRECATED # 'description' : 'Enter your last name',
-# DEPRECATED # }, {
-# DEPRECATED # 'name' : 'Email',
-# DEPRECATED # 'field' : 'email',
-# DEPRECATED # 'type' : 'text',
-# DEPRECATED # 'description' : 'Enter your email address',
-# DEPRECATED # }, {
-# DEPRECATED # 'name' : 'Password',
-# DEPRECATED # 'field' : 'password',
-# DEPRECATED # 'type' : 'password',
-# DEPRECATED # 'description' : 'Enter your password',
-# DEPRECATED # }, {
-# DEPRECATED # 'name' : 'Confirm password',
-# DEPRECATED # 'field' : 'password2',
-# DEPRECATED # 'type' : 'password',
-# DEPRECATED # 'description' : 'Enter your password again',
-# DEPRECATED # }]
-# DEPRECATED # sons.append(CreateForm(page = p, title = STEP1_TITLE, togglable = False, object = 'local:user', fields = field_list))
-# DEPRECATED #
-# DEPRECATED # # STEP 2
-# DEPRECATED # # If the user already exists (is logged), let's display a summary of its institution
-# DEPRECATED # # Otherwise propose a form to fill in (we should base our selection on the email)
-# DEPRECATED # if the_user(request):
-# DEPRECATED # # Fill a disabled form with institution
-# DEPRECATED # # Please logout to register another user
-# DEPRECATED # sons.append(Raw(page=p, title=STEP2_TITLE, togglable=False, html="User created"))
-# DEPRECATED # start_step += 1
-# DEPRECATED # else:
-# DEPRECATED # sons.append(CreateForm(page = p, title = STEP2_TITLE, togglable = False, object = 'slice')) #institution'))
-# DEPRECATED #
-# DEPRECATED # # STEP3
-# DEPRECATED # # Please should your prefered authentication method
-# DEPRECATED # # This step should allow the user to either choose the user or managed mode in MySlice
-# DEPRECATED # sons.append(Raw(page = p, title = STEP3_TITLE, togglable = False, html = STEP2_HTML))
-# DEPRECATED #
-# DEPRECATED # # Step 4: Request a slice (optional)
-# DEPRECATED # sons.append(CreateForm(page = p, title = STEP4_TITLE, togglable = False, object = 'slice'))
-# DEPRECATED #
-# DEPRECATED # # Step 5: Your request is waiting for validation
-# DEPRECATED # # Periodic refresh
-# DEPRECATED # sons.append(Raw(page = p, title = STEP5_TITLE, togglable = False, html = STEP4))
-# DEPRECATED #
-# DEPRECATED # # Step 6: Account validation = welcome for newly validated users
-# DEPRECATED # # . delegation
-# DEPRECATED # # . platforms
-# DEPRECATED # # . slice
-# DEPRECATED # # . pointers
-# DEPRECATED # sons.append(Raw(page = p, title = STEP6_TITLE, togglable = False, html = STEP5))
-# DEPRECATED #
-# DEPRECATED # wizard = Wizard(
-# DEPRECATED # page = p,
-# DEPRECATED # title = WIZARD_TITLE,
-# DEPRECATED # togglable = False,
-# DEPRECATED # sons = sons,
-# DEPRECATED # start_step = start_step,
-# DEPRECATED # )
-# DEPRECATED #
-# DEPRECATED # p << wizard.render(request) # in portal page if possible
-# DEPRECATED #
-# DEPRECATED # return p.render()
-
-
-# DEPRECATED ## view for my_account
-# DEPRECATED # class MyAccountView(TemplateView):
-# DEPRECATED # template_name = "my_account.html"
-# DEPRECATED #
-# DEPRECATED # def from_process(self, request, **cleaned_data):
-# DEPRECATED # #if request.method == 'POST':
-# DEPRECATED # # if request.POST['submit_name']:
-# DEPRECATED # if 'fname' in request.POST:
-# DEPRECATED # messsag= "Got Name"
-# DEPRECATED # #return render(request, 'portal/my_account.html')
-# DEPRECATED # #response = HttpResponse("Here's the text of the Web page.")
-# DEPRECATED # return HttpResponse(message)
-# DEPRECATED #
-# DEPRECATED # def get_context_data(self, **kwargs):
-# DEPRECATED # page = Page(self.request)
-# DEPRECATED # context = super(MyAccountView, self).get_context_data(**kwargs)
-# DEPRECATED # context['person'] = self.request.user
-# DEPRECATED # # XXX This is repeated in all pages
-# DEPRECATED # # more general variables expected in the template
-# DEPRECATED # context['title'] = 'User Profile Page'
-# DEPRECATED # # the menu items on the top
-# DEPRECATED # context['topmenu_items'] = topmenu_items('my_account', self.request)
-# DEPRECATED # # so we can sho who is logged
-# DEPRECATED # context['username'] = the_user(self.request)
-# 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"
-
- 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
-
-# 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
+@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
+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()
-
- return HttpResponse('Success: Name Updated!!')
+ # 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:
- #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()
+ 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 +125,19 @@ 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':
+ # 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_aff = request.POST.get('affiliation','')
+ reg_auth = request.POST.get('authority_hrn', '')
reg_email = request.POST.get('email','').lower()
#POST value validation
@@ -700,44 +149,29 @@ def register_4m_f4f(request):
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.')
+# 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']:
- #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()
+ 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()
@@ -756,9 +190,35 @@ def register_4m_f4f(request):
# 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,
- email=reg_email, password=request.POST['password'], keypair=keypair)
+ 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']
+ }
+
+ 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',{
@@ -766,9 +226,11 @@ def register_4m_f4f(request):
'errors': errors,
'firstname': request.POST.get('firstname', ''),
'lastname': request.POST.get('lastname', ''),
- 'affiliation': request.POST.get('affiliation', ''),
+ #'affiliation': request.POST.get('affiliation', ''),
+ 'authority_hrn': request.POST.get('authority_hrn', ''),
'email': request.POST.get('email', ''),
'password': request.POST.get('password', ''),
+ 'authorities': authorities
})
@@ -786,6 +248,7 @@ def contact(request):
email = form.cleaned_data['email'] # email of the sender
cc_myself = form.cleaned_data['cc_myself']
+ #recipients = authority_get_pi_emails(authority_hrn)
recipients = ['yasin.upmc@gmail.com']
if cc_myself:
recipients.append(email)
@@ -803,28 +266,56 @@ 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
- if form.is_valid(): # All validation rules pass
- # Process the data in form.cleaned_data
- slice_name = form.cleaned_data['slice_name']
+ 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']
+ 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']
- recipients = ['yasin.upmc@gmail.com','jordan.auge@lip6.fr']
+ # 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)
- from django.core.mail import send_mail
- send_mail("Onelab New Slice request form submitted", [slice_name,number_of_nodes,type_of_nodes,purpose], email, recipients)
return render(request,'slicereq_recvd.html') # Redirect after POST
else:
- form = SliceRequestForm() # An unbound form
+ form = SliceRequestForm(initial=authority_hrn_initial)
# template_env = {}
# template_env['form'] = form
@@ -1130,28 +621,10 @@ class ValidatePendingView(TemplateView):
queried_pending_authorities = pi_my_authorities | pi_delegation_authorities
print "----"
print "queried_pending_authorities = ", queried_pending_authorities
-
- # Pending requests + authorities
- #pending_users = PendingUser.objects.filter(authority_hrn__in = queried_pending_authorities).all()
- #pending_slices = PendingSlice.objects.filter(authority_hrn__in = queried_pending_authorities).all()
- pending_users = PendingUser.objects.all()
- pending_slices = PendingSlice.objects.all()
-
- # Dispatch requests and build the proper structure for the template:
-
- print "pending users =", pending_users
- print "pending slices =", pending_slices
- for user in pending_users:
- auth_hrn = user.authority_hrn
- if not auth_hrn:
- auth_hrn = "fed4fire.upmc" # XXX HARDCODED
-
- request = {}
- request['type'] = 'user'
- request['id'] = 'TODO' # XXX in DB ?
- request['timestamp'] = 'TODO' # XXX in DB ?
- request['details'] = "%s %s <%s>" % (user.first_name, user.last_name, user.email)
+ requests = get_request_by_authority(queried_pending_authorities)
+ for request in requests:
+ auth_hrn = request['authority_hrn']
if auth_hrn in pi_my_authorities:
dest = ctx_my_authorities
@@ -1174,45 +647,11 @@ class ValidatePendingView(TemplateView):
else:
continue
-
- if not auth_hrn in dest:
- dest[auth_hrn] = []
- print "auth_hrn [%s] was added %r" % (auth_hrn, request)
- dest[auth_hrn].append(request)
- for slice in pending_slices:
- auth_hrn = slice.authority_hrn
- if not auth_hrn:
- auth_hrn = "ple.upmc" # XXX HARDCODED
-
- request = {}
- request['type'] = 'slice'
- request['id'] = 'TODO' # XXX in DB ?
- request['timestamp'] = 'TODO' # XXX in DB ?
- request['details'] = "Number of nodes: %d -- Type of nodes: %s
%s" % ('TODO', 'TODO', 'TODO') # XXX
- if auth_hrn in pi_my_authorities:
- dest = ctx_my_authorities
-
- # define the css class
- if auth_hrn in pi_credential_authorities:
- request['allowed'] = 'allowed'
- elif auth_hrn in pi_expired_credential_authorities:
- request['allowed'] = 'expired'
- else: # pi_no_credential_authorities
- request['allowed'] = 'denied'
-
- elif auth_hrn in pi_delegation_authorities:
- dest = ctx_delegation_authorities
-
- if auth_hrn in pi_delegation_credential_authorities:
- request['allowed'] = 'allowed'
- else: # pi_delegation_expired_authorities
- request['allowed'] = 'expired'
-
if not auth_hrn in dest:
dest[auth_hrn] = []
dest[auth_hrn].append(request)
-
+
context = super(ValidatePendingView, self).get_context_data(**kwargs)
context['my_authorities'] = ctx_my_authorities
context['delegation_authorities'] = ctx_delegation_authorities