websocket: log when unable to convert to UTF-8

thc202 · Jun 20, 2017 · 498ef50 · 498ef50
1 parent b4c6eb6
commit 498ef50
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/org/zaproxy/zap/extension/websocket/WebSocketProxyV13.java b/src/org/zaproxy/zap/extension/websocket/WebSocketProxyV13.java
@@ -705,6 +705,7 @@ public String getReadablePayload() {
 				isValidUtf8Payload = true;
 				return Utf8Util.encodePayloadToUtf8(payload.array(), 0, payload.limit());
 			} catch (InvalidUtf8Exception e) {
+				logger.warn("Unable to decode as UTF-8: " + payload.toString() + " " + Arrays.toString(payload.array()), e);
 				isValidUtf8Payload  = false;
 				return "<invalid UTF-8>";
 			}

diff --git a/...rg/zaproxy/zap/extension/websocket/ui/httppanel/models/StringWebSocketPanelViewModel.java b/...rg/zaproxy/zap/extension/websocket/ui/httppanel/models/StringWebSocketPanelViewModel.java
@@ -17,12 +17,17 @@
  */
 package org.zaproxy.zap.extension.websocket.ui.httppanel.models;
 
+import java.util.Arrays;
+
+import org.apache.log4j.Logger;
 import org.parosproxy.paros.Constant;
 import org.zaproxy.zap.extension.websocket.WebSocketMessage;
 import org.zaproxy.zap.extension.websocket.utility.InvalidUtf8Exception;
 
 public class StringWebSocketPanelViewModel extends AbstractWebSocketStringPanelViewModel {
 
+	private static final Logger logger = Logger.getLogger(StringWebSocketPanelViewModel.class);
+
     @Override
     public String getData() {
     	String data;
@@ -36,6 +41,7 @@ public String getData() {
 					data = Constant.messages.getString("websocket.payload.unreadable_binary");
 				} else {
 					data = Constant.messages.getString("websocket.payload.invalid_utf8");
+					logger.warn("Unable to decode " + Arrays.toString((byte[]) webSocketMessage.payload) + " as UTF-8.", e);
 				}
 			}
         }