httphook: Allow specifying requires_login info field

Author: heinrich5991

httphook-ldpreload/README.md

@@ -45,6 +45,9 @@ registration process:
 - `LIBTW2_HTTPHOOK_LOG` (default: `info`): Specify log level of the library.
   Examples: `debug`, `error`. [Documentation of the
   syntax](https://docs.rs/env_logger/0.3.5/env_logger/#enabling-logging).
+- `LIBTW2_HTTPHOOK_OVERRIDE_REQUIRES_LOGIN` (unset by default): Populate the
+  `"requires_login"` field in the server info with this. Possible values:
+  `true`, `false`.
 - `LIBTW2_HTTPHOOK_REGISTER_URL` (default:
   `https://master1.ddnet.org/ddnet/15/register`): Contact the mastersrv given
   by this URL. Example: `http://localhost:8080/ddnet/15/register` for local testing.

httphook/src/json.rs

@@ -3,32 +3,34 @@ use serde_derive::Serialize;
 
 #[derive(Serialize)]
 pub struct Server {
-    max_clients: i32,
-    max_players: i32,
-    passworded: bool,
-    game_type: String,
-    name: String,
-    map: Map,
-    version: String,
-    clients: Vec<Client>,
+    pub max_clients: i32,
+    pub max_players: i32,
+    pub passworded: bool,
+    pub game_type: String,
+    pub name: String,
+    pub map: Map,
+    pub version: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub requires_login: Option<bool>,
+    pub clients: Vec<Client>,
 }
 
 #[derive(Serialize)]
 pub struct Map {
-    name: String,
+    pub name: String,
     #[serde(skip_serializing_if = "Option::is_none")]
-    tw_crc: Option<String>,
+    pub tw_crc: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    size: Option<u32>,
+    pub size: Option<u32>,
 }
 
 #[derive(Serialize)]
 pub struct Client {
-    name: String,
-    clan: String,
-    country: i32,
-    score: i32,
-    is_player: bool,
+    pub name: String,
+    pub clan: String,
+    pub country: i32,
+    pub score: i32,
+    pub is_player: bool,
 }
 
 impl From<&browse_protocol::ServerInfo> for Server {
@@ -45,6 +47,7 @@ impl From<&browse_protocol::ServerInfo> for Server {
                 size: info.map_size,
             },
             version: (&*info.version).into(),
+            requires_login: None,
             clients: info.clients.iter().map(Client::from).collect(),
         }
     }

httphook/src/lib.rs

@@ -31,6 +31,7 @@ mod runtime;
 struct Config {
     community_token: Option<Box<str>>,
     log: Option<Box<str>>,
+    override_requires_login: Option<bool>,
     register_url: Option<Box<str>>,
 }
 
@@ -177,6 +178,12 @@ fn build_register(port: u16, info: Arc<str>) -> Register {
     builder.build(port, info.into())
 }
 
+fn apply_overrides(mut info: json::Server) -> json::Server {
+    let config = &config();
+    info.requires_login = config.override_requires_login.or(info.requires_login);
+    info
+}
+
 async fn register_server_6_impl(port: u16, register: Arc<OnceLock<Register>>) {
     let socket = UdpSocket::bind("0.0.0.0:0").await.unwrap();
     const LOCALHOST: IpAddr = IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1));
@@ -197,7 +204,7 @@ async fn register_server_6_impl(port: u16, register: Arc<OnceLock<Register>>) {
             Ok(info) => info,
             Err(_) => continue,
         };
-        let info = serde_json::to_string(&json::Server::from(&info)).unwrap();
+        let info = serde_json::to_string(&apply_overrides(json::Server::from(&info))).unwrap();
 
         if let Some(register) = register.get() {
             register.on_new_info(info.into());