exclude empty assertion arrays from signature

AthenZ · Mar 31, 2017 · 7ff6485 · 7ff6485
1 parent bf5c0c1
commit 7ff6485
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/libs/java/client_common/src/main/java/com/yahoo/athenz/common/utils/SignUtils.java b/libs/java/client_common/src/main/java/com/yahoo/athenz/common/utils/SignUtils.java
@@ -85,8 +85,8 @@ private static Struct asStruct(Policy policy) {
         // on their attribute name
         Struct struct = new Struct();
         List<Assertion> assertions = policy.getAssertions();
-        Array assertionsArray = new Array();
-        if (assertions != null) {
+        if (assertions != null && !assertions.isEmpty()) {
+            Array assertionsArray = new Array();
             for (Assertion assertion : assertions) {
                 Struct structAssertion = new Struct();
                 appendObject(structAssertion, ATTR_ACTION, assertion.getAction());
@@ -95,8 +95,8 @@ private static Struct asStruct(Policy policy) {
                 appendObject(structAssertion, ATTR_ROLE, assertion.getRole());
                 assertionsArray.add(structAssertion);
             }
+            appendArray(struct, ATTR_ASSERTIONS, assertionsArray);
         }
-        appendArray(struct, ATTR_ASSERTIONS, assertionsArray);
         appendObject(struct, ATTR_MODIFIED, policy.getModified());
         appendObject(struct, ATTR_NAME, policy.getName());
         return struct;
@@ -107,8 +107,8 @@ private static Struct asStruct(com.yahoo.athenz.zts.Policy policy) {
         // on their attribute name
         Struct struct = new Struct();
         List<com.yahoo.athenz.zts.Assertion> assertions = policy.getAssertions();
-        Array assertionsArray = new Array();
-        if (assertions != null) {
+        if (assertions != null && !assertions.isEmpty()) {
+            Array assertionsArray = new Array();
             for (com.yahoo.athenz.zts.Assertion assertion : assertions) {
                 Struct structAssertion = new Struct();
                 appendObject(structAssertion, ATTR_ACTION, assertion.getAction());
@@ -117,8 +117,8 @@ private static Struct asStruct(com.yahoo.athenz.zts.Policy policy) {
                 appendObject(structAssertion, ATTR_ROLE, assertion.getRole());
                 assertionsArray.add(structAssertion);
             }
+            appendArray(struct, ATTR_ASSERTIONS, assertionsArray);
         }
-        appendArray(struct, ATTR_ASSERTIONS, assertionsArray);
         appendObject(struct, ATTR_MODIFIED, policy.getModified());
         appendObject(struct, ATTR_NAME, policy.getName());
         return struct;

diff --git a/libs/java/client_common/src/test/java/com/yahoo/athenz/common/utils/SignUtilsTest.java b/libs/java/client_common/src/test/java/com/yahoo/athenz/common/utils/SignUtilsTest.java
@@ -96,7 +96,7 @@ public void testAsStructPolicy() {
 
         check = SignUtils.asCanonicalString(mockPolicies);
         assertNotNull(check);
-        assertEquals(check,"{\"policies\":[{\"assertions\":[]}]}");
+        assertEquals(check,"{\"policies\":[{}]}");
     }
 
     @Test
@@ -120,7 +120,7 @@ public void testAsStructZTSPolicy() {
 
         check = SignUtils.asCanonicalString(mockPolicy);
         assertNotNull(check);
-        assertEquals(check,"{\"policies\":[{\"assertions\":[]}]}");
+        assertEquals(check,"{\"policies\":[{}]}");
     }
 
     @Test