Skip to content

Commit

Permalink
feat(x509): Add ordering field
Browse files Browse the repository at this point in the history
  • Loading branch information
miron0xff committed Jul 15, 2024
1 parent 4affcea commit a4e0ac3
Showing 1 changed file with 18 additions and 12 deletions.
30 changes: 18 additions & 12 deletions x509/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,11 @@ class KeyViewSet(viewsets.ModelViewSet):
filter_backends = [
rest_framework.DjangoFilterBackend,
filters.SearchFilter,
filters.OrderingFilter,
]
filterset_class = KeyFilterSet
search_fields = ["name", "fingerprint"]
ordering_fields = ["created_at", "algo", "used"]

def create(self, request, *args, **kwargs):
instance = None
Expand Down Expand Up @@ -181,9 +183,11 @@ class CSRViewSet(viewsets.ModelViewSet):
filter_backends = [
rest_framework.DjangoFilterBackend,
filters.SearchFilter,
filters.OrderingFilter,
]
filterset_class = CSRFilterSet
search_fields = ["name"]
ordering_fields = ["created_at", "name", "signed", "ca"]

def create(self, request, *args, **kwargs):
instance = None
Expand Down Expand Up @@ -316,9 +320,11 @@ class CertificateViewSet(viewsets.ModelViewSet):
filter_backends = [
rest_framework.DjangoFilterBackend,
filters.SearchFilter,
filters.OrderingFilter,
]
filterset_class = CertificateFilterSet
search_fields = ["csr__name", "fingerprint"]
ordering_fields = ["created_at", "revoked_at", "imported", "revoked"]

http_method_names = ["get", "post", "put"]

Expand Down Expand Up @@ -594,9 +600,9 @@ def get(self, request, key_id, *args, **kwargs):
data = key_to_der(key.private_as_object(), private=True)

response = HttpResponse(data, content_type=CTYPE[key_format])
response[
"Content-Disposition"
] = f"attachment; filename='{key.name}'"
response["Content-Disposition"] = (
f"attachment; filename='{key.name}'"
)

return response
else:
Expand All @@ -606,9 +612,9 @@ def get(self, request, key_id, *args, **kwargs):
data = key_to_der(key.public_as_object())

response = HttpResponse(data, content_type=CTYPE[key_format])
response[
"Content-Disposition"
] = f"attachment; filename='{key.name}'"
response["Content-Disposition"] = (
f"attachment; filename='{key.name}'"
)

return response

Expand Down Expand Up @@ -646,15 +652,15 @@ def get(self, request, cert_id, *args, **kwargs):
else:
response = HttpResponse(
cert_to_der(cert.as_object()),
content_type=CTYPE["der_ca"]
if cert.is_ca
else CTYPE["der_enduser"],
content_type=(
CTYPE["der_ca"] if cert.is_ca else CTYPE["der_enduser"]
),
)
# TODO: Add PKCS12

response[
"Content-Disposition"
] = f"attachment; filename='{cert.cn}'"
response["Content-Disposition"] = (
f"attachment; filename='{cert.cn}'"
)

return response

Expand Down

0 comments on commit a4e0ac3

Please sign in to comment.