Add auto BasicAuth credential detection based on URL

spec/Authentication/AutoBasicAuthSpec.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace spec\Http\Message\Authentication;
+
+use PhpSpec\ObjectBehavior;
+use Prophecy\Argument;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\UriInterface;
+
+class AutoBasicAuthSpec extends ObjectBehavior
+{
+    function it_is_initializable()
+    {
+        $this->shouldHaveType('Http\Message\Authentication\AutoBasicAuth');
+    }
+
+    function it_is_an_authentication()
+    {
+        $this->shouldImplement('Http\Message\Authentication');
+    }
+
+    function it_authenticates_a_request(
+        RequestInterface $request,
+        UriInterface $uri,
+        UriInterface $uriWithoutUserInfo,
+        RequestInterface $requestWithoutUserInfo,
+        RequestInterface $authenticatedRequest
+    ) {
+        $request->getUri()->willReturn($uri);
+        $uri->getUserInfo()->willReturn('username:password');
+        $uri->withUserInfo('', null)->willReturn($uriWithoutUserInfo);
+        $request->withUri($uriWithoutUserInfo)->willReturn($requestWithoutUserInfo);
+        $requestWithoutUserInfo
+            ->withHeader('Authorization', 'Basic '.base64_encode('username:password'))
+            ->willReturn($authenticatedRequest)
+        ;
+
+        $this->authenticate($request)->shouldReturn($authenticatedRequest);
+    }
+
+    function it_authenticates_a_request_without_password(
+        RequestInterface $request,
+        UriInterface $uri,
+        UriInterface $uriWithoutUserInfo,
+        RequestInterface $requestWithoutUserInfo,
+        RequestInterface $authenticatedRequest
+    ) {
+        $request->getUri()->willReturn($uri);
+        $uri->getUserInfo()->willReturn('username');
+        $uri->withUserInfo('', null)->willReturn($uriWithoutUserInfo);
+        $request->withUri($uriWithoutUserInfo)->willReturn($requestWithoutUserInfo);
+        $requestWithoutUserInfo
+            ->withHeader('Authorization', 'Basic '.base64_encode('username'))
+            ->willReturn($authenticatedRequest)
+        ;
+
+        $this->authenticate($request)->shouldReturn($authenticatedRequest);
+    }
+
+    function it_does_not_authenticate_a_request(RequestInterface $request, UriInterface $uri)
+    {
+        $request->getUri()->willReturn($uri);
+        $uri->getUserInfo()->willReturn('');
+
+        $this->authenticate($request)->shouldReturn($request);
+    }
+
+    function it_authenticates_a_request_without_user_info_removal(
+        RequestInterface $request,
+        UriInterface $uri,
+        RequestInterface $authenticatedRequest
+    ) {
+        $this->beConstructedWith(false);
+
+        $request->getUri()->willReturn($uri);
+        $uri->getUserInfo()->willReturn('username:password');
+        $request
+            ->withHeader('Authorization', 'Basic '.base64_encode('username:password'))
+            ->willReturn($authenticatedRequest)
+        ;
+
+        $this->authenticate($request)->shouldReturn($authenticatedRequest);
+    }
+}

spec/Authentication/BasicAuthSpec.php

