diff options
| -rw-r--r-- | mullvad-cli/src/cmds/status.rs | 2 | ||||
| -rw-r--r-- | mullvad-cli/src/cmds/tunnel.rs | 4 | ||||
| -rw-r--r-- | mullvad-cli/src/format.rs | 21 | ||||
| -rw-r--r-- | mullvad-daemon/src/lib.rs | 2 | ||||
| -rw-r--r-- | mullvad-management-interface/proto/management_interface.proto | 10 | ||||
| -rw-r--r-- | mullvad-management-interface/src/types.rs | 20 | ||||
| -rw-r--r-- | mullvad-types/src/wireguard.rs | 21 |
7 files changed, 5 insertions, 75 deletions
diff --git a/mullvad-cli/src/cmds/status.rs b/mullvad-cli/src/cmds/status.rs index f5a681e36c..0a11aca475 100644 --- a/mullvad-cli/src/cmds/status.rs +++ b/mullvad-cli/src/cmds/status.rs @@ -1,4 +1,4 @@ -use crate::{format, format::print_keygen_event, new_rpc_client, Command, Error, Result}; +use crate::{format, new_rpc_client, Command, Error, Result}; use mullvad_management_interface::{ types::daemon_event::Event as EventType, ManagementServiceClient, }; diff --git a/mullvad-cli/src/cmds/tunnel.rs b/mullvad-cli/src/cmds/tunnel.rs index f27e29d147..f01452a925 100644 --- a/mullvad-cli/src/cmds/tunnel.rs +++ b/mullvad-cli/src/cmds/tunnel.rs @@ -1,4 +1,4 @@ -use crate::{format::print_keygen_event, new_rpc_client, Command, Error, Result}; +use crate::{new_rpc_client, Command, Error, Result}; use mullvad_management_interface::types::{self, Timestamp, TunnelOptions}; use mullvad_types::wireguard::DEFAULT_ROTATION_INTERVAL; use std::{convert::TryFrom, time::Duration}; @@ -251,7 +251,7 @@ impl Tunnel { async fn process_wireguard_key_generate() -> Result<()> { let mut rpc = new_rpc_client().await?; - let keygen_event = rpc.rotate_wireguard_key(()).await?; + rpc.rotate_wireguard_key(()).await?; println!("Rotated WireGuard key"); Ok(()) } diff --git a/mullvad-cli/src/format.rs b/mullvad-cli/src/format.rs index b056ffff53..eb91ffcca8 100644 --- a/mullvad-cli/src/format.rs +++ b/mullvad-cli/src/format.rs @@ -5,30 +5,11 @@ use mullvad_management_interface::types::{ }, tunnel_state, tunnel_state::State::*, - ErrorState, KeygenEvent, ProxyType, TransportProtocol, TunnelEndpoint, TunnelState, TunnelType, + ErrorState, ProxyType, TransportProtocol, TunnelEndpoint, TunnelState, TunnelType, }; use mullvad_types::auth_failed::AuthFailed; use std::fmt::Write; -pub fn print_keygen_event(key_event: &KeygenEvent) { - use mullvad_management_interface::types::keygen_event::KeygenEvent as EventType; - - match EventType::from_i32(key_event.event).unwrap() { - EventType::NewKey => { - println!( - "New WireGuard key: {}", - base64::encode(&key_event.new_key.as_ref().unwrap().key) - ); - } - EventType::TooManyKeys => { - println!("Account has too many keys already"); - } - EventType::GenerationFailure => { - println!("Failed to generate new WireGuard key"); - } - } -} - pub fn print_state(state: &TunnelState) { print!("Tunnel status: "); match state.state.as_ref().unwrap() { diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs index 464824fc59..a51c8bf2c6 100644 --- a/mullvad-daemon/src/lib.rs +++ b/mullvad-daemon/src/lib.rs @@ -47,7 +47,7 @@ use mullvad_types::{ settings::{DnsOptions, DnsState, Settings}, states::{TargetState, TunnelState}, version::{AppVersion, AppVersionInfo}, - wireguard::{KeygenEvent, PublicKey, RotationInterval}, + wireguard::{PublicKey, RotationInterval}, }; use settings::SettingsPersister; #[cfg(target_os = "android")] diff --git a/mullvad-management-interface/proto/management_interface.proto b/mullvad-management-interface/proto/management_interface.proto index 701a2e267e..4ad231774c 100644 --- a/mullvad-management-interface/proto/management_interface.proto +++ b/mullvad-management-interface/proto/management_interface.proto @@ -427,16 +427,6 @@ message PublicKey { google.protobuf.Timestamp created = 2; } -message KeygenEvent { - enum KeygenEvent { - NEW_KEY = 0; - TOO_MANY_KEYS = 1; - GENERATION_FAILURE = 2; - } - KeygenEvent event = 1; - PublicKey new_key = 2; -} - message AppVersionInfo { bool supported = 1; string latest_stable = 2; diff --git a/mullvad-management-interface/src/types.rs b/mullvad-management-interface/src/types.rs index eb6dbf6a31..c8e8189c0a 100644 --- a/mullvad-management-interface/src/types.rs +++ b/mullvad-management-interface/src/types.rs @@ -234,26 +234,6 @@ impl From<Vec<mullvad_types::device::Device>> for DeviceList { } } -impl From<mullvad_types::wireguard::KeygenEvent> for KeygenEvent { - fn from(event: mullvad_types::wireguard::KeygenEvent) -> Self { - use keygen_event::KeygenEvent as Event; - use mullvad_types::wireguard::KeygenEvent as MullvadEvent; - - KeygenEvent { - event: match event { - MullvadEvent::NewKey(_) => i32::from(Event::NewKey), - MullvadEvent::TooManyKeys => i32::from(Event::TooManyKeys), - MullvadEvent::GenerationFailure => i32::from(Event::GenerationFailure), - }, - new_key: if let MullvadEvent::NewKey(key) = event { - Some(PublicKey::from(key)) - } else { - None - }, - } - } -} - impl From<mullvad_types::wireguard::PublicKey> for PublicKey { fn from(public_key: mullvad_types::wireguard::PublicKey) -> Self { PublicKey { diff --git a/mullvad-types/src/wireguard.rs b/mullvad-types/src/wireguard.rs index 2991eb1a1d..4c05f1e552 100644 --- a/mullvad-types/src/wireguard.rs +++ b/mullvad-types/src/wireguard.rs @@ -145,24 +145,3 @@ pub struct AssociatedAddresses { pub ipv4_address: ipnetwork::Ipv4Network, pub ipv6_address: ipnetwork::Ipv6Network, } - -/// Event that is emitted when the daemon has finished generating a key. -#[derive(Clone, Debug, Deserialize, Serialize)] -#[serde(rename_all = "snake_case")] -#[cfg_attr(target_os = "android", derive(IntoJava))] -#[cfg_attr(target_os = "android", jnix(package = "net.mullvad.mullvadvpn.model"))] -pub enum KeygenEvent { - NewKey(PublicKey), - TooManyKeys, - GenerationFailure, -} - -impl fmt::Display for KeygenEvent { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> { - match self { - KeygenEvent::NewKey(new_key) => write!(f, "New wireguard key {}", new_key.key), - KeygenEvent::TooManyKeys => write!(f, "Account has too many keys already"), - KeygenEvent::GenerationFailure => write!(f, "Failed to generate new wireguard key"), - } - } -} |