Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions pulpcore/app/models/openpgp.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
from aiohttp.web_response import Response
from django.db import models
from django.utils import timezone
from pysequoia import Cert

from pulpcore.app.models import AutoAddObjPermsMixin, Content, Distribution, Repository
from pulpcore.app.openpgp import wrap_armor
from pulpcore.app.util import get_domain_pk, gpg_verify


Expand Down Expand Up @@ -61,7 +62,7 @@ def represent(self, repository_version=None):
data += public_subkey.packet()
for signature in public_subkey.openpgp_signatures.filter(**content_filter):
data += signature.packet()
return wrap_armor(data)
return str(Cert.from_bytes(data)).strip()

class Meta:
default_related_name = "%(app_label)s_%(model_name)s"
Expand Down Expand Up @@ -127,11 +128,11 @@ class OpenPGPSignature(_OpenPGPContent):

sha256 = models.CharField(max_length=128)
signature_type = models.PositiveSmallIntegerField()
created = models.DateTimeField() # 2
expiration_time = models.DurationField(null=True) # 3
key_expiration_time = models.DurationField(null=True) # 9
issuer = models.CharField(max_length=16, null=True) # 16
signers_user_id = models.CharField(null=True) # 28
created = models.DateTimeField()
expiration_time = models.DurationField(null=True)
key_expiration_time = models.DurationField(null=True)
issuer = models.CharField(max_length=16, null=True)
signers_user_id = models.CharField(null=True)
signed_content = models.ForeignKey(
Content, related_name="openpgp_signatures", on_delete=models.PROTECT
)
Expand Down
Loading
Loading