moced color consts to a utility class

.gitignore

@@ -14,3 +14,6 @@
 /config.json.prod
 keys.txt
 /.phpunit.cache
+/var/log/*
+/public/openapi/bindapi.json
+/public/openapi/bootstrap.php

README.md

@@ -6,9 +6,6 @@
 6. [DynDNS](#6-dyndns)
 7. [Conclusion](#7-conclusion)
 
-Don't use this code right now.
-You can try 1.0.2, but it's not well tested.
-
 
 NOTICE: This documentation is not current as of September 2022.
 After I finished the refactoring I'll upgrade it.

TODO

@@ -1,3 +1,12 @@
+check:cache
+check:bootstrap
+check:version remove option update, we have -v as option
+move stuff to dev:xxx which is not needed for endusers
+make use of environment, somehow, dev, prod, test
+check log file location
+API Endpoint cleanup
+check keytype of panel/bindApi
+check:configkey => update config.json
 more UNIT tests
-DB migrations
+
 

bindapi.json

@@ -0,0 +1,148 @@
+{
+    "openapi": "3.0.0",
+    "info": {
+        "title": "bindAPI",
+        "version": "1.0.9"
+    },
+    "servers": [
+        {
+            "url": "{schema}://{hostname}/api",
+            "description": "The bindAPI URL.",
+            "variables": {
+                "schema": {
+                    "enum": [
+                        "http",
+                        "https"
+                    ],
+                    "default": "https"
+                },
+                "hostname": {
+                    "enum": [
+                        "ns1.24unix.net",
+                        "ns2.24unix.net"
+                    ],
+                    "default": "ns2.24unix.net"
+                }
+            }
+        }
+    ],
+    "paths": {
+        "/ping": {
+            "get": {
+                "tags": [
+                    "Server"
+                ],
+                "description": "Checks for connectivity and valid APIkey",
+                "operationId": "ping",
+                "responses": {
+                    "200": {
+                        "description": "OK"
+                    },
+                    "401": {
+                        "description": "API key is missing or invalid."
+                    }
+                },
+                "security": [
+                    {
+                        "Authorization": []
+                    }
+                ]
+            }
+        },
+        "/version": {
+            "get": {
+                "tags": [
+                    "Server"
+                ],
+                "description": "Check the API version of the nameserver.",
+                "operationId": "version",
+                "responses": {
+                    "200": {
+                        "description": "x.y.z, aka major, minor, patch"
+                    },
+                    "401": {
+                        "description": "API key is missing or invalid."
+                    }
+                },
+                "security": [
+                    {
+                        "Authorization": []
+                    }
+                ]
+            }
+        },
+        "/domains": {
+            "get": {
+                "tags": [
+                    "Domains"
+                ],
+                "summary": "List all domains.",
+                "description": "Returns a list of all domains on this server.",
+                "operationId": "getAllDomains",
+                "responses": {
+                    "200": {
+                        "description": "OK"
+                    },
+                    "401": {
+                        "description": "API key is missing or invalid."
+                    },
+                    "404": {
+                        "description": "Domain not found."
+                    }
+                },
+                "security": [
+                    {
+                        "Authorization": []
+                    }
+                ]
+            }
+        },
+        "/domains/{name}": {
+            "get": {
+                "tags": [
+                    "Domains"
+                ],
+                "summary": "Returns a single domain.",
+                "description": "Returns information of a single domain specified by its domain name.",
+                "operationId": "getSingleDomain",
+                "parameters": [
+                    {
+                        "name": "name",
+                        "in": "path",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK"
+                    },
+                    "401": {
+                        "description": "API key is missing or invalid."
+                    },
+                    "404": {
+                        "description": "Domain not found."
+                    }
+                },
+                "security": []
+            }
+        }
+    },
+    "components": {
+        "securitySchemes": {
+            "Authorization": {
+                "type": "apiKey",
+                "description": "Api Authentication",
+                "name": "X-API-Key",
+                "in": "header"
+            }
+        }
+    },
+    "tags": [
+        {
+            "name": "Server"
+        }
+    ]
+}

composer.json

@@ -1,8 +1,8 @@
 {
   "name": "24unix/bindapi",
   "description": "manage Bind9 DNS server via REST API",
-  "version": "2023.0.1",
-  "build_number": "332",
+  "version": "1.0.9",
+  "build_number": "375",
   "authors": [
     {
       "name": "Micha Espey",
@@ -23,6 +23,7 @@
     "ext-posix": "*",
     "ext-sodium": "*",
     "arubacao/tld-checker": "^1.2",
+    "bartlett/php-compatinfo": "^7.1",
     "monolog/monolog": "^3.1",
     "netresearch/jsonmapper": "^4.4",
     "php-di/php-di": "^6.3",
@@ -30,7 +31,7 @@
     "robmorgan/phinx": "^0.15",
     "symfony/property-access": "^6.1",
     "symfony/serializer": "^6.1",
-    "zircote/swagger-php": "^4.2"
+    "zircote/swagger-php": "^4.8"
   },
   "config": {
     "optimize-autoloader": true,

config.json.sample

@@ -1,9 +1,10 @@
 {
+  "env": "prod",
   "dbHost": "localhost",
   "dbPort": 3306,
   "dbDatabase": "sampledb",
   "dbUser": "sampleuser",
   "dbPassword": "secret",
-  "encryptionKey": "12345678901234567890123456789012",
+  "encryptionKey": "1bad::babe",
   "debug": false
 }

db/migrations/20240418112243_config_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Phinx\Db\Adapter\MysqlAdapter;
+
+class ConfigTable extends Phinx\Migration\AbstractMigration
+{
+    public function change()
+    {
+        $this->table('config', [
+                'id' => false,
+                'engine' => 'InnoDB',
+                'encoding' => 'utf8mb4',
+                'collation' => 'utf8mb4_general_ci',
+                'comment' => '',
+                'row_format' => 'DYNAMIC',
+            ])
+            ->addColumn('name', 'string', [
+                'null' => false,
+                'limit' => 256,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+            ])
+            ->addColumn('value', 'string', [
+                'null' => false,
+                'limit' => 256,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'after' => 'name',
+            ])
+            ->removeColumn('version')
+            ->save();
+    }
+}

db/migrations/20240418172308_api_key_creation_date.php

@@ -0,0 +1,24 @@
+<?php
+
+use Phinx\Db\Adapter\MysqlAdapter;
+
+class ApiKeyCreationDate extends Phinx\Migration\AbstractMigration
+{
+    public function change()
+    {
+        $this->table('apikeys', [
+                'id' => false,
+                'primary_key' => ['id'],
+                'engine' => 'InnoDB',
+                'encoding' => 'utf8mb4',
+                'collation' => 'utf8mb4_unicode_ci',
+                'comment' => '',
+                'row_format' => 'DYNAMIC',
+            ])
+            ->addColumn('created_at', 'timestamp', [
+                'null' => false,
+                'after' => 'apikey',
+            ])
+            ->save();
+    }
+}

db/migrations/20240419120157_unique_config_values.php

@@ -0,0 +1,24 @@
+<?php
+
+use Phinx\Db\Adapter\MysqlAdapter;
+
+class UniqueConfigValues extends Phinx\Migration\AbstractMigration
+{
+    public function change()
+    {
+        $this->table('config', [
+                'id' => false,
+                'primary_key' => ['name'],
+                'engine' => 'InnoDB',
+                'encoding' => 'utf8mb4',
+                'collation' => 'utf8mb4_general_ci',
+                'comment' => '',
+                'row_format' => 'DYNAMIC',
+            ])
+            ->addIndex(['name'], [
+                'name' => 'name',
+                'unique' => true,
+            ])
+            ->save();
+    }
+}

db/migrations/20240419134939_time_stamp_defaultfor_api_keys.php

@@ -0,0 +1,25 @@
+<?php
+
+use Phinx\Db\Adapter\MysqlAdapter;
+
+class TimeStampDefaultforApiKeys extends Phinx\Migration\AbstractMigration
+{
+    public function change()
+    {
+        $this->table('apikeys', [
+                'id' => false,
+                'primary_key' => ['id'],
+                'engine' => 'InnoDB',
+                'encoding' => 'utf8mb4',
+                'collation' => 'utf8mb4_unicode_ci',
+                'comment' => '',
+                'row_format' => 'DYNAMIC',
+            ])
+            ->changeColumn('created_at', 'timestamp', [
+                'null' => true,
+                'default' => 'current_timestamp()',
+                'after' => 'apikey',
+            ])
+            ->save();
+    }
+}

db/migrations/20240427114541_add_self_to_nameservers.php

@@ -0,0 +1,37 @@
+<?php
+
+use Phinx\Db\Adapter\MysqlAdapter;
+
+class AddSelfToNameservers extends Phinx\Migration\AbstractMigration
+{
+    public function change()
+    {
+//        $this->table('domains', [
+//                'id' => false,
+//                'primary_key' => ['id'],
+//                'engine' => 'InnoDB',
+//                'encoding' => 'utf8mb4',
+//                'collation' => 'utf8mb4_unicode_ci',
+//                'comment' => '',
+//                'row_format' => 'DYNAMIC',
+//            ])
+//            ->removeColumn('self')
+//            ->save();
+        $this->table('nameservers', [
+                'id' => false,
+                'primary_key' => ['id'],
+                'engine' => 'InnoDB',
+                'encoding' => 'utf8mb4',
+                'collation' => 'utf8mb4_unicode_ci',
+                'comment' => '',
+                'row_format' => 'DYNAMIC',
+            ])
+            ->addColumn('self', 'enum', [
+                'null' => false,
+                'limit' => 3,
+                'values' => ['yes', 'no'],
+                'after' => 'apikey_prefix',
+            ])
+            ->save();
+    }
+}

db/migrations/20240430111136_u_u_i_d_for_config.php

@@ -0,0 +1,41 @@
+<?php
+
+use Phinx\Db\Adapter\MysqlAdapter;
+
+class UUIDForConfig extends Phinx\Migration\AbstractMigration
+{
+    public function change()
+    {
+        $this->table('config', [
+                'id' => false,
+                'primary_key' => ['id'],
+                'engine' => 'InnoDB',
+                'encoding' => 'utf8mb4',
+                'collation' => 'utf8mb4_general_ci',
+                'comment' => '',
+                'row_format' => 'DYNAMIC',
+            ])
+            ->addColumn('id', 'uuid', [
+                'null' => false,
+            ])
+            ->changeColumn('name', 'string', [
+                'null' => false,
+                'limit' => 256,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'after' => 'id',
+            ])
+            ->changeColumn('value', 'string', [
+                'null' => false,
+                'limit' => 256,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'after' => 'name',
+            ])
+            ->addIndex(['id'], [
+                'name' => 'id',
+                'unique' => true,
+            ])
+            ->save();
+    }
+}

db/migrations/20240430112049_default_u_u_i_dfor_config.php

@@ -0,0 +1,24 @@
+<?php
+
+use Phinx\Db\Adapter\MysqlAdapter;
+
+class DefaultUUIDforConfig extends Phinx\Migration\AbstractMigration
+{
+    public function change()
+    {
+        $this->table('config', [
+                'id' => false,
+                'primary_key' => ['id'],
+                'engine' => 'InnoDB',
+                'encoding' => 'utf8mb4',
+                'collation' => 'utf8mb4_general_ci',
+                'comment' => '',
+                'row_format' => 'DYNAMIC',
+            ])
+            ->changeColumn('id', 'uuid', [
+                'null' => false,
+                'default' => 'uuid()',
+            ])
+            ->save();
+    }
+}

db/migrations/schema.php

@@ -112,23 +112,71 @@ return array (
       ),
       'columns' => 
       array (
-        'version' => 
+        'id' => 
         array (
           'TABLE_CATALOG' => 'def',
           'TABLE_NAME' => 'config',
-          'COLUMN_NAME' => 'version',
+          'COLUMN_NAME' => 'id',
           'ORDINAL_POSITION' => 1,
+          'COLUMN_DEFAULT' => 'uuid()',
+          'IS_NULLABLE' => 'NO',
+          'DATA_TYPE' => 'uuid',
+          'CHARACTER_MAXIMUM_LENGTH' => NULL,
+          'CHARACTER_OCTET_LENGTH' => NULL,
+          'NUMERIC_PRECISION' => NULL,
+          'NUMERIC_SCALE' => NULL,
+          'DATETIME_PRECISION' => NULL,
+          'CHARACTER_SET_NAME' => NULL,
+          'COLLATION_NAME' => NULL,
+          'COLUMN_TYPE' => 'uuid',
+          'COLUMN_KEY' => 'PRI',
+          'EXTRA' => '',
+          'PRIVILEGES' => 'select,insert,update,references',
+          'COLUMN_COMMENT' => '',
+          'IS_GENERATED' => 'NEVER',
+          'GENERATION_EXPRESSION' => NULL,
+        ),
+        'name' => 
+        array (
+          'TABLE_CATALOG' => 'def',
+          'TABLE_NAME' => 'config',
+          'COLUMN_NAME' => 'name',
+          'ORDINAL_POSITION' => 2,
           'COLUMN_DEFAULT' => NULL,
           'IS_NULLABLE' => 'NO',
           'DATA_TYPE' => 'varchar',
-          'CHARACTER_MAXIMUM_LENGTH' => 11,
-          'CHARACTER_OCTET_LENGTH' => 44,
+          'CHARACTER_MAXIMUM_LENGTH' => 256,
+          'CHARACTER_OCTET_LENGTH' => 1024,
           'NUMERIC_PRECISION' => NULL,
           'NUMERIC_SCALE' => NULL,
           'DATETIME_PRECISION' => NULL,
           'CHARACTER_SET_NAME' => 'utf8mb4',
           'COLLATION_NAME' => 'utf8mb4_general_ci',
-          'COLUMN_TYPE' => 'varchar(11)',
+          'COLUMN_TYPE' => 'varchar(256)',
+          'COLUMN_KEY' => 'UNI',
+          'EXTRA' => '',
+          'PRIVILEGES' => 'select,insert,update,references',
+          'COLUMN_COMMENT' => '',
+          'IS_GENERATED' => 'NEVER',
+          'GENERATION_EXPRESSION' => NULL,
+        ),
+        'value' => 
+        array (
+          'TABLE_CATALOG' => 'def',
+          'TABLE_NAME' => 'config',
+          'COLUMN_NAME' => 'value',
+          'ORDINAL_POSITION' => 3,
+          'COLUMN_DEFAULT' => NULL,
+          'IS_NULLABLE' => 'NO',
+          'DATA_TYPE' => 'varchar',
+          'CHARACTER_MAXIMUM_LENGTH' => 256,
+          'CHARACTER_OCTET_LENGTH' => 1024,
+          'NUMERIC_PRECISION' => NULL,
+          'NUMERIC_SCALE' => NULL,
+          'DATETIME_PRECISION' => NULL,
+          'CHARACTER_SET_NAME' => 'utf8mb4',
+          'COLLATION_NAME' => 'utf8mb4_general_ci',
+          'COLUMN_TYPE' => 'varchar(256)',
           'COLUMN_KEY' => '',
           'EXTRA' => '',
           'PRIVILEGES' => 'select,insert,update,references',
@@ -139,6 +187,60 @@ return array (
       ),
       'indexes' => 
       array (
+        'PRIMARY' => 
+        array (
+          1 => 
+          array (
+            'Table' => 'config',
+            'Non_unique' => 0,
+            'Key_name' => 'PRIMARY',
+            'Seq_in_index' => 1,
+            'Column_name' => 'id',
+            'Collation' => 'A',
+            'Sub_part' => NULL,
+            'Packed' => NULL,
+            'Null' => '',
+            'Index_type' => 'BTREE',
+            'Comment' => '',
+            'Index_comment' => '',
+          ),
+        ),
+        'name' => 
+        array (
+          1 => 
+          array (
+            'Table' => 'config',
+            'Non_unique' => 0,
+            'Key_name' => 'name',
+            'Seq_in_index' => 1,
+            'Column_name' => 'name',
+            'Collation' => 'A',
+            'Sub_part' => NULL,
+            'Packed' => NULL,
+            'Null' => '',
+            'Index_type' => 'BTREE',
+            'Comment' => '',
+            'Index_comment' => '',
+          ),
+        ),
+        'id' => 
+        array (
+          1 => 
+          array (
+            'Table' => 'config',
+            'Non_unique' => 0,
+            'Key_name' => 'id',
+            'Seq_in_index' => 1,
+            'Column_name' => 'id',
+            'Collation' => 'A',
+            'Sub_part' => NULL,
+            'Packed' => NULL,
+            'Null' => '',
+            'Index_type' => 'BTREE',
+            'Comment' => '',
+            'Index_comment' => '',
+          ),
+        ),
       ),
       'foreign_keys' => NULL,
     ),
@@ -879,6 +981,30 @@ return array (
           'IS_GENERATED' => 'NEVER',
           'GENERATION_EXPRESSION' => NULL,
         ),
+        'created_at' => 
+        array (
+          'TABLE_CATALOG' => 'def',
+          'TABLE_NAME' => 'apikeys',
+          'COLUMN_NAME' => 'created_at',
+          'ORDINAL_POSITION' => 5,
+          'COLUMN_DEFAULT' => 'current_timestamp()',
+          'IS_NULLABLE' => 'YES',
+          'DATA_TYPE' => 'timestamp',
+          'CHARACTER_MAXIMUM_LENGTH' => NULL,
+          'CHARACTER_OCTET_LENGTH' => NULL,
+          'NUMERIC_PRECISION' => NULL,
+          'NUMERIC_SCALE' => NULL,
+          'DATETIME_PRECISION' => 0,
+          'CHARACTER_SET_NAME' => NULL,
+          'COLLATION_NAME' => NULL,
+          'COLUMN_TYPE' => 'timestamp',
+          'COLUMN_KEY' => '',
+          'EXTRA' => '',
+          'PRIVILEGES' => 'select,insert,update,references',
+          'COLUMN_COMMENT' => '',
+          'IS_GENERATED' => 'NEVER',
+          'GENERATION_EXPRESSION' => NULL,
+        ),
       ),
       'indexes' => 
       array (
@@ -1060,6 +1186,30 @@ return array (
           'IS_GENERATED' => 'NEVER',
           'GENERATION_EXPRESSION' => NULL,
         ),
+        'self' => 
+        array (
+          'TABLE_CATALOG' => 'def',
+          'TABLE_NAME' => 'nameservers',
+          'COLUMN_NAME' => 'self',
+          'ORDINAL_POSITION' => 7,
+          'COLUMN_DEFAULT' => NULL,
+          'IS_NULLABLE' => 'NO',
+          'DATA_TYPE' => 'enum',
+          'CHARACTER_MAXIMUM_LENGTH' => 3,
+          'CHARACTER_OCTET_LENGTH' => 12,
+          'NUMERIC_PRECISION' => NULL,
+          'NUMERIC_SCALE' => NULL,
+          'DATETIME_PRECISION' => NULL,
+          'CHARACTER_SET_NAME' => 'utf8mb4',
+          'COLLATION_NAME' => 'utf8mb4_unicode_ci',
+          'COLUMN_TYPE' => 'enum(\'yes\',\'no\')',
+          'COLUMN_KEY' => '',
+          'EXTRA' => '',
+          'PRIVILEGES' => 'select,insert,update,references',
+          'COLUMN_COMMENT' => '',
+          'IS_GENERATED' => 'NEVER',
+          'GENERATION_EXPRESSION' => NULL,
+        ),
       ),
       'indexes' => 
       array (

dist/systemd/README.md

@@ -0,0 +1,6 @@
+Copy these files to /etc/systems/system, adapt the path in the service unit and enable the timer by issuing:
+
+systemctl daemon-reload
+systemctl enable bindAPI.timer
+systemctl start bindAPI.timer
+systemctl list-timers

dist/systemd/bindAPI.service

@@ -0,0 +1,6 @@
+[Unit]
+Description=BindAPI Service to check zone file and reload configuration
+
+[Service]
+User=<paneluser>
+ExecStart=/home/users/<user>/<bindApi>/bin/console -q cron:run

dist/systemd/bindAPI.timer

@@ -0,0 +1,10 @@
+[Unit]
+Description=Runs BindAPI every minute
+
+[Timer]
+OnBootSec=1min
+OnUnitActiveSec=1min
+Unit=bindAPI.service
+
+[Install]
+WantedBy=timers.target

public/index.php

@@ -1,17 +1,20 @@
 <?php declare(strict_types=1);
 
-namespace App\Controller;
-
-use Exception;
+use App\Service\BindAPI;
 
 error_reporting(error_level: E_ALL);
 
 require dirname(path: __DIR__) . '/vendor/autoload.php';
 
-$uri = parse_url(url: $_SERVER['REQUEST_URI'], component: PHP_URL_PATH);
-$uri = explode(separator: '/', string: $uri);
+$parsedUrl = parse_url(url: $_SERVER['REQUEST_URI'], component: PHP_URL_PATH);
+$uri = explode(separator: '/', string: $parsedUrl);
 
-if ($uri[1] !== 'api') {
+$baseRoutes = ['app', 'api'];
+$uriPrefix = $uriFirstThreeLetters = substr(string: $uri[1], offset: 0, length: 3);
+
+
+if (!in_array(needle: $uriPrefix, haystack: $baseRoutes)) {
+    // only handle $baseRoutes, elso go to swagger ui
 	$scheme = $_SERVER['REQUEST_SCHEME'];
 	$host = $_SERVER['SERVER_NAME'];
 	$header = "$scheme://$host/openapi/index.html";
@@ -23,15 +26,22 @@ header(header: "Access-Control-Allow-Origin: *");
 header(header: "Content-Type: application/json; charset=UTF-8");
 header(header: "Access-Control-Allow-Methods: OPTIONS,GET,POST,PUT,DELETE");
 header(header: "Access-Control-Max-Age: 3600");
-header(header: "Access-Control-Allow-Headers: Content-Type, Access-Control-Allow-Headers, Authorization, X-Requested-With");
+header(header: "Access-Control-Allow-Headers: Content-Type, Access-Control-Allow-Headers, Authorization, X-Requested-With, x-api-key");
 
 $requestMethod = $_SERVER["REQUEST_METHOD"];
 
+if ($requestMethod === "OPTIONS") {
+    // Respond with OK status code for preflight requests
+    http_response_code(response_code: 200);
+    exit();
+}
+
 try {
-	$app = new BindAPI();
+	$app = new BindAPI(quiet: false);
 	$app->handleRequest(requestMethod: $requestMethod, uri: $uri);
 } catch (Exception $e) {
 	echo json_encode(value: [
 		'error' => $e->getMessage()
 	]);
 }
+

public/openapi/bootstrap.php2

@@ -0,0 +1,5 @@
+<?php
+
+const DEFAULT_NS = 'ns2.24unix.net';
+
+const NAMESERVERS = ['ns1.24unix.net', 'ns2.24unix.net'];

public/openapi/index.html

@@ -19,7 +19,8 @@
 <script>
 	window.onload = function () {
 		// Begin Swagger UI call region
-		const ui = SwaggerUIBundle({
+		let ui;
+		ui = SwaggerUIBundle({
 			url: "/openapi/bindapi.json",
 			dom_id: "#swagger-ui",
 			deepLinking: true,

src/Controller/BindAPI.php

@@ -1,93 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace App\Controller;
-
-error_reporting(error_level: E_ALL);
-
-use App\Repository\DomainRepository;
-use App\Repository\DynDNSRepository;
-use DI\Container;
-use DI\ContainerBuilder;
-use DI\DependencyException;
-use DI\NotFoundException;
-use Exception;
-use Monolog\Formatter\LineFormatter;
-use Monolog\Handler\StreamHandler;
-use Monolog\Level;
-use Monolog\Logger;
-use function DI\autowire;
-
-/**
- *
- */
-class BindAPI
-{
-	private Logger $logger;
-	private Container $container;
-
-	/**
-	 * @throws Exception
-	 */
-	public function __construct(bool $quiet)
-	{
-		// init the logger
-		$dateFormat = "Y:m:d H:i:s";
-		$output = "%datetime% %channel%.%level_name% %message%\n"; // %context% %extra%
-		$formatter = new LineFormatter(format: $output, dateFormat: $dateFormat);
-		
-		$debug = (new ConfigController(quiet: $quiet))->getConfig(configKey: 'debug');
-		if ($debug) {
-			$stream = new StreamHandler(stream: dirname(path: __DIR__, levels: 2) . '/bindAPI.log', level: Level::Debug);
-		} else {
-			$stream = new StreamHandler(stream: dirname(path: __DIR__, levels: 2) . '/bindAPI.log', level: Level::Info);
-		}
-		$stream->setFormatter(formatter: $formatter);
-		
-		$this->logger = new Logger(name: 'bindAPI');
-		$this->logger->pushHandler(handler: $stream);
-		$this->logger->debug(message: 'bindAPI started');
-		
-		
-		$containerBuilder = new ContainerBuilder();
-		$containerBuilder->addDefinitions([
-			ConfigController::class => autowire()
-                ->constructorParameter(parameter: 'quiet', value: $quiet),
-			CLIController::class      => autowire()
-				->constructorParameter(parameter: 'logger', value: $this->logger),
-			DomainController::class   => autowire()
-				->constructorParameter(parameter: 'logger', value: $this->logger)
-                ->constructorParameter(parameter: 'quiet', value: $quiet),
-            DomainRepository::class   => autowire()
-				->constructorParameter(parameter: 'logger', value: $this->logger),
-			DynDnsRepository::class  => autowire()
-				->constructorParameter(parameter: 'logger', value: $this->logger),
-			RequestController::class => autowire()
-				->constructorParameter(parameter: 'logger', value: $this->logger)
-		]);
-		$this->container = $containerBuilder->build();
-	}
-	
-	
-	/**
-	 * @throws DependencyException
-	 * @throws NotFoundException
-	 */
-	public function runCommand(array $arguments): void
-	{
-		$this->logger->debug(message: 'runCommand()');
-		$cliController = $this->container->get(name: CLIController::class);
-		$cliController->runCommand(arguments: $arguments);
-	}
-	
-	
-	/**
-	 * @throws DependencyException
-	 * @throws NotFoundException
-	 */
-	public function handleRequest(string $requestMethod, array $uri): void
-	{
-		$this->logger->debug(message: 'handleRequest()');
-		$requestController = $this->container->get(name: RequestController::class);
-		$requestController->handleRequest(requestMethod: $requestMethod, uri: $uri);
-	}
-}

