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
use arrayref::array_ref;
use async_trait::async_trait;
use bytes::Bytes;
use chacha20poly1305::{
aead::{Aead, NewAead},
ChaCha20Poly1305, Nonce,
};
use nanorpc::nanorpc_derive;
use serde::{Deserialize, Serialize};
use serde_with::serde_as;
use smol_str::SmolStr;
use std::net::SocketAddr;
use thiserror::Error;
pub fn box_encrypt(
plain: &[u8],
my_sk: x25519_dalek::StaticSecret,
their_pk: x25519_dalek::PublicKey,
) -> Bytes {
let my_pk = x25519_dalek::PublicKey::from(&my_sk);
let shared_secret = my_sk.diffie_hellman(&their_pk);
let key = blake3::keyed_hash(
blake3::hash(their_pk.as_bytes()).as_bytes(),
shared_secret.as_bytes(),
);
let cipher = ChaCha20Poly1305::new(key.as_bytes().into());
let ciphertext = cipher
.encrypt(Nonce::from_slice(&[0u8; 12]), plain)
.unwrap();
let mut pk_and_ctext = Vec::with_capacity(ciphertext.len() + 32);
pk_and_ctext.extend_from_slice(my_pk.as_bytes());
pk_and_ctext.extend_from_slice(&ciphertext);
pk_and_ctext.into()
}
pub fn box_decrypt(
ctext: &[u8],
my_sk: x25519_dalek::StaticSecret,
) -> Result<(Bytes, x25519_dalek::PublicKey), BoxDecryptError> {
if ctext.len() < 32 {
return Err(BoxDecryptError::BadFormat);
}
let their_pk = x25519_dalek::PublicKey::from(*array_ref![ctext, 0, 32]);
let shared_secret = my_sk.diffie_hellman(&their_pk);
let my_pk = x25519_dalek::PublicKey::from(&my_sk);
let key = blake3::keyed_hash(
blake3::hash(my_pk.as_bytes()).as_bytes(),
shared_secret.as_bytes(),
);
let cipher = ChaCha20Poly1305::new(key.as_bytes().into());
let plain = cipher
.decrypt(Nonce::from_slice(&[0u8; 12]), &ctext[32..])
.map_err(|_| BoxDecryptError::DecryptionFailed)?;
Ok((plain.into(), their_pk))
}
#[derive(Error, Debug, Clone, Copy, Serialize, Deserialize)]
pub enum BoxDecryptError {
#[error("decryption failed")]
DecryptionFailed,
#[error("badly formatted message")]
BadFormat,
}
#[nanorpc_derive]
#[async_trait]
pub trait BinderProtocol {
async fn authenticate(&self, auth_req: AuthRequest) -> Result<AuthResponse, AuthError>;
async fn validate(&self, token: BlindToken) -> bool;
async fn get_captcha(&self) -> Result<Captcha, MiscFatalError>;
async fn register_user(
&self,
username: SmolStr,
password: SmolStr,
captcha_id: SmolStr,
captcha_soln: SmolStr,
) -> Result<(), RegisterError>;
async fn delete_user(&self, username: SmolStr, password: SmolStr) -> Result<(), AuthError>;
async fn add_bridge_route(&self, descriptor: BridgeDescriptor) -> Result<(), MiscFatalError>;
async fn get_summary(&self) -> MasterSummary;
async fn get_bridges(&self, token: BlindToken, exit: SmolStr) -> Vec<BridgeDescriptor>;
async fn get_mizaru_pk(&self, level: Level) -> mizaru::PublicKey;
async fn get_mizaru_epoch_key(&self, level: Level, epoch: u16) -> rsa::RSAPublicKey;
}
#[serde_as]
#[derive(Serialize, Deserialize)]
pub struct AuthRequest {
pub username: SmolStr,
pub password: SmolStr,
pub level: Level,
pub epoch: u16,
#[serde_as(as = "serde_with::base64::Base64")]
pub blinded_digest: Bytes,
}
#[serde_as]
#[derive(Serialize, Deserialize)]
pub struct AuthResponse {
pub user_info: UserInfo,
#[serde_as(as = "serde_with::base64::Base64")]
pub blind_signature_bincode: Bytes,
}
#[derive(Error, Debug, Clone, Serialize, Deserialize)]
pub enum AuthError {
#[error("invalid username or password")]
InvalidUsernameOrPassword,
#[error("too many requests")]
TooManyRequests,
#[error("level wrong")]
WrongLevel,
#[error("other error: {0}")]
Other(SmolStr),
}
#[derive(Error, Debug, Clone, Serialize, Deserialize)]
pub enum RegisterError {
#[error("duplicate username")]
DuplicateUsername,
#[error("other error: {0}")]
Other(SmolStr),
}
#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize, Deserialize)]
pub struct UserInfo {
pub userid: i32,
pub username: SmolStr,
pub subscription: Option<SubscriptionInfo>,
}
#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize, Deserialize)]
pub struct SubscriptionInfo {
pub level: Level,
pub expires_unix: i64,
}
#[derive(Serialize, Deserialize, Copy, Clone, PartialEq, Eq, Debug, Hash)]
pub enum Level {
Free,
Plus,
}
#[serde_as]
#[derive(Serialize, Deserialize, Clone, PartialEq, Eq, Debug, Hash)]
pub struct BlindToken {
pub level: Level,
#[serde_as(as = "serde_with::base64::Base64")]
pub unblinded_digest: Bytes,
#[serde_as(as = "serde_with::base64::Base64")]
pub unblinded_signature_bincode: Bytes,
}
#[serde_as]
#[derive(Serialize, Deserialize, Clone, PartialEq, Eq, Debug, Hash)]
pub struct Captcha {
pub captcha_id: SmolStr,
#[serde_as(as = "serde_with::base64::Base64")]
pub png_data: Bytes,
}
#[derive(Error, Debug, Clone, Serialize, Deserialize)]
pub enum MiscFatalError {
#[error("database error: {0}")]
Database(SmolStr),
#[error("backend network error: {0}")]
BadNet(SmolStr),
}
#[serde_as]
#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, Hash)]
pub struct BridgeDescriptor {
pub is_direct: bool,
pub protocol: SmolStr,
pub endpoint: SocketAddr,
pub sosistab_key: x25519_dalek::PublicKey,
pub exit_hostname: SmolStr,
pub alloc_group: SmolStr,
pub update_time: u64,
#[serde_as(as = "serde_with::base64::Base64")]
pub exit_signature: Bytes,
}
#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)]
pub struct ExitDescriptor {
pub hostname: SmolStr,
pub signing_key: ed25519_dalek::PublicKey,
pub country_code: SmolStr,
pub city_code: SmolStr,
pub direct_routes: Vec<BridgeDescriptor>,
pub legacy_direct_sosistab_pk: x25519_dalek::PublicKey,
pub allowed_levels: Vec<Level>,
}
#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)]
pub struct MasterSummary {
pub exits: Vec<ExitDescriptor>,
pub bad_countries: Vec<SmolStr>,
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn box_encryption() {
let test_string = b"hello world";
let alice_sk = x25519_dalek::StaticSecret::new(&mut rand::thread_rng());
let alice_pk = x25519_dalek::PublicKey::from(&alice_sk);
let bob_sk = x25519_dalek::StaticSecret::new(&mut rand::thread_rng());
let bob_pk = x25519_dalek::PublicKey::from(&bob_sk);
let encrypted = box_encrypt(test_string, alice_sk, bob_pk);
let (decrypted, purported_alice_pk) = box_decrypt(&encrypted, bob_sk).unwrap();
assert_eq!(test_string, &decrypted[..]);
assert_eq!(purported_alice_pk, alice_pk);
}
}