amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added manage_public_key when deleting a key (However, this does not seem to work in cdist)

Browse source
This commit is contained in:
M.Ravi 2017-08-30 09:42:56 +02:00
commit 92e47b6f90
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
hosting/views.py
View file

@ -363,17 +363,14 @@ class SSHKeyDeleteView(LoginRequiredMixin, DeleteView):
def delete(self, request, *args, **kwargs): def delete(self, request, *args, **kwargs):
owner = self.request.user owner = self.request.user
manager = OpenNebulaManager() manager = OpenNebulaManager(
email=owner.email,
password=owner.password
)
pk = self.kwargs.get('pk') pk = self.kwargs.get('pk')
# Get user ssh key # Get user ssh key
public_key = UserHostingKey.objects.get(pk=pk).public_key public_key = UserHostingKey.objects.get(pk=pk).public_key
# Add ssh key to user manager.manage_public_key([{'value': public_key, 'state': False}])
try:
manager.remove_public_key(user=owner, public_key=public_key)
except ConnectionError:
pass
except WrongNameError:
pass
return super(SSHKeyDeleteView, self).delete(request, *args, **kwargs) return super(SSHKeyDeleteView, self).delete(request, *args, **kwargs)
@ -465,7 +462,7 @@ class SSHKeyCreateView(LoginRequiredMixin, FormView):
public_key = form.cleaned_data['public_key'] public_key = form.cleaned_data['public_key']
if type(public_key) is bytes: if type(public_key) is bytes:
public_key = public_key.decode() public_key = public_key.decode()
manager.save_public_key([public_key]) manager.manage_public_key([{'value': public_key, 'state': True}])
return HttpResponseRedirect(self.success_url) return HttpResponseRedirect(self.success_url)
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):