src/Controller/Commands/CommandGroup.php

@@ -2,6 +2,8 @@
 
 namespace App\Controller\Commands;
 
+use App\Utilities\Colors;
+
 /**
  *
  */
@@ -31,17 +33,17 @@ class CommandGroup
 
     public function printCommands(int $longestCommandLength): void
     {
-        echo COLOR_YELLOW . str_pad(string: $this->name, length: $longestCommandLength + 1) . COLOR_WHITE . $this->description . COLOR_DEFAULT . PHP_EOL;
+        echo Colors::YELLOW . str_pad(string: $this->name, length: $longestCommandLength + 1) . Colors::WHITE . $this->description . Colors::DEFAULT . PHP_EOL;
         foreach ($this->commands as $command) {
-            echo COLOR_GREEN . str_pad(string: ' ', length: $longestCommandLength + 1, pad_type: STR_PAD_LEFT) . $this->name . ':' . $command->getName();
+            echo Colors::GREEN . str_pad(string: ' ', length: $longestCommandLength + 1, pad_type: STR_PAD_LEFT) . $this->name . ':' . $command->getName();
             foreach ($command->getMandatoryParameters() as $optionals) {
                 echo ' <' . $optionals . '>';
             }
             foreach ($command->getOptionalParameters() as $mandatory) {
                 echo ' {' . $mandatory . '}';
             }
-            echo COLOR_WHITE . ' ' . $command->getDescription();
-            echo COLOR_DEFAULT . PHP_EOL;
+            echo Colors::WHITE . ' ' . $command->getDescription();
+            echo Colors::DEFAULT . PHP_EOL;
         }
     }
 

