-
Notifications
You must be signed in to change notification settings - Fork 41
Expand file tree
/
Copy pathcertificates.py
More file actions
246 lines (212 loc) · 8.56 KB
/
Copy pathcertificates.py
File metadata and controls
246 lines (212 loc) · 8.56 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
"""DNSCrypt certificate parsing, signing, and selection."""
from __future__ import annotations
import struct
from dataclasses import dataclass, replace
from typing import Iterable, Sequence
from constants import (
AEAD_ID_XCHACHA20_DJB_POLY1305,
CERT_MAGIC,
CLIENT_MAGIC_SIZE,
ES_VERSION_XCHACHA20POLY1305,
ES_VERSION_XSALSA20POLY1305,
ES_VERSION_XWING,
KDF_ID_HKDF_SHA256,
PQ_PROFILE_EXTENSION_MAGIC,
PQ_PROFILE_EXTENSION_VERSION,
PROTOCOL_MINOR_VERSION,
PUBLIC_KEY_SIZE,
SIGNATURE_SIZE,
XWING_CIPHERTEXT_SIZE,
XWING_PUBLIC_KEY_SIZE,
)
from crypto import _require_size, ed25519_sign, ed25519_verify
from errors import CertificateError
def resolver_pk_len_for_es_version(es_version: bytes) -> int:
"""Return the certificate `<resolver-pk>` length for an encryption system."""
if es_version in (ES_VERSION_XSALSA20POLY1305, ES_VERSION_XCHACHA20POLY1305):
return PUBLIC_KEY_SIZE
if es_version == ES_VERSION_XWING:
return XWING_PUBLIC_KEY_SIZE
raise CertificateError(f"unsupported es-version: {es_version.hex()}")
def client_pk_len_for_es_version(es_version: bytes) -> int:
"""Return the query `<client-pk>` length for an encryption system."""
if es_version in (ES_VERSION_XSALSA20POLY1305, ES_VERSION_XCHACHA20POLY1305):
return PUBLIC_KEY_SIZE
if es_version == ES_VERSION_XWING:
return XWING_CIPHERTEXT_SIZE
raise CertificateError(f"unsupported es-version: {es_version.hex()}")
@dataclass(frozen=True)
class PQProfileExtension:
"""Parsed fields of the signed PQ profile extension."""
ext_version: int
es_version: bytes
kdf_id: int
aead_id: int
resolver_pk_len: int
client_kex_len: int
def pq_profile_extension(
es_version: bytes = ES_VERSION_XWING,
resolver_pk_len: int = XWING_PUBLIC_KEY_SIZE,
client_kex_len: int = XWING_CIPHERTEXT_SIZE,
) -> bytes:
"""Build the signed 12-byte PQ profile extension."""
_require_size("es_version", es_version, 2)
return (
PQ_PROFILE_EXTENSION_MAGIC
+ bytes([PQ_PROFILE_EXTENSION_VERSION])
+ es_version
+ bytes([KDF_ID_HKDF_SHA256, AEAD_ID_XCHACHA20_DJB_POLY1305])
+ resolver_pk_len.to_bytes(2, "big")
+ client_kex_len.to_bytes(2, "big")
)
def parse_pq_profile_extension(
extensions: bytes, expected_es_version: bytes = ES_VERSION_XWING
) -> PQProfileExtension:
"""Parse and validate the signed PQ profile extension."""
if len(extensions) != 12:
raise CertificateError("PQ profile extension must be 12 bytes")
if extensions[:3] != PQ_PROFILE_EXTENSION_MAGIC:
raise CertificateError("PQ profile extension magic is invalid")
parsed = PQProfileExtension(
ext_version=extensions[3],
es_version=extensions[4:6],
kdf_id=extensions[6],
aead_id=extensions[7],
resolver_pk_len=int.from_bytes(extensions[8:10], "big"),
client_kex_len=int.from_bytes(extensions[10:12], "big"),
)
if parsed.ext_version != PQ_PROFILE_EXTENSION_VERSION:
raise CertificateError("unsupported PQ profile extension version")
if parsed.es_version != expected_es_version:
raise CertificateError("PQ extension es-version does not match certificate")
if parsed.kdf_id != KDF_ID_HKDF_SHA256:
raise CertificateError("unsupported PQ KDF")
if parsed.aead_id != AEAD_ID_XCHACHA20_DJB_POLY1305:
raise CertificateError("unsupported PQ AEAD")
if parsed.resolver_pk_len != resolver_pk_len_for_es_version(expected_es_version):
raise CertificateError("PQ resolver-pk length mismatch")
if parsed.client_kex_len != client_pk_len_for_es_version(expected_es_version):
raise CertificateError("PQ client-kex length mismatch")
return parsed
@dataclass(frozen=True)
class DNSCryptCertificate:
"""DNSCrypt certificate fields after parsing."""
es_version: bytes
protocol_minor_version: bytes
signature: bytes
resolver_pk: bytes
client_magic: bytes
serial: int
ts_start: int
ts_end: int
extensions: bytes = b""
def signed_data(self) -> bytes:
"""Return the byte string covered by the Ed25519 signature."""
return (
self.resolver_pk
+ self.client_magic
+ self.serial.to_bytes(4, "big")
+ self.ts_start.to_bytes(4, "big")
+ self.ts_end.to_bytes(4, "big")
+ self.extensions
)
def to_bytes(self) -> bytes:
"""Serialize the certificate as it appears in a TXT record."""
return (
CERT_MAGIC
+ self.es_version
+ self.protocol_minor_version
+ self.signature
+ self.signed_data()
)
def verify(self, provider_public_key: bytes) -> None:
"""Verify the signature, validity interval shape, and PQ extension."""
ed25519_verify(provider_public_key, self.signature, self.signed_data())
if self.ts_start >= self.ts_end:
raise CertificateError("certificate validity start must precede end")
if self.es_version == ES_VERSION_XWING:
parse_pq_profile_extension(self.extensions, self.es_version)
@classmethod
def sign(
cls,
provider_signing_seed: bytes,
es_version: bytes,
resolver_pk: bytes,
client_magic: bytes,
serial: int,
ts_start: int,
ts_end: int,
extensions: bytes = b"",
protocol_minor_version: bytes = PROTOCOL_MINOR_VERSION,
) -> "DNSCryptCertificate":
"""Create and sign a DNSCrypt certificate."""
_require_size("es_version", es_version, 2)
_require_size("protocol_minor_version", protocol_minor_version, 2)
_require_size("client_magic", client_magic, CLIENT_MAGIC_SIZE)
if len(resolver_pk) != resolver_pk_len_for_es_version(es_version):
raise CertificateError("resolver-pk length does not match es-version")
unsigned = cls(
es_version=es_version,
protocol_minor_version=protocol_minor_version,
signature=b"\x00" * SIGNATURE_SIZE,
resolver_pk=resolver_pk,
client_magic=client_magic,
serial=serial,
ts_start=ts_start,
ts_end=ts_end,
extensions=extensions,
)
signature = ed25519_sign(provider_signing_seed, unsigned.signed_data())
return replace(unsigned, signature=signature)
@classmethod
def from_bytes(cls, certificate: bytes) -> "DNSCryptCertificate":
"""Parse a DNSCrypt certificate from its wire bytes."""
resolver_pk_start = len(CERT_MAGIC) + 2 + 2 + SIGNATURE_SIZE
if len(certificate) < resolver_pk_start:
raise CertificateError("certificate is too short")
if certificate[: len(CERT_MAGIC)] != CERT_MAGIC:
raise CertificateError("invalid certificate magic")
es_version = certificate[4:6]
protocol_minor_version = certificate[6:8]
signature = certificate[8:resolver_pk_start]
resolver_pk_len = resolver_pk_len_for_es_version(es_version)
tail_start = resolver_pk_start + resolver_pk_len
tail_format = f">{CLIENT_MAGIC_SIZE}sIII"
tail_end = tail_start + struct.calcsize(tail_format)
if len(certificate) < tail_end:
raise CertificateError("certificate is truncated")
resolver_pk = certificate[resolver_pk_start:tail_start]
client_magic, serial, ts_start, ts_end = struct.unpack(
tail_format, certificate[tail_start:tail_end]
)
return cls(
es_version=es_version,
protocol_minor_version=protocol_minor_version,
signature=signature,
resolver_pk=resolver_pk,
client_magic=client_magic,
serial=serial,
ts_start=ts_start,
ts_end=ts_end,
extensions=certificate[tail_end:],
)
def choose_certificate(
certificates: Iterable[DNSCryptCertificate],
provider_public_key: bytes,
now: int,
supported_es_versions: Sequence[bytes] = (
ES_VERSION_XCHACHA20POLY1305,
ES_VERSION_XWING,
),
) -> DNSCryptCertificate:
"""Choose the valid certificate with the highest serial number."""
usable = []
for certificate in certificates:
if certificate.es_version not in supported_es_versions:
continue
certificate.verify(provider_public_key)
if certificate.ts_start <= now <= certificate.ts_end:
usable.append(certificate)
if not usable:
raise CertificateError("no usable certificate")
return max(usable, key=lambda c: c.serial)