#
from manifold.core.query import Query
from manifold.manifoldapi import execute_query
-from portal.actions import manifold_update_user
+from portal.actions import manifold_update_user, manifold_update_account
#
from myslice.viewutils import topmenu_items, the_user
#
from django.http import HttpResponse
from django.contrib.auth.decorators import login_required
-import json
+import json, os, re
# requires login
class AccountView(LoginRequiredAutoLogoutView):
# keypair = re.sub("\n", "\\n", keypair)
# #keypair = keypair.rstrip('\r\n')
# keypair = ''.join(keypair.split())
- get_user.keypair = keypair
- get_user.save()
- return HttpResponse('Success: New Keypair Generated! %s' % keypair)
+ user_params = { 'config': keypair, 'auth_type':'managed'}
+ manifold_update_account(request,user_params)
+ return HttpResponse('Success: New Keypair Generated!')
elif 'upload_key' in request.POST:
up_file = request.FILES['pubkey']
allowed_extension = ['.pub','.txt']
if file_extension in allowed_extension and re.search(r'ssh-rsa',file_content):
file_content = '{"user_public_key":"'+ file_content +'"}'
- file_content = re.sub("\r", "", file_content)
- file_content = re.sub("\n", "\\n",file_content)
+ #file_content = re.sub("\r", "", file_content)
+ #file_content = re.sub("\n", "\\n",file_content)
file_content = ''.join(file_content.split())
- get_user.keypair = file_content
- get_user.save()
- return HttpResponse('Success: Publickey uploaded! Old records overwritten')
+ # update manifold account table
+ user_params = { 'config': file_content, 'auth_type':'user'}
+ manifold_update_account(request,user_params)
+ return HttpResponse('Success: Publickey uploaded! Please delegate your credentials using SFA: http://trac.myslice.info/wiki/DelegatingCredentials')
else:
return HttpResponse('Please upload a valid RSA public key [.txt or .pub].')
else:
- message = 'You submitted an empty form.'
+ message = 'Under Construction.'
return HttpResponse(message)