src/Controller/Commands/CommandGroupContainer.php

@@ -2,6 +2,8 @@
 
 namespace App\Controller\Commands;
 
+use App\Utilities\Colors;
+
 /**
  *
  */
@@ -64,23 +66,23 @@ class CommandGroupContainer
                 if ($group->exec(subcommand: $subcommand)) {
                     exit(0);
                 } else {
-                    echo COLOR_DEFAULT . 'Unknown subcommand ' . COLOR_YELLOW . $subcommand . COLOR_DEFAULT .' for ' . COLOR_YELLOW . $command . COLOR_DEFAULT . '.' . PHP_EOL;
+                    echo Colors::DEFAULT . 'Unknown subcommand ' . Colors::YELLOW . $subcommand . Colors::DEFAULT .' for ' . Colors::YELLOW . $command . Colors::DEFAULT . '.' . PHP_EOL;
                     exit(1);
                 }
             } else {
-                echo COLOR_DEFAULT . 'Unknown subcommand ' . COLOR_YELLOW . $subcommand . COLOR_DEFAULT .' for ' . COLOR_YELLOW . $command . COLOR_DEFAULT . '.' . PHP_EOL;
+                echo Colors::DEFAULT . 'Unknown command group ' . Colors::YELLOW . $command . Colors::DEFAULT . '.' . PHP_EOL;
                 exit(1);
             }
         } else {
             // check for command group and print available commands
             foreach ($this->commandGroups as $group) {
                 if ($group->getName() === $command) {
-                    echo 'Available subcommands for: ' . COLOR_YELLOW . $group->getName() . COLOR_DEFAULT . ':' . PHP_EOL;
+                    echo 'Available subcommands for: ' . Colors::YELLOW . $group->getName() . Colors::DEFAULT . ':' . PHP_EOL;
                     $group->printCommands(strlen(string: $group->getName()));
                     exit(0);
                 }
             }
         }
-        echo COLOR_DEFAULT . 'Unknown command ' . COLOR_YELLOW . $command . COLOR_DEFAULT . '.' . PHP_EOL;
+        echo Colors::DEFAULT . 'Unknown command ' . Colors::YELLOW . $command . Colors::DEFAULT . '.' . PHP_EOL;
     }
 }

src/Controller/ConfigController.php

@@ -2,14 +2,14 @@
 
 namespace App\Controller;
 
