Do not display client environment unless specifically asked for

apache · Nov 25, 2024 · a503cb2 · a503cb2
1 parent 0951c2f
commit a503cb2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/Message.java b/common/src/main/java/org/mvndaemon/mvnd/common/Message.java
@@ -375,8 +375,7 @@ public String toString() {
             return "BuildRequest{" + "args="
                     + args + ", workingDir='"
                     + workingDir + '\'' + ", projectDir='"
-                    + projectDir + '\'' + ", env='"
-                    + env + '\'' + '}';
+                    + projectDir + '\'' + '}';
         }
 
         @Override

diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java b/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java
@@ -283,9 +283,15 @@ private void client(SocketChannel socket) {
                 updateState(DaemonState.Idle);
                 return;
             }
-            LOGGER.info("Request received: {}", message);
-            if (message instanceof BuildRequest) {
-                handle(connection, (BuildRequest) message);
+            if (message instanceof BuildRequest buildRequest) {
+                LOGGER.info("Request received: {}", message);
+                if (Boolean.getBoolean("mvnd.dump.client.env")) {
+                    // Environment can contain passwords or tokens, so do not dump, unless specifically asked for
+                    LOGGER.trace("Client environment dump: {}", buildRequest.getEnv());
+                }
+                handle(connection, buildRequest);
+            } else {
+                LOGGER.info("Ignoring message: {}", message);
             }
         } catch (Throwable t) {
             LOGGER.error("Error reading request", t);