git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(wip)
[myslice.git]
/
portal
/
registrationview.py
diff --git
a/portal/registrationview.py
b/portal/registrationview.py
index
e27dfb4
..
85935f2
100644
(file)
--- a/
portal/registrationview.py
+++ b/
portal/registrationview.py
@@
-63,7
+63,11
@@
class RegistrationView (FreeAccessView):
reg_auth = request.POST.get('authority_hrn', '')
reg_login = request.POST.get('login', '')
reg_email = request.POST.get('email','').lower()
reg_auth = request.POST.get('authority_hrn', '')
reg_login = request.POST.get('login', '')
reg_email = request.POST.get('email','').lower()
-
+ #prepare user_hrn
+ split_email = reg_email.split("@")[0]
+ split_email = split_email.replace(".", "_")
+ user_hrn = reg_auth + '.' + split_email
+
#POST value validation
if (re.search(r'^[\w+\s.@+-]+$', reg_fname)==None):
errors.append('First Name may contain only letters, numbers, spaces and @/./+/-/_ characters.')
#POST value validation
if (re.search(r'^[\w+\s.@+-]+$', reg_fname)==None):
errors.append('First Name may contain only letters, numbers, spaces and @/./+/-/_ characters.')
@@
-89,7
+93,7
@@
class RegistrationView (FreeAccessView):
# private_key = ''.join(private_key.split())
# public_key = "ssh-rsa " + public_key
# Saving to DB
# 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 + '
, "user_hrn":"'+ user_hrn + '"
}'
#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')
@@
-101,7
+105,7
@@
class RegistrationView (FreeAccessView):
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):
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 = '{"user_public_key":"'+ file_content +
'", "user_hrn":"'+ user_hrn +
'"}'
keypair = re.sub("\r", "", keypair)
keypair = re.sub("\n", "\\n",keypair)
keypair = ''.join(keypair.split())
keypair = re.sub("\r", "", keypair)
keypair = re.sub("\n", "\\n",keypair)
keypair = ''.join(keypair.split())
@@
-131,11
+135,11
@@
class RegistrationView (FreeAccessView):
'first_name' : reg_fname,
'last_name' : reg_lname,
'authority_hrn' : reg_auth,
'first_name' : reg_fname,
'last_name' : reg_lname,
'authority_hrn' : reg_auth,
- 'email' : reg_email,
+ 'email' : reg_email,
+ 'user_hrn' : user_hrn,
'keypair' : 'Public Key :' + public_key,
'cc_myself' : True # form.cleaned_data['cc_myself']
}
'keypair' : 'Public Key :' + public_key,
'cc_myself' : True # form.cleaned_data['cc_myself']
}
-
recipients = authority_get_pi_emails(request,reg_auth)
if ctx['cc_myself']:
recipients = authority_get_pi_emails(request,reg_auth)
if ctx['cc_myself']: