Add optional "group" parameter to FromKeePass

Author: thekid

README.md

@@ -67,9 +67,13 @@ Via the `KeePass` class.
 use security\credentials\{Credentials, FromKeePass};
 use util\Secret;
 
-$credentials= new Credentials(new FromKeePass('database.kdbx', new Secret('key')));
+$secret= new Secret('key');
+
+$credentials= new Credentials(new FromKeePass('database.kdbx', $secret));
 $secret= $credentials->named('ldap_password');     // Reads top-level entry ldap_password
-$secret= $credentials->named('vendor/name/mysql'); // Reads mysql entry in vendor/name subfolder
+
+$credentials= new Credentials(new FromKeePass('database.kdbx', $secret, 'vendor/name'));
+$secret= $credentials->named('mysql');             // Reads mysql entry in vendor/name subfolder
 ```
 
 ### Docker secrets

src/main/php/security/credentials/FromKeePass.class.php

@@ -14,10 +14,12 @@ class FromKeePass implements Secrets {
    *
    * @param  io.File|string $file
    * @param  util.Secret $key
+   * @param  string $group The secret group, e.g. "/vendor/name"
    */
-  public function __construct($file, Secret $key) {
+  public function __construct($file, Secret $key, $group= '/') {
     $this->file= $file instanceof File ? $file : new File($file);
     $this->key= $key;
+    $this->group= trim($group, '/');
   }
 
   /** @return self */
@@ -43,7 +45,7 @@ public function named($name) {
       $match= substr($name, $p + 1);
     }
 
-    foreach ($this->db->group($group)->passwords() as $path => $value) {
+    foreach ($this->db->group($this->group.$group)->passwords() as $path => $value) {
       if (basename($path) === $match) return new Secret((string)$value);
     }
     return null;
@@ -64,7 +66,7 @@ public function all($pattern) {
       $match= substr($pattern, $p + 1, strrpos($pattern, '*') - $p - 1);
     }
 
-    foreach ($this->db->group($group)->passwords() as $path => $value) {
+    foreach ($this->db->group($this->group.$group)->passwords() as $path => $value) {
       if (0 === strncmp(basename($path), $match, strlen($match))) yield substr($path, 1) => new Secret((string)$value);
     }
   }

src/test/php/security/credentials/unittest/FromKeePassTest.class.php

@@ -1,16 +1,28 @@
 <?php namespace security\credentials\unittest;
 
+use lang\ClassLoader;
 use security\credentials\FromKeePass;
 use util\Secret;
-use lang\ClassLoader;
 
 class FromKeePassTest extends AbstractSecretsTest {
 
   /** @return security.vault.Secrets */
-  protected function newFixture() {
+  protected function newFixture($group= '/') {
     return new FromKeePass(
       ClassLoader::getDefault()->getResourceAsStream('keepass/unittest.kdbx'),
-      new Secret('test')
+      new Secret('test'),
+      $group
     );
   }
+
+  #[@test, @values(['xp/app', '/xp/app', '/xp/app/'])]
+  public function using_group($group) {
+    $fixture= $this->newFixture($group);
+    $fixture->open();
+    try {
+      $this->assertEquals('test', $fixture->named('mysql')->reveal());
+    } finally {
+      $fixture->close();
+    }
+  }
 }