From 976e53ff9b627d5f10a9ce815d5591654c20f2c8 Mon Sep 17 00:00:00 2001
From: Anton Nikolaev <nikoant@fb.com>
Date: Wed, 13 Oct 2021 08:37:51 -0700
Subject: [PATCH] Avoid logging csr

Summary: I unintentionally added logging of csr certificates in my previous diff. This diff makes sure we're not logging them anymore.

Reviewed By: mweststrate

Differential Revision: D31609709

fbshipit-source-id: e43b348dbd62653f8a6e9089930c2a3699b29a12
---
 .../src/comms/ServerController.tsx                  | 13 +++----------
 .../src/comms/ServerWebSocket.tsx                   |  3 ++-
 desktop/flipper-server-core/src/comms/Utilities.tsx |  5 +++++
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/desktop/flipper-server-core/src/comms/ServerController.tsx b/desktop/flipper-server-core/src/comms/ServerController.tsx
index 62327bd79..6919b62c2 100644
--- a/desktop/flipper-server-core/src/comms/ServerController.tsx
+++ b/desktop/flipper-server-core/src/comms/ServerController.tsx
@@ -25,6 +25,7 @@ import invariant from 'invariant';
 import DummyDevice from '../devices/DummyDevice';
 import {
   appNameWithUpdateHint,
+  cloneClientQuerySafeForLogging,
   transformCertificateExchangeMediumToType,
 } from './Utilities';
 import ServerAdapter, {
@@ -192,7 +193,7 @@ class ServerController extends EventEmitter implements ServerEventsListener {
     const transformedMedium = transformCertificateExchangeMediumToType(medium);
     console.info(
       `[conn] Connection established: ${app} on ${device_id}. Medium ${medium}. CSR: ${csr_path}`,
-      clientQuery,
+      cloneClientQuerySafeForLogging(clientQuery),
     );
     return this.addConnection(
       clientConnection,
@@ -356,7 +357,6 @@ class ServerController extends EventEmitter implements ServerEventsListener {
       console.info(
         `[conn] Detected ${app_name} on ${query.device_id} in certificate`,
         query,
-        csrQuery,
       );
     }
 
@@ -372,7 +372,6 @@ class ServerController extends EventEmitter implements ServerEventsListener {
     console.info(
       `[conn] Matching device for ${query.app} on ${query.device_id}...`,
       query,
-      csrQuery,
     );
 
     const client: ClientDescription = {
@@ -388,7 +387,6 @@ class ServerController extends EventEmitter implements ServerEventsListener {
     console.info(
       `[conn] Initializing client ${query.app} on ${query.device_id}...`,
       query,
-      csrQuery,
     );
 
     connection.subscribeToEvents((status: ConnectionStatus) => {
@@ -400,12 +398,7 @@ class ServerController extends EventEmitter implements ServerEventsListener {
       }
     });
 
-    console.debug(
-      `[conn] Device client initialized: ${id}.`,
-      'server',
-      query,
-      csrQuery,
-    );
+    console.debug(`[conn] Device client initialized: ${id}.`, 'server', query);
 
     /* If a device gets disconnected without being cleaned up properly,
      * Flipper won't be aware until it attempts to reconnect.
diff --git a/desktop/flipper-server-core/src/comms/ServerWebSocket.tsx b/desktop/flipper-server-core/src/comms/ServerWebSocket.tsx
index 3cf856017..fe271060c 100644
--- a/desktop/flipper-server-core/src/comms/ServerWebSocket.tsx
+++ b/desktop/flipper-server-core/src/comms/ServerWebSocket.tsx
@@ -24,6 +24,7 @@ import {
   ClientQuery,
   DeviceOS,
 } from 'flipper-common';
+import {cloneClientQuerySafeForLogging} from './Utilities';
 
 /**
  * WebSocket-based server.
@@ -95,7 +96,7 @@ class ServerWebSocket extends ServerWebSocketBase {
     }
     console.info(
       `[conn] Secure websocket connection attempt: ${clientQuery.app} on ${clientQuery.device_id}. Medium ${clientQuery.medium}. CSR: ${clientQuery.csr_path}`,
-      clientQuery,
+      cloneClientQuerySafeForLogging(clientQuery),
     );
     this.listener.onSecureConnectionAttempt(clientQuery);
 
diff --git a/desktop/flipper-server-core/src/comms/Utilities.tsx b/desktop/flipper-server-core/src/comms/Utilities.tsx
index 64a8cae17..4ab6d7a44 100644
--- a/desktop/flipper-server-core/src/comms/Utilities.tsx
+++ b/desktop/flipper-server-core/src/comms/Utilities.tsx
@@ -9,6 +9,7 @@
 
 import {ClientQuery} from 'flipper-common';
 import {CertificateExchangeMedium} from '../utils/CertificateProvider';
+import {SecureClientQuery} from './ServerAdapter';
 
 /**
  * Transforms the certificate exchange medium type as number to the
@@ -48,3 +49,7 @@ export function appNameWithUpdateHint(query: ClientQuery): string {
   }
   return query.app;
 }
+
+export function cloneClientQuerySafeForLogging(clientQuery: SecureClientQuery) {
+  return {...clientQuery, csr: !clientQuery.csr ? clientQuery.csr : '<hidden>'};
+}