From 8eaac347f021f2c2872026d99b12f44f5fd8152f Mon Sep 17 00:00:00 2001
From: icex2 <djh.icex2@gmail.com>
Date: Thu, 1 Apr 2021 23:17:04 +0200
Subject: [PATCH] Redact any refID and machineID info from logging of pumpnet
 modules

That information wasn't really valuable on most debugging efforts
so far and just leaked as sensitive information with any bug
report.
---
 src/main/hook/patch/net-profile.c | 36 ++++++++++++-------------------
 src/main/pumpnet/lib/pumpnet.c    |  8 +++----
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/src/main/hook/patch/net-profile.c b/src/main/hook/patch/net-profile.c
index 2ab2701..8413550 100644
--- a/src/main/hook/patch/net-profile.c
+++ b/src/main/hook/patch/net-profile.c
@@ -438,11 +438,9 @@ static bool _patch_net_profile_download_profile_file(
   player_ref_id = virtual_file->player_ref_id;
 
   log_info(
-      "Profile file player %d, file_type %d, refId %llX downloading from "
-      "server...",
+      "Profile file player %d, file_type %d downloading from server...",
       player,
-      file_type,
-      player_ref_id);
+      file_type);
 
   if (!pumpnet_lib_get(
           file_type,
@@ -450,18 +448,16 @@ static bool _patch_net_profile_download_profile_file(
           virtual_file->buffer,
           virtual_file->file_info->file_size)) {
     log_error(
-        "Downloading file player %d, file_type %d, refId %llX failed",
+        "Downloading file player %d, file_type %d, failed",
         player,
-        file_type,
-        player_ref_id);
+        file_type);
     return false;
   }
 
   log_info(
-      "Downloading file player %d, file_type %d, refId %llX successful",
+      "Downloading file player %d, file_type %d, successful",
       player,
-      file_type,
-      player_ref_id);
+      file_type);
   return true;
 }
 
@@ -510,10 +506,9 @@ static bool _patch_net_profile_upload_profile_file(
   player_ref_id = virtual_file->player_ref_id;
 
   log_info(
-      "Profile file player %d, file_type %d, refId %llX uploading to server...",
+      "Profile file player %d, file_type %d, uploading to server...",
       player,
-      file_type,
-      player_ref_id);
+      file_type);
 
   if (!pumpnet_lib_put(
           file_type,
@@ -521,18 +516,16 @@ static bool _patch_net_profile_upload_profile_file(
           virtual_file->buffer,
           virtual_file->file_info->file_size)) {
     log_error(
-        "Uploading file player %d, file_type %d, refId %llX failed",
+        "Uploading file player %d, file_type %d, failed",
         player,
-        file_type,
-        player_ref_id);
+        file_type);
     return false;
   }
 
   log_info(
-      "Uploading file player %d, file_type %d, refId %llX successful",
+      "Uploading file player %d, file_type %d, successful",
       player,
-      file_type,
-      player_ref_id);
+      file_type);
   return true;
 }
 
@@ -630,10 +623,9 @@ void patch_net_profile_init(
   pthread_mutex_init(&_patch_net_profile_mutex, NULL);
 
   log_info(
-      "Initialized: game %d, server %s, machine id %llX",
+      "Initialized: game %d, server %s",
       game,
-      pumpnet_server_addr,
-      machine_id);
+      pumpnet_server_addr);
 }
 
 void patch_net_profile_shutdown()
diff --git a/src/main/pumpnet/lib/pumpnet.c b/src/main/pumpnet/lib/pumpnet.c
index 57a4a69..a3be8ae 100644
--- a/src/main/pumpnet/lib/pumpnet.c
+++ b/src/main/pumpnet/lib/pumpnet.c
@@ -131,7 +131,7 @@ _pumpnet_lib_get_rank(uint64_t player_ref_id, void *buffer, size_t size)
   resp_size = sizeof(struct pumpnet_lib_get_rank_resp) + size;
   resp = util_xmalloc(resp_size);
 
-  log_info("[%llX][%llX] Get rank", trace_id, player_ref_id);
+  log_info("[%llX] Get rank", trace_id);
 
   if (!_pumpnet_lib_get_put(
           trace_id,
@@ -181,7 +181,7 @@ _pumpnet_lib_get_save(uint64_t player_ref_id, void *buffer, size_t size)
   resp_size = sizeof(struct pumpnet_lib_get_save_resp) + size;
   resp = util_xmalloc(resp_size);
 
-  log_info("[%llX][%llX] Get save", trace_id, player_ref_id);
+  log_info("[%llX] Get save", trace_id);
 
   if (!_pumpnet_lib_get_put(
           trace_id,
@@ -233,7 +233,7 @@ _pumpnet_lib_put_rank(uint64_t player_ref_id, const void *buffer, size_t size)
   req->size = size;
   memcpy(req->data, buffer, size);
 
-  log_info("[%llX][%llX] Put rank", trace_id, player_ref_id);
+  log_info("[%llX] Put rank", trace_id);
 
   if (!_pumpnet_lib_get_put(
           trace_id,
@@ -273,7 +273,7 @@ _pumpnet_lib_put_save(uint64_t player_ref_id, const void *buffer, size_t size)
   req->size = size;
   memcpy(req->data, buffer, size);
 
-  log_info("[%llX][%llX] Put save", trace_id, player_ref_id);
+  log_info("[%llX] Put save", trace_id);
 
   if (!_pumpnet_lib_get_put(
           trace_id,