Quellcode durchsuchen

Add logging of requests and the encryption key.

Andrew Klopper vor 8 Jahren
Ursprung
Commit
5ba5028492
2 geänderte Dateien mit 15 neuen und 1 gelöschten Zeilen
  1. 1 1
      BulkPrintingAPI/appsettings.Development.json
  2. 14 0
      MAXClient/Client.cs

+ 1 - 1
BulkPrintingAPI/appsettings.Development.json

11
     "Host": "41.223.25.5",
11
     "Host": "41.223.25.5",
12
     "Port": 4006,
12
     "Port": 4006,
13
     "ConnectTimeout": 10000,
13
     "ConnectTimeout": 10000,
14
-    "ReceiveTimeout": 10000,
14
+    "ReceiveTimeout": 60000,
15
     "SendTimeout": 10000,
15
     "SendTimeout": 10000,
16
     "LogResponses":  true
16
     "LogResponses":  true
17
   }
17
   }

+ 14 - 0
MAXClient/Client.cs

104
             // Key exchange
104
             // Key exchange
105
             _des = TripleDES.Create();
105
             _des = TripleDES.Create();
106
             _des.IV = new byte[8];
106
             _des.IV = new byte[8];
107
+            if (_logResponses)
108
+            {
109
+                _logger.LogDebug("Key for {0}: {1}",
110
+                    LoginCredentials.Format(_userId, _username, _vendorId, _serialNumber),
111
+                    BitConverter.ToString(_des.Key).Replace("-", "")
112
+                );
113
+            }
107
             await WriteMessageAsync(new MessageBuilder()
114
             await WriteMessageAsync(new MessageBuilder()
108
                 .Append("3D ")
115
                 .Append("3D ")
109
                 .Append(EncryptRSA(response, BitConverter.ToString(_des.Key).Replace("-", "")))).ConfigureAwait(false);
116
                 .Append(EncryptRSA(response, BitConverter.ToString(_des.Key).Replace("-", "")))).ConfigureAwait(false);
511
         private async Task WriteMessageAsync(MessageBuilder message)
518
         private async Task WriteMessageAsync(MessageBuilder message)
512
         {
519
         {
513
             byte[] data = message.GetBytes();
520
             byte[] data = message.GetBytes();
521
+            if (_logResponses)
522
+            {
523
+                _logger.LogDebug("Request for {0}: {1}",
524
+                    LoginCredentials.Format(_userId, _username, _vendorId, _serialNumber),
525
+                    Encoding.ASCII.GetString(data, 2, data.Length - 2)
526
+                );
527
+            }
514
             await _connectionStream.WriteAsync(data, 0, data.Length).ConfigureAwait(false);
528
             await _connectionStream.WriteAsync(data, 0, data.Length).ConfigureAwait(false);
515
         }
529
         }
516
     }
530
     }