Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cli: use bit flags for publishing tunnel data #197164

Merged
merged 1 commit into from
Nov 1, 2023
Merged

cli: use bit flags for publishing tunnel data #197164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
49 changes: 38 additions & 11 deletions cli/src/tunnels/dev_tunnels.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
use super::protocol::{self, PortPrivacy};
use crate::auth;
use crate::constants::{IS_INTERACTIVE_CLI, PROTOCOL_VERSION_TAG, TUNNEL_SERVICE_USER_AGENT};
use crate::state::{LauncherPaths, PersistedState};
Expand Down Expand Up @@ -32,11 +33,42 @@ use tunnels::management::{
NO_REQUEST_OPTIONS,
};

use super::protocol::{self, PortPrivacy};
use super::wsl_detect::is_wsl_installed;

static TUNNEL_COUNT_LIMIT_NAME: &str = "TunnelsPerUserPerLocation";

#[allow(dead_code)]
mod tunnel_flags {
use crate::{log, tunnels::wsl_detect::is_wsl_installed};

pub const IS_WSL_INSTALLED: u32 = 1 << 0;
pub const IS_WINDOWS: u32 = 1 << 1;
pub const IS_LINUX: u32 = 1 << 2;
pub const IS_MACOS: u32 = 1 << 3;

/// Creates a flag string for the tunnel
pub fn create(log: &log::Logger) -> String {
let mut flags = 0;

#[cfg(windows)]
{
flags |= IS_WINDOWS;
}
#[cfg(target_os = "linux")]
{
flags |= IS_LINUX;
}
#[cfg(target_os = "macos")]
{
flags |= IS_MACOS;
}

if is_wsl_installed(log) {
flags |= IS_WSL_INSTALLED;
}

format!("_flag{}", flags)
}
}

#[derive(Clone, Serialize, Deserialize)]
pub struct PersistedTunnel {
pub name: String,
Expand Down Expand Up @@ -600,17 +632,12 @@ impl DevTunnels {

/// Gets the expected tunnel tags
fn get_tags(&self, name: &str) -> Vec<String> {
let mut tags = vec![
vec![
name.to_string(),
PROTOCOL_VERSION_TAG.to_string(),
self.tag.to_string(),
];

if is_wsl_installed(&self.log) {
tags.push("_wsl".to_string())
}

tags
tunnel_flags::create(&self.log),
]
}

/// Ensures the tunnel contains a tag for the current PROTCOL_VERSION, and no
Expand Down