-/**
- *
- */
+use App\Utilities\Colors;
+
 class ConfigController
 {
     private array $config;
+    private static $missingEncryptionShown = false;
 
-    public function __construct(bool $quiet, bool $test = false)
+    public function __construct(private readonly bool $quiet, bool $test = false)
     {
 
         if ($test) {
@@ -38,16 +38,23 @@ class ConfigController
         }
         $configJSON = file_get_contents(filename: $configFile);
 
-        if (json_decode(json: $configJSON) === null) {
+        // first check if json is valid, after make the assignment
+        if (json_decode(json: $configJSON, associative: true) === null) {
             echo 'Config file is not valid JSON.' . PHP_EOL;
             echo $configJSON . PHP_EOL;
             exit(1);
         }
 
         $this->config = json_decode(json: $configJSON, associative: true);
+        if (!ConfigController::$missingEncryptionShown) {
+            if ($this->config['encryptionKey'] === '1bad::babe') {
+                ConfigController::$missingEncryptionShown = true;
+                if (!$this->quiet) {
+                    echo Colors::RED . 'Error: ' . Colors::DEFAULT . 'No encryption key, please run ' . Colors::YELLOW . './bin/console check:generatekey' . Colors::DEFAULT . PHP_EOL;
+                }
+            }
+        }
 
-        $this->config['quiet'] = (bool)$quiet;
-        $this->config['test'] = (bool)$test;
     }
 
     public function getConfig(string $configKey): string

src/Controller/DomainController.php

@@ -6,6 +6,8 @@ use App\Entity\Domain;
 use App\Repository\DomainRepository;
 use App\Repository\NameserverRepository;
 use App\Repository\PanelRepository;
+use App\Service\ApiClient;
+use App\Utilities\Colors;
 use Monolog\Logger;
 
 error_reporting(error_level: E_ALL);
@@ -25,7 +27,7 @@ class DomainController
 	
 	public function __construct(
 		private readonly NameserverRepository $nameserverRepository,
-		private readonly ApiController        $checkController,
+		private readonly ApiClient            $checkController,
 		private readonly DomainRepository     $domainRepository,
 		private readonly PanelRepository      $panelRepository,
 		private readonly ConfigController     $configController,
@@ -70,23 +72,58 @@ class DomainController
 	
 	function updateSlaveZones(): void
 	{
-		$this->logger->debug(message: 'Delete all slave zones');
+		$this->logger->debug(message: 'update slave zones');
 		
-		$zones = glob(pattern: $this->localZonesDir . '*');
-		foreach ($zones as $zone) {
-			unlink(filename: $zone);
-		}
-		
-		$domains = $this->domainRepository->findAll();
-		
-		foreach ($domains as $domain) {
-            if (!$this->quiet) {
-                echo 'Create zone: ' . $domain->getName() . PHP_EOL;
-            }
-			$this->createSlaveZoneFile(domain: $domain);
-		}
+		$existingZones = glob(pattern: $this->localZonesDir . '*');
 
-		$this->createIncludeFile();
+		$domains = $this->domainRepository->findAll();
+        $longestEntry = $this->domainRepository->getLongestEntry(field: 'name');
+        $self = $this->panelRepository->getSelf();
+
+		foreach ($domains as $domain) {
+            $zoneFile = $this->localZonesDir . $domain->getName();
+            if (!$this->quiet) {
+                echo '   ' . Colors::YELLOW . str_pad(string: $domain->getName(), length: $longestEntry + 1, pad_string: " ", pad_type: STR_PAD_RIGHT) ;
+            }
+
+            if (strcmp(string1: $self->getName(), string2: $domain->getPanel()) !== 0) {
+                if (!file_exists(filename: $zoneFile)) {
+                    if (!$this->quiet) {
+                        echo Colors::GREEN . ' OK' . Colors::DEFAULT . PHP_EOL;
+                    }
+                    $this->createSlaveZoneFile(domain: $domain);
+                } else {
+                    if (($key = array_search(needle: $zoneFile, haystack: $existingZones)) !== false) {
+                        if (isset($existingZones[$key])) {
+                            unset($existingZones[$key]);
+                        }
+                    } else {
+                        echo 'missing value: ' . $zoneFile;
+                    }
+                    if (!$this->quiet) {
+                        echo Colors::DEFAULT . 'Zone already exists.' . PHP_EOL;
+                    }
+                }
+            } else {
+                if (!$this->quiet) {
+                    echo Colors::DEFAULT . 'We are master for ' . Colors::YELLOW . $domain->getName() . PHP_EOL;
+                }
+            }
+		}
+        // remove stale zones
+        foreach ($existingZones as $zone) {
+            if (!$this->quiet) {
+                echo 'Removing stale zone: ' . Colors::YELLOW . $zone . Colors::DEFAULT . PHP_EOL;
+            }
+            echo $zone . PHP_EOL;
+            unlink(filename: $zone);
+        }
+
+        $semaphore = $this->localZonesDir . 'zones.flag';
+        if (file_exists(filename: $semaphore)) {
+            unlink(filename: $semaphore);
+            $this->createIncludeFile();
+        }
 	}
 	
 	
@@ -154,12 +191,12 @@ class DomainController
             $uid = posix_geteuid();
         }
 		if (!$this->quiet) {
-			echo "UID:\t" . COLOR_YELLOW . $uid . PHP_EOL;
+			echo "UID:\t" . Colors::YELLOW . $uid . PHP_EOL;
 		}
 		$pwuid = posix_getpwuid(user_id: $uid);
 		$name = $pwuid['name'];
 		if (!$this->quiet) {
-			echo COLOR_DEFAULT . "Name:\t" . COLOR_YELLOW . $name . PHP_EOL;
+			echo Colors::DEFAULT . "Name:\t" . Colors::YELLOW . $name . PHP_EOL;
 		}
 
         if (!$bindGroup = posix_getgrnam(name: 'bind')) {
@@ -168,40 +205,40 @@ class DomainController
         $members = $bindGroup['members'] ?? [];
 		if (in_array(needle: $name, haystack: $members)) {
             if (!$this->quiet) {
-				echo "\t✅ $name" . COLOR_DEFAULT . ' is in group ' . COLOR_YELLOW . 'bind' . PHP_EOL;
+				echo "\t✅ $name" . Colors::DEFAULT . ' is in group ' . Colors::YELLOW . 'bind' . PHP_EOL;
 			}
 		} else {
 			$setupIsValid = false;
 			if (!$this->quiet) {
-				echo COLOR_RED . "\t❌$name needs to be in group " . COLOR_YELLOW . 'bind' . COLOR_DEFAULT . '!' . PHP_EOL;
+				echo Colors::RED . "\t❌$name needs to be in group " . Colors::YELLOW . 'bind' . Colors::DEFAULT . '!' . PHP_EOL;
 			}
 		}
 		if (!$this->quiet) {
-			echo COLOR_DEFAULT . 'Checking  ' . COLOR_YELLOW . $this->localZoneFile . PHP_EOL;
+			echo Colors::DEFAULT . 'Checking  ' . Colors::YELLOW . $this->localZoneFile . PHP_EOL;
 		}
 		$localZoneFilePermissions = @fileperms(filename: $this->localZoneFile);
 		if ($localZoneFilePermissions & 0x0010) {
 			if (!$this->quiet) {
-				echo COLOR_DEFAULT . "\t✅ Group has write access." . PHP_EOL;
+				echo Colors::DEFAULT . "\t✅ Group has write access." . PHP_EOL;
 			}
 		} else {
 			$setupIsValid = false;
 			if (!$this->quiet) {
-				echo COLOR_RED . "\t❌Group needs write permission!" . COLOR_DEFAULT . PHP_EOL;
+				echo Colors::RED . "\t❌Group needs write permission!" . Colors::DEFAULT . PHP_EOL;
 			}
 		}
 		if (!$this->quiet) {
-			echo 'Checking ' . COLOR_YELLOW . $this->namedConfLocalFile . PHP_EOL;
+			echo 'Checking ' . Colors::YELLOW . $this->namedConfLocalFile . PHP_EOL;
 		}
 		if (file_exists(filename: $this->namedConfLocalFile) && $namedConfLocal = file_get_contents(filename: $this->namedConfLocalFile)) {
 			if (!str_contains(haystack: $namedConfLocal, needle: $this->localZoneFile)) {
 				$setupIsValid = false;
 				if (!$this->quiet) {
-					echo "\t❌ $this->localZoneFile" . COLOR_RED . ' needs to be included in ' . COLOR_YELLOW . $this->namedConfLocalFile . PHP_EOL;
+					echo "\t❌ $this->localZoneFile" . Colors::RED . ' needs to be included in ' . Colors::YELLOW . $this->namedConfLocalFile . PHP_EOL;
 				}
 			} else {
 				if (!$this->quiet) {
-					echo "\t✅ $this->localZoneFile" . COLOR_DEFAULT . ' is included in ' . COLOR_YELLOW . $this->namedConfLocalFile . PHP_EOL;
+					echo "\t✅ $this->localZoneFile" . Colors::DEFAULT . ' is included in ' . Colors::YELLOW . $this->namedConfLocalFile . PHP_EOL;
 				}
 			}
 		} else {
@@ -211,7 +248,7 @@ class DomainController
 			}
 		}
 		if (!$this->quiet) {
-			echo COLOR_DEFAULT . 'Checking directory: ' . COLOR_YELLOW . $this->localZonesDir . PHP_EOL;
+			echo Colors::DEFAULT . 'Checking directory: ' . Colors::YELLOW . $this->localZonesDir . PHP_EOL;
 		}
 		$localZoneDirPermissions = @fileperms(filename: $this->localZonesDir);
 		if ($localZoneDirPermissions & 0x0010) {
@@ -221,7 +258,7 @@ class DomainController
 		} else {
 			$setupIsValid = false;
 			if (!$this->quiet) {
-				echo COLOR_RED . "\t❌Group needs write permission!" . PHP_EOL;
+				echo Colors::RED . "\t❌Group needs write permission!" . PHP_EOL;
 			}
 		}
 		return $setupIsValid;
@@ -234,7 +271,9 @@ class DomainController
 	function checkDomains(): void
 	{
 		if (!file_exists(filename: $this->localZoneFile)) {
-			echo COLOR_DEFAULT . 'Local Zone file ' . COLOR_YELLOW . $this->localZoneFile . COLOR_DEFAULT . ' does not exist.' . PHP_EOL;
+            if (!$this->quiet) {
+                echo Colors::DEFAULT . 'Local Zone file ' . Colors::YELLOW . $this->localZoneFile . Colors::DEFAULT . ' does not exist.' . PHP_EOL;
+            }
 			exit(1);
 		}
 		$localZones = file_get_contents(filename: $this->localZoneFile);
@@ -243,26 +282,34 @@ class DomainController
 		
 		foreach ($domains as $domain) {
             $idString = '(' . $domain->getId() . ') ';
-			echo COLOR_YELLOW .
-                str_pad(string: $domain->getName(), length: $maxNameLength + 1)
-                . COLOR_DEFAULT
-                . str_pad(string: $idString, length: 7, pad_type: STR_PAD_LEFT);
+            if (!$this->quiet) {
+                echo Colors::YELLOW .
+                    str_pad(string: $domain->getName(), length: $maxNameLength + 1)
+                    . Colors::DEFAULT
+                    . str_pad(string: $idString, length: 7, pad_type: STR_PAD_LEFT);
+            }
 
             $hasError = false;
 			if ($this->isMasterZone(domain: $domain)) {
-				echo 'Master Zone lies on this panel.';
+                if (!$this->quiet) {
+                    echo Colors::GREEN . 'Master Zone';
+                }
 			} else {
 				if (!str_contains(haystack: $localZones, needle: $domain->getName())) {
-					echo COLOR_RED . 'is missing in ' . COLOR_YELLOW . $this->localZoneFile . COLOR_DEFAULT;
+                    if (!$this->quiet) {
+                        echo Colors::RED . 'is missing in ' . Colors::YELLOW . $this->localZoneFile . Colors::DEFAULT;
+                    }
                     $hasError = true;
 				} else {
-					echo COLOR_GREEN . 'OK';
+                    if (!$this->quiet) {
+                        echo Colors::GREEN . 'OK';
+                    }
 				}
 				
 				$zoneFile = $this->localZonesDir . $domain->getName();
 				
 				if (!file_exists(filename: $zoneFile)) {
-					echo ' Missing zone file for ' . COLOR_YELLOW . $zoneFile . COLOR_DEFAULT;
+					echo ' Missing zone file for ' . Colors::YELLOW . $zoneFile . Colors::DEFAULT;
                     $hasError = true;
 				}
 
@@ -270,7 +317,9 @@ class DomainController
                     echo " Update zone (Domain) to create it.";
                 }
 			}
-			echo COLOR_DEFAULT . PHP_EOL;
+            if (!$this->quiet) {
+                echo Colors::DEFAULT . PHP_EOL;
+            }
 		}
 		
 	}
@@ -281,22 +330,26 @@ class DomainController
 	 *
 	 * @return void
 	 */
-	public function createSlaveZoneFile(Domain $domain): void
+	public function createSlaveZoneFile(Domain $domain): bool
 	{
-		$domainName = $domain->getName();
+        touch(filename: $this->localZonesDir . 'zones.flag');
+
+        $domainName = $domain->getName();
 		$this->logger->info(message: "createZoneFile($domainName)");
 		
 		// check if we're a master zone
 		if ($this->isMasterZone(domain: $domain)) {
 			//echo 'We are zone master for ' . $domainName . PHP_EOL;
-			return;
+			return true;
 		}
 		
 		if ($zoneFile = fopen(filename: $this->localZonesDir . $domainName, mode: 'w')) {
 			$panelName = $domain->getPanel();
 			if (!$panel = $this->panelRepository->findByName(name: $panelName)) {
-				echo "Error: Panel $panelName doesn't exist." . PHP_EOL;
-				exit(1);
+                if (!$this->quiet) {
+                    echo "Error: Panel $panelName doesn't exist." . PHP_EOL;
+                }
+                return false;
 			}
 			$a = $panel->getA();
 			$aaaa = $panel->getAaaa();
@@ -312,7 +365,13 @@ class DomainController
 			}
 			fputs(stream: $zoneFile, data: "\t};" . PHP_EOL);
 			fputs(stream: $zoneFile, data: "};" . PHP_EOL);
-		}
+            return true;
+		} else {
+            if (!$this->quiet) {
+                echo Colors::RED . ' Error: ' . Colors::DEFAULT . 'unable to create ' . Colors::YELLOW . $this->localZonesDir . $domainName . Colors::DEFAULT . PHP_EOL;
+            }
+            return false;
+        }
 	}
 	
 	

src/Controller/RequestController.php

@@ -10,39 +10,40 @@ use App\Repository\ApikeyRepository;
 use App\Repository\DomainRepository;
 use App\Repository\DynDNSRepository;
 use App\Repository\PanelRepository;
+use App\Service\ApiClient;
 use Monolog\Logger;
-use OpenApi\Attributes as OAT;
+use OpenApi\Attributes as OA;
+use OpenApi\Attributes\OpenApi;
+use OpenApi\Generator;
 use UnhandledMatchError;
