From 0b1e90dee06bc6208aeb332326c515bc6c3958aa Mon Sep 17 00:00:00 2001
From: Evan Goode <mail@evangoo.de>
Date: Thu, 31 Oct 2024 13:27:51 -0400
Subject: [PATCH] mitmproxy doesn't work for Minecraft server

---
 account.go             | 1 +
 doc/troubleshooting.md | 7 ++++++-
 services.go            | 1 -
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/account.go b/account.go
index 5b56a90..2977538 100644
--- a/account.go
+++ b/account.go
@@ -79,6 +79,7 @@ func AccountPlayerNameToID(app *App) func(c echo.Context) error {
 }
 
 // POST /profiles/minecraft
+// POST /minecraft/profile/lookup/bulk/byname
 // https://wiki.vg/Mojang_API#Usernames_to_UUIDs
 func AccountPlayerNamesToIDs(app *App) func(c echo.Context) error {
 	return func(c echo.Context) error {
diff --git a/doc/troubleshooting.md b/doc/troubleshooting.md
index bcb4381..dedab1e 100644
--- a/doc/troubleshooting.md
+++ b/doc/troubleshooting.md
@@ -11,7 +11,7 @@ export DRASL_DEBUG=1
 drasl
 ```
 
-## How to use mitmproxy to intercept HTTPS requests from the Minecraft Client and Minecraft Server
+## How to use mitmproxy to intercept HTTPS requests from the Minecraft Client
 
 [mitmproxy](https://mitmproxy.org) is a powerful debugging tool. Using it to intercept HTTPS requests from Java requires a little extra work since Java keeps its own store of trusted CA root certificates, and you'll need to tell Java to trust the mitmproxy CA certificate.
 
@@ -50,10 +50,13 @@ keytool -import -trustcacerts -noprompt -file ~/.mitmproxy/mitmproxy-ca-cert.pem
 -Djavax.net.ssl.trustStore=/home/CHANGEME/cacerts -Djavax.net.ssl.trustStorePassword=changeit -Dhttp.proxyHost=localhost -Dhttp.proxyPort=8080 -Dhttps.proxyHost=localhost -Dhttps.proxyPort=8080
 ```
 
+<!-- This doesn't work on the server... I think we need to make a Java agent or mod to patch Java URL to always use the default proxy
+
 6. Configure the Minecraft server to use mitmproxy by passing these same arguments to the Minecraft server when you launch it. For example, the full command you use to start the server might be:
 
 ```
 java -Xmx1024M -Xms1024M \
+  -Djavax.net.ssl.trustStore=/home/CHANGEME/cacerts -Djavax.net.ssl.trustStorePassword=changeit -Dhttp.proxyHost=localhost -Dhttp.proxyPort=8080 -Dhttps.proxyHost=localhost -Dhttps.proxyPort=8080 \
   -Dminecraft.api.env=custom \
   -Dminecraft.api.auth.host=https://drasl.unmojang.org/auth \
   -Dminecraft.api.account.host=https://drasl.unmojang.org/account \
@@ -61,3 +64,5 @@ java -Xmx1024M -Xms1024M \
   -Dminecraft.api.services.host=https://drasl.unmojang.org/services \
   -jar server.jar nogui
 ```
+
+-->
diff --git a/services.go b/services.go
index 3440356..4387572 100644
--- a/services.go
+++ b/services.go
@@ -560,7 +560,6 @@ func SerializedKeyToPublicKey(serializedKey SerializedKey) (*rsa.PublicKey, erro
 }
 
 // GET /publickeys
-// TODO document on wiki.vg
 func ServicesPublicKeys(app *App) func(c echo.Context) error {
 	serializedProfilePropertyKeys := make([]SerializedKey, 0, len(app.ProfilePropertyKeys))
 	serializedPlayerCertificateKeys := make([]SerializedKey, 0, len(app.PlayerCertificateKeys))