From 88bceea93907af8f954c4da3834d0ad55814d3a0 Mon Sep 17 00:00:00 2001 From: Jeremy Dormitzer Date: Fri, 18 Jan 2019 09:13:38 -0500 Subject: [PATCH] Test SignatureListener --- src/Auth/SignatureListener.php | 4 +- test/Auth/SignatureListenerTest.php | 152 ++++++++++++++++++++++++++++ 2 files changed, 154 insertions(+), 2 deletions(-) create mode 100644 test/Auth/SignatureListenerTest.php diff --git a/src/Auth/SignatureListener.php b/src/Auth/SignatureListener.php index 9761e6d..4cf01a6 100644 --- a/src/Auth/SignatureListener.php +++ b/src/Auth/SignatureListener.php @@ -51,14 +51,14 @@ class SignatureListener implements EventSubscriberInterface if ( $headers->has( 'signature' ) ) { $signatureHeader = $headers->get( 'signature' ); } else if ( $headers->has( 'authorization' ) && - substr( $headers->get( 'authorization', 0, 9 ) === 'Signature' ) ) { + substr( $headers->get( 'authorization' ), 0, 9 ) === 'Signature' ) { $signatureHeader = substr( $headers->get( 'authorization' ), 10 ); } if ( ! $signatureHeader ) { return; } $matches = array(); - if ( ! preg_match( '/keyId="(.*)"/', $signatureHeader, $matches) ) { + if ( ! preg_match( '/keyId="([^"]*)"/', $signatureHeader, $matches) ) { return; } $keyId = $matches[1]; diff --git a/test/Auth/SignatureListenerTest.php b/test/Auth/SignatureListenerTest.php new file mode 100644 index 0000000..8e0e4ed --- /dev/null +++ b/test/Auth/SignatureListenerTest.php @@ -0,0 +1,152 @@ + self::KEY_ID, + 'owner' => 'https://example.com/actor/1', + 'publicKeyPem' => self::PUBLIC_KEY, + ); + + private $signatureListener; + + public function setUp() + { + $dateTimeProvider = new TestDateTimeProvider( array( + 'http-signature.verify' => DateTime::createFromFormat( + DateTime::RFC2822, 'Sun, 05 Jan 2014 21:31:40 GMT' + ), + ) ); + $httpSignatureService = new HttpSignatureService( $dateTimeProvider ); + $objectsService = $this->createMock( ObjectsService::class ); + $objectsService->method( 'dereference' ) + ->will( $this->returnValueMap( array( + array( self::KEY_ID, self::objectFromArray( self::KEY ) ) + ) ) ); + $this->signatureListener = new SignatureListener( + $httpSignatureService, $objectsService + ); + } + + private static function objectFromArray( $array ) { + $object = new ActivityPubObject(); + foreach ( $array as $name => $value ) { + if ( is_array( $value ) ) { + $child = $this->objectFromArray( $value ); + Field::withObject( $object, $name, $child ); + } else { + Field::withValue( $object, $name, $value ); + } + } + return $object; + } + + private function getEvent() + { + $kernel = $this->createMock( HttpKernelInterface::class ); + $request = Request::create( + 'https://example.com/foo?param=value&pet=dog', + Request::METHOD_POST, + array(), + array(), + array(), + array(), + '{"hello": "world"}' + ); + $request->headers->set( 'host', 'example.com' ); + $request->headers->set( 'content-type', 'application/json' ); + $request->headers->set( + 'digest', 'SHA-256=X48E9qOokqqrvdts8nOJRJN3OWDUoyWxBf7kbu9DBPE=' + ); + $request->headers->set( 'content-length', 18 ); + $request->headers->set( 'date', 'Sun, 05 Jan 2014 21:31:40 GMT' ); + $event = new GetResponseEvent( $kernel, $request, HttpKernelInterface::MASTER_REQUEST ); + return $event; + } + + public function testSignatureListener() + { + $testCases = array( + array( + 'id' => 'basicTest', + 'headers' => array( + 'Authorization' => 'Signature keyId="https://example.com/actor/1/key",algorithm="rsa-sha256",headers="(request-target) host date", signature="qdx+H7PHHDZgy4y/Ahn9Tny9V3GP6YgBPyUXMmoxWtLbHpUnXS2mg2+SbrQDMCJypxBLSPQR2aAjn7ndmw2iicw3HMbe8VfEdKFYRqzic+efkb3nndiv/x1xSHDJWeSWkx3ButlYSuBskLu6kd9Fswtemr3lgdDEmn04swr2Os0="', + ), + 'expectedAttributes' => array( + 'signed' => true, + 'signedBy' => 'https://example.com/actor/1', + 'actor' => 'https://example.com/actor/1', + ), + ), + array( + 'id' => 'existingActorTest', + 'headers' => array( + 'Authorization' => 'Signature keyId="https://example.com/actor/1/key",algorithm="rsa-sha256",headers="(request-target) host date", signature="qdx+H7PHHDZgy4y/Ahn9Tny9V3GP6YgBPyUXMmoxWtLbHpUnXS2mg2+SbrQDMCJypxBLSPQR2aAjn7ndmw2iicw3HMbe8VfEdKFYRqzic+efkb3nndiv/x1xSHDJWeSWkx3ButlYSuBskLu6kd9Fswtemr3lgdDEmn04swr2Os0="', + ), + 'requestAttributes' => array( + 'actor' => 'https://example.com/actor/2', + ), + 'expectedAttributes' => array( + 'signed' => true, + 'signedBy' => 'https://example.com/actor/1', + 'actor' => 'https://example.com/actor/2', + ), + ), + array( + 'id' => 'signatureHeaderTest', + 'headers' => array( + 'Signature' => 'keyId="https://example.com/actor/1/key",algorithm="rsa-sha256",headers="(request-target) host date", signature="qdx+H7PHHDZgy4y/Ahn9Tny9V3GP6YgBPyUXMmoxWtLbHpUnXS2mg2+SbrQDMCJypxBLSPQR2aAjn7ndmw2iicw3HMbe8VfEdKFYRqzic+efkb3nndiv/x1xSHDJWeSWkx3ButlYSuBskLu6kd9Fswtemr3lgdDEmn04swr2Os0="', + ), + 'expectedAttributes' => array( + 'signed' => true, + 'signedBy' => 'https://example.com/actor/1', + 'actor' => 'https://example.com/actor/1', + ), + ), + array( + 'id' => 'noSignatureTest', + 'expectedAttributes' => array(), + ), + ); + foreach ( $testCases as $testCase ) { + $event = $this->getEvent(); + if ( array_key_exists( 'headers', $testCase ) ) { + foreach( $testCase['headers'] as $header => $value ) { + $event->getRequest()->headers->set( $header, $value ); + } + } + if ( array_key_exists( 'requestAttributes', $testCase ) ) { + foreach( $testCase['requestAttributes'] as $attribute => $value ) { + $event->getRequest()->attributes->set( $attribute, $value ); + } + } + $this->signatureListener->validateHttpSignature( $event ); + $this->assertEquals( + $testCase['expectedAttributes'], + $event->getRequest()->attributes->all(), + "Error on test $testCase[id]" + ); + } + } +} +?>