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

Merge branch '7032/bugfix_existing_key' into 'master'

Browse source 
7032/bugfix existing key

See merge request ungleich-public/dynamicweb!712
This commit is contained in:
pcoder116 2019-08-28 18:36:51 +02:00
commit 5646e370ec
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
hosting/forms.py
View file

@ -9,7 +9,6 @@ from django.contrib.auth import authenticate
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from membership.models import CustomUser from membership.models import CustomUser
from utils.hosting_utils import get_all_public_keys
from .models import UserHostingKey, GenericProduct from .models import UserHostingKey, GenericProduct
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -193,15 +192,6 @@ class UserHostingKeyForm(forms.ModelForm):
KEY_ERROR_MESSAGE = _("Please input a proper SSH key") KEY_ERROR_MESSAGE = _("Please input a proper SSH key")
openssh_pubkey_str = self.data.get('public_key').strip() openssh_pubkey_str = self.data.get('public_key').strip()
if openssh_pubkey_str in get_all_public_keys(self.request.user):
key_name = UserHostingKey.objects.filter(
user_id=self.request.user.id,
public_key=openssh_pubkey_str).first().name
KEY_EXISTS_MESSAGE = _(
"This key exists already with the name \"%(name)s\"") % {
'name': key_name}
raise forms.ValidationError(KEY_EXISTS_MESSAGE)
with tempfile.NamedTemporaryFile(delete=True) as tmp_public_key_file: with tempfile.NamedTemporaryFile(delete=True) as tmp_public_key_file:
tmp_public_key_file.write(openssh_pubkey_str.encode('utf-8')) tmp_public_key_file.write(openssh_pubkey_str.encode('utf-8'))
tmp_public_key_file.flush() tmp_public_key_file.flush()

2
utils/hosting_utils.py
View file

@ -18,7 +18,7 @@ def get_all_public_keys(customer):
:return: A list of public keys :return: A list of public keys
""" """
return UserHostingKey.objects.filter(user_id=customer.id).values_list( return UserHostingKey.objects.filter(user_id=customer.id).values_list(
"public_key", flat=True) "public_key", flat=True).distinct()
def get_or_create_vm_detail(user, manager, vm_id): def get_or_create_vm_detail(user, manager, vm_id):