-
+use function Symfony\Component\String\s;
 
 // TODO attributes for swaggerUI
 
-/**
- *
- */
-#[OAT\Info(version: '0.0.1', title: 'bindAPI')]
-#[OAT\Server(
+#[OA\Info(version: VERSION, title: 'bindAPI')]
+#[OA\Server(
     url: "{schema}://{hostname}/api",
     description: "The bindAPI URL.",
     variables: [
-        new OAT\ServerVariable(
-            serverVariable: "schema",
-            default: "https",
-            enum: ["https", "http"]
+        new OA\ServerVariable(
+            serverVariable: 'schema',
+            default: 'https',
+            enum: ['http', 'https']
         ),
-        new OAT\ServerVariable(
-            serverVariable: "hostname",
-            default: "ns2.24unix.net",
+        new OA\ServerVariable(
+            serverVariable: 'hostname',
+            default: DEFAULT_NS,
+            enum: NAMESERVERS
         )
     ]
 )]
-#[OAT\Tag(
+#[OA\Tag(
     name: "Server"
 )]
-#[OAT\SecurityScheme(
+#[OA\SecurityScheme(
     securityScheme: "Authorization",
     type: "apiKey",
-    description: "description",
+    description: "Api Authentication",
     name: "X-API-Key",
     in: "header"
 )]
@@ -56,60 +57,96 @@ class RequestController
     private array $uri;
 
 
-    /**
-     * @param ApiController $apiController
-     * @param ApikeyRepository $apikeyRepository
-     * @param DomainController $domainController
-     * @param DomainRepository $domainRepository
-     * @param DynDNSRepository $dynDNSRepository
-     * @param PanelRepository $panelRepository
-     * @param ConfigController $configController
-     * @param EncryptionController $encryptionController
-     * @param Logger $logger
-     */
-    public function __construct(
-        private readonly ApiController        $apiController,
-        private readonly ApikeyRepository     $apikeyRepository,
-        private readonly DomainController     $domainController,
-        private readonly DomainRepository     $domainRepository,
-        private readonly DynDNSRepository     $dynDNSRepository,
-        private readonly PanelRepository      $panelRepository,
-        private readonly ConfigController     $configController,
-        private readonly EncryptionController $encryptionController,
-        private readonly Logger               $logger)
-    {
-        $this->status = '';
-        $this->response = '';
-        $this->message = '';
-        $this->result = [];
-    }
+    // server tag
+    private string $baseDir;
 
-    /**
-     * @return void
-     */
-    #[OAT\Get(
-        path: '/domains',
-        operationId: 'getAllDomains',
-        description: 'Returns a list of all domains on this server.',
-        summary: 'Listing all domains.',
-//		security: [
-//			'Authorization' => [
-//
-//				"read:api"
-//			]
-//		],
-        servers: [],
-        tags: ['Domains'],
+    #[OA\Get(
+        path: '/ping',
+        operationId: 'ping',
+        description: 'Checks for connectivity and valid APIkey',
+        security: [
+            ['Authorization' => []]
+        ],
+        tags: ['Server'],
         responses: [
-            new OAT\Response(
+            new OA\Response(
                 response: 200,
                 description: 'OK'
             ),
-            new OAT\Response(
+            new OA\Response(
+                response: 401,
+                description: 'API key is missing or invalid.'
+            )
+        ]
+    )]
+    private function handlePing(): void
+    {
+        if ($this->validateApiKey()) {
+            $this->status = '200 OK';
+            $this->response = 'pong';
+        } else {
+            $this->status = '401 Unauthorized';
+            $this->message = 'API key is missing or invalid';
+        }
+    }
+
+    #[OA\Get(
+        path: '/version',
+        operationId: 'version',
+        description: 'Check the API version of the nameserver.',
+        security: [
+            ['Authorization' => []]
+        ],
+        tags: ['Server'],
+        responses: [
+            new OA\Response(
+                response: 200,
+                description: 'x.y.z, aka major, minor, patch'
+            ),
+            new OA\Response(
+                response: 401,
+                description: 'API key is missing or invalid.'
+            )
+        ]
+    )]
+    private function getVersion(): void
+    {
+        if ($this->validateApiKey()) {
+            $this->status = '200 OK';
+
+            $composerJson = json_decode(json: file_get_contents(filename: $this->baseDir . 'composer.json'));
+            $version = $composerJson->version;
+            $buildNumber = $composerJson->build_number;
+
+            $this->result = [
+                'version' => $version,
+                'buildnumber' => $buildNumber,
+            ];
+        } else {
+            $this->status = '401 Unauthorized';
+            $this->message = 'API key is missing or invalid';
+        }
+    }
+
+    #[OA\Get(
+        path: '/domains',
+        operationId: 'getAllDomains',
+        description: 'Returns a list of all domains on this server.',
+        summary: 'List all domains.',
+        security: [
+            ['Authorization' => []]
+        ],
+        tags: ['Domains'],
+        responses: [
+            new OA\Response(
+                response: 200,
+                description: 'OK'
+            ),
+            new OA\Response(
                 response: 401,
                 description: 'API key is missing or invalid.'
             ),
-            new OAT\Response(
+            new OA\Response(
                 response: 404,
                 description: 'Domain not found.'
             )]
@@ -131,16 +168,6 @@ class RequestController
 
     /**
      */
-    private function handlePing(): void
-    {
-        if ($this->checkPassword()) {
-            $this->status = '200 OK';
-            $this->response = 'pong';
-        } else {
-            $this->status = '401 Unauthorized';
-            $this->message = 'API key is missing or invalid';
-        }
-    }
 
 
     /**
@@ -148,7 +175,7 @@ class RequestController
      */
     private function handleDomains(): void
     {
-        if ($this->checkPassword()) {
+        if ($this->validateApiKey()) {
             try {
                 match ($this->requestMethod) {
                     'GET' => $this->handleDomainsGetRequest(),
@@ -164,131 +191,8 @@ class RequestController
     }
 
 
-    /**
-     * @OA\Tag(name = "Server")
-     * @OA\Get(
-     *     path = "/ping",
-     *     summary = "Returning pong.",
-     *     description = "Can be used to check API or server availability.",
-     *     tags={"Server"},
-     *     @OA\Response(response = "200", description = "OK"),
-     *     @OA\Response(response = "401", description = "API key is missing or invalid."),
-     *     security={
-     *         {"Authorization":{"read"}}
-     *     }
-     * )
-     *
-     * @OA\Tag(name = "Domains")
-     * @OA\Put(
-     *     path="/domains/{name}",
-     *     summary="Updates a domain.",
-     *     description="Updates a domain. Only supplied fields will be updated, existing won't be affected.",
-     *     tags={"Domains"},
-     *     @OA\Response(response="200", description="OK"),
-     *     @OA\Response(response = "401", description = "API key is missing or invalid."),
-     *     @OA\Response(response="404", description="Domain not found."),
-     *     security={
-     *         {"Authorization":{"read":"write"}}
-     *     }
-     * )
-     * @OA\Delete (
-     *     path="/domains/{name}",
-     *     summary="Deletes a domain.",
-     *     description="Deletes a domain.",
-     *     tags={"Domains"},
-     *     @OA\Response(response="200", description="OK"),
-     *     @OA\Response(response = "401", description = "API key is missing or invalid."),
-     *     @OA\Response(response="404", description="Domain not found."),
-     *     security={
-     *         {"Authorization":{"read":"write"}}
-     *     }
-     * )
-     * @param string $requestMethod
-     * @param array $uri
-     *
-     * @return void
-     */
 
-    #[
-        OAT\Get(
-            path: '/domains/{name}',
-            operationId: 'getSingleDomain',
-            description: 'Returns information of a single domain specified by its domain name.',
-            summary: 'Returns a single domain.',
-            security: [
-            ],
-            tags: ['Domains'],
-            parameters: [
-                new OAT\Parameter(name: 'name', in: 'path', required: true, schema: new OAT\Schema(type: 'string')),
-            ],
-            responses: [
-                new OAT\Response(
-                    response: 200,
-                    description: 'OK'
-                ),
-                new OAT\Response(
-                    response: 401,
-                    description: 'API key is missing or invalid.'
-                ),
-                new OAT\Response(
-                    response: 404,
-                    description: 'Domain not found.'
-                )]
-
-        )]
-    public function handleRequest(string $requestMethod, array $uri): void
-    {
-        $this->logger->debug(message: "Request: $requestMethod $uri[1]");
-
-        $this->requestMethod = strtoupper(string: $requestMethod);
-        $this->uri = $uri;
-
-        $command = $this->uri[2];
-
-        if (empty($command) || !(($command == 'domains') || ($command == 'ping') || ($command == 'apidoc') || ($command == 'dyndns'))) {
-            $this->status = "404 Not Found";
-            $this->message = "Endpoint not found.";
-        } else {
-            try {
-                match ($command) {
-                    'dyndns' => $this->handleDynDNS(),
-                    'ping' => $this->handlePing(),
-                    'domains' => $this->handleDomains(),
-                };
-            } catch (UnhandledMatchError) {
-                $this->status = '400 Bad Request';
-                $this->message = 'Unknown path: ' . $command;
-            }
-        }
-
-        if (!empty($this->status)) {
-            header(header: $_SERVER['SERVER_PROTOCOL'] . ' ' . $this->status);
-        }
-
-        if (!empty($this->response)) {
-            echo json_encode(value: [
-                'response' => $this->response
-            ]);
-        } elseif (!empty($this->result)) {
-            echo json_encode(value: [
-                'result' => $this->result
-            ]);
-        } elseif (!empty($this->message)) {
-            echo json_encode(value: [
-                'message' => $this->message
-            ]);
-        } else {
-            echo json_encode(value: [
-                'message' => $this->message ?? 'Error: No message.'
-            ]);
-        }
-    }
-
-
-    /**
-     * @return bool
-     */
-    private function checkPassword(): bool
+    private function validateApiKey(): bool
     {
         $headers = array_change_key_case(array: getallheaders(), case: CASE_UPPER);
         $apiKey = $headers['X-API-KEY'] ?? '';
@@ -318,10 +222,33 @@ class RequestController
         return true;
     }
 
+    #[OA\Get(
+        path: '/domains/{name}',
+        operationId: 'getSingleDomain',
+        description: 'Returns information of a single domain specified by its domain name.',
+        summary: 'Returns a single domain.',
+        security: [
+            ['Authorization' => []]
+        ],
+        tags: ['Domains'],
+        parameters: [
+            new OA\Parameter(name: 'name', in: 'path', required: true, schema: new OA\Schema(type: 'string')),
+        ],
+        responses: [
+            new OA\Response(
+                response: 200,
+                description: 'OK'
+            ),
+            new OA\Response(
+                response: 401,
+                description: 'API key is missing or invalid.'
+            ),
+            new OA\Response(
+                response: 404,
+                description: 'Domain not found.'
+            )]
 
-    /**
-     * @return void
-     */
+    )]
     private function handleDomainsGetRequest(): void
     {
         $name = $this->uri[3] ?? '';
@@ -433,9 +360,6 @@ class RequestController
     }
 
 
-    /**
-     * @return void
-     */
     private function handleDomainsDeleteRequest(): void
     {
         $deleteData = fopen(filename: 'php://input', mode: 'r');
@@ -470,7 +394,7 @@ class RequestController
     {
         $this->logger->debug(message: 'handleDynDNS()');
 
-        if ($this->checkPassword()) {
+        if ($this->validateApiKey()) {
             $host = $this->uri[3] ?? '';
 
             if (empty($host)) {
@@ -537,7 +461,7 @@ class RequestController
                         $panel = $this->panelRepository->findByName(name: $domain->getPanel());
 
                         if (!empty($panel->getAaaa())) {
-                            $domainData = $this->apiController->sendCommand(
+                            $domainData = $this->apiClient->sendCommand(
                                 requestType: 'GET',
                                 serverName: $panel->getName(),
                                 versionIP: 6,
@@ -545,7 +469,7 @@ class RequestController
                                 command: 'domains/name/' . $domainName,
                                 serverType: 'panel');
                         } else {
-                            $domainData = $this->apiController->sendCommand(
+                            $domainData = $this->apiClient->sendCommand(
                                 requestType: 'GET',
                                 serverName: $panel->getName(),
                                 versionIP: 4,
@@ -558,7 +482,7 @@ class RequestController
                         $domainID = $domainDecodedData->id;
 
                         if (!empty($panel->getAaaa())) {
-                            $dnsData = $this->apiController->sendCommand(
+                            $dnsData = $this->apiClient->sendCommand(
                                 requestType: 'GET',
                                 serverName: $panel->getName(),
                                 versionIP: 6,
@@ -566,7 +490,7 @@ class RequestController
                                 command: 'dns/' . $domainID,
                                 serverType: 'panel');
                         } else {
-                            $dnsData = $this->apiController->sendCommand(
+                            $dnsData = $this->apiClient->sendCommand(
                                 requestType: 'GET',
                                 serverName: $panel->getName(),
                                 versionIP: 4,
@@ -607,7 +531,7 @@ class RequestController
                             ]);
 
                             if (!empty($panel->getAaaa())) {
-                                $result = $this->apiController->sendCommand(
+                                $result = $this->apiClient->sendCommand(
                                     requestType: 'PUT',
                                     serverName: $panel->getName(),
                                     versionIP: 6,
@@ -617,7 +541,7 @@ class RequestController
                                     body: json_decode(json: $newDnsData, associative: true)
                                 );
                             } else {
-                                $result = $this->apiController->sendCommand(
+                                $result = $this->apiClient->sendCommand(
                                     requestType: 'PUT',
                                     serverName: $panel->getName(),
                                     versionIP: 4,
@@ -645,11 +569,6 @@ class RequestController
     }
 
 
-    /**
-     * @param String $host
-     *
-     * @return string
-     */
     private function getDomain(string $host): string
     {
         $host = strtolower(string: trim(string: $host));
@@ -664,5 +583,89 @@ class RequestController
         return $host;
     }
 
+//    private function apiDoc(): void
+//    {
+//        $srcDir = dirname(path: __DIR__);
+//        $requestControllerPath = $srcDir . '/Controller/RequestController.php';
+//
+//        $openApi = Generator::scan(sources: [$requestControllerPath]);
+//        header(header: 'Content-Type: application/json');
+//
+//        echo $openApi->toJson();
+//        exit(0);
+//    }
+
+    public function __construct(
+        private readonly ApiClient            $apiClient,
+        private readonly ApikeyRepository     $apikeyRepository,
+        private readonly DomainController     $domainController,
+        private readonly DomainRepository     $domainRepository,
+        private readonly DynDNSRepository     $dynDNSRepository,
+        private readonly PanelRepository      $panelRepository,
+        private readonly ConfigController     $configController,
+        private readonly EncryptionController $encryptionController,
+        private readonly Logger               $logger)
+    {
+        $this->baseDir = dirname(path: __DIR__, levels: 2) . '/';
+
+        $this->status = '';
+        $this->response = '';
+        $this->message = '';
+        $this->result = [];
+    }
+
+    public function handleRequest(string $requestMethod, array $uri): void
+    {
+        $this->logger->debug(message: "Request: $requestMethod $uri[1]");
+
+        $this->requestMethod = strtoupper(string: $requestMethod);
+        $this->uri = $uri;
+
+        $command = $this->uri[2];
+
+        // use my router class from address book?
+        $routes = ['ping', 'version', 'domains', 'apidoc', 'dyndns'];
+
+        if (empty($command) || !(in_array(needle: $command, haystack: $routes))) {
+            $this->status = "404 Not Found";
+            $this->message = "Endpoint not found.";
+        } else {
+            try {
+                match ($command) {
+                    // server
+                    'ping' => $this->handlePing(),
+                    'version' => $this->getVersion(),
+                    // domains
+                    'domains' => $this->handleDomains(),
+                    'dyndns' => $this->handleDynDNS(),
+//                    'apidoc' => $this->apiDoc(),
+                };
+            } catch (UnhandledMatchError) {
+                $this->status = '400 Bad Request';
+                $this->message = 'Unknown path: ' . $command;
+            }
+        }
+
+        // process api requests
+        if (!empty($this->status)) {
+            header(header: $_SERVER['SERVER_PROTOCOL'] . ' ' . $this->status);
+        }
+
+        if (!empty($this->response)) {
+            echo json_encode(value: [
+                'response' => $this->response
+            ]);
+        } elseif (!empty($this->result)) {
+            echo json_encode(value: $this->result);
+        } elseif (!empty($this->message)) {
+            echo json_encode(value: [
+                'message' => $this->message
+            ]);
+        } else {
+            echo json_encode(value: [
+                'message' => $this->message ?? 'Error: No message.'
+            ]);
+        }
+    }
 
 }

src/Entity/Apikey.php

@@ -5,24 +5,20 @@ namespace App\Entity;
 use App\Controller\ConfigController;
 use App\Controller\EncryptionController;
 use Exception;
-use SodiumException;
 
-/**
- *
- */
 class Apikey
 {
-
     public function __construct(
         private int             $id = 0,
         private string          $name = '',
         private string          $apikey = '',
         private string          $apikeyPrefix = '',
-        private readonly string $passphrase = ''
+        private readonly string $passphrase = '',
+        private string          $createdAt = ''
     )
     {
         if ($this->passphrase) {
-            $configController = new ConfigController();
+            $configController = new ConfigController(quiet: true);
             $encryptionController = new EncryptionController();
 
             $encryptionKey = $configController->getConfig(configKey: 'encryptionKey');
@@ -31,82 +27,45 @@ class Apikey
 
             try {
                 $this->apikey = $encryptionController->safeEncrypt(message: $this->passphrase, key: $encryptionKey);
-            } catch (Exception|SodiumException $e) {
+            } catch (Exception $e) {
                 exit($e->getMessage() . PHP_EOL);
             }
         }
     }
 
-    /**
-     * @return string
-     */
-    public function getPassphrase(): string
+    public function getCreatedAt(): string
     {
-        return $this->passphrase;
+        return $this->createdAt;
     }
 
-
-    /**
-     * @return String
-     */
     public function getApikey(): string
     {
         return $this->apikey;
     }
 
-    /**
-     * @return string
-     */
     public function getApikeyPrefix(): string
     {
         return $this->apikeyPrefix;
     }
 
 
-    /**
-     * @return int
-     */
     public function getId(): int
     {
         return $this->id;
     }
 
-    /**
-     * @param int $id
-     */
-    public function setId(int $id): void
-    {
-        $this->id = $id;
-    }
-
-    /**
-     * @return String
-     */
     public function getName(): string
     {
         return $this->name;
     }
 
-    /**
-     * @param string $apikeyPrefix
-     */
-    public function setApikeyPrefix(string $apikeyPrefix): void
-    {
-        $this->apikeyPrefix = $apikeyPrefix;
-    }
 
-    /**
-     * @param String $apiToken
-     */
     public function setApikey(string $apikey): void
     {
         $this->apikey = $apikey;
     }
 
 
-    /**
-     * @param String $name
-     */
     public function setName(string $name): void
     {
         $this->name = $name;

src/Entity/Nameserver.php

@@ -12,7 +12,6 @@ use SodiumException;
  *
  */
 #[OAT\Schema(schema: 'nameserver')]
-
 class Nameserver
 {
     /**
@@ -31,10 +30,12 @@ class Nameserver
         private string          $aaaa = '',
         private readonly string $passphrase = '',
         private string          $apikey = '',
-        private string          $apikeyPrefix = '')
-	{
+        private string          $apikeyPrefix = '',
+        private string          $self = 'no'
+    )
+    {
         if ($this->passphrase) {
-            $configController = new ConfigController();
+            $configController = new ConfigController(quiet: false);
             $encryptionController = new EncryptionController();
 
             $encryptionKey = $configController->getConfig(configKey: 'encryptionKey');
@@ -50,6 +51,16 @@ class Nameserver
 
     }
 
+    public function getSelf(): string
+    {
+        return $this->self;
+    }
+
+    public function setSelf(string $self): void
+    {
+        $this->self = $self;
+    }
+
     /**
      * @return string
      */
@@ -67,90 +78,90 @@ class Nameserver
     }
 
 
-	/**
-	 * @return string
-	 */
-	#[OAT\Property(type: 'string')]
-	public function getA(): string
-	{
-		return $this->a;
-	}
+    /**
+     * @return string
+     */
+    #[OAT\Property(type: 'string')]
+    public function getA(): string
+    {
+        return $this->a;
+    }
 
-	/**
-	 * @param string $a
-	 */
-	public function setA(string $a): void
-	{
-		$this->a = $a;
-	}
+    /**
+     * @param string $a
+     */
+    public function setA(string $a): void
+    {
+        $this->a = $a;
+    }
 
-	/**
-	 * @return string
-	 */
-	#[OAT\Property(type: 'string')]
-	public function getAaaa(): string
-	{
-		return $this->aaaa;
-	}
+    /**
+     * @return string
+     */
+    #[OAT\Property(type: 'string')]
+    public function getAaaa(): string
+    {
+        return $this->aaaa;
+    }
 
-	/**
-	 * @param string $aaaa
-	 */
-	public function setAaaa(string $aaaa): void
-	{
-		$this->aaaa = $aaaa;
-	}
+    /**
+     * @param string $aaaa
+     */
+    public function setAaaa(string $aaaa): void
+    {
+        $this->aaaa = $aaaa;
+    }
 
-	/**
-	 * @return string
-	 */
-	#[OAT\Property(type: 'string')]
-	public function getApikey(): string
-	{
-		return $this->apikey;
-	}
+    /**
+     * @return string
+     */
+    #[OAT\Property(type: 'string')]
+    public function getApikey(): string
+    {
+        return $this->apikey;
+    }
 
-	/**
-	 * @param string $apikey
-	 */
-	public function setApikey(string $apikey): void
-	{
-		$this->apikey = $apikey;
-	}
+    /**
+     * @param string $apikey
+     */
+    public function setApikey(string $apikey): void
+    {
+        $this->apikey = $apikey;
+    }
 
-	/**
-	 * @return int
-	 */
-	#[OAT\Property(type: 'int')]
-	public function getId(): int
-	{
-		return $this->id;
-	}
+    /**
+     * @return int
+     */
+    #[OAT\Property(type: 'int')]
+    public function getId(): int
+    {
+        return $this->id;
+    }
 
-	/**
-	 * @param int $id
-	 */
-	public function setId(int $id): void
-	{
-		$this->id = $id;
-	}
+    /**
+     * @param int $id
+     */
+    public function setId(int $id): void
+    {
+        $this->id = $id;
+    }
 
-	/**
-	 * @return string
-	 */
-	#[OAT\Property(type: 'string')]
-	public function getName(): string
-	{
-		return $this->name;
-	}
+    /**
+     * @return string
+     */
+    #[OAT\Property(type: 'string')]
+    public function getName(): string
+    {
+        return $this->name;
+    }
 
-	/**
-	 * @param string $name
-	 */
-	public function setName(string $name): void
-	{
-		$this->name = $name;
-	}
+    /**
+     * @param string $name
+     */
+    public function setName(string $name): void
+    {
+        $this->name = $name;
+    }
 
     /**
      * @return string

src/Entity/Panel.php

@@ -24,7 +24,7 @@ class Panel
     )
     {
         if ($this->passphrase) {
-            $configController = new ConfigController();
+            $configController = new ConfigController(quiet: false);
             $encryptionController = new EncryptionController();
 
             $encryptionKey = $configController->getConfig(configKey: 'encryptionKey');

src/Provider/DatabaseConnection.php

@@ -1,13 +1,15 @@
 <?php
 
-namespace App\Controller;
+namespace App\Provider;
 
 //error_reporting(error_level: E_ALL);
 
 
+use App\Utilities\Colors;
 use PDO;
 use PDOException;
 use PHPUnit\Exception;
+use App\Controller\ConfigController;
 
 /**
  *
@@ -22,6 +24,7 @@ class DatabaseConnection
     const TABLE_PANELS      = self::TABLE_PREFIX . "panels";
     const TABLE_APIKEYS     = self::TABLE_PREFIX . "apikeys";
     const TABLE_DYNDNS      = self::TABLE_PREFIX . "dyndns";
+    const TABLE_SETTINGS    = self::TABLE_PREFIX . 'config';
 
     public function __construct(private readonly ConfigController $configController)
     {
@@ -52,8 +55,8 @@ class DatabaseConnection
                 $result = $statement->fetch();
                 if (empty($result)) {
                     // ALTER TABLE `domains` ADD `panel_id` INT NULL AFTER `id`;
-                    echo COLOR_RED . 'Error: ' . COLOR_DEFAULT . 'Cannot find tables.' . PHP_EOL;
-                    echo 'Run the migration: ' . COLOR_YELLOW . './bin/console migrations:make' . COLOR_DEFAULT . PHP_EOL;
+                    echo Colors::RED . 'Error: ' . Colors::DEFAULT . 'Cannot find tables.' . PHP_EOL;
+                    echo 'Run the migration: ' . Colors::YELLOW . './bin/console migrations:migrate' . Colors::DEFAULT . PHP_EOL;
                 }
             } catch (PDOException $exception) {
                 echo $exception->getMessage() . PHP_EOL;

src/Repository/ApikeyRepository.php

@@ -3,7 +3,7 @@ namespace App\Repository;
 
 error_reporting(error_level: E_ALL);
 
-use App\Controller\DatabaseConnection;
+use App\Provider\DatabaseConnection;
 use App\Controller\EncryptionController;
 use App\Entity\Apikey;
 use PDO;
@@ -18,27 +18,24 @@ class ApikeyRepository
 	{}
 	
 	
-	/**
-	 * @return array|false
-	 */
 	public function findAll(): bool|array
 	{
 
 		$sql = "
-            SELECT id, name, apikey_prefix, apikey
+            SELECT id, name, apikey_prefix, apikey, created_at
             FROM " . DatabaseConnection::TABLE_APIKEYS;
 		
 		try {
 			$statement = $this->databaseConnection->getConnection()->prepare(query: $sql);
 			$statement->execute();
 			
-			$apikeys = [];
+			$apiKeys = [];
 			
 			while ($result = $statement->fetch()) {
-				$apikey = new Apikey(id: $result['id'], name: $result['name'], apikey: $result['apikey'], apikeyPrefix: $result['apikey_prefix']);
-				$apikeys[] = $apikey;
+				$apikey = new Apikey(id: $result['id'], name: $result['name'], apikey: $result['apikey'], apikeyPrefix: $result['apikey_prefix'], createdAt: $result['created_at']);
+				$apiKeys[] = $apikey;
 			}
-			return $apikeys;
+			return $apiKeys;
 		} catch (PDOException $e) {
 			exit($e->getMessage());
 		}

src/Repository/DomainRepository.php

@@ -3,7 +3,7 @@
 namespace App\Repository;
 
 use App\Controller\ConfigController;
-use App\Controller\DatabaseConnection;
+use App\Provider\DatabaseConnection;
 use App\Entity\Domain;
 use Monolog\Logger;
 use PDO;
@@ -218,7 +218,8 @@ readonly class DomainRepository
 	{
 		$domainName = $domain->getName();
 		$this->logger->debug(message: "delete($domainName)");
-		
+
+        // FIXME, add force parameter, reject deletion if domains left on panel
 		$sql = "
             DELETE FROM " . DatabaseConnection::TABLE_DOMAINS . "
             WHERE id = :id";
@@ -235,6 +236,7 @@ readonly class DomainRepository
 		}
 	}
 
+    // FIXME check for master/slave in config generation
 	public function getLongestEntry(string $field): int
 	{
 		$sql = "
@@ -244,7 +246,8 @@ readonly class DomainRepository
 			$statement = $this->databaseConnection->getConnection()->prepare(query: $sql);
 			$statement->execute();
 			$result = $statement->fetch();
-			return $result['length'];
+            // if there are not yet any domains, just return 30
+			return $result['length'] ?? 30;
 		} catch (PDOException $e) {
 			exit($e->getMessage());
 		}

src/Repository/DynDNSRepository.php

@@ -2,7 +2,7 @@
 
 namespace App\Repository;
 
-use App\Controller\DatabaseConnection;
+use App\Provider\DatabaseConnection;
 use App\Entity\DynDNS;
 use Monolog\Logger;
 use PDO;

src/Repository/NameserverRepository.php

@@ -2,7 +2,7 @@
 
 namespace App\Repository;
 
-use App\Controller\DatabaseConnection;
+use App\Provider\DatabaseConnection;
 use App\Entity\Nameserver;
 use PDO;
 use PDOException;
@@ -26,7 +26,7 @@ class NameserverRepository
     {
         $nameservers = [];
         $sql = "
-            SELECT id, name, a, aaaa, apikey, apikey_prefix
+            SELECT id, name, a, aaaa, apikey, apikey_prefix, self
             FROM " . DatabaseConnection::TABLE_NAMESERVERS . "
             ORDER BY name";
 
@@ -34,7 +34,7 @@ class NameserverRepository
             $statement = $this->databaseConnection->getConnection()->prepare(query: $sql);
             $statement->execute();
             while ($result = $statement->fetch(mode: PDO::FETCH_ASSOC)) {
-                $nameserver = new Nameserver(name: $result['name'], id: $result['id'], a: $result['a'], aaaa: $result['aaaa'], apikey: $result['apikey'], apikeyPrefix: $result['apikey_prefix']);
+                $nameserver = new Nameserver(name: $result['name'], id: $result['id'], a: $result['a'], aaaa: $result['aaaa'], apikey: $result['apikey'], apikeyPrefix: $result['apikey_prefix'], self: $result['self']);
                 $nameservers[] = $nameserver;
             }
             return $nameservers;
@@ -50,7 +50,7 @@ class NameserverRepository
     public function findFirst(): ?Nameserver
     {
         $sql = "
-            SELECT id, name, a, aaaa, apikey, apikey_prefix
+            SELECT id, name, a, aaaa, apikey, apikey_prefix, self
             FROM " . DatabaseConnection::TABLE_NAMESERVERS . "
             ORDER BY name";
 
@@ -58,7 +58,7 @@ class NameserverRepository
             $statement = $this->databaseConnection->getConnection()->prepare(query: $sql);
             $statement->execute();
             $result = $statement->fetch(mode: PDO::FETCH_ASSOC);
-            return new Nameserver(name: $result['name'], id: $result['id'], a: $result['a'], aaaa: $result['aaaa'], apikey: $result['apikey'], apikeyPrefix: $result['apikey_prefix']);
+            return new Nameserver(name: $result['name'], id: $result['id'], a: $result['a'], aaaa: $result['aaaa'], apikey: $result['apikey'], apikeyPrefix: $result['apikey_prefix'], self: $result['self']);
         } catch (PDOException $e) {
             exit($e->getMessage());
         }
@@ -73,7 +73,7 @@ class NameserverRepository
     public function findByID(int $id): ?Nameserver
     {
         $sql = "
-			SELECT id, name, a, aaaa, apikey, apikey_prefix
+			SELECT id, name, a, aaaa, apikey, apikey_prefix, self
 			FROM . " . DatabaseConnection::TABLE_NAMESERVERS . "
             WHERE id = :id";
 
@@ -82,7 +82,7 @@ class NameserverRepository
             $statement->bindParam(param: ':id', var: $id);
             $statement->execute();
             if ($result = $statement->fetch(mode: PDO::FETCH_ASSOC)) {
-                return new Nameserver(name: $result['name'], a: $result['a'], aaaa: $result['aaaa'], apikey: $result['apikey'], apikeyPrefix: $result['apikey_prefix']);
+                return new Nameserver(name: $result['name'], a: $result['a'], aaaa: $result['aaaa'], apikey: $result['apikey'], apikeyPrefix: $result['apikey_prefix'], self: $result['self']);
             } else {
                 return null;
             }
@@ -100,7 +100,7 @@ class NameserverRepository
     public function findByName(string $name): ?Nameserver
     {
         $sql = "
-			SELECT id, name, a, aaaa, apikey, apikey_prefix
+			SELECT id, name, a, aaaa, apikey, apikey_prefix, self
 			FROM " . DatabaseConnection::TABLE_NAMESERVERS . "
             WHERE name = :name";
 
@@ -109,7 +109,7 @@ class NameserverRepository
             $statement->bindParam(param: ':name', var: $name);
             $statement->execute();
             if ($result = $statement->fetch(mode: PDO::FETCH_ASSOC)) {
-                return new Nameserver(name: $result['name'], a: $result['a'], aaaa: $result['aaaa'], apikey: $result['apikey'], apikeyPrefix: $result['apikey_prefix']);
+                return new Nameserver(name: $result['name'], a: $result['a'], aaaa: $result['aaaa'], apikey: $result['apikey'], apikeyPrefix: $result['apikey_prefix'], self: $result['self']);
             } else {
                 return null;
             }
@@ -131,11 +131,17 @@ class NameserverRepository
         $aaaa = $nameserver->getAaaa();
         $apikey = $nameserver->getApikey();
         $apikeyPrefix = $nameserver->getApikeyPrefix();
+        $self = $nameserver->getSelf();
+        if ($self === '') {
+            $selfValue = 'no';
+        } else {
+            $selfValue = $self;
+        }
 
 
         $sql = "
-            INSERT INTO " . DatabaseConnection::TABLE_NAMESERVERS . " (name, a, aaaa, apikey, apikey_prefix)
-            VALUES (:name, :a, :aaaa, :apikey, :apikey_prefix)";
+            INSERT INTO " . DatabaseConnection::TABLE_NAMESERVERS . " (name, a, aaaa, apikey, apikey_prefix, self)
+            VALUES (:name, :a, :aaaa, :apikey, :apikey_prefix, :self)";
 
         try {
             $statement = $this->databaseConnection->getConnection()->prepare(query: $sql);
@@ -144,6 +150,7 @@ class NameserverRepository
             $statement->bindParam(param: ':aaaa', var: $aaaa);
             $statement->bindParam(param: ':apikey', var: $apikey);
             $statement->bindParam(param: ':apikey_prefix', var: $apikeyPrefix);
+            $statement->bindParam(param: ':self', var: $selfValue);
             $statement->execute();
 
             return intval(value: $this->databaseConnection->getConnection()->lastInsertId());
@@ -166,6 +173,7 @@ class NameserverRepository
         $apikey = $nameserver->getApikey();
         $apikeyPrefix = $nameserver->getApikeyPrefix();
         $passphrase = $nameserver->getPassphrase();
+        $self =$nameserver->getSelf();
 
         $current = $this->findByID(id: $id);
 
@@ -185,6 +193,10 @@ class NameserverRepository
             $apikeyPrefix = $current->getApikeyPrefix();
         }
 
+        if (empty($self)) {
+            $self = $current->getSelf();
+        }
+
 
         $sql = "
 			UPDATE " . DatabaseConnection::TABLE_NAMESERVERS . " SET
@@ -192,7 +204,8 @@ class NameserverRepository
 				a = :a,
                	aaaa = :aaaa,
                	apikey = :apikey,
-               	apikey_prefix = :apikey_prefix
+               	apikey_prefix = :apikey_prefix,
+               	self = :self
             WHERE id = :id";
 
         try {
@@ -203,6 +216,7 @@ class NameserverRepository
             $statement->bindParam(param: 'aaaa', var: $aaaa);
             $statement->bindParam(param: 'apikey', var: $apikey);
             $statement->bindParam(param: 'apikey_prefix', var: $apikeyPrefix);
+            $statement->bindParam(param: 'self', var: $self);
             $statement->execute();
             try {
                 sodium_memzero(string: $apikey);

src/Repository/PanelRepository.php

@@ -2,7 +2,7 @@
 
 namespace App\Repository;
 
-use App\Controller\DatabaseConnection;
+use App\Provider\DatabaseConnection;
 use App\Entity\Panel;
 use PDO;
 use PDOException;
@@ -162,6 +162,8 @@ class PanelRepository
         $apikey = $panel->getApikey();
         $apikeyPrefix = $panel->getApikeyPrefix();
         $passphrase = $panel->getPassphrase();
+        $self = $panel->getSelf();
+        echo 'self: ' . $self;
 
         $current = $this->findByID(id: $id);
 
@@ -185,7 +187,6 @@ class PanelRepository
             $self = $current->getSelf();
         }
 
-
         $sql = "
 			UPDATE " . DatabaseConnection::TABLE_PANELS . " SET
 				name = :name,

src/Repository/SettingsRepository.php

@@ -0,0 +1,69 @@
+<?php declare(strict_types=1);
+namespace App\Repository;
+
+error_reporting(error_level: E_ALL);
+
+use App\Provider\DatabaseConnection;
+use App\Controller\EncryptionController;
+use PDO;
+use PDOException;
+
+/**
+ *
+ */
+readonly class SettingsRepository
+{
+    public function __construct(private DatabaseConnection $databaseConnection, EncryptionController $encryptionController)
+    {}
+
+    public function findByName(string $name): string|bool
+    {
+        $sql = "
+			SELECT value
+			FROM " . DatabaseConnection::TABLE_SETTINGS . "
+            WHERE name = :name;
+        ";
+
+        try {
+            $statement = $this->databaseConnection->getConnection()->prepare(query: $sql);
+            $statement->bindParam(param: ':name', var: $name);
+            $statement->execute();
+            if ($result = $statement->fetch(mode: PDO::FETCH_ASSOC)) {
+                return $result['value'];
+            } else {
+                return false;
+            }
+        } catch (PDOException $e) {
+            exit($e->getMessage());
+        }
+    }
+
+    public function set(string $name, string $value): int
+    {
+        $currentSetting = $this->findByName($name);
+        if ($currentSetting !== false) {
+                $sql = "
+                UPDATE " . DatabaseConnection::TABLE_SETTINGS . "
+                SET value = :value
+                WHERE name = :name
+            ";
+            } else {
+                $sql = "
+                INSERT INTO " . DatabaseConnection::TABLE_SETTINGS . " (id, name, value)
+                VALUES (UUID(), :name, :value)
+            ";
+            }
+
+        try {
+            $statement = $this->databaseConnection->getConnection()->prepare(query: $sql);
+            $statement->bindParam(param: ':name', var: $name);
+            $statement->bindParam(param: ':value', var: $value);
+
+            $statement->execute();
+            return intval(value: $this->databaseConnection->getConnection()->lastInsertId());
+        } catch (PDOException $e) {
+            exit($e->getMessage());
+        }
+    }
+
+}

src/Service/ApiClient.php

@@ -1,25 +1,13 @@
 <?php declare(strict_types=1);
 
-namespace App\Controller;
+namespace App\Service;
 
 use UnhandledMatchError;
 
 error_reporting(error_level: E_ALL);
 
-class ApiController
+class ApiClient
 {
-
-    /**
-     * @param String $requestType
-     * @param String $serverName
-     * @param int $versionIP
-     * @param String $apiKey
-     * @param String $command
-     * @param String $serverType
-     * @param array $body
-     *
-     * @return array
-     */
     function sendCommand(string $requestType, string $serverName, int $versionIP, string $apiKey, string $command, string $serverType, array $body = []): array
     {
         $error = false;
@@ -75,6 +63,7 @@ class ApiController
                     break;
                 case 400:
                     $result = $resultJSON;
+                    $error = true;
                     break;
                 case 401:
                     $result = 'Missing or wrong API Key';
@@ -82,11 +71,14 @@ class ApiController
                     break;
                 case 404:
                     $result = '404 Not Found';
+                    $error = true;
                     break;
                 case 500:
                     $result = 'server error';
+                    $error = true;
                     break;
                 default:
+                    $error = true;
                     $result = 'Unhandled error: ' . $httpResponse;
             }
         } else {
@@ -113,7 +105,7 @@ class ApiController
         $options = array(
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_ENCODING       => "",
+            CURLOPT_ENCODING       => '',
             CURLOPT_AUTOREFERER    => true,
             CURLOPT_CONNECTTIMEOUT => 120,
             CURLOPT_TIMEOUT        => 120,
@@ -139,4 +131,6 @@ class ApiController
 
         return $header;
     }
+
+
 }

src/Service/BindAPI.php

@@ -0,0 +1,94 @@
+<?php declare(strict_types=1);
+
+namespace App\Service;
+
+error_reporting(error_level: E_ALL);
+
+use App\Controller\ConfigController;
+use App\Controller\CLIController;
+use App\Controller\DomainController;
+use App\Controller\RequestController;
+use App\Repository\DomainRepository;
+use App\Repository\DynDNSRepository;
+use App\Service\ApiClient;
+use DI\Container;
+use DI\ContainerBuilder;
+use DI\DependencyException;
+use DI\NotFoundException;
+use Exception;
+use Monolog\Formatter\LineFormatter;
+use Monolog\Handler\StreamHandler;
+use Monolog\Level;
+use Monolog\Logger;
+use function DI\autowire;
+
+class BindAPI
+{
+    private Logger $logger;
+    private Container $container;
+
+    public function __construct(bool $quiet)
+    {
+        // init the logger
+        $dateFormat = "Y:m:d H:i:s";
+        $output = "%datetime% %channel%.%level_name% %message%\n"; // %context% %extra%
+        $formatter = new LineFormatter(format: $output, dateFormat: $dateFormat);
+
+        $debug = (new ConfigController(quiet: $quiet))->getConfig(configKey: 'debug');
+        if ($debug) {
+            $stream = new StreamHandler(stream: dirname(path: __DIR__, levels: 2) . '/var/log/bindAPI.debug', level: Level::Debug);
+        } else {
+            $stream = new StreamHandler(stream: dirname(path: __DIR__, levels: 2) . '/var/log/bindAPI.info', level: Level::Info);
+        }
+        $stream->setFormatter(formatter: $formatter);
+
+        $this->logger = new Logger(name: 'bindAPI');
+        $this->logger->pushHandler(handler: $stream);
+        $this->logger->debug(message: 'bindAPI started');
+
+
+        $containerBuilder = new ContainerBuilder();
+        $containerBuilder->addDefinitions([
+            ApiClient::class => autowire(),
+            ConfigController::class => autowire()
+                ->constructorParameter(parameter: 'quiet', value: $quiet),
+            CLIController::class => autowire()
+                ->constructorParameter(parameter: 'logger', value: $this->logger)
+                ->constructorParameter(parameter: 'quiet', value: $quiet),
+            DomainController::class => autowire()
+                ->constructorParameter(parameter: 'logger', value: $this->logger)
+                ->constructorParameter(parameter: 'quiet', value: $quiet),
+            DomainRepository::class => autowire()
+                ->constructorParameter(parameter: 'logger', value: $this->logger),
+            DynDnsRepository::class => autowire()
+                ->constructorParameter(parameter: 'logger', value: $this->logger),
+            RequestController::class => autowire()
+                ->constructorParameter(parameter: 'logger', value: $this->logger)
+        ]);
+        $this->container = $containerBuilder->build();
+    }
+
+
+    /**
+     * @throws DependencyException
+     * @throws NotFoundException
+     */
+    public function runCommand(array $arguments): void
+    {
+        $this->logger->debug(message: 'runCommand()');
+        $cliController = $this->container->get(name: CLIController::class);
+        $cliController->runCommand(arguments: $arguments);
+    }
+
+
+    /**
+     * @throws DependencyException
+     * @throws NotFoundException
+     */
+    public function handleRequest(string $requestMethod, array $uri): void
+    {
+        $this->logger->debug(message: 'handleRequest()');
+        $requestController = $this->container->get(name: RequestController::class);
+        $requestController->handleRequest(requestMethod: $requestMethod, uri: $uri);
+    }
+}

src/Util/Console.php

@@ -1,11 +1,12 @@
 <?php
 
-use App\Controller\BindAPI;
+use App\Service\BindAPI;
 
 error_reporting(error_level: E_ALL & ~E_DEPRECATED);
 
 if (!is_file(filename: dirname(path: __DIR__, levels: 2) . '/vendor/autoload.php')) {
-    exit('Required runtime components are missing. Try running "composer install".' . PHP_EOL);
+    echo 'Required runtime components are missing. Try running "' . COLOR_YELLOW . 'composer install' . COLOR_DEFAULT . '".' . PHP_EOL;
+    exit(1);
 }
 
 require dirname(path: __DIR__, levels: 2) . '/vendor/autoload.php';
@@ -38,11 +39,11 @@ if (array_key_exists(key: 'v', array: $options) || array_key_exists(key: 'versio
     $authorName = $authors[0]->name;
     $authorEmail = $authors[0]->email;
 
-    echo 'Name: $name' . PHP_EOL;
-    echo 'Description: $description' . PHP_EOL;
-    echo 'Version: $version' . PHP_EOL;
-    echo 'Build Number: $buildNumber' . PHP_EOL;
-    echo 'Author: $authorName ($authorEmail)' . PHP_EOL;
+    echo "Name: $name" . PHP_EOL;
+    echo "Description: $description" . PHP_EOL;
+    echo "Version: $version" . PHP_EOL;
+    echo "Build Number: $buildNumber" . PHP_EOL;
+    echo "Author: $authorName ($authorEmail)" . PHP_EOL;
     exit(0);
 }
 

src/Utilities/Colors.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Utilities;
+
+class Colors
+{
+    const RED = "\033[31m";
+    const GREEN = "\033[32m";
+    const YELLOW = "\033[33m";
+    const BLUE = "\033[34m";
+    const WHITE = "\033[37m";
+    const DEFAULT = "\033[39m";
+}