from manifold.core.query import Query
from portal.models import PendingUser
-#from portal.actions import create_pending_user
-# Edelberto - LDAP
-from portal.actions import create_pending_user, ldap_create_user
+from django.contrib.auth.models import User #Pedro
+
+from portal.actions import create_pending_user
from myslice.theme import ThemeView
"""
"""
errors = []
-
- authorities_query = Query.get('authority').select('name', 'authority_hrn')
+ authority_hrn = None
+ authorities_query = Query.get('authority').select('name','authority_hrn')
authorities = execute_admin_query(wsgi_request, authorities_query)
if authorities is not None:
authorities = sorted(authorities)
current_site = Site.objects.get_current()
current_site = current_site.domain
- authorities_query = Query.get('authority').select('name', 'authority_hrn')
- authorities = execute_admin_query(wsgi_request, authorities_query)
+ #authorities_query = Query.get('authority').select('name', 'authority_hrn')
+ #authorities = execute_admin_query(wsgi_request, authorities_query)
for authority in authorities:
if authority['name'] == wsgi_request.POST.get('org_name', ''):
authority_hrn = authority['authority_hrn']
+ # Handle the case when the template uses only hrn and not name
+ if authority_hrn is None:
+ authority_hrn = wsgi_request.POST.get('org_name', '')
+
post_email = wsgi_request.POST.get('email','').lower()
salt = randint(1,100000)
email_hash = md5(str(salt)+post_email).hexdigest()
'organization' : wsgi_request.POST.get('org_name', ''),
'authority_hrn' : authority_hrn,
'email' : post_email,
+ 'username' : wsgi_request.POST.get('username','').lower(),
'password' : wsgi_request.POST.get('password', ''),
+ 'reasons' : wsgi_request.POST.get('reasons', ''),
'current_site' : current_site,
'email_hash' : email_hash,
'pi' : '',
- 'validation_link': 'http://' + current_site + '/portal/email_activation/'+ email_hash
+ 'validation_link': 'https://' + current_site + '/portal/email_activation/'+ email_hash
}
# Construct user_hrn from email (XXX Should use common code)
- split_email = user_request['email'].split("@")[0]
- split_email = split_email.replace(".", "_")
- user_request['user_hrn'] = user_request['authority_hrn'] \
- + '.' + split_email
+ # split_email = user_request['email'].split("@")[0]
+ # split_email = split_email.replace(".", "_")
+ # user_request['user_hrn'] = user_request['authority_hrn'] \
+ # + '.' + split_email
+ username = user_request['username']
+
+ if user_request['authority_hrn'] == "fibre" :
+ user_request['username'] = user_request['username'] + "@" + "rnp" # catch-all island
+ split_authority = user_request['authority_hrn']
+ else :
+ split_authority = user_request['authority_hrn'].split(".")[1]
+ user_request['username'] = user_request['username'] + '@' + split_authority
+ split_authority = user_request['authority_hrn'].split(".")[0]
+
+ user_request['user_hrn'] = split_authority + '.' + user_request['username']
+
# Validate input
UserModel = get_user_model()
if (re.search(r'^[\w+\s.@+-]+$', user_request['first_name']) == None):
errors.append('First name may contain only letters, numbers, spaces and @/./+/-/_ characters.')
if (re.search(r'^[\w+\s.@+-]+$', user_request['last_name']) == None):
errors.append('Last name may contain only letters, numbers, spaces and @/./+/-/_ characters.')
+ if (re.search(r'^[\w,]+$' , username) == None):
+ errors.append('Username may contain only letters,numbers and -/_ characters.')
# checking in django_db !!
if PendingUser.objects.filter(email__iexact = user_request['email']):
errors.append('Email is pending for validation. Please provide a new email address.')
- if UserModel._default_manager.filter(email__iexact = user_request['email']):
- errors.append('This email is not usable. Please contact the administrator or try with another email.')
+ # if UserModel._default_manager.filter(email__iexact = user_request['email']):
+ # errors.append('This email is not usable. Please contact the administrator or try with another email.')
+ if User.objects.filter(username__iexact = user_request['username']):
+ errors.append('This username is already in use, try another one')
# Does the user exist in Manifold?
user_query = Query().get('local:user').select('user_id','email')
user_details = execute_admin_query(wsgi_request, user_query)
user_query = Query().get('user').select('user_hrn','user_email').filter_by('user_hrn','==',user_request['user_hrn'])
user_details_sfa = execute_admin_query(wsgi_request, user_query)
- for user in user_details_sfa:
- if user['user_email'] == user_request['email']:
- errors.append('Email already registered in SFA registry. Please use another email.')
- if user['user_hrn'] == user_request['user_hrn']:
- # add random number if user_hrn already exists in the registry
- user_request['user_hrn'] = user_request['authority_hrn'] \
- + '.' + split_email + str(randint(1,1000000))
+ # for user in user_details_sfa:
+ # if user['user_email'] == user_request['email']:
+ # errors.append('Email already registered in SFA registry. Please use another email.')
+ # if user['user_hrn'] == user_request['user_hrn']:
+ # # add random number if user_hrn already exists in the registry
+ # user_request['user_hrn'] = user_request['authority_hrn'] \
+ # + '.' + split_email + str(randint(1,1000000))
# XXX TODO: Factorize with portal/accountview.py
+ # XXX TODO: Factorize with portal/registrationview.py
+ # XXX TODO: Factorize with portal/joinview.py
if 'generate' in wsgi_request.POST['question']:
user_request['auth_type'] = 'managed'
user_request['public_key'] = file_content
if not errors:
- '''
- try:
- # verify if is a LDAP
- mail = user_detail['email']
- login = mail.split('@')[0]
- org = mail.split('@')[1]
- o = org.split('.')[-2]
- dc = org.split('.')[-1]
- # To know if user is a LDAP user - Need to has a 'dc' identifier
- if dc == 'br' or 'eu':
- # LDAP insert directly - but with userEnable = FALSE
- ldap_create_user(wsgi_request, user_request, user_detail)
-
- except Exception, e:
- print "LDAP: problem em access the LDAP with this credentail"
- '''
create_pending_user(wsgi_request, user_request, user_detail)
self.template_name = 'user_register_complete.html'
- return render(wsgi_request, self.template, {'theme': self.theme})
+ return render(wsgi_request, self.template, {'theme': self.theme, 'REQINST':wsgi_request.POST.get('org_name', '').split(".")[1].upper()})
else:
user_request = {}
'topmenu_items': topmenu_items_live('Register', page),
'errors': errors,
'authorities': authorities,
- 'theme': self.theme
+ 'theme': self.theme,
+ 'section':'Registration'
}
template_env.update(user_request)
template_env.update(reg_form)
git://git.onelab.eu / myslice.git / blobdiff