PIE-1526: Fix account permissioning check case matching (PegaSysEng#1314

)
notlesh · May 4, 2019 · 886c53b · 886c53b
1 parent 097fb61
commit 886c53b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/...rc/main/java/tech/pegasys/pantheon/ethereum/permissioning/AccountWhitelistController.java b/...rc/main/java/tech/pegasys/pantheon/ethereum/permissioning/AccountWhitelistController.java
@@ -141,7 +141,7 @@ private boolean inputHasDuplicates(final List<String> accounts) {
   }
 
   public boolean contains(final String account) {
-    return (accountWhitelist.contains(account));
+    return accountWhitelist.stream().anyMatch(a -> a.equalsIgnoreCase(account));
   }
 
   public List<String> getAccountWhitelist() {

diff --git a/...est/java/tech/pegasys/pantheon/ethereum/permissioning/AccountWhitelistControllerTest.java b/...est/java/tech/pegasys/pantheon/ethereum/permissioning/AccountWhitelistControllerTest.java
@@ -231,6 +231,16 @@ public void accountThatDoesNotStartWith0xIsNotValid() {
         .isTrue();
   }
 
+  @Test
+  public void shouldMatchAccountsWithInconsistentCasing() {
+    when(permissioningConfig.isAccountWhitelistEnabled()).thenReturn(true);
+    when(permissioningConfig.getAccountWhitelist())
+        .thenReturn(singletonList("0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"));
+    controller = new AccountWhitelistController(permissioningConfig, whitelistPersistor);
+
+    assertThat(controller.contains("0xFE3B557E8Fb62b89F4916B721be55cEb828dBd73")).isTrue();
+  }
+
   private Path createPermissionsFileWithAccount(final String account) throws IOException {
     final String nodePermissionsFileContent = "accounts-whitelist=[\"" + account + "\"]";
     final Path permissionsFile = Files.createTempFile("account_permissions", "");