fix(core): gate mq-admin-only transport helpers behind feature flag
This commit is contained in:
3 files changed
+6
-1
No files matched your search
@@ -24,7 +24,7 @@ use crate::db::proxy_tunnel::ProxyTunnelManager;
|
|||||||
use crate::db::ssh_tunnel::TunnelManager;
|
use crate::db::ssh_tunnel::TunnelManager;
|
||||||
use crate::models::connection::{
|
use crate::models::connection::{
|
||||||
database_info_from_protocol_value, parse_jdbc_host_port, parse_mongo_first_host, rewrite_jdbc_url_host,
|
database_info_from_protocol_value, parse_jdbc_host_port, parse_mongo_first_host, rewrite_jdbc_url_host,
|
||||||
ConnectionConfig, ConnectionTestResult, DatabaseConnectionInfo, DatabaseType, ProxyType, TransportLayerConfig,
|
ConnectionConfig, ConnectionTestResult, DatabaseConnectionInfo, DatabaseType, TransportLayerConfig,
|
||||||
};
|
};
|
||||||
use crate::path_utils::expand_tilde;
|
use crate::path_utils::expand_tilde;
|
||||||
use crate::plugins::{PluginDriverSession, PluginRegistry, PluginRuntimeEnv};
|
use crate::plugins::{PluginDriverSession, PluginRegistry, PluginRuntimeEnv};
|
||||||
@@ -2684,6 +2684,9 @@ impl AppState {
|
|||||||
connection_id: &str,
|
connection_id: &str,
|
||||||
transport_layers: &[TransportLayerConfig],
|
transport_layers: &[TransportLayerConfig],
|
||||||
) -> Result<crate::mq::config::MqSocksProxy, String> {
|
) -> Result<crate::mq::config::MqSocksProxy, String> {
|
||||||
|
// ProxyType 仅此 mq-admin 分支用到,局部导入避免在关闭 mq-admin 时
|
||||||
|
// 顶层 import 触发 unused 警告。
|
||||||
|
use crate::models::connection::ProxyType;
|
||||||
let final_layer = transport_layers.last().ok_or("No transport layers configured")?;
|
let final_layer = transport_layers.last().ok_or("No transport layers configured")?;
|
||||||
match final_layer {
|
match final_layer {
|
||||||
TransportLayerConfig::Ssh(_) => {
|
TransportLayerConfig::Ssh(_) => {
|
||||||
|
|||||||
@@ -136,6 +136,7 @@ async fn connect_via_proxy(proxy: &ProxyEndpoint, remote: &RemoteEndpoint) -> Re
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(feature = "mq-admin")]
|
||||||
pub(crate) async fn connect_via_socks5_proxy(
|
pub(crate) async fn connect_via_socks5_proxy(
|
||||||
proxy_host: &str,
|
proxy_host: &str,
|
||||||
proxy_port: u16,
|
proxy_port: u16,
|
||||||
|
|||||||
@@ -85,6 +85,7 @@ pub(crate) async fn start_transport_layers_with_final_ssh_local_port(
|
|||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(feature = "mq-admin")]
|
||||||
pub(crate) async fn start_transport_layers_with_final_ssh_socks5(
|
pub(crate) async fn start_transport_layers_with_final_ssh_socks5(
|
||||||
connection_id: &str,
|
connection_id: &str,
|
||||||
layers: &[TransportLayerConfig],
|
layers: &[TransportLayerConfig],
|
||||||
|
|||||||
Reference in new issue
Block a user