src/Authorize/MacAddressAuthentication.php

@@ -1,55 +0,0 @@
-<?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/Lib/Authenticate.php

@@ -120,19 +120,15 @@ class Authenticate {
         return $this;
     }
 
-    public function logUser(null|int|object $id) : ? UserInterface
+    public function logUser(?int $id) : ? UserInterface
     {
-        if (! is_object($id)) {
+        try {
-            try {
+            if ($id === null || null === ($entity = $this->user::repository()->loadFromPk($id))) {
-                if ($id === null || null === ($entity = $this->user::repository()->loadFromPk($id))) {
-                    return null;
-                }
-            } catch (\Exception $ex) {
                 return null;
             }
         }
-        else {
+        catch(\Exception $ex) {
-            $entity = $id;
+            return null;
         }
 
         $this->user->fromArray($entity);

src/Middleware/LocalMacAddressMiddleware.php

@@ -1,40 +0,0 @@
-<?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

@@ -30,9 +30,6 @@ 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");
             }
         }