@@ -7,8 +7,6 @@
 
 class BasicAuthSpec extends ObjectBehavior
 {
-    use AuthenticationBehavior;
-
     function let()
     {
         $this->beConstructedWith('john.doe', 'secret');
@@ -19,6 +17,11 @@ function it_is_initializable()
         $this->shouldHaveType('Http\Message\Authentication\BasicAuth');
     }
 
+    function it_is_an_authentication()
+    {
+        $this->shouldImplement('Http\Message\Authentication');
+    }
+
     function it_authenticates_a_request(RequestInterface $request, RequestInterface $newRequest)
     {
         $request->withHeader('Authorization', 'Basic '.base64_encode('john.doe:secret'))->willReturn($newRequest);

spec/Authentication/BearerSpec.php

@@ -7,8 +7,6 @@
 
 class BearerSpec extends ObjectBehavior
 {
-    use AuthenticationBehavior;
-
     function let()
     {
         $this->beConstructedWith('token');
@@ -19,6 +17,11 @@ function it_is_initializable()
         $this->shouldHaveType('Http\Message\Authentication\Bearer');
     }
 
+    function it_is_an_authentication()
+    {
+        $this->shouldImplement('Http\Message\Authentication');
+    }
+
     function it_authenticates_a_request(RequestInterface $request, RequestInterface $newRequest)
     {
         $request->withHeader('Authorization', 'Bearer token')->willReturn($newRequest);

spec/Authentication/ChainSpec.php

@@ -8,13 +8,16 @@
 
 class ChainSpec extends ObjectBehavior
 {
-    use AuthenticationBehavior;
-
     function it_is_initializable()
     {
         $this->shouldHaveType('Http\Message\Authentication\Chain');
     }
 
+    function it_is_an_authentication()
+    {
+        $this->shouldImplement('Http\Message\Authentication');
+    }
+
     function it_throws_an_exception_when_non_authentication_is_passed()
     {
         $this->beConstructedWith(['authentication']);

spec/Authentication/MatchingSpec.php

@@ -8,22 +8,23 @@
 
 class MatchingSpec extends ObjectBehavior
 {
-    use AuthenticationBehavior;
-
-    private $matcher;
-
     function let(Authentication $authentication)
     {
-        $this->matcher = function($request) { return true; };
+        $matcher = function($request) { return true; };
 
-        $this->beConstructedWith($authentication, $this->matcher);
+        $this->beConstructedWith($authentication, $matcher);
     }
 
     function it_is_initializable()
     {
         $this->shouldHaveType('Http\Message\Authentication\Matching');
     }
 
+    function it_is_an_authentication()
+    {
+        $this->shouldImplement('Http\Message\Authentication');
+    }
+
     function it_authenticates_a_request(Authentication $authentication, RequestInterface $request, RequestInterface $newRequest)
     {
         $authentication->authenticate($request)->willReturn($newRequest);

spec/Authentication/QueryParamSpec.php

@@ -8,8 +8,6 @@
 
 class QueryParamSpec extends ObjectBehavior
 {
-    use AuthenticationBehavior;
-
     function let()
     {
         $this->beConstructedWith([
@@ -23,6 +21,11 @@ function it_is_initializable()
         $this->shouldHaveType('Http\Message\Authentication\QueryParam');
     }
 
+    function it_is_an_authentication()
+    {
+        $this->shouldImplement('Http\Message\Authentication');
+    }
+
     function it_authenticates_a_request(
         RequestInterface $request,
         UriInterface $uri,

spec/Authentication/RequestConditionalSpec.php

@@ -9,8 +9,6 @@
 
 class RequestConditionalSpec extends ObjectBehavior
 {
-    use AuthenticationBehavior;
-
     function let(RequestMatcher $requestMatcher, Authentication $authentication)
     {
         $this->beConstructedWith($requestMatcher, $authentication);
@@ -21,6 +19,11 @@ function it_is_initializable()
         $this->shouldHaveType('Http\Message\Authentication\RequestConditional');
     }
 
+    function it_is_an_authentication()
+    {
+        $this->shouldImplement('Http\Message\Authentication');
+    }
+
     function it_authenticates_a_request(
         Authentication $authentication,
         RequestMatcher $requestMatcher,

spec/Authentication/WsseSpec.php

@@ -8,8 +8,6 @@
 
 class WsseSpec extends ObjectBehavior
 {
-    use AuthenticationBehavior;
-
     function let()
     {
         $this->beConstructedWith('john.doe', 'secret');
@@ -20,6 +18,11 @@ function it_is_initializable()
         $this->shouldHaveType('Http\Message\Authentication\Wsse');
     }
 
+    function it_is_an_authentication()
+    {
+        $this->shouldImplement('Http\Message\Authentication');
+    }
+
     function it_authenticates_a_request(
         RequestInterface $request,
         RequestInterface $newRequest,

src/Authentication/AutoBasicAuth.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Http\Message\Authentication;
+
+use Http\Message\Authentication;
+use Psr\Http\Message\RequestInterface;
+
+/**
+ * Authenticate a PSR-7 Request using Basic Auth based on credentials in the URI.
+ *
+ * @author Márk Sági-Kazár <mark.sagikazar@gmail.com>
+ */
+final class AutoBasicAuth implements Authentication
+{
+    /**
+     * Whether user info should be removed from the URI.
+     *
+     * @var bool
+     */
+    private $shouldRemoveUserInfo;
+
+    /**
+     * @param bool|true $shouldRremoveUserInfo
+     */
+    public function __construct($shouldRremoveUserInfo = true)
+    {
+        $this->shouldRemoveUserInfo = (bool) $shouldRremoveUserInfo;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function authenticate(RequestInterface $request)
+    {
+        $uri = $request->getUri();
+        $userInfo = $uri->getUserInfo();
+
+        if (!empty($userInfo)) {
+            if ($this->shouldRemoveUserInfo) {
+                $request = $request->withUri($uri->withUserInfo(''));
+            }
+
+            $request = $request->withHeader('Authorization', sprintf('Basic %s', base64_encode($userInfo)));
+        }
+
+        return $request;
+    }
+}