From 18e9660962b489eaae59e3b2580ccfa080f875a0 Mon Sep 17 00:00:00 2001
From: WenFeiYi <wenfeiyi666@gmail.com>
Date: Thu, 5 Nov 2020 19:55:08 +0530
Subject: [PATCH] HBASE-25240 gson format of RpcServer.logResponse is abnormal

Closes #2623

Signed-off-by: Viraj Jasani <vjasani@apache.org>
---
 .../apache/hadoop/hbase/util/GsonUtil.java    |  4 ++
 .../hadoop/hbase/util/TestGsonUtil.java       | 42 +++++++++++++++++++
 .../apache/hadoop/hbase/ipc/RpcServer.java    |  2 +-
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestGsonUtil.java

diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/GsonUtil.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/GsonUtil.java
index d1c65ef78c1..f67f68dcdc9 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/GsonUtil.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/GsonUtil.java
@@ -57,4 +57,8 @@ public final class GsonUtil {
         }
       });
   }
+
+  public static GsonBuilder createGsonWithDisableHtmlEscaping() {
+    return createGson().disableHtmlEscaping();
+  }
 }
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestGsonUtil.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestGsonUtil.java
new file mode 100644
index 00000000000..d276f5557b0
--- /dev/null
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestGsonUtil.java
@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.util;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
+import org.apache.hbase.thirdparty.com.google.gson.Gson;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category({ MiscTests.class, SmallTests.class })
+public class TestGsonUtil {
+
+  private static final Gson GSON = GsonUtil.createGson().create();
+  private static final Gson DHE_GSON = GsonUtil.createGsonWithDisableHtmlEscaping().create();
+
+  @Test
+  public void testDisableHtmlEscaping() {
+    // enable html escaping, turn '=' into '\u003d'
+    assertEquals("\"\\u003d\\u003d\\u003d\"", GSON.toJson("==="));
+
+    // disable html escaping
+    assertEquals("\"===\"", DHE_GSON.toJson("==="));
+  }
+}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
index 31bb32649aa..7745930944c 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
@@ -283,7 +283,7 @@ public class RpcServer implements RpcServerInterface, ConfigurationObserver {
   private static final int DEFAULT_WARN_RESPONSE_TIME = 10000; // milliseconds
   private static final int DEFAULT_WARN_RESPONSE_SIZE = 100 * 1024 * 1024;
 
-  protected static final Gson GSON = GsonUtil.createGson().create();
+  protected static final Gson GSON = GsonUtil.createGsonWithDisableHtmlEscaping().create();
 
   protected static final int DEFAULT_TRACE_LOG_MAX_LENGTH = 1000;
   protected static final String TRACE_LOG_MAX_LENGTH = "hbase.ipc.trace.log.max.length";