diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-07-09 16:56:53 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-07-09 16:56:53 +0200 |
| commit | ce13689ba8222ec9ede22d6669b802258bd07d4d (patch) | |
| tree | 7a6d2e22a1f6e155063967d224ba5f03c12b9584 | |
| parent | 5587f6ffdebc08dba1420164c27a3109c7e9a35c (diff) | |
| parent | 90d6e1d3cbe481842376ea216857ee35ae2ab3db (diff) | |
| download | mullvadvpn-ce13689ba8222ec9ede22d6669b802258bd07d4d.tar.xz mullvadvpn-ce13689ba8222ec9ede22d6669b802258bd07d4d.zip | |
Merge branch 'uuid-in-problem-report'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | mullvad-problem-report/Cargo.toml | 1 | ||||
| -rw-r--r-- | mullvad-problem-report/src/main.rs | 6 |
4 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 77840f748c..7a6b7fada6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ Line wrap the file at 100 chars. Th ### Added - Bundle the root CA signing the API and only trust that single one, limiting trust to a single root CA +- Add a unique UUID to problem reports. Makes it easier for Mullvad support staff to find reports. ### Changed - App now uses statically linked OpenSSL on all platforms. diff --git a/Cargo.lock b/Cargo.lock index 53fcadd298..0a8a18c01a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -850,6 +850,7 @@ dependencies = [ "mullvad-paths 0.1.0", "mullvad-rpc 0.1.0", "regex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml index a78264a2e9..66358a4a36 100644 --- a/mullvad-problem-report/Cargo.toml +++ b/mullvad-problem-report/Cargo.toml @@ -14,6 +14,7 @@ clap = "2.25" error-chain = "0.12" lazy_static = "1.0" regex = "1.0" +uuid = { version = "0.6", features = ["v4"] } mullvad-paths = { path = "../mullvad-paths" } mullvad-rpc = { path = "../mullvad-rpc" } diff --git a/mullvad-problem-report/src/main.rs b/mullvad-problem-report/src/main.rs index 0749aa2946..440b1a9c75 100644 --- a/mullvad-problem-report/src/main.rs +++ b/mullvad-problem-report/src/main.rs @@ -13,6 +13,7 @@ extern crate error_chain; #[macro_use] extern crate lazy_static; extern crate regex; +extern crate uuid; extern crate mullvad_paths; extern crate mullvad_rpc; @@ -449,11 +450,12 @@ fn read_file_lossy(path: &Path, max_bytes: usize) -> io::Result<String> { fn collect_metadata() -> HashMap<String, String> { let mut metadata = HashMap::new(); + metadata.insert("id".to_owned(), uuid::Uuid::new_v4().to_string()); metadata.insert( - String::from("mullvad-product-version"), + "mullvad-product-version".to_owned(), product_version().to_owned(), ); - metadata.insert(String::from("os"), os_version()); + metadata.insert("os".to_owned(), os_version()); metadata } |