Avoiding array out of bounds

garrettjonesgoogle · garrettjonesgoogle · commit f6fffdacd0f2 · 2017-04-18T17:18:41.000-07:00
diff --git a/google-cloud-core/src/main/java/com/google/cloud/Identity.java b/google-cloud-core/src/main/java/com/google/cloud/Identity.java
@@ -280,10 +280,12 @@ public String strValue() {
   public static Identity valueOf(String identityStr) {
     String[] info = identityStr.split(":");
     Type type = Type.valueOf(CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, info[0]));
-    if (type.equals(Type.ALL_AUTHENTICATED_USERS) || type.equals(Type.ALL_USERS)) {
+    if (info.length == 1) {
       return new Identity(type, null);
+    } else if (info.length == 2){
+      return new Identity(type, info[1]);
     } else {
-      return new Identity(type, checkNotNull(info[1]));
+      throw new IllegalArgumentException("Illegal identity string: \"" + identityStr + "\"");
     }
   }
 }
diff --git a/google-cloud-core/src/main/java/com/google/cloud/StringEnumType.java b/google-cloud-core/src/main/java/com/google/cloud/StringEnumType.java
@@ -66,6 +66,9 @@ public EnumT valueOfStrict(String constant) {
    * Get the enum object for the given String constant, and allow unrecognized values.
    */
   public EnumT valueOf(String constant) {
+    if (constant == null || constant.isEmpty()) {
+      throw new IllegalArgumentException("Empty enum constants not allowed.");
+    }
     EnumT value = knownValues.get(constant);
     if (value != null) {
       return value;
diff --git a/google-cloud-core/src/test/java/com/google/cloud/IdentityTest.java b/google-cloud-core/src/test/java/com/google/cloud/IdentityTest.java
@@ -142,6 +142,21 @@ public void testIdentityToAndFromPb() {
     compareIdentities(PROJECT_VIEWER, Identity.valueOf(PROJECT_VIEWER.strValue()));
   }
 
+  @Test(expected = IllegalArgumentException.class)
+  public void testValueOfEmpty() {
+    Identity.valueOf("");
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void testValueOfThreePart() {
+    Identity.valueOf("a:b:c");
+  }
+
+  @Test
+  public void testUnrecognizedToString() {
+    assertEquals("a:b", Identity.valueOf("a:b").strValue());
+  }
+
   private void compareIdentities(Identity expected, Identity actual) {
     assertEquals(expected, actual);
     assertEquals(expected.getType(), actual.getType());

Original file line number	Diff line number	Diff line change
`@@ -280,10 +280,12 @@ public String strValue() {`
`280`	`280`	`public static Identity valueOf(String identityStr) {`
`281`	`281`	`String[] info = identityStr.split(":");`
`282`	`282`	`Type type = Type.valueOf(CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, info[0]));`
`283`		`- if (type.equals(Type.ALL_AUTHENTICATED_USERS) \|\| type.equals(Type.ALL_USERS)) {`
	`283`	`+ if (info.length == 1) {`
`284`	`284`	`return new Identity(type, null);`
	`285`	`+ } else if (info.length == 2){`
	`286`	`+ return new Identity(type, info[1]);`
`285`	`287`	`} else {`
`286`		`- return new Identity(type, checkNotNull(info[1]));`
	`288`	`+ throw new IllegalArgumentException("Illegal identity string: \"" + identityStr + "\"");`
`287`	`289`	`}`
`288`	`290`	`}`
`289`	`291`	`}`