From 7a0ebbdc531c8d8a3c385500e8e32405cd9db3a3 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Thu, 1 Apr 2021 11:38:35 +0200 Subject: [PATCH] crypto: add filter for key-pairs with private key Signed-off-by: Jens Langhammer --- authentik/crypto/api.py | 19 ++++++++++ swagger.yaml | 80 ++++++++++++++++++++++++++--------------- 2 files changed, 70 insertions(+), 29 deletions(-) diff --git a/authentik/crypto/api.py b/authentik/crypto/api.py index daa43e672..27b5b5fa9 100644 --- a/authentik/crypto/api.py +++ b/authentik/crypto/api.py @@ -1,4 +1,5 @@ """Crypto API Views""" +import django_filters from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives.serialization import load_pem_private_key from cryptography.x509 import load_pem_x509_certificate @@ -95,11 +96,29 @@ class CertificateGenerationSerializer(PassiveSerializer): validity_days = IntegerField(initial=365) +class CertificateKeyPairFilter(django_filters.FilterSet): + """Filter for certificates""" + + has_key = django_filters.BooleanFilter( + label="Only return certificate-key pairs with keys", method="filter_has_key" + ) + + # pylint: disable=unused-argument + def filter_has_key(self, queryset, name, value): + """Only return certificate-key pairs with keys""" + return queryset.exclude(key_data__exact="") + + class Meta: + model = CertificateKeyPair + fields = ["name"] + + class CertificateKeyPairViewSet(ModelViewSet): """CertificateKeyPair Viewset""" queryset = CertificateKeyPair.objects.all() serializer_class = CertificateKeyPairSerializer + filterset_class = CertificateKeyPairFilter @permission_required(None, ["authentik_crypto.add_certificatekeypair"]) @swagger_auto_schema( diff --git a/swagger.yaml b/swagger.yaml index 209392d4a..4718ed966 100755 --- a/swagger.yaml +++ b/swagger.yaml @@ -2290,6 +2290,16 @@ paths: operationId: crypto_certificatekeypairs_list description: CertificateKeyPair Viewset parameters: + - name: name + in: query + description: '' + required: false + type: string + - name: has_key + in: query + description: '' + required: false + type: string - name: ordering in: query description: Which field to use when ordering the results. @@ -16548,10 +16558,10 @@ definitions: title: Expression type: string minLength: 1 - object_field: - title: Object field + object_type: + title: Object type type: string - minLength: 1 + readOnly: true verbose_name: title: Verbose name type: string @@ -16560,11 +16570,15 @@ definitions: title: Verbose name plural type: string readOnly: true + object_field: + title: Object field + type: string + minLength: 1 SAMLPropertyMapping: required: - name - - saml_name - expression + - saml_name type: object properties: pk: @@ -16576,6 +16590,22 @@ definitions: title: Name type: string minLength: 1 + expression: + title: Expression + type: string + minLength: 1 + object_type: + title: Object type + type: string + readOnly: true + verbose_name: + title: Verbose name + type: string + readOnly: true + verbose_name_plural: + title: Verbose name plural + type: string + readOnly: true saml_name: title: SAML Name type: string @@ -16584,23 +16614,11 @@ definitions: title: Friendly name type: string x-nullable: true - expression: - title: Expression - type: string - minLength: 1 - verbose_name: - title: Verbose name - type: string - readOnly: true - verbose_name_plural: - title: Verbose name plural - type: string - readOnly: true ScopeMapping: required: - name - - scope_name - expression + - scope_name type: object properties: pk: @@ -16612,6 +16630,22 @@ definitions: title: Name type: string minLength: 1 + expression: + title: Expression + type: string + minLength: 1 + object_type: + title: Object type + type: string + readOnly: true + verbose_name: + title: Verbose name + type: string + readOnly: true + verbose_name_plural: + title: Verbose name plural + type: string + readOnly: true scope_name: title: Scope name description: Scope used by the client @@ -16622,18 +16656,6 @@ definitions: description: Description shown to the user when consenting. If left empty, the user won't be informed. type: string - expression: - title: Expression - type: string - minLength: 1 - verbose_name: - title: Verbose name - type: string - readOnly: true - verbose_name_plural: - title: Verbose name plural - type: string - readOnly: true OAuth2ProviderSetupURLs: type: object properties: