Added call to manage_public_key task when generating dcl generated keys
and reorganized imports
This commit is contained in:
parent
a4a2b2a803
commit
51b1ee2013
1 changed files with 33 additions and 29 deletions
|
@ -1,45 +1,42 @@
|
||||||
|
import logging
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from django.core.files.base import ContentFile
|
from django.conf import settings
|
||||||
|
from django.contrib import messages
|
||||||
from oca.pool import WrongNameError, WrongIdError
|
|
||||||
from django.shortcuts import render
|
|
||||||
from django.http import Http404
|
|
||||||
from django.core.urlresolvers import reverse_lazy, reverse
|
|
||||||
from django.contrib.auth.mixins import LoginRequiredMixin
|
from django.contrib.auth.mixins import LoginRequiredMixin
|
||||||
|
from django.contrib.auth.tokens import default_token_generator
|
||||||
|
from django.core.files.base import ContentFile
|
||||||
|
from django.core.urlresolvers import reverse_lazy, reverse
|
||||||
|
from django.http import Http404
|
||||||
|
from django.http import HttpResponseRedirect
|
||||||
|
from django.shortcuts import redirect
|
||||||
|
from django.shortcuts import render
|
||||||
|
from django.utils.http import urlsafe_base64_decode
|
||||||
|
from django.utils.safestring import mark_safe
|
||||||
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.views.generic import View, CreateView, FormView, ListView, \
|
from django.views.generic import View, CreateView, FormView, ListView, \
|
||||||
DetailView, \
|
DetailView, \
|
||||||
DeleteView, TemplateView, UpdateView
|
DeleteView, TemplateView, UpdateView
|
||||||
from django.http import HttpResponseRedirect
|
|
||||||
from django.contrib import messages
|
|
||||||
from django.conf import settings
|
|
||||||
from django.shortcuts import redirect
|
|
||||||
from django.utils.http import urlsafe_base64_decode
|
|
||||||
from django.contrib.auth.tokens import default_token_generator
|
|
||||||
|
|
||||||
from guardian.mixins import PermissionRequiredMixin
|
from guardian.mixins import PermissionRequiredMixin
|
||||||
from stored_messages.settings import stored_messages_settings
|
from oca.pool import WrongIdError
|
||||||
from stored_messages.models import Message
|
|
||||||
from stored_messages.api import mark_read
|
from stored_messages.api import mark_read
|
||||||
from django.utils.safestring import mark_safe
|
from stored_messages.models import Message
|
||||||
|
from stored_messages.settings import stored_messages_settings
|
||||||
|
|
||||||
from membership.models import CustomUser, StripeCustomer
|
from membership.models import CustomUser, StripeCustomer
|
||||||
from utils.stripe_utils import StripeUtils
|
|
||||||
from utils.forms import BillingAddressForm, PasswordResetRequestForm, \
|
|
||||||
UserBillingAddressForm
|
|
||||||
from utils.views import PasswordResetViewMixin, \
|
|
||||||
PasswordResetConfirmViewMixin, LoginViewMixin
|
|
||||||
from utils.mailer import BaseEmail
|
|
||||||
from .models import HostingOrder, HostingBill, HostingPlan, UserHostingKey
|
|
||||||
from .forms import HostingUserSignupForm, HostingUserLoginForm, \
|
|
||||||
UserHostingKeyForm, generate_ssh_key_name
|
|
||||||
from .mixins import ProcessVMSelectionMixin
|
|
||||||
|
|
||||||
from opennebula_api.models import OpenNebulaManager
|
from opennebula_api.models import OpenNebulaManager
|
||||||
from opennebula_api.serializers import VirtualMachineSerializer, \
|
from opennebula_api.serializers import VirtualMachineSerializer, \
|
||||||
VirtualMachineTemplateSerializer
|
VirtualMachineTemplateSerializer
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from utils.forms import BillingAddressForm, PasswordResetRequestForm, \
|
||||||
import logging
|
UserBillingAddressForm
|
||||||
|
from utils.mailer import BaseEmail
|
||||||
|
from utils.stripe_utils import StripeUtils
|
||||||
|
from utils.views import PasswordResetViewMixin, \
|
||||||
|
PasswordResetConfirmViewMixin, LoginViewMixin
|
||||||
|
from .forms import HostingUserSignupForm, HostingUserLoginForm, \
|
||||||
|
UserHostingKeyForm, generate_ssh_key_name
|
||||||
|
from .mixins import ProcessVMSelectionMixin
|
||||||
|
from .models import HostingOrder, HostingBill, HostingPlan, UserHostingKey
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
@ -411,6 +408,13 @@ class SSHKeyChoiceView(LoginRequiredMixin, View):
|
||||||
user=request.user, public_key=public_key, name=name)
|
user=request.user, public_key=public_key, name=name)
|
||||||
filename = name + '_' + str(uuid.uuid4())[:8] + '_private.pem'
|
filename = name + '_' + str(uuid.uuid4())[:8] + '_private.pem'
|
||||||
ssh_key.private_key.save(filename, content)
|
ssh_key.private_key.save(filename, content)
|
||||||
|
owner = self.request.user
|
||||||
|
manager = OpenNebulaManager(
|
||||||
|
email=owner.email,
|
||||||
|
password=owner.password
|
||||||
|
)
|
||||||
|
public_key_str = public_key.decode()
|
||||||
|
manager.manage_public_key([{'value': public_key_str, 'state': True}])
|
||||||
return redirect(reverse_lazy('hosting:ssh_keys'), foo='bar')
|
return redirect(reverse_lazy('hosting:ssh_keys'), foo='bar')
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue