import os.path, re
+import json
from django.core.mail import send_mail
from django.template.loader import render_to_string
from django.shortcuts import render
-from myslice.viewutils import topmenu_items
+from unfold.page import Page
+from ui.topmenu import topmenu_items
-from manifold.manifoldapi import execute_query
+from manifold.manifoldapi import execute_admin_query
from manifold.core.query import Query
from portal.models import PendingUser
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)
+
+ onelab_enabled_query = Query.get('local:platform').filter_by('platform', '==', 'ple-onelab').filter_by('disabled', '==', 'False')
+ #onelab_enabled = not not execute_admin_query(request, onelab_enabled_query)
+ onelab_enabled = True
+ if onelab_enabled:
+ print "ONELAB ENABLED"
+ authorities_query = authorities_query.filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc', 'ple.ibbtple'])
+ else:
+ print "FIREXP ENABLED"
+
+ authorities = execute_admin_query(request, authorities_query)
+ # xxx tocheck - if authorities is empty, it's no use anyway
+ # (users won't be able to validate the form anyway)
+
+ page = Page(request)
+ page.add_js_files ( [ "js/jquery.validate.js", "js/my_account.register.js" ] )
+ page.add_css_files ( [ "css/onelab.css", "css/registration.css" ] )
+
+ print 'registration view, method',request.method
if request.method == 'POST':
# We shall use a form here
# XXX validate authority hrn !!
if PendingUser.objects.filter(email__iexact=reg_email):
errors.append('Email already registered.Please provide a new email address.')
+
+# XXX TODO: Factorize with portal/accountview.py
if 'generate' in request.POST['question']:
- # 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
+ from Crypto.PublicKey import RSA
+ private = RSA.generate(1024)
+ private_key = json.dumps(private.exportKey())
+ public = private.publickey()
+ public_key = json.dumps(public.exportKey(format='OpenSSH'))
+
+# # 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 = '{"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 = ''.join(keypair.split())
+ # for sending email
+ public_key = file_content
else:
errors.append('Please upload a valid RSA public key [.txt or .pub].')
# 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,
- 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,
- 'authority_hrn': reg_auth,
- 'email' : reg_email,
- 'keypair' : keypair,
- 'cc_myself' : True # form.cleaned_data['cc_myself']
- }
-
- recipients = authority_get_pi_emails(request,reg_auth)
- if ctx['cc_myself']:
- recipients.append(ctx['email'])
-
- msg = render_to_string('user_request_email.txt', ctx)
- send_mail("Onelab New User request for %s submitted"%reg_email, msg, reg_email, recipients)
-
- return render(request, 'user_register_complete.html')
-
- return render(request, 'registration_view.html',{
- 'topmenu_items': topmenu_items('Register', request),
- 'errors': errors,
- '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,
- })
+ 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,
+ 'authority_hrn' : reg_auth,
+ 'email' : reg_email,
+ 'keypair' : 'Public Key :' + public_key,
+ 'cc_myself' : True # form.cleaned_data['cc_myself']
+ }
+ #not working
+ #recipients = authority_get_pi_emails(request,reg_auth)
+ recipients = ['devel@myslice.info']
+ if ctx['cc_myself']:
+ recipients.append(ctx['email'])
+
+ msg = render_to_string('user_request_email.txt', ctx)
+ print "tesing msg"
+ print msg
+ send_mail("Onelab New User request for %s submitted"%reg_email, msg, reg_email, recipients)
+
+ return render(request, 'user_register_complete.html')
+
+ template_env = {
+ 'topmenu_items': topmenu_items('Register', request),
+ 'errors': errors,
+ '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,
+ }
+ template_env.update(page.prelude_env ())
+ return render(request, 'registration_view.html',template_env)
git://git.onelab.eu / unfold.git / blobdiff