Adds inspect method to Macaroon

immense · Apr 29, 2015 · a7f2e7a · a7f2e7a
1 parent c3fa32e
commit a7f2e7a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/lib/Macaroons/Macaroon.php b/lib/Macaroons/Macaroon.php
@@ -105,6 +105,34 @@ public function bindSignature($signature)
     return Utils::hmac($key, $currentSignatureHash . $newSignatureHash);
   }
 
+  public function inspect()
+  {
+    $str = "location {$this->location}\n";
+    $str .= "identifier {$this->identifier}\n";
+    foreach ($this->caveats as $caveat)
+    {
+      $caveatKeys = array(
+                          'cid' => $caveat->getCaveatId()
+                          );
+      if ($caveat->getVerificationId() && $caveat->getCaveatLocation())
+      {
+        $caveatKeys = array_merge(
+                                  $caveatKeys,
+                                  array(
+                                        'vid' => $caveat->getVerificationId(),
+                                        'cl' => $caveat->getCaveatLocation()
+                                        )
+                                  );
+      }
+      $caveatKeys = array_map(function($key, $value){
+        return "$key $value";
+      }, array_keys($caveatKeys), $caveatKeys);
+      $str .= join("\n", $caveatKeys) . "\n";
+    }
+    $str .= "signature {$this->getSignature()}";
+    return $str;
+  }
+
   private function initialSignature($key, $identifier)
   {
     return Utils::hmac( Utils::generateDerivedKey($key), $identifier);

diff --git a/tests/PacketTest.php b/tests/PacketTest.php
@@ -37,10 +37,4 @@ public function testPacketDecoding()
     $this->assertEquals('a', $packet->getKey());
     $this->assertEquals('b', $packet->getData());
   }
-
-  public function testDerserialize()
-  {
-    // $m = Macaroon::deserialize(Utils::base64_url_encode("0007a \n0008a b\n"));
-    $this->markTestSkipped('TODO');
-  }
 }