Merge pull request #419 from kbrabrand/array-adapter-validation

Add check for public key duplicates
imbo · Dec 7, 2015 · 21ffea1 · 21ffea1
2 parents 0ab2bc7 + 29dd8df
commit 21ffea1
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/library/Imbo/Auth/AccessControl/Adapter/ArrayAdapter.php b/library/Imbo/Auth/AccessControl/Adapter/ArrayAdapter.php
@@ -53,6 +53,8 @@ public function __construct(array $accessList = [], $groups = []) {
         $this->accessList = $accessList;
         $this->groups = $groups;
         $this->keys = $this->getKeysFromAcl();
+
+        $this->validateAccessList();
     }
 
     /**
@@ -174,4 +176,25 @@ private function getKeysFromAcl() {
 
         return $keys;
     }
+
+    /**
+     * Validate access list data
+     *
+     * @throws InvalidArgumentException
+     */
+    private function validateAccessList() {
+        // Get all user lists
+        $declaredPublicKeys = array_map(function($acl) {
+            return $acl['publicKey'];
+        }, $this->accessList);
+
+        $publicKeys = [];
+        foreach ($declaredPublicKeys as $key) {
+            if (in_array($key, $publicKeys)) {
+                throw new InvalidArgumentException('Public key declared twice in config: ' . $key, 500);
+            }
+
+            $publicKeys[] = $key;
+        }
+    }
 }
diff --git a/tests/phpunit/ImboUnitTest/Auth/AccessControl/Adapter/ArrayAdapterTest.php b/tests/phpunit/ImboUnitTest/Auth/AccessControl/Adapter/ArrayAdapterTest.php
@@ -139,4 +139,15 @@ public function getAuthConfig() {
             'public key does not exist' => [$users, 'publicKey3', null],
         ];
     }
+
+    /**
+     * @expectedException InvalidArgumentException
+     * @expectedExceptionMessage Public key declared twice in config: pubkey
+     */
+    public function testThrowsErrorOnDuplicatePublicKey() {
+        $accessControl = new ArrayAdapter([
+            ['publicKey'  => 'pubkey', 'privateKey' => 'privkey', 'acl' => []],
+            ['publicKey'  => 'pubkey', 'privateKey' => 'privkey', 'acl' => []]
+        ]);
+    }
 }