fix

XiaoMi · Nov 6, 2020 · 28b6c47 · 28b6c47
1 parent c928bd5
commit 28b6c47
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/scripts/format-all.sh b/scripts/format-all.sh
@@ -39,6 +39,7 @@ SRC_FILES=(src/main/java/com/xiaomi/infra/pegasus/client/*.java
            src/test/java/com/xiaomi/infra/pegasus/rpc/async/*.java
            src/test/java/com/xiaomi/infra/pegasus/tools/*.java
            src/test/java/com/xiaomi/infra/pegasus/base/*.java
+           src/test/java/com/xiaomi/infra/pegasus/security/*.java
            )
 
 if [ ! -f "${PROJECT_DIR}"/google-java-format-1.7-all-deps.jar ]; then

diff --git a/src/main/java/com/xiaomi/infra/pegasus/security/Negotiation.java b/src/main/java/com/xiaomi/infra/pegasus/security/Negotiation.java
@@ -106,7 +106,7 @@ public void onRecvMechanisms(negotiation_response response) throws Exception {
 
     String[] matchMechanisms = new String[1];
     matchMechanisms[0] = getMatchMechanism(new String(response.msg.data, Charset.defaultCharset()));
-    if (matchMechanisms[0] == null) {
+    if (matchMechanisms[0] == "") {
       throw new Exception("No matching mechanism was found");
     }
 
@@ -116,7 +116,7 @@ public void onRecvMechanisms(negotiation_response response) throws Exception {
   }
 
   public String getMatchMechanism(String respString) {
-    String matchMechanism = null;
+    String matchMechanism = "";
     String[] serverSupportMechanisms = respString.split(",");
     for (String serverSupportMechanism : serverSupportMechanisms) {
       if (expectedMechanisms.contains(serverSupportMechanism)) {

diff --git a/src/test/java/com/xiaomi/infra/pegasus/security/NegotiationTest.java b/src/test/java/com/xiaomi/infra/pegasus/security/NegotiationTest.java
@@ -23,6 +23,7 @@
 import com.xiaomi.infra.pegasus.apps.negotiation_response;
 import com.xiaomi.infra.pegasus.apps.negotiation_status;
 import com.xiaomi.infra.pegasus.base.blob;
+import java.nio.charset.Charset;
 import javax.security.auth.Subject;
 import org.junit.Assert;
 import org.junit.Test;
@@ -80,12 +81,24 @@ public void testRecvMechanisms() {
         () -> {
           negotiation_response response =
               new negotiation_response(
-                  negotiation_status.SASL_LIST_MECHANISMS_RESP, new blob(new byte[0]));
+                  negotiation_status.SASL_LIST_MECHANISMS_RESP,
+                  new blob("GSSAPI".getBytes(Charset.defaultCharset())));
           mockNegotiation.onRecvMechanisms(response);
           Assert.assertEquals(
               mockNegotiation.getStatus(), negotiation_status.SASL_SELECT_MECHANISMS);
         });
 
+    // deal with wrong response.msg
+    Assertions.assertThrows(
+        Exception.class,
+        () -> {
+          negotiation_response response =
+              new negotiation_response(
+                  negotiation_status.SASL_LIST_MECHANISMS,
+                  new blob("NOTSUPPORTED".getBytes(Charset.defaultCharset())));
+          mockNegotiation.onRecvMechanisms(response);
+        });
+
     // deal with wrong response.status
     Assertions.assertThrows(
         Exception.class,