From 7638cb1a3b07713cc490aa2909a37037f89e08b4 Mon Sep 17 00:00:00 2001
From: Ayush Saxena <ayushsaxena@apache.org>
Date: Thu, 23 Nov 2023 11:50:50 +0530
Subject: [PATCH] Refactor Some Code. (#4887). (Ayush Saxena, reviewed by
Denys Kuzmenko)
---
 .../org/apache/hive/service/CookieSigner.java |  6 +---
 .../apache/hive/service/TestCookieSigner.java | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/service/src/java/org/apache/hive/service/CookieSigner.java b/service/src/java/org/apache/hive/service/CookieSigner.java
index c4d88de4..62c9acbd 100644
--- a/service/src/java/org/apache/hive/service/CookieSigner.java
+++ b/service/src/java/org/apache/hive/service/CookieSigner.java
@@ -78,12 +78,8 @@ public String verifyAndExtract(String signedStr) {
     String rawValue = signedStr.substring(0, index);
     String currentSignature = getSignature(rawValue);
 
-    if (LOG.isDebugEnabled()) {
-      LOG.debug("Signature generated for " + rawValue + " inside verify is " + currentSignature);
-    }
     if (!MessageDigest.isEqual(originalSignature.getBytes(), currentSignature.getBytes())) {
-      throw new IllegalArgumentException("Invalid sign, original = " + originalSignature +
-        " current = " + currentSignature);
+      throw new IllegalArgumentException("Invalid sign= " + originalSignature);
     }
     return rawValue;
   }
diff --git a/service/src/test/org/apache/hive/service/TestCookieSigner.java b/service/src/test/org/apache/hive/service/TestCookieSigner.java
index b1aa0d84..544f54cf 100644
--- a/service/src/test/org/apache/hive/service/TestCookieSigner.java
+++ b/service/src/test/org/apache/hive/service/TestCookieSigner.java
@@ -56,4 +56,32 @@ public void testVerifyAndExtract() throws Exception {
     String signedStr = cs.signCookie(originalStr);
     assert(cs.verifyAndExtract(signedStr).equals(originalStr));
   }
+
+  @Test
+  public void testVerifyAndExtractNoSignature() {
+    String originalStr = "cu=scott";
+    String signedStr = cs.signCookie(originalStr);
+    String modifedSignedStr = signedStr.replace("&s=", "");
+    try {
+      cs.verifyAndExtract(modifedSignedStr);
+    } catch (IllegalArgumentException e) {
+      assertEquals("Invalid input sign: " + modifedSignedStr, e.getMessage());
+      return;
+    }
+    fail("Expected IllegalArgumentException due to no signature");
+  }
+
+  @Test
+  public void testVerifyAndExtractInvalidSignature() {
+    String originalStr = "cu=scott";
+    String signedStr = cs.signCookie(originalStr);
+    String modifedSignedStr = signedStr.replace("&s=", "&s=abc");
+    try {
+      cs.verifyAndExtract(modifedSignedStr);
+    } catch (IllegalArgumentException e) {
+      assertTrue(e.getMessage().startsWith("Invalid sign= "));
+      return;
+    }
+    fail("Expected IllegalArgumentException checking signature");
+  }
 }
-- 
2.41.0