Merge branch 'master' of https://git.mcnd.ca/mcndave/ulmus-user

- forgetMe() defined as void

composer.json

@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "mcnd/ulmus": "dev-master"
+        "mcnd/ulmus": "^1.0 || ^2.0"
     },
     "repositories": [
         {

src/Authorize/MacAddressAuthentication.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Ulmus\User\Authorize;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Ulmus\User\Entity\UserInterface;
+use Ulmus\User\Lib\Authenticate;
+
+class MacAddressAuthentication implements AuthorizeMethodInterface
+{
+    public function __construct(
+        public Authenticate $authenticate,
+        protected string $fieldUser = "mac",
+    ) {}
+
+    public function connect(ServerRequestInterface $request, UserInterface $user): bool
+    {
+        $server = $request->getServerParams();
+
+       # var_dump($server, $this->getArpMacAddress($server['REMOTE_ADDR']));die();
+
+        return false;
+
+        return $this->authenticate->authenticate([ $this->fieldUser => $post[$this->postFieldUser] ], $post[$this->postFieldPassword]);
+    }
+
+    public function catchRequest(ServerRequestInterface $request): bool
+    {
+        return true;
+
+        $post = $request->getParsedBody();
+
+        return strtoupper( $request->getMethod() ) === "POST" && isset($post[$this->postFieldUser], $post[$this->postFieldPassword]);
+    }
+
+    protected function getArpMacAddress(string $ip) : ?string
+    {
+        #run the external command, break output into lines
+        $arp = shell_exec(sprintf("arp -a %s", escapeshellarg($ip)));
+        $lines = explode("\n", $arp);
+
+        #look for the output line describing our IP address
+        foreach($lines as $line)
+        {
+            $cols = preg_split('/\s+/', trim($line));
+
+            if ($cols[0] === $ip)
+            {
+                return $cols[0];
+            }
+        }
+
+        return false;
+    }
+}

src/Entity/User.php

@@ -80,9 +80,13 @@ abstract class User implements UserInterface {
         return password_verify($password, $this->password ?? null);
     }
 
-    public function fullName() : string
+    public function fullname(bool $reverse = false) : string
     {
-        return trim( ( $this->firstName ?? "" ) . " " . ( $this->lastName ?? "" ) );
+        if (! $this->isLoaded() ) {
+            return "???";
+        }
+
+        return trim($reverse ? "{$this->lastName}, {$this->firstName}" : "{$this->firstName} {$this->lastName}");
     }
 
     public function loggedIn(?bool $set = null): bool

src/Lib/Authenticate.php

@@ -37,7 +37,8 @@ class Authenticate {
         return null;
     }
 
-    public function forgetMe() {
+    public function forgetMe() : void
+    {
         $this->cookie->delete("user.id");
         $this->session->destroy();
     }
@@ -120,15 +121,19 @@ class Authenticate {
         return $this;
     }
 
-    public function logUser(?int $id) : ? UserInterface
+    public function logUser(null|int|object $id) : ? UserInterface
     {
-        try {
-            if ($id === null || null === ($entity = $this->user::repository()->loadFromPk($id))) {
+        if (! is_object($id)) {
+            try {
+                if ($id === null || null === ($entity = $this->user::repository()->loadFromPk($id))) {
+                    return null;
+                }
+            } catch (\Exception $ex) {
                 return null;
             }
         }
-        catch(\Exception $ex) {
-            return null;
+        else {
+            $entity = $id;
         }
 
         $this->user->fromArray($entity);

src/Middleware/HeaderAuthenticationMiddleware.php

@@ -20,7 +20,7 @@ class HeaderAuthenticationMiddleware implements MiddlewareInterface
         protected Authenticate $authorize,
         protected UserInterface $entity,
         protected \Closure $loginFailedResponse,
-        HeaderAuthentication $authenticator = null,
+        ? HeaderAuthentication $authenticator = null,
     ) {
         $this->authenticator = $authenticator ?: new HeaderAuthentication($authorize);
     }

src/Middleware/LocalMacAddressMiddleware.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Ulmus\User\Middleware;
+
+use Psr\Http\{
+    Message\ResponseInterface,
+    Message\ServerRequestInterface,
+    Server\MiddlewareInterface,
+    Server\RequestHandlerInterface
+};
+use Ulmus\User\Authorize\MacAddressAuthentication;
+use Ulmus\User\Entity\UserInterface;
+use Ulmus\User\Authorize\PostRequestAuthentication;
+use Ulmus\User\Lib\Authenticate;
+
+class LocalMacAddressMiddleware implements MiddlewareInterface
+{
+    protected MacAddressAuthentication $authenticator;
+
+    public function __construct(
+        protected UserInterface     $entity,
+        protected \Closure          $loginFailedResponse,
+        ? MacAddressAuthentication   $authenticator = null,
+    ) {
+        $this->authenticator = $authenticator ?: new MacAddressAuthentication(new Authenticate($entity));
+    }
+
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        $this->authenticator->authenticate->rememberMe();
+
+        if ( $this->authenticator->catchRequest($request) ) {
+            if ( ! $this->authenticator->connect($request, $this->entity) ) {
+                return call_user_func($this->loginFailedResponse, "Login failed");
+            }
+        }
+
+        return $handler->handle($request);
+    }
+}

src/Middleware/PostRequestAuthenticationMiddleware.php

@@ -19,7 +19,7 @@ class PostRequestAuthenticationMiddleware implements MiddlewareInterface
     public function __construct(
         protected UserInterface     $entity,
         protected \Closure          $loginFailedResponse,
-        PostRequestAuthentication   $authenticator = null,
+        ? PostRequestAuthentication $authenticator = null,
     ) {
         $this->authenticator = $authenticator ?: new PostRequestAuthentication(new Authenticate($entity));
     }
@@ -30,6 +30,9 @@ class PostRequestAuthenticationMiddleware implements MiddlewareInterface
 
         if ( $this->authenticator->catchRequest($request) ) {
             if ( ! $this->authenticator->connect($request, $this->entity) ) {
+                # Adds random sleep after a bad login attempts
+                sleep(random_int(2,8));
+
                 return call_user_func($this->loginFailedResponse, "Login failed");
             }
         }