From: Loic Baron Date: Fri, 24 Jan 2014 15:48:14 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice X-Git-Tag: myslice-0.3-0~19 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=e50dc5c2f20e313ec89e9aa1532de388e682072f;hp=c530f4c2ee9dfe6da3c2349a73796dc38fc4e5bf Merge branch 'master' of ssh://git.onelab.eu/git/myslice --- diff --git a/portal/accountview.py b/portal/accountview.py index 70ec790f..5447bce8 100644 --- a/portal/accountview.py +++ b/portal/accountview.py @@ -86,43 +86,44 @@ class AccountView(LoginRequiredAutoLogoutView): account_pub_key = account_config.get('user_public_key','N/A') account_reference = account_config.get ('reference_platform','N/A') # credentials - acc_user_cred = account_config.get('delegated_user_credential','N/A') - acc_slice_cred = account_config.get('delegated_slice_credentials','N/A') - acc_auth_cred = account_config.get('delegated_authority_credentials','N/A') - - if 'N/A' not in acc_user_cred: - exp_date = re.search('(.*)', acc_user_cred) - if exp_date: - user_exp_date = exp_date.group(1) - user_cred_exp_list.append(user_exp_date) - - my_users = [{'cred_exp': t[0]} - for t in zip(user_cred_exp_list)] - + if 'myslice' in platform_detail['platform']: + acc_user_cred = account_config.get('delegated_user_credential','N/A') + acc_slice_cred = account_config.get('delegated_slice_credentials','N/A') + acc_auth_cred = account_config.get('delegated_authority_credentials','N/A') - if 'N/A' not in acc_slice_cred: - for key, value in acc_slice_cred.iteritems(): - slice_list.append(key) - # get cred_exp date - exp_date = re.search('(.*)', value) + if 'N/A' not in acc_user_cred: + exp_date = re.search('(.*)', acc_user_cred) if exp_date: - exp_date = exp_date.group(1) - slice_cred_exp_list.append(exp_date) - - my_slices = [{'slice_name': t[0], 'cred_exp': t[1]} - for t in zip(slice_list, slice_cred_exp_list)] + user_exp_date = exp_date.group(1) + user_cred_exp_list.append(user_exp_date) - if 'N/A' not in acc_auth_cred: - for key, value in acc_auth_cred.iteritems(): - auth_list.append(key) - #get cred_exp date - exp_date = re.search('(.*)', value) - if exp_date: - exp_date = exp_date.group(1) - auth_cred_exp_list.append(exp_date) + my_users = [{'cred_exp': t[0]} + for t in zip(user_cred_exp_list)] + - my_auths = [{'auth_name': t[0], 'cred_exp': t[1]} - for t in zip(auth_list, auth_cred_exp_list)] + if 'N/A' not in acc_slice_cred: + for key, value in acc_slice_cred.iteritems(): + slice_list.append(key) + # get cred_exp date + exp_date = re.search('(.*)', value) + if exp_date: + exp_date = exp_date.group(1) + slice_cred_exp_list.append(exp_date) + + my_slices = [{'slice_name': t[0], 'cred_exp': t[1]} + for t in zip(slice_list, slice_cred_exp_list)] + + if 'N/A' not in acc_auth_cred: + for key, value in acc_auth_cred.iteritems(): + auth_list.append(key) + #get cred_exp date + exp_date = re.search('(.*)', value) + if exp_date: + exp_date = exp_date.group(1) + auth_cred_exp_list.append(exp_date) + + my_auths = [{'auth_name': t[0], 'cred_exp': t[1]} + for t in zip(auth_list, auth_cred_exp_list)] # for reference accounts diff --git a/portal/django_passresetview.py b/portal/django_passresetview.py index adf62395..769e9f5a 100644 --- a/portal/django_passresetview.py +++ b/portal/django_passresetview.py @@ -115,7 +115,7 @@ def password_reset(request, is_admin_site=False, if form.is_valid(): ### email check in manifold DB ### - email = form.cleaned_data['email'] # email inserted on the form + email = form.cleaned_data['email'].lower() # email inserted on the form user_query = Query().get('local:user').select('user_id','email') user_details = execute_admin_query(request, user_query) flag = 0 @@ -196,13 +196,13 @@ def password_reset_confirm(request, uidb36=None, token=None, ### manifold pass update ### #password = form.cleaned_data('password1') password=request.POST['new_password1'] - user_query = Query().get('local:user').select('user_id','email','password') - user_details = execute_admin_query(request, user_query) - for user_detail in user_details: - if user_detail['email'] == user.email: - user_detail['password'] = password + #user_query = Query().get('local:user').select('user_id','email','password') + #user_details = execute_admin_query(request, user_query) + #for user_detail in user_details: + # if user_detail['email'] == user.email: + # user_detail['password'] = password #updating password in local:user - user_params = { 'password': user_detail['password']} + user_params = { 'password': password} manifold_update_user(request,user.email,user_params) ### end of manifold pass update ### diff --git a/portal/registrationview.py b/portal/registrationview.py index c966b52f..90893f75 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -133,7 +133,7 @@ class RegistrationView (FreeAccessView): public_key = file_content public_key = ''.join(public_key.split()) else: - errors.append('Please upload a valid RSA public key [.txt or .pub].') + errors.append('Please upload a valid RSA public key.') #b = PendingUser(first_name=reg_fname, last_name=reg_lname, affiliation=reg_aff, # email=reg_email, password=request.POST['password'], keypair=keypair)