mirror of
https://github.com/EasyTier/EasyTier.git
synced 2026-05-07 18:24:36 +00:00
feat(web): add webhook-managed machine access and multi-instance CLI support (#1989)
* feat: add webhook-managed access and multi-instance CLI support * fix(foreign): verify credential of foreign credential peer
This commit is contained in:
KKRainbow
@@ -5,6 +5,7 @@ use axum::{
|
||||
Json, Router,
|
||||
};
|
||||
use axum_login::AuthUser as _;
|
||||
use easytier::proto::rpc_types::controller::BaseController;
|
||||
|
||||
use super::{other_error, AppState, HttpHandleError};
|
||||
|
||||
@@ -19,34 +20,15 @@ macro_rules! match_service {
|
||||
($factory:ty, $method_name:expr, $payload:expr, $session:expr) => {{
|
||||
let client = $session.scoped_client::<$factory>();
|
||||
client
|
||||
.json_call_method(
|
||||
easytier::proto::rpc_types::controller::BaseController::default(),
|
||||
&$method_name,
|
||||
$payload,
|
||||
)
|
||||
.json_call_method(BaseController::default(), &$method_name, $payload)
|
||||
.await
|
||||
}};
|
||||
}
|
||||
|
||||
pub async fn handle_proxy_rpc(
|
||||
auth_session: super::users::AuthSession,
|
||||
State(client_mgr): AppState,
|
||||
Path(machine_id): Path<uuid::Uuid>,
|
||||
Json(req): Json<ProxyRpcRequest>,
|
||||
async fn handle_proxy_rpc_by_session(
|
||||
session: &crate::client_manager::session::Session,
|
||||
req: ProxyRpcRequest,
|
||||
) -> Result<Json<serde_json::Value>, HttpHandleError> {
|
||||
let user_id = auth_session
|
||||
.user
|
||||
.as_ref()
|
||||
.ok_or((StatusCode::UNAUTHORIZED, other_error("Unauthorized").into()))?
|
||||
.id();
|
||||
|
||||
let session = client_mgr
|
||||
.get_session_by_machine_id(user_id, &machine_id)
|
||||
.ok_or((
|
||||
StatusCode::NOT_FOUND,
|
||||
other_error("Session not found").into(),
|
||||
))?;
|
||||
|
||||
let ProxyRpcRequest {
|
||||
service_name,
|
||||
method_name,
|
||||
@@ -55,97 +37,79 @@ pub async fn handle_proxy_rpc(
|
||||
|
||||
let resp = match service_name.as_str() {
|
||||
"api.manage.WebClientService" => match_service!(
|
||||
easytier::proto::api::manage::WebClientServiceClientFactory<
|
||||
easytier::proto::rpc_types::controller::BaseController,
|
||||
>,
|
||||
easytier::proto::api::manage::WebClientServiceClientFactory<BaseController>,
|
||||
method_name,
|
||||
payload,
|
||||
session
|
||||
),
|
||||
"api.instance.PeerManageRpcService" => match_service!(
|
||||
easytier::proto::api::instance::PeerManageRpcClientFactory<
|
||||
easytier::proto::rpc_types::controller::BaseController,
|
||||
>,
|
||||
easytier::proto::api::instance::PeerManageRpcClientFactory<BaseController>,
|
||||
method_name,
|
||||
payload,
|
||||
session
|
||||
),
|
||||
"api.instance.PeerCenterManageRpcService" => match_service!(
|
||||
easytier::proto::peer_rpc::PeerCenterRpcClientFactory<BaseController>,
|
||||
method_name,
|
||||
payload,
|
||||
session
|
||||
),
|
||||
"api.instance.ConnectorManageRpcService" => match_service!(
|
||||
easytier::proto::api::instance::ConnectorManageRpcClientFactory<
|
||||
easytier::proto::rpc_types::controller::BaseController,
|
||||
>,
|
||||
easytier::proto::api::instance::ConnectorManageRpcClientFactory<BaseController>,
|
||||
method_name,
|
||||
payload,
|
||||
session
|
||||
),
|
||||
"api.instance.MappedListenerManageRpcService" => match_service!(
|
||||
easytier::proto::api::instance::MappedListenerManageRpcClientFactory<
|
||||
easytier::proto::rpc_types::controller::BaseController,
|
||||
>,
|
||||
easytier::proto::api::instance::MappedListenerManageRpcClientFactory<BaseController>,
|
||||
method_name,
|
||||
payload,
|
||||
session
|
||||
),
|
||||
"api.instance.VpnPortalRpcService" => match_service!(
|
||||
easytier::proto::api::instance::VpnPortalRpcClientFactory<
|
||||
easytier::proto::rpc_types::controller::BaseController,
|
||||
>,
|
||||
easytier::proto::api::instance::VpnPortalRpcClientFactory<BaseController>,
|
||||
method_name,
|
||||
payload,
|
||||
session
|
||||
),
|
||||
"api.instance.TcpProxyRpcService" => match_service!(
|
||||
easytier::proto::api::instance::TcpProxyRpcClientFactory<
|
||||
easytier::proto::rpc_types::controller::BaseController,
|
||||
>,
|
||||
easytier::proto::api::instance::TcpProxyRpcClientFactory<BaseController>,
|
||||
method_name,
|
||||
payload,
|
||||
session
|
||||
),
|
||||
"api.instance.AclManageRpcService" => match_service!(
|
||||
easytier::proto::api::instance::AclManageRpcClientFactory<
|
||||
easytier::proto::rpc_types::controller::BaseController,
|
||||
>,
|
||||
easytier::proto::api::instance::AclManageRpcClientFactory<BaseController>,
|
||||
method_name,
|
||||
payload,
|
||||
session
|
||||
),
|
||||
"api.instance.PortForwardManageRpcService" => match_service!(
|
||||
easytier::proto::api::instance::PortForwardManageRpcClientFactory<
|
||||
easytier::proto::rpc_types::controller::BaseController,
|
||||
>,
|
||||
easytier::proto::api::instance::PortForwardManageRpcClientFactory<BaseController>,
|
||||
method_name,
|
||||
payload,
|
||||
session
|
||||
),
|
||||
"api.instance.StatsRpcService" => match_service!(
|
||||
easytier::proto::api::instance::StatsRpcClientFactory<
|
||||
easytier::proto::rpc_types::controller::BaseController,
|
||||
>,
|
||||
easytier::proto::api::instance::StatsRpcClientFactory<BaseController>,
|
||||
method_name,
|
||||
payload,
|
||||
session
|
||||
),
|
||||
"api.instance.CredentialManageRpcService" => match_service!(
|
||||
easytier::proto::api::instance::CredentialManageRpcClientFactory<
|
||||
easytier::proto::rpc_types::controller::BaseController,
|
||||
>,
|
||||
easytier::proto::api::instance::CredentialManageRpcClientFactory<BaseController>,
|
||||
method_name,
|
||||
payload,
|
||||
session
|
||||
),
|
||||
"api.logger.LoggerRpcService" => match_service!(
|
||||
easytier::proto::api::logger::LoggerRpcClientFactory<
|
||||
easytier::proto::rpc_types::controller::BaseController,
|
||||
>,
|
||||
easytier::proto::api::logger::LoggerRpcClientFactory<BaseController>,
|
||||
method_name,
|
||||
payload,
|
||||
session
|
||||
),
|
||||
"api.config.ConfigRpcService" => match_service!(
|
||||
easytier::proto::api::config::ConfigRpcClientFactory<
|
||||
easytier::proto::rpc_types::controller::BaseController,
|
||||
>,
|
||||
easytier::proto::api::config::ConfigRpcClientFactory<BaseController>,
|
||||
method_name,
|
||||
payload,
|
||||
session
|
||||
@@ -167,9 +131,52 @@ pub async fn handle_proxy_rpc(
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn handle_proxy_rpc(
|
||||
auth_session: super::users::AuthSession,
|
||||
State(client_mgr): AppState,
|
||||
Path(machine_id): Path<uuid::Uuid>,
|
||||
Json(req): Json<ProxyRpcRequest>,
|
||||
) -> Result<Json<serde_json::Value>, HttpHandleError> {
|
||||
let user_id = auth_session
|
||||
.user
|
||||
.as_ref()
|
||||
.ok_or((StatusCode::UNAUTHORIZED, other_error("Unauthorized").into()))?
|
||||
.id();
|
||||
|
||||
let session = client_mgr
|
||||
.get_session_by_machine_id(user_id, &machine_id)
|
||||
.ok_or((
|
||||
StatusCode::NOT_FOUND,
|
||||
other_error("Session not found").into(),
|
||||
))?;
|
||||
handle_proxy_rpc_by_session(session.as_ref(), req).await
|
||||
}
|
||||
|
||||
pub fn router() -> Router<super::AppStateInner> {
|
||||
Router::new().route(
|
||||
"/api/v1/machines/:machine-id/proxy-rpc",
|
||||
post(handle_proxy_rpc),
|
||||
)
|
||||
}
|
||||
|
||||
/// Internal proxy-rpc handler: no AuthSession, resolves the active session by machine_id.
|
||||
pub async fn handle_proxy_rpc_internal(
|
||||
State(client_mgr): AppState,
|
||||
Path(machine_id): Path<uuid::Uuid>,
|
||||
Json(req): Json<ProxyRpcRequest>,
|
||||
) -> Result<Json<serde_json::Value>, HttpHandleError> {
|
||||
let session = client_mgr
|
||||
.get_session_by_machine_id_global(&machine_id)
|
||||
.ok_or((
|
||||
StatusCode::NOT_FOUND,
|
||||
other_error("Session not found").into(),
|
||||
))?;
|
||||
handle_proxy_rpc_by_session(session.as_ref(), req).await
|
||||
}
|
||||
|
||||
pub fn router_internal() -> Router<super::AppStateInner> {
|
||||
Router::new().route(
|
||||
"/api/internal/machines/:machine-id/proxy-rpc",
|
||||
post(handle_proxy_rpc_internal),
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user