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
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
use once_cell::sync::Lazy;
use tor_cert::Ed25519Cert;
use tor_checkable::signed::SignatureGated;
use tor_checkable::timed::TimerangeBound;
use tor_checkable::Timebound;
use tor_hscrypto::pk::HsBlindId;
use tor_hscrypto::{RevisionCounter, Subcredential};
use tor_llcrypto::pk::ed25519::{self, ValidatableEd25519Signature};
use tor_units::IntegerMinutes;
use crate::parse::{keyword::Keyword, parser::SectionRules, tokenize::NetDocReader};
use crate::types::misc::{UnvalidatedEdCert, B64};
use crate::{Pos, Result};
use super::desc_enc;
#[derive(Clone, Debug)]
#[cfg_attr(feature = "hsdesc-inner-docs", visibility::make(pub))]
pub(super) struct HsDescOuter {
pub(super) lifetime: IntegerMinutes<u16>,
pub(super) desc_signing_key_cert: Ed25519Cert,
pub(super) revision_counter: RevisionCounter,
pub(super) superencrypted: Vec<u8>,
}
impl HsDescOuter {
pub(super) fn blinded_id(&self) -> HsBlindId {
let ident = self
.desc_signing_key_cert
.signing_key()
.expect("signing key was absent!?");
(*ident).into()
}
pub(super) fn revision_counter(&self) -> RevisionCounter {
self.revision_counter
}
pub(super) fn decrypt_body(
&self,
subcredential: &Subcredential,
) -> std::result::Result<Vec<u8>, desc_enc::DecryptionError> {
let decrypt = desc_enc::HsDescEncryption {
blinded_id: &self.blinded_id(),
desc_enc_nonce: None,
subcredential,
revision: self.revision_counter,
string_const: b"hsdir-superencrypted-data",
};
let mut body = decrypt.decrypt(&self.superencrypted[..])?;
let n_padding = body.iter().rev().take_while(|n| **n == 0).count();
body.truncate(body.len() - n_padding);
if !body.ends_with(b"\n") {
body.push(b'\n');
}
Ok(body)
}
}
pub(super) type UncheckedHsDescOuter = SignatureGated<TimerangeBound<HsDescOuter>>;
decl_keyword! {
HsOuterKwd {
"hs-descriptor" => HS_DESCRIPTOR,
"descriptor-lifetime" => DESCRIPTOR_LIFETIME,
"descriptor-signing-key-cert" => DESCRIPTOR_SIGNING_KEY_CERT,
"revision-counter" => REVISION_COUNTER,
"superencrypted" => SUPERENCRYPTED,
"signature" => SIGNATURE
}
}
static HS_OUTER_RULES: Lazy<SectionRules<HsOuterKwd>> = Lazy::new(|| {
use HsOuterKwd::*;
let mut rules = SectionRules::builder();
rules.add(HS_DESCRIPTOR.rule().required().args(1..));
rules.add(DESCRIPTOR_LIFETIME.rule().required().args(1..));
rules.add(DESCRIPTOR_SIGNING_KEY_CERT.rule().required().obj_required());
rules.add(REVISION_COUNTER.rule().required().args(1..));
rules.add(SUPERENCRYPTED.rule().required().obj_required());
rules.add(SIGNATURE.rule().required().args(1..));
rules.add(UNRECOGNIZED.rule().may_repeat().obj_optional());
rules.build()
});
impl HsDescOuter {
#[cfg_attr(feature = "hsdesc-inner-docs", visibility::make(pub))]
pub(super) fn parse(s: &str) -> Result<UncheckedHsDescOuter> {
let mut reader = NetDocReader::new(s);
let result = HsDescOuter::take_from_reader(&mut reader).map_err(|e| e.within(s))?;
Ok(result)
}
fn take_from_reader(reader: &mut NetDocReader<'_, HsOuterKwd>) -> Result<UncheckedHsDescOuter> {
use crate::err::ParseErrorKind as EK;
use HsOuterKwd::*;
let s = reader.str();
let body = HS_OUTER_RULES.parse(reader)?;
let signed_text = {
let first_item = body
.first_item()
.expect("Somehow parsing worked though no keywords were present‽");
let last_item = body
.last_item()
.expect("Somehow parsing worked though no keywords were present‽");
if first_item.kwd() != HS_DESCRIPTOR {
return Err(EK::WrongStartingToken
.with_msg(first_item.kwd_str().to_string())
.at_pos(first_item.pos()));
}
if last_item.kwd() != SIGNATURE {
return Err(EK::WrongEndingToken
.with_msg(last_item.kwd_str().to_string())
.at_pos(last_item.pos()));
}
let start_idx = first_item
.pos()
.offset_within(s)
.expect("Token came from nowhere within the string‽");
let end_idx = last_item
.pos()
.offset_within(s)
.expect("Token came from nowhere within the string‽");
let mut signed_text = b"Tor onion service descriptor sig v3".to_vec();
signed_text.extend_from_slice(
s.get(start_idx..end_idx)
.expect("Somehow the first item came after the last‽")
.as_bytes(),
);
signed_text
};
{
let version = body.required(HS_DESCRIPTOR)?.required_arg(0)?;
if version != "3" {
return Err(EK::BadDocumentVersion
.with_msg(format!("Unexpected hsdesc version {}", version))
.at_pos(Pos::at(version)));
}
}
let lifetime: IntegerMinutes<u16> = {
let tok = body.required(DESCRIPTOR_LIFETIME)?;
let lifetime_minutes: u16 = tok.parse_arg(0)?;
if !(30..=720).contains(&lifetime_minutes) {
return Err(EK::BadArgument
.with_msg(format!("Invalid HsDesc lifetime {}", lifetime_minutes))
.at_pos(tok.pos()));
}
lifetime_minutes.into()
};
let (unchecked_cert, kp_desc_sign) = {
let cert_tok = body.required(DESCRIPTOR_SIGNING_KEY_CERT)?;
let cert = cert_tok
.parse_obj::<UnvalidatedEdCert>("ED25519 CERT")?
.check_cert_type(tor_cert::CertType::HS_BLINDED_ID_V_SIGNING)?
.into_unchecked()
.check_key(None) .map_err(|err| {
EK::BadObjectVal
.err()
.with_source(err)
.at_pos(cert_tok.pos())
})?;
let kp_desc_sign: ed25519::PublicKey = cert
.peek_subject_key()
.as_ed25519()
.and_then(|id| id.try_into().ok())
.ok_or_else(|| {
EK::BadObjectVal
.err()
.with_msg("Invalid ed25519 subject key")
.at_pos(cert_tok.pos())
})?;
(cert, kp_desc_sign)
};
let revision_counter = body.required(REVISION_COUNTER)?.parse_arg::<u64>(0)?.into();
let encrypted_body: Vec<u8> = body.required(SUPERENCRYPTED)?.obj("MESSAGE")?;
let signature = body
.required(SIGNATURE)?
.parse_arg::<B64>(0)?
.into_array()
.map_err(|_| EK::BadSignature.with_msg("Bad signature object length"))?;
let signature = ed25519::Signature::from(signature);
let (desc_signing_key_cert, cert_signature) = unchecked_cert
.dangerously_split()
.map_err(|e| EK::Internal.err().with_source(e))?;
let desc_signing_key_cert = desc_signing_key_cert.dangerously_assume_timely();
let expiration = desc_signing_key_cert.expiry();
let desc = HsDescOuter {
lifetime,
desc_signing_key_cert,
revision_counter,
superencrypted: encrypted_body,
};
let desc = TimerangeBound::new(desc, ..expiration);
let signatures: Vec<Box<dyn tor_llcrypto::pk::ValidatableSignature>> = vec![
Box::new(cert_signature),
Box::new(ValidatableEd25519Signature::new(
kp_desc_sign,
signature,
&signed_text[..],
)),
];
Ok(SignatureGated::new(desc, signatures))
}
}
#[cfg(test)]
mod test {
#![allow(clippy::bool_assert_comparison)]
#![allow(clippy::clone_on_copy)]
#![allow(clippy::dbg_macro)]
#![allow(clippy::print_stderr)]
#![allow(clippy::print_stdout)]
#![allow(clippy::single_char_pattern)]
#![allow(clippy::unwrap_used)]
#![allow(clippy::unchecked_duration_subtraction)]
use super::*;
use crate::doc::hsdesc::test::{TEST_DATA, TEST_SUBCREDENTIAL};
use tor_checkable::SelfSigned;
#[test]
fn parse_good() -> Result<()> {
let desc = HsDescOuter::parse(TEST_DATA)?;
let desc = desc
.check_signature()?
.check_valid_at(&humantime::parse_rfc3339("2023-01-23T15:00:00Z").unwrap())
.unwrap();
let subcred: tor_hscrypto::Subcredential = TEST_SUBCREDENTIAL.into();
let inner = desc.decrypt_body(&subcred).unwrap();
assert!(std::str::from_utf8(&inner)
.unwrap()
.starts_with("desc-auth-type"));
Ok(())
}
}