feat(grpc): add support for maintenance checks
All checks were successful
Build and Test / sonic-transformed (push) Successful in 7m20s
Build and Test / mario-tennis (push) Successful in 7m30s
Build and Test / minecraft-wiiu (push) Successful in 7m35s
Build and Test / terraria (push) Successful in 7m58s
Build and Test / wii-sports-club (push) Successful in 8m0s
Build and Test / puyopuyo (push) Successful in 8m2s
Build and Test / splatoon-testfire (push) Successful in 8m55s
Build and Test / splatoon (push) Successful in 8m55s
Build and Test / wii-u-chat (push) Successful in 9m12s
Build and Test / super-mario-maker (push) Successful in 9m14s
Build and Test / friends (push) Successful in 9m16s
Build and Test / fast-racing-neo (push) Successful in 9m26s
All checks were successful
Build and Test / sonic-transformed (push) Successful in 7m20s
Build and Test / mario-tennis (push) Successful in 7m30s
Build and Test / minecraft-wiiu (push) Successful in 7m35s
Build and Test / terraria (push) Successful in 7m58s
Build and Test / wii-sports-club (push) Successful in 8m0s
Build and Test / puyopuyo (push) Successful in 8m2s
Build and Test / splatoon-testfire (push) Successful in 8m55s
Build and Test / splatoon (push) Successful in 8m55s
Build and Test / wii-u-chat (push) Successful in 9m12s
Build and Test / super-mario-maker (push) Successful in 9m14s
Build and Test / friends (push) Successful in 9m16s
Build and Test / fast-racing-neo (push) Successful in 9m26s
This commit is contained in:
parent
d4ede0ca83
commit
667f434189
8 changed files with 150 additions and 2 deletions
2
Cargo.lock
generated
2
Cargo.lock
generated
|
|
@ -2682,7 +2682,9 @@ version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"rnex-auth",
|
"rnex-auth",
|
||||||
"rnex-server",
|
"rnex-server",
|
||||||
|
"rnex-server-api",
|
||||||
"tokio",
|
"tokio",
|
||||||
|
"tonic",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
|
||||||
13
rnex-server-api-grpc/auth.proto
Normal file
13
rnex-server-api-grpc/auth.proto
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
syntax = "proto3";
|
||||||
|
package auth;
|
||||||
|
|
||||||
|
message MaintenanceState {
|
||||||
|
bool enabled = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
message Empty {}
|
||||||
|
|
||||||
|
service AuthAdminService {
|
||||||
|
rpc SetMaintenance(MaintenanceState) returns (Empty);
|
||||||
|
rpc GetMaintenance(Empty) returns (MaintenanceState);
|
||||||
|
}
|
||||||
|
|
@ -4,3 +4,7 @@ pub mod meta {
|
||||||
pub mod gatherings {
|
pub mod gatherings {
|
||||||
tonic::include_proto!("gatherings");
|
tonic::include_proto!("gatherings");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub mod auth {
|
||||||
|
tonic::include_proto!("auth");
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ use rnex_rmc::{
|
||||||
use rnex_server::PassthroughInitModule;
|
use rnex_server::PassthroughInitModule;
|
||||||
use tracing::{info, warn};
|
use tracing::{info, warn};
|
||||||
|
|
||||||
use crate::AuthManager;
|
use crate::{AuthManager, is_maintenance};
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
#[rmc_struct(AuthProtocol)]
|
#[rmc_struct(AuthProtocol)]
|
||||||
|
|
@ -188,6 +188,10 @@ impl Auth for AuthHandler {
|
||||||
&self,
|
&self,
|
||||||
name: String,
|
name: String,
|
||||||
) -> Result<(QResult, PID, Vec<u8>, ConnectionDataOld, String), ErrorCode> {
|
) -> Result<(QResult, PID, Vec<u8>, ConnectionDataOld, String), ErrorCode> {
|
||||||
|
if is_maintenance() {
|
||||||
|
return Err(ErrorCode::RendezVous_GameServerMaintenance);
|
||||||
|
}
|
||||||
|
|
||||||
let (pid, ticket) = self.generate_ticket_from_name(&name).await?;
|
let (pid, ticket) = self.generate_ticket_from_name(&name).await?;
|
||||||
|
|
||||||
let result = QResult::success(ErrorCode::Core_Unknown);
|
let result = QResult::success(ErrorCode::Core_Unknown);
|
||||||
|
|
@ -231,6 +235,10 @@ impl Auth for AuthHandler {
|
||||||
name: String,
|
name: String,
|
||||||
_extra_data: Any,
|
_extra_data: Any,
|
||||||
) -> Result<(QResult, PID, Vec<u8>, ConnectionData, String, String), ErrorCode> {
|
) -> Result<(QResult, PID, Vec<u8>, ConnectionData, String, String), ErrorCode> {
|
||||||
|
if is_maintenance() {
|
||||||
|
return Err(ErrorCode::RendezVous_GameServerMaintenance);
|
||||||
|
}
|
||||||
|
|
||||||
let (pid, key, ticket) = self.generate_ticket_from_name_string_user_key(&name).await?;
|
let (pid, key, ticket) = self.generate_ticket_from_name_string_user_key(&name).await?;
|
||||||
|
|
||||||
let result = QResult::success(Core_Unknown);
|
let result = QResult::success(Core_Unknown);
|
||||||
|
|
@ -296,6 +304,10 @@ impl Auth for AuthHandler {
|
||||||
name: String,
|
name: String,
|
||||||
_extra_data: Any,
|
_extra_data: Any,
|
||||||
) -> Result<(QResult, PID, Vec<u8>, ConnectionData, String), ErrorCode> {
|
) -> Result<(QResult, PID, Vec<u8>, ConnectionData, String), ErrorCode> {
|
||||||
|
if is_maintenance() {
|
||||||
|
return Err(ErrorCode::RendezVous_GameServerMaintenance);
|
||||||
|
}
|
||||||
|
|
||||||
let (pid, ticket) = self.generate_ticket_from_name(&name).await?;
|
let (pid, ticket) = self.generate_ticket_from_name(&name).await?;
|
||||||
|
|
||||||
let result = QResult::success(ErrorCode::Core_Unknown);
|
let result = QResult::success(ErrorCode::Core_Unknown);
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,26 @@ use rnex_server::{ConnectionInitData, RnexManager, RnexModule, WeakPassthroughIn
|
||||||
use tracing::info;
|
use tracing::info;
|
||||||
|
|
||||||
use crate::auth_handler::AuthHandler;
|
use crate::auth_handler::AuthHandler;
|
||||||
|
use std::sync::{
|
||||||
|
Arc, OnceLock,
|
||||||
|
atomic::{AtomicBool, Ordering},
|
||||||
|
};
|
||||||
|
|
||||||
|
static MAINTENANCE: OnceLock<Arc<AtomicBool>> = OnceLock::new();
|
||||||
|
|
||||||
|
pub fn maintenance_flag() -> Arc<AtomicBool> {
|
||||||
|
MAINTENANCE
|
||||||
|
.get_or_init(|| Arc::new(AtomicBool::new(false)))
|
||||||
|
.clone()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn set_maintenance(on: bool) {
|
||||||
|
maintenance_flag().store(on, Ordering::Relaxed);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_maintenance() -> bool {
|
||||||
|
maintenance_flag().load(Ordering::Relaxed)
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct AuthManager {
|
pub struct AuthManager {
|
||||||
|
|
|
||||||
|
|
@ -25,3 +25,5 @@ big_pid = []
|
||||||
rnex-server = {path = ".."}
|
rnex-server = {path = ".."}
|
||||||
rnex-auth = {path = "../../rnex-server-nex-modules/rnex-auth"}
|
rnex-auth = {path = "../../rnex-server-nex-modules/rnex-auth"}
|
||||||
tokio = { version = "1.52.3", features = ["rt-multi-thread"] }
|
tokio = { version = "1.52.3", features = ["rt-multi-thread"] }
|
||||||
|
rnex-server-api = { path = "../../rnex-server-api" }
|
||||||
|
tonic = { version = "0.14.6", features = ["transport"] }
|
||||||
72
rnex-server/backend-auth/src/admin.rs
Normal file
72
rnex-server/backend-auth/src/admin.rs
Normal file
|
|
@ -0,0 +1,72 @@
|
||||||
|
use std::net::SocketAddr;
|
||||||
|
|
||||||
|
use rnex_auth::{is_maintenance, set_maintenance};
|
||||||
|
use rnex_server_api::auth::{
|
||||||
|
auth_admin_service_server::{AuthAdminService, AuthAdminServiceServer},
|
||||||
|
MaintenanceState, Empty,
|
||||||
|
};
|
||||||
|
use tonic::{Request, Response, Status, transport::Server};
|
||||||
|
|
||||||
|
pub struct AdminGrpc {
|
||||||
|
token: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl AdminGrpc {
|
||||||
|
pub fn new(token: Option<String>) -> Self {
|
||||||
|
Self { token }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn authorize<T>(&self, request: &Request<T>) -> Result<(), Status> {
|
||||||
|
let Some(expected) = &self.token else {
|
||||||
|
return Ok(());
|
||||||
|
};
|
||||||
|
|
||||||
|
let Some(value) = request.metadata().get("authorization") else {
|
||||||
|
return Err(Status::unauthenticated("missing authorization header"));
|
||||||
|
};
|
||||||
|
|
||||||
|
let header = value
|
||||||
|
.to_str()
|
||||||
|
.map_err(|_| Status::unauthenticated("authorization header must be ASCII"))?;
|
||||||
|
|
||||||
|
let supplied = header
|
||||||
|
.strip_prefix("Bearer ")
|
||||||
|
.or_else(|| header.strip_prefix("bearer "))
|
||||||
|
.ok_or_else(|| Status::unauthenticated("authorization header must use Bearer scheme"))?;
|
||||||
|
|
||||||
|
if supplied == expected {
|
||||||
|
Ok(())
|
||||||
|
} else {
|
||||||
|
Err(Status::unauthenticated("invalid admin token"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tonic::async_trait]
|
||||||
|
impl AuthAdminService for AdminGrpc {
|
||||||
|
async fn set_maintenance(
|
||||||
|
&self,
|
||||||
|
request: Request<MaintenanceState>,
|
||||||
|
) -> Result<Response<Empty>, Status> {
|
||||||
|
self.authorize(&request)?;
|
||||||
|
set_maintenance(request.into_inner().enabled);
|
||||||
|
Ok(Response::new(Empty {}))
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn get_maintenance(
|
||||||
|
&self,
|
||||||
|
request: Request<Empty>,
|
||||||
|
) -> Result<Response<MaintenanceState>, Status> {
|
||||||
|
self.authorize(&request)?;
|
||||||
|
Ok(Response::new(MaintenanceState {
|
||||||
|
enabled: is_maintenance(),
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn serve(addr: SocketAddr, token: Option<String>) -> Result<(), tonic::transport::Error> {
|
||||||
|
Server::builder()
|
||||||
|
.add_service(AuthAdminServiceServer::new(AdminGrpc::new(token)))
|
||||||
|
.serve(addr)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
@ -1,9 +1,32 @@
|
||||||
|
mod admin;
|
||||||
|
|
||||||
|
use std::net::SocketAddr;
|
||||||
|
|
||||||
use rnex_auth::AuthModule;
|
use rnex_auth::AuthModule;
|
||||||
use rnex_server::{ConnectionInitData, launch_rnex_module_server};
|
use rnex_server::{ConnectionInitData, launch_rnex_module_server};
|
||||||
|
|
||||||
|
fn admin_addr() -> SocketAddr {
|
||||||
|
std::env::var("RNEX_AUTH_ADMIN_GRPC_ADDR")
|
||||||
|
.ok()
|
||||||
|
.and_then(|v| v.parse().ok())
|
||||||
|
.unwrap_or_else(|| SocketAddr::from(([127, 0, 0, 1], 50052)))
|
||||||
|
}
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() {
|
async fn main() {
|
||||||
|
let token = std::env::var("RNEX_AUTH_ADMIN_GRPC_TOKEN").ok();
|
||||||
|
|
||||||
|
let admin_task = tokio::spawn(async move {
|
||||||
|
if let Err(err) = admin::serve(admin_addr(), token).await {
|
||||||
|
rnex_server::tracing::error!(%err, "auth admin gRPC server stopped");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
launch_rnex_module_server! {
|
launch_rnex_module_server! {
|
||||||
ConnectionInitData;
|
ConnectionInitData;
|
||||||
AuthModule
|
AuthModule
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
admin_task.abort();
|
||||||
|
let _ = admin_task.await;
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue