From fd51903a8a6dd9786b05f054899f0bc6e90ef113 Mon Sep 17 00:00:00 2001
From: Dave Mc Nicoll <info@mcnd.ca>
Date: Mon, 4 Dec 2023 12:32:25 -0500
Subject: [PATCH] - Started WIP on firewall

---
 src/Controller/Console.php                   |  1 +
 src/Entity/Firewall/BannedIp.php             | 31 ++++++++++++++++++++
 src/Entity/Firewall/Connection.php           |  8 ++---
 src/Form/Storage/DatabaseMigration.php       |  2 +-
 src/Middleware/FirewallMiddleware.php        | 27 +++++++++++++++++
 view/lean-console/page/dashboard/index.phtml | 11 +++++++
 view/lean-console/page/update/index.phtml    | 14 +++++++++
 7 files changed, 89 insertions(+), 5 deletions(-)
 create mode 100644 src/Entity/Firewall/BannedIp.php
 create mode 100644 src/Middleware/FirewallMiddleware.php

diff --git a/src/Controller/Console.php b/src/Controller/Console.php
index 1e4b8b4..faf8616 100644
--- a/src/Controller/Console.php
+++ b/src/Controller/Console.php
@@ -26,6 +26,7 @@ class Console {
         new FormHandler($request, $git = new Form\Update\Git(getenv('PROJECT_PATH')));
 
         $status = iterator_to_array($git->run("/usr/bin/git status -s"));
+        $diff = iterator_to_array($git->run("/usr/bin/git diff"));
 
         return $this->renderView("lean-console/page/update/index", get_defined_vars());
     }
diff --git a/src/Entity/Firewall/BannedIp.php b/src/Entity/Firewall/BannedIp.php
new file mode 100644
index 0000000..91013f3
--- /dev/null
+++ b/src/Entity/Firewall/BannedIp.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Lean\Console\Entity\Firewall;
+
+use Ulmus\Attribute\Obj\Table;
+use Ulmus\Attribute\Property\Field;
+use Ulmus\Entity\Field\Datetime;
+
+#[Table(name:"firewall_banned_ips", adapter: "lean.console")]
+class BannedIp implements \JsonSerializable
+{
+    use \Ulmus\EntityTrait;
+
+    #[Field\Id]
+    public string $id;
+
+    #[Field\ForeignKey(name: "connection_id")]
+    public ? int $connectionId;
+
+    #[Field(length: 12)]
+    public ? string $ipv4;
+
+    #[Field(length: 40)]
+    public ? string $ipv6;
+
+    #[Field\Datetime(name: "banned_until")]
+    public Datetime $bannedUntil;
+
+    #[Field\Datetime(name: "created_at")]
+    public Datetime $createdAt;
+}
\ No newline at end of file
diff --git a/src/Entity/Firewall/Connection.php b/src/Entity/Firewall/Connection.php
index 26827fe..372e07b 100644
--- a/src/Entity/Firewall/Connection.php
+++ b/src/Entity/Firewall/Connection.php
@@ -15,17 +15,17 @@ class Connection implements \JsonSerializable
     public string $id;
 
     #[Field(length: 12)]
-    public string $ipv4;
+    public ? string $ipv4;
 
     #[Field(length: 40)]
-    public string $ipv6;
+    public ? string $ipv6;
 
     #[Field]
     public bool $success;
 
-    #[Field(length: 255)]
+    #[Field(length: 255, name: "error_message")]
     public ? string $errorMessage;
 
-    #[Field\Datetime]
+    #[Field\Datetime(name: "created_at")]
     public Datetime $createdAt;
 }
\ No newline at end of file
diff --git a/src/Form/Storage/DatabaseMigration.php b/src/Form/Storage/DatabaseMigration.php
index 39737c0..7b18ffa 100644
--- a/src/Form/Storage/DatabaseMigration.php
+++ b/src/Form/Storage/DatabaseMigration.php
@@ -73,7 +73,7 @@ class DatabaseMigration implements FormInterface
                 if ( $alter->count() ) {
                     if ( $adapter->splitAlterQuery() ) {
                         $query = $alter->map(fn(Lib\Database\Definition $map) => $entity::repository()
-                            ->alterSqlQuery([$map->toArray()])
+                            ->alterSqlQuery([ $map->toArray() ])
                             ->getSqlQuery(true));
                     }
                     else {
diff --git a/src/Middleware/FirewallMiddleware.php b/src/Middleware/FirewallMiddleware.php
new file mode 100644
index 0000000..8f0ccc9
--- /dev/null
+++ b/src/Middleware/FirewallMiddleware.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Ulmus\User\Middleware;
+
+use Psr\Http\{
+    Message\ResponseInterface,
+    Message\ServerRequestInterface,
+    Server\MiddlewareInterface,
+    Server\RequestHandlerInterface
+};
+use Ulmus\User\Entity\UserInterface;
+use Ulmus\User\Authorize\HeaderAuthentication;
+
+class HeaderAuthenticationMiddleware implements MiddlewareInterface
+{
+    protected HeaderAuthentication $authenticator;
+
+    public function __construct() {
+
+    }
+
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+
+        return $handler->handle($request);
+    }
+}
diff --git a/view/lean-console/page/dashboard/index.phtml b/view/lean-console/page/dashboard/index.phtml
index 390b4c4..4d6a109 100644
--- a/view/lean-console/page/dashboard/index.phtml
+++ b/view/lean-console/page/dashboard/index.phtml
@@ -12,4 +12,15 @@
     <section>
         <article>Welcome into your Lean Console section. Select the appropriate menu item from the sidebar.</article>
     </section>
+
+    <section style="margin-top:1rem;">
+        <article>
+            <div>Firewall</div>
+            <br>
+            <b>@todo</b>
+            <u>latest 50 connections</u>
+            <u>banned users / IP !</u>
+            <u>fail2ban integration</u>
+        </article>
+    </section>
 {% endsection %}
\ No newline at end of file
diff --git a/view/lean-console/page/update/index.phtml b/view/lean-console/page/update/index.phtml
index be70a47..13d5305 100644
--- a/view/lean-console/page/update/index.phtml
+++ b/view/lean-console/page/update/index.phtml
@@ -20,6 +20,20 @@
 
                 <code style="white-space:normal;font-size:120%">
                     {% foreach $status as $line %}
+                    <div>
+                        {% if $line %}
+                        {{ $line }}
+                        {% endif %}
+                    </div>
+                    {% endforeach %}
+                </code>
+            </div>
+
+            <div class="git-diff" style="margin-top:2rem">
+                <strong style="display:block;margin-bottom:7px">'git diff' output</strong>
+
+                <code style="white-space:normal;font-size:120%">
+                    {% foreach $diff as $line %}
                         <div>
                             {% if $line %}
                                 {{ $line }}