Skip to content

Commit 96c8b33

Browse files
refactor(pki): Remove submitter_der_x509_certificate_sha1
This field does not appear to be used as we look through the pki enrollment using their IDs. This will also prevent raising false alarm about using sha1 on a cert. Fix #11586
1 parent d66f7de commit 96c8b33

File tree

5 files changed

+9
-12
lines changed

5 files changed

+9
-12
lines changed

server/parsec/components/memory/datamodel.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,6 @@ class MemoryPkiEnrollmentInfoCancelled:
744744
class MemoryPkiEnrollment:
745745
enrollment_id: PKIEnrollmentID
746746
submitter_der_x509_certificate: bytes = field(repr=False)
747-
submitter_der_x509_certificate_sha1: bytes = field(repr=False)
748747

749748
submit_payload_signature: bytes = field(repr=False)
750749
submit_payload_signature_algorithm: PkiSignatureAlgorithm

server/parsec/components/memory/pki.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS
22
from __future__ import annotations
33

4-
from hashlib import sha1
54
from typing import override
65

76
from parsec._parsec import (
@@ -152,11 +151,9 @@ async def submit(
152151

153152
# 7) All checks are good, now we do the actual insertion
154153

155-
submitter_der_x509_certificate_sha1 = sha1(submitter_der_x509_certificate).digest()
156154
org.pki_enrollments[enrollment_id] = MemoryPkiEnrollment(
157155
enrollment_id=enrollment_id,
158156
submitter_der_x509_certificate=submitter_der_x509_certificate,
159-
submitter_der_x509_certificate_sha1=submitter_der_x509_certificate_sha1,
160157
submit_payload_signature=submit_payload_signature,
161158
submit_payload_signature_algorithm=submit_payload_signature_algorithm,
162159
submit_payload=submit_payload,
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
-- Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS
2+
3+
-------------------------------------------------------
4+
-- Migration
5+
--
6+
-- Remove column `submitter_der_x509_certificate_sha1` to the `pki_enrollment` table
7+
-------------------------------------------------------
8+
9+
ALTER TABLE pki_enrollment DROP submitter_der_x509_certificate_sha1;

server/parsec/components/postgresql/migrations/datamodel.sql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,6 @@ CREATE TABLE pki_enrollment (
458458

459459
enrollment_id UUID NOT NULL,
460460
submitter_der_x509_certificate BYTEA NOT NULL,
461-
submitter_der_x509_certificate_sha1 BYTEA NOT NULL,
462461

463462
submit_payload_signature BYTEA NOT NULL,
464463
submit_payload BYTEA NOT NULL,

server/parsec/components/postgresql/pki_submit.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS
22
from __future__ import annotations
33

4-
from hashlib import sha1
5-
64
from parsec._parsec import (
75
DateTime,
86
OrganizationID,
@@ -97,7 +95,6 @@
9795
organization,
9896
enrollment_id,
9997
submitter_der_x509_certificate,
100-
submitter_der_x509_certificate_sha1,
10198
submit_payload_signature,
10299
submit_payload_signature_algorithm,
103100
submit_payload,
@@ -108,7 +105,6 @@
108105
$organization_internal_id,
109106
$enrollment_id,
110107
$submitter_der_x509_certificate,
111-
$submitter_der_x509_certificate_sha1,
112108
$submit_payload_signature,
113109
$submit_payload_signature_algorithm,
114110
$submit_payload,
@@ -285,14 +281,11 @@ async def pki_submit(
285281

286282
# 7) All checks are good, now we do the actual insertion
287283

288-
submitter_der_x509_certificate_sha1 = sha1(submitter_der_x509_certificate).digest()
289-
290284
await conn.execute(
291285
*_q_insert_enrollment(
292286
organization_internal_id=organization_internal_id,
293287
enrollment_id=enrollment_id,
294288
submitter_der_x509_certificate=submitter_der_x509_certificate,
295-
submitter_der_x509_certificate_sha1=submitter_der_x509_certificate_sha1,
296289
submit_payload_signature=submit_payload_signature,
297290
submit_payload_signature_algorithm=submit_payload_signature_algorithm.str,
298291
submit_payload=submit_payload,

0 commit comments

Comments
 (0)