enforce accounts must start with 0x (PegaSysEng#900)

rain-on · Feb 20, 2019 · 173c629 · 173c629
1 parent c1d36ae
commit 173c629
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/...rc/main/java/tech/pegasys/pantheon/ethereum/permissioning/AccountWhitelistController.java b/...rc/main/java/tech/pegasys/pantheon/ethereum/permissioning/AccountWhitelistController.java
@@ -151,6 +151,9 @@ private boolean containsInvalidAccount(final List<String> accounts) {
 
   static boolean isValidAccountString(final String account) {
     try {
+      if (account == null || !account.startsWith("0x")) {
+        return false;
+      }
       BytesValue bytesValue = BytesValue.fromHexString(account);
       return bytesValue.size() == ACCOUNT_BYTES_SIZE;
     } catch (NullPointerException | IndexOutOfBoundsException | IllegalArgumentException e) {

diff --git a/...est/java/tech/pegasys/pantheon/ethereum/permissioning/AccountWhitelistControllerTest.java b/...est/java/tech/pegasys/pantheon/ethereum/permissioning/AccountWhitelistControllerTest.java
@@ -218,6 +218,19 @@ public void reloadAccountWhitelistWithErrorReadingConfigFileShouldKeepOldWhiteli
         .containsExactly("0xfe3b557e8fb62b89f4916b721be55ceb828dbd73");
   }
 
+  @Test
+  public void accountThatDoesNotStartWith0xIsNotValid() {
+    assertThat(AccountWhitelistController.isValidAccountString("bob")).isFalse();
+    assertThat(
+            AccountWhitelistController.isValidAccountString(
+                "b9b81ee349c3807e46bc71aa2632203c5b462032"))
+        .isFalse();
+    assertThat(
+            AccountWhitelistController.isValidAccountString(
+                "0xb9b81ee349c3807e46bc71aa2632203c5b462032"))
+        .isTrue();
+  }
+
   private Path createPermissionsFileWithAccount(final String account) throws IOException {
     final String nodePermissionsFileContent = "accounts-whitelist=[\"" + account + "\"]";
     final Path permissionsFile = Files.createTempFile("account_permissions", "");