tamipes/mc-ingress
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

feat: add some botched old address support

Browse source
This commit is contained in:
Tamipes 2025-12-11 02:26:08 +01:00
parent 1d9d205d8c
commit 2eb9adc61a
3 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/kube_cache.rs
View file

@ -84,7 +84,7 @@ pub struct McApi {
impl MinecraftAPI<Server> for McApi { impl MinecraftAPI<Server> for McApi {
#[tracing::instrument(name = "MinecraftAPI::query_server", level = "info", skip(self))] #[tracing::instrument(name = "MinecraftAPI::query_server", level = "info", skip(self))]
async fn query_server(&self, addr: String) -> Result<Server, OpaqueError> { async fn query_server(&self, addr: &str) -> Result<Server, OpaqueError> {
let dep_name = match self.cache.query_dep_addr(&addr).await { let dep_name = match self.cache.query_dep_addr(&addr).await {
Some(x) => x, Some(x) => x,
None => { None => {
@ -137,7 +137,7 @@ impl MinecraftAPI<Server> for McApi {
async move { async move {
tracing::info!("starting watch"); tracing::info!("starting watch");
tokio::time::sleep(frequency).await; tokio::time::sleep(frequency).await;
let server = self.query_server(addr.clone()).await.unwrap(); let server = self.query_server(&addr).await.unwrap();
let status_json = match server.query_description().await { let status_json = match server.query_description().await {
Ok(x) => x, Ok(x) => x,
Err(e) => { Err(e) => {

20
src/main.rs
View file

@ -129,7 +129,7 @@ async fn handle_status<T: MinecraftServerHandle>(
status_struct.version.protocol = handshake.protocol_version.get_int(); status_struct.version.protocol = handshake.protocol_version.get_int();
let bye_message = format!(" - §dTami§r with §d<3§r §8(rev: {commit_hash})§r"); let bye_message = format!(" - §dTami§r with §d<3§r §8(rev: {commit_hash})§r");
let server = match api.query_server(handshake.get_server_address()).await { let server = match api.query_server(&handshake.get_server_address()).await {
Ok(x) => x, Ok(x) => x,
Err(e) => { Err(e) => {
tracing::warn!(err = e.context); tracing::warn!(err = e.context);
@ -186,7 +186,23 @@ async fn handle_login<T: MinecraftServerHandle>(
handshake: &Handshake, handshake: &Handshake,
api: impl MinecraftAPI<T>, api: impl MinecraftAPI<T>,
) -> Result<(), OpaqueError> { ) -> Result<(), OpaqueError> {
let server = api.query_server(handshake.get_server_address()).await?; let addr = handshake.get_server_address();
// Thanks to a buggy minecraft, when the client sends a join
// from a SRV DNS record, it will not use the address typed
// in the game, but use the address redicted *to* by the
// DNS record as the address for joining, plus a trailing "."
//
// For example:
// server.example.com (_minecraft._tcp.server.example.com)
// (the typed address) I (the DNS SRV record which gets read)
// V
// 5 25565 server.example.com
// I (the response for the DNS SRV query)
// V
// server.example.com.
// (the address used in the protocol)
let server = api.query_server(addr.trim_end_matches(".")).await?;
let status = server.query_status().await?; let status = server.query_status().await?;
tracing::debug!(msg = "server status", status = ?status); tracing::debug!(msg = "server status", status = ?status);
match status { match status {

2
src/mc_server.rs
View file

@ -124,7 +124,7 @@ pub trait MinecraftServerHandle: Clone {
} }
pub trait MinecraftAPI<T> { pub trait MinecraftAPI<T> {
async fn query_server(&self, addr: String) -> Result<T, OpaqueError>; async fn query_server(&self, addr: &str) -> Result<T, OpaqueError>;
async fn start_watch( async fn start_watch(
self, self,
server: impl MinecraftServerHandle, server: impl MinecraftServerHandle,