Skip to content

build: update ngrok #1395

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

build: update ngrok #1395

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion devolutions-gateway/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ reqwest = { version = "0.12", default-features = false, features = ["rustls-tls-
futures = "0.3"
async-trait = "0.1"
tower = { version = "0.5", features = ["timeout"] }
ngrok = "0.13"
ngrok = { version = "0.15", default-features = false, features = ["ring"] }

# HTTP
hyper = "1.4"
Expand Down
71 changes: 37 additions & 34 deletions devolutions-gateway/src/ngrok.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ use async_trait::async_trait;
use devolutions_gateway_task::{ChildTask, ShutdownSignal, Task};
use futures::TryStreamExt as _;
use ngrok::config::{HttpTunnelBuilder, TcpTunnelBuilder, TunnelBuilder as _};
use ngrok::tunnel::UrlTunnel as _;
use ngrok::conn::ConnInfo as _;
use ngrok::tunnel::EndpointInfo as _;
use tracing::Instrument as _;

use crate::config::dto::{NgrokConf, NgrokTunnelConf};
Expand All @@ -19,22 +20,28 @@ pub struct NgrokSession {

impl NgrokSession {
pub async fn connect(conf: &NgrokConf) -> anyhow::Result<Self> {
let mut builder = ngrok::Session::builder().authtoken(&conf.auth_token);
let mut builder = ngrok::Session::builder();

builder.authtoken(&conf.auth_token);

if let Some(heartbeat_interval) = conf.heartbeat_interval {
builder = builder.heartbeat_interval(Duration::from_secs(heartbeat_interval));
builder
.heartbeat_interval(Duration::from_secs(heartbeat_interval))
.context("set heartbeat interval")?;
}

if let Some(heartbeat_tolerance) = conf.heartbeat_tolerance {
builder = builder.heartbeat_tolerance(Duration::from_secs(heartbeat_tolerance));
builder
.heartbeat_tolerance(Duration::from_secs(heartbeat_tolerance))
.context("set heartbeat tolerence")?;
}

if let Some(metadata) = &conf.metadata {
builder = builder.metadata(metadata);
builder.metadata(metadata);
}

if let Some(server_addr) = &conf.server_addr {
builder = builder.server_addr(server_addr);
builder.server_addr(server_addr).context("set server address")?;
}

info!("Connecting to ngrok service");
Expand All @@ -53,23 +60,23 @@ impl NgrokSession {

match conf {
NgrokTunnelConf::Tcp(tcp_conf) => {
let mut builder = self.inner.tcp_endpoint().remote_addr(&tcp_conf.remote_addr);
let mut builder = self.inner.tcp_endpoint();

builder.remote_addr(&tcp_conf.remote_addr);

if let Some(metadata) = &tcp_conf.metadata {
builder = builder.metadata(metadata);
builder.metadata(metadata);
}

let before_cidrs = builder.clone();

builder = tcp_conf
.allow_cidrs
.iter()
.fold(builder, |builder, cidr| builder.allow_cidr(cidr));
tcp_conf.allow_cidrs.iter().for_each(|cidr| {
builder.allow_cidr(cidr);
});

builder = tcp_conf
.deny_cidrs
.iter()
.fold(builder, |builder, cidr| builder.deny_cidr(cidr));
tcp_conf.deny_cidrs.iter().for_each(|cidr| {
builder.deny_cidr(cidr);
});

// HACK: Find the subscription plan. This uses ngrok-rs internal API, so it’s not great.
// Ideally, we could use the `Session` to find out about the subscription plan without dirty tricks.
Expand Down Expand Up @@ -102,35 +109,31 @@ impl NgrokSession {
}
}
NgrokTunnelConf::Http(http_conf) => {
let mut builder = self
.inner
.http_endpoint()
.domain(&http_conf.domain)
.scheme(Scheme::HTTPS);
let mut builder = self.inner.http_endpoint();

builder.domain(&http_conf.domain).scheme(Scheme::HTTPS);

if let Some(metadata) = &http_conf.metadata {
builder = builder.metadata(metadata);
builder.metadata(metadata);
}

if let Some(circuit_breaker) = http_conf.circuit_breaker {
builder = builder.circuit_breaker(circuit_breaker);
builder.circuit_breaker(circuit_breaker);
}

if matches!(http_conf.compression, Some(true)) {
builder = builder.compression();
builder.compression();
}

let before_cidrs = builder.clone();

builder = http_conf
.allow_cidrs
.iter()
.fold(builder, |builder, cidr| builder.allow_cidr(cidr));
http_conf.allow_cidrs.iter().for_each(|cidr| {
builder.allow_cidr(cidr);
});

builder = http_conf
.deny_cidrs
.iter()
.fold(builder, |builder, cidr| builder.deny_cidr(cidr));
http_conf.deny_cidrs.iter().for_each(|cidr| {
builder.deny_cidr(cidr);
});

// HACK: Find the subscription plan. This uses ngrok-rs internal API, so it’s not great.
// Ideally, we could use the `Session` to find out about the subscription plan without dirty tricks.
Expand Down Expand Up @@ -184,7 +187,7 @@ impl NgrokTunnel {
let hostname = state.conf_handle.get_conf().hostname.clone();

match self.inner {
NgrokTunnelInner::Tcp(builder) => {
NgrokTunnelInner::Tcp(mut builder) => {
// Start tunnel with a TCP edge
let tunnel = builder
.forwards_to(hostname)
Expand All @@ -196,7 +199,7 @@ impl NgrokTunnel {

run_tcp_tunnel(tunnel, state).await;
}
NgrokTunnelInner::Http(builder) => {
NgrokTunnelInner::Http(mut builder) => {
// Start tunnel with an HTTP edge
let tunnel = builder
.forwards_to(hostname)
Expand Down
Loading