git://git.onelab.eu
/
myslice.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e98799c
)
genkey/upkey works even if there is no user_hrn
author
Yasin
<mohammed-yasin.rahman@lip6.fr>
Fri, 15 Nov 2013 17:31:13 +0000
(18:31 +0100)
committer
Yasin
<mohammed-yasin.rahman@lip6.fr>
Fri, 15 Nov 2013 17:31:13 +0000
(18:31 +0100)
portal/accountview.py
patch
|
blob
|
history
diff --git
a/portal/accountview.py
b/portal/accountview.py
index
646ea2c
..
f7fa1b8
100644
(file)
--- a/
portal/accountview.py
+++ b/
portal/accountview.py
@@
-171,7
+171,7
@@
def account_process(request):
# updating maniolf local:account table
account_config = json.loads(account_detail['config'])
# preserving user_hrn
# updating maniolf local:account table
account_config = json.loads(account_detail['config'])
# preserving user_hrn
- user_hrn = account_config
['user_hrn']
+ user_hrn = account_config
.get('user_hrn','N/A')
keypair = '{"user_public_key":'+ public_key + ', "user_private_key":'+ private_key + ', "user_hrn":"'+ user_hrn + '"}'
updated_config = json.dumps(account_config)
keypair = '{"user_public_key":'+ public_key + ', "user_private_key":'+ private_key + ', "user_hrn":"'+ user_hrn + '"}'
updated_config = json.dumps(account_config)
@@
-196,7
+196,7
@@
def account_process(request):
if file_extension in allowed_extension and re.search(r'ssh-rsa',file_content):
account_config = json.loads(account_detail['config'])
# preserving user_hrn
if file_extension in allowed_extension and re.search(r'ssh-rsa',file_content):
account_config = json.loads(account_detail['config'])
# preserving user_hrn
- user_hrn = account_config
['user_hrn']
+ user_hrn = account_config
.get('user_hrn','N/A')
file_content = '{"user_public_key":"'+ file_content + '", "user_hrn":"'+ user_hrn +'"}'
#file_content = re.sub("\r", "", file_content)
#file_content = re.sub("\n", "\\n",file_content)
file_content = '{"user_public_key":"'+ file_content + '", "user_hrn":"'+ user_hrn +'"}'
#file_content = re.sub("\r", "", file_content)
#file_content = re.sub("\n", "\\n",file_content)