remove node holders and general repo cleanup
Some checks failed
Build and Test / terraria (push) Failing after 4m42s
Build and Test / minecraft-wiiu (push) Failing after 4m44s
Build and Test / splatoon-testfire (push) Failing after 4m45s
Build and Test / mario-tennis (push) Successful in 4m48s
Build and Test / sonic-transformed (push) Failing after 4m54s
Build and Test / friends (push) Failing after 4m56s
Build and Test / splatoon (push) Failing after 4m56s
Build and Test / fast-racing-neo (push) Failing after 4m58s
Build and Test / wii-u-chat (push) Failing after 4m58s
Build and Test / super-mario-maker (push) Failing after 5m2s
Build and Test / puyopuyo (push) Failing after 5m8s
Build and Test / wii-sports-club (push) Failing after 5m9s
Some checks failed
Build and Test / terraria (push) Failing after 4m42s
Build and Test / minecraft-wiiu (push) Failing after 4m44s
Build and Test / splatoon-testfire (push) Failing after 4m45s
Build and Test / mario-tennis (push) Successful in 4m48s
Build and Test / sonic-transformed (push) Failing after 4m54s
Build and Test / friends (push) Failing after 4m56s
Build and Test / splatoon (push) Failing after 4m56s
Build and Test / fast-racing-neo (push) Failing after 4m58s
Build and Test / wii-u-chat (push) Failing after 4m58s
Build and Test / super-mario-maker (push) Failing after 5m2s
Build and Test / puyopuyo (push) Failing after 5m8s
Build and Test / wii-sports-club (push) Failing after 5m9s
the node holders were just causing issues, we have no need for them currently, so we can just set the secure proxy URL through FORWARD_DESTINATION. less complexity for the cluster and self-hosters too
This commit is contained in:
parent
62e867af2f
commit
aaf9bc4b65
31 changed files with 51 additions and 574 deletions
|
|
@ -1,9 +1,5 @@
|
|||
use std::{
|
||||
hash::{DefaultHasher, Hasher},
|
||||
net::SocketAddrV4,
|
||||
sync::LazyLock,
|
||||
};
|
||||
|
||||
use std::{env, hash::{DefaultHasher, Hasher}, net::SocketAddrV4, sync::LazyLock};
|
||||
use std::str::FromStr;
|
||||
use cfg_if::cfg_if;
|
||||
use nex_account::{grpc, grpc_client};
|
||||
use rnex_auth_protos::{
|
||||
|
|
@ -11,7 +7,6 @@ use rnex_auth_protos::{
|
|||
auth::{Auth, ConnectionData, ConnectionDataOld},
|
||||
};
|
||||
use rnex_prudp::kerberos::{Ticket, TicketInternalData};
|
||||
use rnex_reggie_protos::reggie::RemoteEdgeNodeManagement;
|
||||
use rnex_rmc::{
|
||||
any::Any,
|
||||
qresult::QResult,
|
||||
|
|
@ -47,6 +42,14 @@ pub fn generate_ticket(
|
|||
}
|
||||
.encrypt(source_key, &encrypted_inner)
|
||||
}
|
||||
|
||||
fn try_get_env<T: FromStr>(name: &'static str) -> Result<T, ErrorCode> {
|
||||
env::var(name)
|
||||
.ok()
|
||||
.and_then(|val| val.parse::<T>().ok())
|
||||
.ok_or(ErrorCode::Core_Unknown)
|
||||
}
|
||||
|
||||
pub fn generate_ticket_with_string_user_key(
|
||||
source_act: PID,
|
||||
dest_act_login_data: (PID, [u8; 16]),
|
||||
|
|
@ -193,9 +196,14 @@ impl Auth for AuthHandler {
|
|||
|
||||
hasher.write(name.as_bytes());
|
||||
|
||||
let Ok(addr) = self.am.control_server.get_url(hasher.finish()).await else {
|
||||
warn!("no secure proxies");
|
||||
return Err(ErrorCode::Core_Exception);
|
||||
// let Ok(addr) = self.am.control_server.get_url(hasher.finish()).await else {
|
||||
// warn!("no secure proxies");
|
||||
// return Err(ErrorCode::Core_Exception);
|
||||
// };
|
||||
|
||||
let addr = match try_get_env("FORWARD_DESTINATION") {
|
||||
Ok(val) => val,
|
||||
Err(e) => return Err(e),
|
||||
};
|
||||
|
||||
let connection_data = ConnectionDataOld {
|
||||
|
|
@ -231,9 +239,14 @@ impl Auth for AuthHandler {
|
|||
|
||||
hasher.write(name.as_bytes());
|
||||
|
||||
let Ok(addr) = self.control_server.get_url(hasher.finish()).await else {
|
||||
warn!("no secure proxies");
|
||||
return Err(ErrorCode::Core_Exception);
|
||||
// let Ok(addr) = self.control_server.get_url(hasher.finish()).await else {
|
||||
// warn!("no secure proxies");
|
||||
// return Err(ErrorCode::Core_Exception);
|
||||
// };
|
||||
|
||||
let addr = match try_get_env("FORWARD_DESTINATION") {
|
||||
Ok(val) => val,
|
||||
Err(e) => return Err(e),
|
||||
};
|
||||
|
||||
let connection_data = ConnectionData {
|
||||
|
|
@ -291,9 +304,14 @@ impl Auth for AuthHandler {
|
|||
|
||||
hasher.write(name.as_bytes());
|
||||
|
||||
let Ok(addr) = self.am.control_server.get_url(hasher.finish()).await else {
|
||||
warn!("no secure proxies");
|
||||
return Err(ErrorCode::Core_Exception);
|
||||
// let Ok(addr) = self.am.control_server.get_url(hasher.finish()).await else {
|
||||
// warn!("no secure proxies");
|
||||
// return Err(ErrorCode::Core_Exception);
|
||||
// };
|
||||
|
||||
let addr = match try_get_env("FORWARD_DESTINATION") {
|
||||
Ok(val) => val,
|
||||
Err(e) => return Err(e),
|
||||
};
|
||||
|
||||
let connection_data = ConnectionData {
|
||||
|
|
|
|||
Loading…
Reference in a new issue