mirror of https://github.com/jumpserver/jumpserver
parent
a890a8d535
commit
e2de744398
|
@ -1,7 +1,7 @@
|
||||||
import os
|
|
||||||
from django.utils.functional import LazyObject
|
|
||||||
from importlib import import_module
|
from importlib import import_module
|
||||||
|
|
||||||
|
from django.utils.functional import LazyObject
|
||||||
|
|
||||||
from common.utils import get_logger
|
from common.utils import get_logger
|
||||||
from ..const import VaultTypeChoices
|
from ..const import VaultTypeChoices
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
from django.utils.translation import gettext_lazy as _
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
from django.utils.translation import gettext_lazy as _
|
||||||
from rest_framework import status
|
from rest_framework import status
|
||||||
from rest_framework.generics import GenericAPIView
|
from rest_framework.generics import GenericAPIView
|
||||||
from rest_framework.views import Response, APIView
|
from rest_framework.views import Response, APIView
|
||||||
|
|
||||||
from accounts.tasks.vault import sync_secret_to_vault
|
|
||||||
from accounts.backends import get_vault_client
|
from accounts.backends import get_vault_client
|
||||||
|
from accounts.tasks.vault import sync_secret_to_vault
|
||||||
from settings.models import Setting
|
from settings.models import Setting
|
||||||
from .. import serializers
|
from .. import serializers
|
||||||
|
|
||||||
|
@ -29,6 +29,7 @@ class VaultTestingAPI(GenericAPIView):
|
||||||
|
|
||||||
def post(self, request):
|
def post(self, request):
|
||||||
config = self.get_config(request)
|
config = self.get_config(request)
|
||||||
|
config['VAULT_TYPE'] = settings.VAULT_TYPE
|
||||||
try:
|
try:
|
||||||
client = get_vault_client(raise_exception=True, **config)
|
client = get_vault_client(raise_exception=True, **config)
|
||||||
ok, error = client.is_active()
|
ok, error = client.is_active()
|
||||||
|
|
|
@ -53,6 +53,7 @@ class PrivateSettingSerializer(PublicSettingSerializer):
|
||||||
TICKETS_ENABLED = serializers.BooleanField()
|
TICKETS_ENABLED = serializers.BooleanField()
|
||||||
CONNECTION_TOKEN_REUSABLE = serializers.BooleanField()
|
CONNECTION_TOKEN_REUSABLE = serializers.BooleanField()
|
||||||
CACHE_LOGIN_PASSWORD_ENABLED = serializers.BooleanField()
|
CACHE_LOGIN_PASSWORD_ENABLED = serializers.BooleanField()
|
||||||
|
VAULT_TYPE = serializers.CharField()
|
||||||
|
|
||||||
|
|
||||||
class ServerInfoSerializer(serializers.Serializer):
|
class ServerInfoSerializer(serializers.Serializer):
|
||||||
|
|
|
@ -16,8 +16,12 @@ class VaultSettingSerializer(serializers.Serializer):
|
||||||
max_length=256, allow_blank=True, required=False, label=_('Host')
|
max_length=256, allow_blank=True, required=False, label=_('Host')
|
||||||
)
|
)
|
||||||
VAULT_HCP_TOKEN = EncryptedField(
|
VAULT_HCP_TOKEN = EncryptedField(
|
||||||
max_length=256, allow_blank=True, required=False, label=_('Token')
|
max_length=256, allow_blank=True, required=False, label=_('Token'), default=''
|
||||||
)
|
)
|
||||||
VAULT_HCP_MOUNT_POINT = serializers.CharField(
|
VAULT_HCP_MOUNT_POINT = serializers.CharField(
|
||||||
max_length=256, allow_blank=True, required=False, label=_('Mount Point')
|
max_length=256, allow_blank=True, required=False, label=_('Mount Point')
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def validate(self, attrs):
|
||||||
|
attrs.pop('VAULT_TYPE', None)
|
||||||
|
return attrs
|
||||||
|
|
Loading…
Reference in New Issue