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

Merge branch 'develop' of github.com:ungleich/dynamicweb into develop

Browse source
This commit is contained in:
Henry Bravo 2017-06-11 19:46:26 -05:00
commit 38970e9353
3 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Changelog
View file

@ -27,3 +27,7 @@
* [datacenterlight] Fix initially shown price * [datacenterlight] Fix initially shown price
1.0.0: 2017-05-25 1.0.0: 2017-05-25
* Initial stable release * Initial stable release
Next:
[datacenterlight] Fixed error trying to delete ssh key
[datacenterlight] Fixed footer links

2
hosting/views.py
View file

@ -369,7 +369,7 @@ class SSHKeyCreateView(LoginRequiredMixin, FormView):
manager = OpenNebulaManager() manager = OpenNebulaManager()
# Get user ssh key # Get user ssh key
public_key = form.cleaned_data.get('public_key') public_key = form.cleaned_data.get('public_key', '').decode('utf-8')
# Add ssh key to user # Add ssh key to user
try: try:
manager.add_public_key(user=owner, public_key=public_key, merge=True) manager.add_public_key(user=owner, public_key=public_key, merge=True)

7
opennebula_api/models.py
View file

@ -449,6 +449,7 @@ class OpenNebulaManager():
""" """
# TODO: Check if we can remove this first try because we basically just # TODO: Check if we can remove this first try because we basically just
# raise the possible Errors # raise the possible Errors
try: try:
open_user = self._get_user(user) open_user = self._get_user(user)
try: try:
@ -492,14 +493,16 @@ class OpenNebulaManager():
try: try:
old_key = open_user.template.ssh_public_key old_key = open_user.template.ssh_public_key
if public_key not in old_key: if public_key not in old_key:
raise KeyDoesNotExistsError() return False
# raise KeyDoesNotExistsError()
if '\n{}'.format(public_key) in old_key: if '\n{}'.format(public_key) in old_key:
public_key = old_key.replace('\n{}'.format(public_key), '') public_key = old_key.replace('\n{}'.format(public_key), '')
else: else:
public_key = old_key.replace(public_key, '') public_key = old_key.replace(public_key, '')
except AttributeError: except AttributeError:
raise KeyDoesNotExistsError() return False
#raise KeyDoesNotExistsError()
self.oneadmin_client.call('user.update', open_user.id, self.oneadmin_client.call('user.update', open_user.id,
'<CONTEXT><SSH_PUBLIC_KEY>{key}</SSH_PUBLIC_KEY></CONTEXT>'.format(key=public_key)) '<CONTEXT><SSH_PUBLIC_KEY>{key}</SSH_PUBLIC_KEY></CONTEXT>'.format(key=public_key))