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
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
|
use super::{Error, Result};
use mullvad_types::{relay_constraints::Constraint, settings::SettingsVersion};
use serde::{Deserialize, Serialize};
// ======================================================
// Section for vendoring types and values that
// this settings version depend on. See `mod.rs`.
pub type AccountToken = String;
/// Representation of a transport protocol, either UDP or TCP.
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[serde(rename_all = "snake_case")]
pub enum TransportProtocol {
/// Represents the UDP transport protocol.
Udp,
/// Represents the TCP transport protocol.
Tcp,
}
#[derive(Debug, Copy, Clone, Eq, PartialEq, Deserialize, Serialize)]
#[serde(rename_all = "snake_case")]
pub struct TransportPort {
pub protocol: TransportProtocol,
pub port: Constraint<u16>,
}
/// Contains obfuscation settings
#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize)]
#[serde(rename_all = "snake_case")]
pub struct ObfuscationSettings {
pub selected_obfuscation: SelectedObfuscation,
pub udp2tcp: Udp2TcpObfuscationSettings,
}
#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize)]
#[serde(rename_all = "snake_case")]
pub struct Udp2TcpObfuscationSettings {
pub port: Constraint<u16>,
}
#[derive(Debug, Clone, Copy, Eq, PartialEq, Deserialize, Serialize)]
#[serde(rename_all = "snake_case")]
pub enum SelectedObfuscation {
Auto,
Off,
Udp2Tcp,
}
// ======================================================
pub struct MigrationData {
pub token: AccountToken,
pub wg_data: Option<serde_json::Value>,
}
/// # Changes to the format
///
/// The ability to disable WireGuard multihop while preserving the entry location was added.
/// So a new field, `use_multihop` is introduced. We want this to default to `true` iff:
/// * `use_multihop` was not present in the settings
/// * A multihop entry location had been previously specified.
///
/// It is also no longer valid to have `entry_location` set to null. So remove the field if it
/// is null in order to make it default back to the default location.
///
/// This also removes the account token and WireGuard key from the settings.
///
/// Additionally, the WireGuard protocol constraint, if set to be using TCP, is migrated into
/// having an active Udp2Tcp obfuscator. The protocol constraint is then removed from WireGuard
/// settings since all WireGuard traffic is UDP.
pub fn migrate(settings: &mut serde_json::Value) -> Result<Option<MigrationData>> {
if !version_matches(settings) {
return Ok(None);
}
log::info!("Migrating settings format to V6");
if let Some(wireguard_constraints) = get_wireguard_constraints(settings) {
if let Some(location) = wireguard_constraints.get("entry_location") {
if wireguard_constraints.get("use_multihop").is_none() {
if location.is_null() {
// "Null" is no longer valid. It is not an option.
wireguard_constraints
.as_object_mut()
.ok_or(Error::InvalidSettingsContent)?
.remove("entry_location");
} else {
wireguard_constraints["use_multihop"] = serde_json::json!(true);
}
}
}
// The field `pub port: Constraint<TransportPort>` is now `pub port: Constraint<u16>`.
// Data is migrated as follows:
// If the existing field has `protocol == Tcp` configured, then we need to create a
// corresponding setting to enable the Udp2Tcp obfuscator. In this case, the port
// constraint is moved as well. Otherwise the existing port constraint is moved into
// the new field.
//
if let Some(port) = wireguard_constraints.get("port") {
let port_constraint: Constraint<TransportPort> =
serde_json::from_value(port.clone()).map_err(|_| Error::InvalidSettingsContent)?;
if let Some(transport_port) = port_constraint.option() {
let (port, obfuscation_settings) = match transport_port.protocol {
TransportProtocol::Udp => (serde_json::json!(transport_port.port), None),
TransportProtocol::Tcp => (
serde_json::json!(Constraint::<u16>::Any),
Some(serde_json::json!(create_migrated_obfuscation_settings(
transport_port.port
))),
),
};
wireguard_constraints["port"] = port;
if let Some(obfuscation_settings) = obfuscation_settings {
settings["obfuscation_settings"] = obfuscation_settings;
}
}
}
}
let migration_data = if let Some(token) = settings.get("account_token").filter(|t| !t.is_null())
{
let token: AccountToken =
serde_json::from_value(token.clone()).map_err(|_| Error::InvalidSettingsContent)?;
let migration_data =
if let Some(wg_data) = settings.get("wireguard").filter(|wg| !wg.is_null()) {
Some(MigrationData {
token,
wg_data: Some(wg_data.clone()),
})
} else {
Some(MigrationData {
token,
wg_data: None,
})
};
let settings_map = settings
.as_object_mut()
.ok_or(Error::InvalidSettingsContent)?;
settings_map.remove("account_token");
settings_map.remove("wireguard");
migration_data
} else {
None
};
settings["settings_version"] = serde_json::json!(SettingsVersion::V6);
Ok(migration_data)
}
fn get_wireguard_constraints(settings: &mut serde_json::Value) -> Option<&mut serde_json::Value> {
if let Some(relay_settings) = settings.get_mut("relay_settings") {
if let Some(normal) = relay_settings.get_mut("normal") {
return normal.get_mut("wireguard_constraints");
}
}
None
}
// Create an ObfuscationSettings struct that replaces the `protocol == TCP` setting
// that was previously used on the wireguard constraints.
// If a port is specified, this is the remote port to be used for Udp2Tcp.
//
fn create_migrated_obfuscation_settings(port: Constraint<u16>) -> ObfuscationSettings {
ObfuscationSettings {
selected_obfuscation: SelectedObfuscation::Udp2Tcp,
udp2tcp: Udp2TcpObfuscationSettings { port },
}
}
fn version_matches(settings: &serde_json::Value) -> bool {
settings
.get("settings_version")
.map(|version| version == SettingsVersion::V5 as u64)
.unwrap_or(false)
}
#[cfg(test)]
mod test {
use super::{migrate, version_matches};
pub const V5_SETTINGS: &str = r#"
{
"account_token": "1234",
"relay_settings": {
"normal": {
"location": {
"only": {
"country": "se"
}
},
"tunnel_protocol": "any",
"wireguard_constraints": {
"port": {
"only": {
"protocol": "tcp",
"port": "any"
}
},
"ip_version": "any",
"entry_location": "any"
},
"openvpn_constraints": {
"port": {
"only": {
"protocol": "udp",
"port": {
"only": 1195
}
}
}
}
}
},
"bridge_settings": {
"normal": {
"location": "any"
}
},
"bridge_state": "auto",
"allow_lan": true,
"block_when_disconnected": false,
"auto_connect": false,
"tunnel_options": {
"openvpn": {
"mssfix": null
},
"wireguard": {
"mtu": null,
"rotation_interval": {
"secs": 86400,
"nanos": 0
}
},
"generic": {
"enable_ipv6": false
},
"dns_options": {
"state": "default",
"default_options": {
"block_ads": false,
"block_trackers": false
},
"custom_options": {
"addresses": [
"1.1.1.1",
"1.2.3.4"
]
}
}
},
"settings_version": 5
}
"#;
pub const V6_SETTINGS: &str = r#"
{
"relay_settings": {
"normal": {
"location": {
"only": {
"country": "se"
}
},
"tunnel_protocol": "any",
"wireguard_constraints": {
"port": "any",
"ip_version": "any",
"use_multihop": true,
"entry_location": "any"
},
"openvpn_constraints": {
"port": {
"only": {
"protocol": "udp",
"port": {
"only": 1195
}
}
}
}
}
},
"bridge_settings": {
"normal": {
"location": "any"
}
},
"obfuscation_settings": {
"selected_obfuscation": "udp2_tcp",
"udp2tcp": {
"port": "any"
}
},
"bridge_state": "auto",
"allow_lan": true,
"block_when_disconnected": false,
"auto_connect": false,
"tunnel_options": {
"openvpn": {
"mssfix": null
},
"wireguard": {
"mtu": null,
"rotation_interval": {
"secs": 86400,
"nanos": 0
}
},
"generic": {
"enable_ipv6": false
},
"dns_options": {
"state": "default",
"default_options": {
"block_ads": false,
"block_trackers": false
},
"custom_options": {
"addresses": [
"1.1.1.1",
"1.2.3.4"
]
}
}
},
"settings_version": 6
}
"#;
#[tokio::test]
async fn test_v5_to_v6_migration() {
let mut old_settings = serde_json::from_str(V5_SETTINGS).unwrap();
assert!(version_matches(&old_settings));
migrate(&mut old_settings).unwrap();
let new_settings: serde_json::Value = serde_json::from_str(V6_SETTINGS).unwrap();
assert_eq!(&old_settings, &new_settings);
}
}
|