Compare commits

..

No commits in common. "79942030fa747cf9ddf607ca9a66ae57da0056da" and "9a59a2563d25ee2fade13d8aeb494a883ccbce03" have entirely different histories.

10 changed files with 410 additions and 711 deletions

View File

@ -7,140 +7,108 @@ use UnhandledMatchError;
error_reporting(error_level: E_ALL); error_reporting(error_level: E_ALL);
/** /**
* *
*/ */
class ApiController class ApiController
{ {
/**
* @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;
$curl = curl_init();
/** try {
* @param String $requestType match ($serverType) {
* @param String $serverName 'panel' => curl_setopt(handle: $curl, option: CURLOPT_URL, value: "https://$serverName/api/v2/" . $command),
* @param int $versionIP 'nameserver' => curl_setopt(handle: $curl, option: CURLOPT_URL, value: "https://$serverName/api/" . $command)
* @param String $apiKey };
* @param String $command } catch (UnhandledMatchError) {
* @param String $serverType echo 'Unhandled match: ' . $serverType;
* @param array $body }
*
* @return array curl_setopt(handle: $curl, option: CURLOPT_RETURNTRANSFER, value: 1);
*/ curl_setopt(handle: $curl, option: CURLOPT_TIMEOUT_MS, value: 19999);
function sendCommand(string $requestType, string $serverName, int $versionIP, string $apiKey, string $command, string $serverType, array $body = []): array curl_setopt(handle: $curl, option: CURLOPT_HTTP_VERSION, value: CURL_HTTP_VERSION_2TLS);
{
$error = false; if ($versionIP == 4) {
$curl = curl_init(); curl_setopt(handle: $curl, option: CURLOPT_IPRESOLVE, value: CURL_IPRESOLVE_V4);
} else {
try { curl_setopt(handle: $curl, option: CURLOPT_IPRESOLVE, value: CURL_IPRESOLVE_V6);
match ($serverType) { }
'panel' => curl_setopt(handle: $curl, option: CURLOPT_URL, value: "https://$serverName/api/v2/" . $command),
'nameserver' => curl_setopt(handle: $curl, option: CURLOPT_URL, value: "https://$serverName/api/" . $command) curl_setopt(handle: $curl, option: CURLOPT_HTTPHEADER, value: ["X-API-Key:$apiKey"]);
};
} catch (UnhandledMatchError) { if ($requestType == "POST") {
echo 'Unhandled match: ' . $serverType; curl_setopt(handle: $curl, option: CURLOPT_POST, value: true);
} curl_setopt(handle: $curl, option: CURLOPT_POSTFIELDS, value: $body);
}
curl_setopt(handle: $curl, option: CURLOPT_RETURNTRANSFER, value: 1); if ($requestType == "PUT") {
curl_setopt(handle: $curl, option: CURLOPT_TIMEOUT_MS, value: 19999); curl_setopt(handle: $curl, option: CURLOPT_CUSTOMREQUEST, value: 'PUT');
curl_setopt(handle: $curl, option: CURLOPT_HTTP_VERSION, value: CURL_HTTP_VERSION_2TLS); curl_setopt(handle: $curl, option: CURLOPT_POSTFIELDS, value: json_encode(value: $body));
}
if ($versionIP == 4) {
curl_setopt(handle: $curl, option: CURLOPT_IPRESOLVE, value: CURL_IPRESOLVE_V4); curl_setopt(handle: $curl, option: CURLOPT_CUSTOMREQUEST, value: $requestType);
} else {
curl_setopt(handle: $curl, option: CURLOPT_IPRESOLVE, value: CURL_IPRESOLVE_V6); if ($resultJSON = curl_exec(handle: $curl)) {
} $httpResponse = curl_getinfo(handle: $curl)['http_code'];
curl_setopt(handle: $curl, option: CURLOPT_HTTPHEADER, value: ["X-API-Key:$apiKey"]); switch ($httpResponse) {
case 200:
if ($requestType == "POST") { $apiResult = json_decode(json: $resultJSON);
curl_setopt(handle: $curl, option: CURLOPT_POST, value: true); if ($command == "ping") {
curl_setopt(handle: $curl, option: CURLOPT_POSTFIELDS, value: $body); if ($apiResult->response == "pong") {
} $result = $apiResult->response;
if ($requestType == "PUT") { } else {
curl_setopt(handle: $curl, option: CURLOPT_CUSTOMREQUEST, value: 'PUT'); $result = $apiResult;
curl_setopt(handle: $curl, option: CURLOPT_POSTFIELDS, value: json_encode(value: $body)); }
} } else {
$result = $resultJSON;
curl_setopt(handle: $curl, option: CURLOPT_CUSTOMREQUEST, value: $requestType); }
break;
if ($resultJSON = curl_exec(handle: $curl)) { case 400:
$httpResponse = curl_getinfo(handle: $curl)['http_code']; $result = $resultJSON;
break;
switch ($httpResponse) { case 401:
case 200: $result = 'Missing or wrong API Key';
$apiResult = json_decode(json: $resultJSON); $error = true;
if ($command == "ping") { break;
if ($apiResult->response == "pong") { case 404:
$result = $apiResult->response; $result = '404 Not Found';
} else { break;
$result = $apiResult; case 500:
} $result = 'server error';
} else { break;
$result = $resultJSON; default:
} $result = 'Unhandled error: ' . $httpResponse;
break; }
case 400: } else {
$result = $resultJSON; $error = true;
break; $result = curl_error(handle: $curl);
case 401: }
$result = 'Missing or wrong API Key';
$error = true; $info = curl_getinfo(handle: $curl);
break; $responseTime = $info['total_time'];
case 404:
$result = '404 Not Found'; curl_close(handle: $curl);
break; return [
case 500: 'responseTime' => $responseTime,
$result = 'server error'; 'error' => $error,
break; 'data' => $result,
default: 'header' => $httpResponse ?? ''
$result = 'Unhandled error: ' . $httpResponse; ];
} }
} else {
$error = true;
$result = curl_error(handle: $curl);
}
$info = curl_getinfo(handle: $curl);
$responseTime = $info['total_time'];
curl_close(handle: $curl);
return [
'responseTime' => $responseTime,
'error' => $error,
'data' => $result,
'header' => $httpResponse ?? ''
];
}
function fileGetContents(string $url, int $versionIP): ?array
{
$curl = curl_init(url: $url);
$options = array(
CURLOPT_RETURNTRANSFER => true,
CURLOPT_FOLLOWLOCATION => true,
CURLOPT_ENCODING => "",
CURLOPT_AUTOREFERER => true,
CURLOPT_CONNECTTIMEOUT => 120,
CURLOPT_TIMEOUT => 120,
CURLOPT_MAXREDIRS => 10,
);
if ($versionIP == 4) {
curl_setopt(handle: $curl, option: CURLOPT_IPRESOLVE, value: CURL_IPRESOLVE_V4);
} else {
curl_setopt(handle: $curl, option: CURLOPT_IPRESOLVE, value: CURL_IPRESOLVE_V6);
}
curl_setopt_array(handle: $curl, options: $options);
$content = curl_exec(handle: $curl);
$error = curl_errno(handle: $curl);
$errorMessage = curl_error(handle: $curl);
$header = curl_getinfo(handle: $curl);
curl_close(handle: $curl);
$header['error'] = $error;
$header['errorMessage'] = $errorMessage;
$header['content'] = $content;
return $header;
}
} }

View File

@ -1745,7 +1745,7 @@ class CLIController
$quiet = $this->configController->getConfig(configKey: 'quiet'); $quiet = $this->configController->getConfig(configKey: 'quiet');
$verbose = $this->configController->getConfig(configKey: 'verbose'); $verbose = $this->configController->getConfig(configKey: 'verbose');
if (empty($this->arguments[1])) { if (empty($this->arguments[1])) {
if (!$quiet) { if (!$quiet) {
echo COLOR_DEFAULT . 'You need to supply a domain name.' . PHP_EOL; echo COLOR_DEFAULT . 'You need to supply a domain name.' . PHP_EOL;
} }
@ -1755,7 +1755,7 @@ class CLIController
} }
if (!$quiet) { if (!$quiet) {
echo COLOR_DEFAULT . 'Checking domain ' . COLOR_YELLOW . $domainName . COLOR_DEFAULT . '.' . PHP_EOL; echo COLOR_DEFAULT . 'Checking domain ' . COLOR_YELLOW . $domainName . COLOR_DEFAULT . PHP_EOL;
} }
if (!$domain = $this->domainRepository->findByName(name: $domainName)) { if (!$domain = $this->domainRepository->findByName(name: $domainName)) {
@ -1780,8 +1780,8 @@ class CLIController
$webmailDomain = 'webmail.' . $domainName; $webmailDomain = 'webmail.' . $domainName;
if (!empty($panel->getAAAA())) { if (!empty($panel->getAAAA())) {
if (!$quiet && $verbose) { if ($verbose) {
echo 'Check using IPv6: ' . COLOR_YELLOW . $panel->getAaaa() . '.' . COLOR_DEFAULT . PHP_EOL; echo 'Check using IPv6: ' . COLOR_YELLOW . $panel->getAaaa() . COLOR_DEFAULT . PHP_EOL;
} }
$result = $this->apiController->sendCommand( $result = $this->apiController->sendCommand(
requestType: 'GET', requestType: 'GET',
@ -1791,7 +1791,7 @@ class CLIController
command: 'domains/name/' . $webmailDomain, command: 'domains/name/' . $webmailDomain,
serverType: 'panel'); serverType: 'panel');
} else { } else {
if (!$quiet && $verbose) { if ($verbose) {
echo 'Check using IPv4: ' . COLOR_YELLOW . $panel->getA() . COLOR_DEFAULT . PHP_EOL; echo 'Check using IPv4: ' . COLOR_YELLOW . $panel->getA() . COLOR_DEFAULT . PHP_EOL;
} }
$result = $this->apiController->sendCommand( $result = $this->apiController->sendCommand(
@ -1800,70 +1800,24 @@ class CLIController
versionIP: 4, versionIP: 4,
apiKey: $decryptedKey, apiKey: $decryptedKey,
command: 'domains/name/' . $webmailDomain, command: 'domains/name/' . $webmailDomain,
serverType: 'panel'); serverType: 'panel' );
} }
if ($result['header'] === 404) { if ($result['header'] === 404) {
if (!$quiet) { if (!$quiet) {
echo 'The domain ' . COLOR_YELLOW . $webmailDomain . COLOR_DEFAULT . " doesn't exist." . PHP_EOL; echo 'The domain ' . COLOR_YELLOW . $webmailDomain . COLOR_DEFAULT . ' doesn\'t exist.' . PHP_EOL;
} }
exit(1); exit(1);
} else { } else {
if (!$quiet) { if(!$quiet) {
echo 'Found ' . COLOR_YELLOW . $webmailDomain . COLOR_DEFAULT . '.' . PHP_EOL; echo 'Found ' . COLOR_YELLOW . $webmailDomain . COLOR_DEFAULT . '.' . PHP_EOL;
} }
} }
if ($v4 = dns_get_record(hostname: $webmailDomain, type: DNS_A)[0]) {
if (!$quiet) {
echo "Found IPv4 entry: " . COLOR_YELLOW . $v4['ip'] . COLOR_DEFAULT . '.' .PHP_EOL;
}
$v4Test = $this->apiController->fileGetContents(url: $webmailDomain, versionIP: 4);
if ($v4Test['error']) {
if (!$quiet) {
echo 'There was an error: ' . COLOR_YELLOW . $v4Test['errorMessage'] . COLOR_DEFAULT . '.';
}
exit(1);
} else {
if (!$quiet) {
echo 'Successfully connected to webserver via ' . COLOR_YELLOW . 'IPv4' . COLOR_DEFAULT . '.' . PHP_EOL;
}
}
} else {
if (!$quiet) {
echo "Found no IPv4 entry for " . COLOR_YELLOW . $webmailDomain . COLOR_DEFAULT . PHP_EOL;
}
}
if ($v6 = dns_get_record(hostname: $webmailDomain, type: DNS_AAAA)[0]) {
if (!$quiet) {
echo "Found IPv6 entry: " . COLOR_YELLOW . $v6['ipv6'] . COLOR_DEFAULT . '.' . PHP_EOL;
}
$v6Test = $this->apiController->fileGetContents(url: $webmailDomain, versionIP: 6);
if ($v6Test['error']) {
if (!$quiet) {
echo 'There was an error: ' . COLOR_YELLOW . $v6Test['errorMessage'] . COLOR_DEFAULT . '.';
}
exit(1);
} else {
if (!$quiet) {
echo 'Successfully connected to webserver via ' . COLOR_YELLOW . 'IPv6' . COLOR_DEFAULT . '.' . PHP_EOL;
}
}
} else {
if (!$quiet) {
echo "Found no IPv6 entry for " . COLOR_YELLOW . $webmailDomain . COLOR_DEFAULT . '.' . PHP_EOL;
}
}
// TODO check that at least IPv4 or IP6 exists?
$domainData = json_decode(json: $result['data']); $domainData = json_decode(json: $result['data']);
$apacheData = $domainData->apache; $apacheData = $domainData->apache;
$httpDirectives = $apacheData->http_directives;
$httpsDirectives = $apacheData->https_directives . PHP_EOL; $httpsDirectives = $apacheData->https_directives . PHP_EOL;
if (!str_contains(haystack: $httpsDirectives, needle: '# bindAPI - webmailer')) { if (!str_contains(haystack: $httpsDirectives, needle: '# bindAPI - webmailer')) {
@ -1871,54 +1825,25 @@ class CLIController
echo 'Generated config is missing.' . PHP_EOL; echo 'Generated config is missing.' . PHP_EOL;
} }
exit(1); exit(1);
} else {
if (!$quiet) {
echo 'Generated config is valid.' . PHP_EOL;
}
exit(0);
} }
} }
/** public function webmailCreate()
* @return void
*/
public function webmailCreate(): bool
{ {
// TODO
/*
$webmailConfig = '# bindAPI - webmailer' . PHP_EOL; $webmailConfig = '# bindAPI - webmailer' . PHP_EOL;
$webmailConfig .= 'SSLProxyEngine On' . PHP_EOL; $webmailConfig .= 'SSLProxyEngine On' . PHP_EOL;
$webmailConfig .= 'ProxyPass /.well-known/ !' . PHP_EOL; $webmailConfig .= 'ProxyPass /.well-known/ !' . PHP_EOL;
$webmailConfig .= 'ProxyPass "/" "https://webmail' . $panel->getName() . '"' . PHP_EOL; $webmailConfig .= 'ProxyPass "/" "https://' . $panel->getName() . '/webmail/"' . PHP_EOL;
$webmailConfig .= '## bindAPI - webmailer' . PHP_EOL; $webmailConfig .= '## bindAPI - webmailer' . PHP_EOL;
echo $webmailConfig; echo $webmailConfig;
//$httpsDirectives += $w //$httpsDirectives += $w
*/
} }
private function checkMail(): void
{
}
private function checksVersion(): void
{
}
private function dynDnyUpdate(): void
{
}
private function dynDnsDelete(): void
{
}
private function webmailDelete(): void
{
}
} }

View File

@ -2,7 +2,7 @@
namespace App\Controller; namespace App\Controller;
//error_reporting(error_level: E_ALL); error_reporting(error_level: E_ALL);
use PDO; use PDO;
@ -15,32 +15,31 @@ class DatabaseConnection
{ {
private PDO $dbConnection; private PDO $dbConnection;
const TABLE_PREFIX = ''; const TABLE_PREFIX = '';
const TABLE_DOMAINS = self::TABLE_PREFIX . "domains"; const TABLE_DOMAINS = self::TABLE_PREFIX . "domains";
const TABLE_NAMESERVERS = self::TABLE_PREFIX . "nameservers"; const TABLE_NAMESERVERS = self::TABLE_PREFIX . "nameservers";
const TABLE_PANELS = self::TABLE_PREFIX . "panels"; const TABLE_PANELS = self::TABLE_PREFIX . "panels";
const TABLE_APIKEYS = self::TABLE_PREFIX . "apikeys"; const TABLE_APIKEYS = self::TABLE_PREFIX . "apikeys";
const TABLE_DYNDNS = self::TABLE_PREFIX . "dyndns"; const TABLE_DYNDNS = self::TABLE_PREFIX . "dyndns";
public function __construct(private readonly ConfigController $configController) public function __construct(private readonly ConfigController $configController)
{ {
$dbHost = $this->configController->getConfig(configKey: 'dbHost'); $dbHost = $this->configController->getConfig(configKey: 'dbHost');
$dbPort = $this->configController->getConfig(configKey: 'dbPort'); $dbPort = $this->configController->getConfig(configKey: 'dbPort');
$dbDatabase = $this->configController->getConfig(configKey: 'dbDatabase'); $dbDatabase = $this->configController->getConfig(configKey: 'dbDatabase');
$dbUser = $this->configController->getConfig(configKey: 'dbUser'); $dbUser = $this->configController->getConfig(configKey: 'dbUser');
$dbPassword = $this->configController->getConfig(configKey: 'dbPassword'); $dbPassword = $this->configController->getConfig(configKey: 'dbPassword');
$this->dbConnection = new PDO(
dsn: "mysql:host=$dbHost;port=$dbPort;charset=utf8mb4;dbname=$dbDatabase",
username: $dbUser,
password: $dbPassword
);
if (!$this->configController->getConfig(configKey: 'test')) { if (!$this->configController->getConfig(configKey: 'test')) {
// TODO create config => encryption key // TODO create config => encryption key
try { try {
$this->dbConnection = new PDO(
dsn: "mysql:host=$dbHost;port=$dbPort;charset=utf8mb4;dbname=$dbDatabase",
username: $dbUser,
password: $dbPassword
);
$sql = "SHOW TABLES"; $sql = "SHOW TABLES";
$statement = $this->dbConnection->prepare(query: $sql); $statement = $this->dbConnection->prepare(query: $sql);
$statement->execute(); $statement->execute();
$result = $statement->fetch(); $result = $statement->fetch();
@ -48,7 +47,7 @@ class DatabaseConnection
// ALTER TABLE `domains` ADD `panel_id` INT NULL AFTER `id`; // ALTER TABLE `domains` ADD `panel_id` INT NULL AFTER `id`;
echo 'Error: Cannot find tables.' . PHP_EOL; echo 'Error: Cannot find tables.' . PHP_EOL;
if (confirm(message: 'Should I try to create them?')) { if (confirm(message: 'Should I try to create them?')) {
$sql = " $sql = "
CREATE TABLE `apikeys` ( CREATE TABLE `apikeys` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
@ -59,7 +58,7 @@ class DatabaseConnection
$statement = $this->dbConnection->prepare(query: $sql); $statement = $this->dbConnection->prepare(query: $sql);
$statement->execute(); $statement->execute();
$sql = " $sql = "
CREATE TABLE `domains` ( CREATE TABLE `domains` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
@ -69,7 +68,7 @@ class DatabaseConnection
$statement = $this->dbConnection->prepare(query: $sql); $statement = $this->dbConnection->prepare(query: $sql);
$statement->execute(); $statement->execute();
$sql = " $sql = "
CREATE TABLE `nameservers` ( CREATE TABLE `nameservers` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
@ -81,7 +80,7 @@ class DatabaseConnection
$statement = $this->dbConnection->prepare(query: $sql); $statement = $this->dbConnection->prepare(query: $sql);
$statement->execute(); $statement->execute();
$sql = " $sql = "
CREATE TABLE `panels` ( CREATE TABLE `panels` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
@ -134,7 +133,7 @@ class DatabaseConnection
*/ */
function generatePassword(int $length = 8): string function generatePassword(int $length = 8): string
{ {
$chars = '23456789bcdfhkmnprstvzBCDFHJKLMNPRSTVZ'; $chars = '23456789bcdfhkmnprstvzBCDFHJKLMNPRSTVZ';
$shuffled = str_shuffle(string: $chars); $shuffled = str_shuffle(string: $chars);
return mb_substr(string: $shuffled, start: 0, length: $length); return mb_substr(string: $shuffled, start: 0, length: $length);
} }

View File

@ -2,6 +2,10 @@
namespace App\Entity; namespace App\Entity;
use App\Enums\PanelType;
/** /**
* *
*/ */

View File

@ -4,8 +4,8 @@ namespace App\Repository;
error_reporting(error_level: E_ALL); error_reporting(error_level: E_ALL);
use App\Controller\DatabaseConnection; use App\Controller\DatabaseConnection;
use App\Controller\EncryptionController;
use App\Entity\Apikey; use App\Entity\Apikey;
use Exception;
use PDO; use PDO;
use PDOException; use PDOException;
@ -14,7 +14,7 @@ use PDOException;
*/ */
class ApikeyRepository class ApikeyRepository
{ {
public function __construct(private readonly DatabaseConnection $databaseConnection, EncryptionController $encryptionController) public function __construct(private readonly DatabaseConnection $databaseConnection)
{} {}
@ -23,9 +23,8 @@ class ApikeyRepository
*/ */
public function findAll(): bool|array public function findAll(): bool|array
{ {
$sql = " $sql = "
SELECT id, name, apikey_prefix, apikey SELECT id, name, api_token_prefix, api_token
FROM " . DatabaseConnection::TABLE_APIKEYS; FROM " . DatabaseConnection::TABLE_APIKEYS;
try { try {
@ -35,7 +34,7 @@ class ApikeyRepository
$apikeys = []; $apikeys = [];
while ($result = $statement->fetch()) { while ($result = $statement->fetch()) {
$apikey = new Apikey(id: $result['id'], name: $result['name'], apikey: $result['apikey'], apikeyPrefix: $result['apikey_prefix']); $apikey = new Apikey(name: $result['name'], apiTokenPrefix: $result['api_token_prefix'], apiToken: $result['api_token'], id: $result['id']);
$apikeys[] = $apikey; $apikeys[] = $apikey;
} }
return $apikeys; return $apikeys;
@ -48,12 +47,12 @@ class ApikeyRepository
/** /**
* @param Int $id * @param Int $id
* *
* @return Apikey|bool * @return \App\Entity\Apikey|bool
*/ */
public function findByID(Int $id): Apikey|bool public function findByID(Int $id): Apikey|bool
{ {
$sql = " $sql = "
SELECT id, name, apikey_prefix, apikey SELECT id, name, api_token_prefix, api_token
FROM " . DatabaseConnection::TABLE_APIKEYS . " FROM " . DatabaseConnection::TABLE_APIKEYS . "
WHERE id = :id; WHERE id = :id;
"; ";
@ -63,7 +62,7 @@ class ApikeyRepository
$statement->bindParam(param: ':id', var: $id); $statement->bindParam(param: ':id', var: $id);
$statement->execute(); $statement->execute();
if ($result = $statement->fetch(mode: PDO::FETCH_ASSOC)) { if ($result = $statement->fetch(mode: PDO::FETCH_ASSOC)) {
return new Apikey(id: $result['id'], name: $result['name'], apikey: $result['apikey'], apikeyPrefix: $result['apikey_prefix']); return new Apikey(name: $result['name'], apiTokenPrefix: $result['api_token_prefix'], apiToken: $result['api_token'], id: $result['id']);
} else { } else {
return false; return false;
} }
@ -76,21 +75,21 @@ class ApikeyRepository
/** /**
* @param String $prefix * @param String $prefix
* *
* @return Apikey|bool * @return \App\Entity\Apikey|bool
*/ */
public function findByPrefix(String $prefix): Apikey|bool public function findByPrefix(String $prefix): Apikey|bool
{ {
$sql = " $sql = "
SELECT id, name, apikey_prefix, apikey SELECT id, name, api_token_prefix, api_token
FROM " . DatabaseConnection::TABLE_APIKEYS . " FROM " . DatabaseConnection::TABLE_APIKEYS . "
WHERE apikey_prefix = :prefix"; WHERE api_token_prefix = :prefix";
try { try {
$statement = $this->databaseConnection->getConnection()->prepare(query: $sql); $statement = $this->databaseConnection->getConnection()->prepare(query: $sql);
$statement->bindParam(param: ':prefix', var: $prefix); $statement->bindParam(param: ':prefix', var: $prefix);
$statement->execute(); $statement->execute();
if ($result = $statement->fetch(mode: PDO::FETCH_ASSOC)) { if ($result = $statement->fetch(mode: PDO::FETCH_ASSOC)) {
return new Apikey(id: $result['id'], name: $result['name'], apikey: $result['apikey'], apikeyPrefix: $result['apikey_prefix']); return new Apikey(name: $result['name'], apiTokenPrefix: $result['api_token_prefix'], apiToken: $result['api_token'], id: $result['id']);
} else { } else {
return false; return false;
} }
@ -98,51 +97,56 @@ class ApikeyRepository
exit($e->getMessage()); exit($e->getMessage());
} }
} }
/** /**
* @param Apikey $apikey * @return array|void
* @return int */
*/ public function create(String $name = '')
public function insert(ApiKey $apikey): int {
{ $tokenPrefix = uniqid();
$result['tokenPrefix'] = $tokenPrefix;
$name = $apikey->getName(); try {
$apikeyPrefix = $apikey->getApikeyPrefix(); $key = bin2hex(string: random_bytes(length: 24));
$apikeyValue = $apikey->getApikey(); $result['key'] = $key;
} catch (Exception $e) {
echo $e->getMessage() . PHP_EOL;
exit(1);
}
$token = password_hash(password: $tokenPrefix . '.' . $key, algo: PASSWORD_ARGON2ID);
$sql = " $sql = "
INSERT INTO " . DatabaseConnection::TABLE_APIKEYS . " (name, apikey_prefix, apikey) INSERT INTO " . DatabaseConnection::TABLE_APIKEYS . " (name, api_token_prefix, api_token)
VALUES (:name, :apikey_prefix, :apikey)"; VALUES (:name, :token_prefix, :token)";
try { try {
$statement = $this->databaseConnection->getConnection()->prepare(query: $sql); $statement = $this->databaseConnection->getConnection()->prepare(query: $sql);
$statement->bindParam(param: ':name', var: $name); $statement->bindParam(param: ':token_prefix', var: $tokenPrefix);
$statement->bindParam(param: ':apikey_prefix', var: $apikeyPrefix); $statement->bindParam(param: ':token', var: $token);
$statement->bindParam(param: ':apikey', var: $apikeyValue); $statement->bindParam(param: ':name', var: $name);
$statement->execute(); $statement->execute();
return intval(value: $this->databaseConnection->getConnection()->lastInsertId()); $result['row'] = $this->databaseConnection->getConnection()->lastInsertId();
return $result;
} catch (PDOException $e) { } catch (PDOException $e) {
exit($e->getMessage()); exit($e->getMessage());
} }
} }
/** /**
* @param Apikey $apikey * @param Int $id
* @return false|int * @param String $name
*/ *
public function update(Apikey $apikey): bool|int * @return false|int
*/
public function update(int $id, string $name): bool|int
{ {
$id = $apikey->getId(); $current = $this->findByID(id: $id);
$name = $apikey->getName();
if (empty($name)) {
$current = $this->findByID(id: $id); $name = $current['name'];
}
if (empty($name)) {
$name = $current->getName();
}
$sql = " $sql = "
UPDATE " . DatabaseConnection::TABLE_APIKEYS . " SET UPDATE " . DatabaseConnection::TABLE_APIKEYS . " SET
name = :name name = :name

View File

@ -6,257 +6,249 @@ use App\Controller\DatabaseConnection;
use App\Entity\Nameserver; use App\Entity\Nameserver;
use PDO; use PDO;
use PDOException; use PDOException;
use SodiumException;
/** /**
* *
*/ */
class NameserverRepository class NameserverRepository
{ {
public function __construct(private readonly DatabaseConnection $databaseConnection) public function __construct(private readonly DatabaseConnection $databaseConnection)
{ {
// no body }
}
/**
/** * @return array
* @return array|null */
*/ public function findAll(): array
public function findAll(): ?array {
{ $nameservers = [];
$nameservers = []; $sql = "
$sql = " SELECT id, name, a, aaaa, apikey
SELECT id, name, a, aaaa, apikey, apikey_prefix
FROM " . DatabaseConnection::TABLE_NAMESERVERS . " FROM " . DatabaseConnection::TABLE_NAMESERVERS . "
ORDER BY name"; ORDER BY name";
try { try {
$statement = $this->databaseConnection->getConnection()->prepare(query: $sql); $statement = $this->databaseConnection->getConnection()->prepare(query: $sql);
$statement->execute(); $statement->execute();
while ($result = $statement->fetch(mode: PDO::FETCH_ASSOC)) { 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']);
$nameservers[] = $nameserver; $nameservers[] = $nameserver;
} }
return $nameservers; return $nameservers;
} catch (PDOException $e) { } catch (PDOException $e) {
exit($e->getMessage()); exit($e->getMessage());
} }
} }
/** /**
* @return Nameserver|null * @return \App\Entity\Nameserver
*/ */
public function findFirst(): ?Nameserver public function findFirst(): Nameserver
{ {
$sql = " $nameservers = [];
SELECT id, name, a, aaaa, apikey, apikey_prefix $sql = "
SELECT id, name, a, aaaa, apikey
FROM " . DatabaseConnection::TABLE_NAMESERVERS . " FROM " . DatabaseConnection::TABLE_NAMESERVERS . "
ORDER BY name"; ORDER BY name";
try { try {
$statement = $this->databaseConnection->getConnection()->prepare(query: $sql); $statement = $this->databaseConnection->getConnection()->prepare(query: $sql);
$statement->execute(); $statement->execute();
$result = $statement->fetch(mode: PDO::FETCH_ASSOC); $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']);
} catch (PDOException $e) { } catch (PDOException $e) {
exit($e->getMessage()); exit($e->getMessage());
} }
} }
/** /**
* @param int $id * @param int $id
* *
* @return null|Nameserver * @return null|\App\Entity\Nameserver
*/ */
public function findByID(int $id): ?Nameserver public function findByID(int $id): ?Nameserver
{ {
$sql = " $sql = "
SELECT id, name, a, aaaa, apikey, apikey_prefix SELECT id, name, a, aaaa, apikey
FROM . " . DatabaseConnection::TABLE_NAMESERVERS . " FROM . " . DatabaseConnection::TABLE_NAMESERVERS . "
WHERE id = :id"; WHERE id = :id";
try { try {
$statement = $this->databaseConnection->getConnection()->prepare(query: $sql); $statement = $this->databaseConnection->getConnection()->prepare(query: $sql);
$statement->bindParam(param: ':id', var: $id); $statement->bindParam(param: ':id', var: $id);
$statement->execute(); $statement->execute();
if ($result = $statement->fetch(mode: PDO::FETCH_ASSOC)) { 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']);
} else { } else {
return null; return null;
} }
} catch (PDOException $e) { } catch (PDOException $e) {
exit($e->getMessage()); exit($e->getMessage());
} }
} }
/** /**
* @param String $name * @param String $name
* *
* @return Nameserver|null * @return \App\Entity\Nameserver|bool
*/ */
public function findByName(string $name): ?Nameserver public function findByName(string $name): Nameserver|bool
{ {
$sql = " $sql = "
SELECT id, name, a, aaaa, apikey, apikey_prefix SELECT id, name, a, aaaa, apikey
FROM " . DatabaseConnection::TABLE_NAMESERVERS . " FROM " . DatabaseConnection::TABLE_NAMESERVERS . "
WHERE name = :name"; WHERE name = :name";
try { try {
$statement = $this->databaseConnection->getConnection()->prepare(query: $sql); $statement = $this->databaseConnection->getConnection()->prepare(query: $sql);
$statement->bindParam(param: ':name', var: $name); $statement->bindParam(param: ':name', var: $name);
$statement->execute(); $statement->execute();
if ($result = $statement->fetch(mode: PDO::FETCH_ASSOC)) { 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']);
} else { } else {
return null; return false;
} }
} catch (PDOException $e) { } catch (PDOException $e) {
exit($e->getMessage()); exit($e->getMessage());
} }
} }
/** /**
* @param Nameserver $nameserver * @param \App\Entity\Nameserver $nameserver
* *
* @return int|null * @return string|false
*/ */
public function insert(Nameserver $nameserver): ?int public function insert(Nameserver $nameserver): bool|string
{ {
$name = $nameserver->getName(); $sql = "
$a = $nameserver->getA(); INSERT INTO " . DatabaseConnection::TABLE_NAMESERVERS . " (name, a, aaaa, apikey)
$aaaa = $nameserver->getAaaa(); VALUES (:name, :a, :aaaa, :apikey)";
$apikey = $nameserver->getApikey();
$apikeyPrefix = $nameserver->getApikeyPrefix(); try {
$name = $nameserver->getName();
$a = $nameserver->getA();
$sql = " $aaaa = $nameserver->getAaaa();
INSERT INTO " . DatabaseConnection::TABLE_NAMESERVERS . " (name, a, aaaa, apikey, apikey_prefix) $apikey = $nameserver->getApikey();
VALUES (:name, :a, :aaaa, :apikey, :apikey_prefix)"; $statement = $this->databaseConnection->getConnection()->prepare(query: $sql);
$statement->bindParam(param: ':name', var: $name);
try { $statement->bindParam(param: ':a', var: $a);
$statement = $this->databaseConnection->getConnection()->prepare(query: $sql); $statement->bindParam(param: ':aaaa', var: $aaaa);
$statement->bindParam(param: ':name', var: $name); $statement->bindParam(param: ':apikey', var: $apikey);
$statement->bindParam(param: ':a', var: $a); $statement->execute();
$statement->bindParam(param: ':aaaa', var: $aaaa);
$statement->bindParam(param: ':apikey', var: $apikey); return $this->databaseConnection->getConnection()->lastInsertId();
$statement->bindParam(param: ':apikey_prefix', var: $apikeyPrefix); } catch (PDOException $e) {
$statement->execute(); exit($e->getMessage());
}
return intval(value: $this->databaseConnection->getConnection()->lastInsertId()); }
} catch (PDOException $e) {
exit($e->getMessage() . PHP_EOL);
} /**
} * @param Int $id
* @param String $name
* @param String $a
/** * @param String $aaaa
* @param Nameserver $nameserver * @param String $apikey
* @return false|int *
*/ * @return false|int
public function update(Nameserver $nameserver): bool|int */
{ public function update(int $id, string $name, string $a, string $aaaa, string $apikey): bool|int
$id = $nameserver->getId(); {
$name = $nameserver->getName(); $current = $this->findByID(id: $id);
$a = $nameserver->getA();
$aaaa = $nameserver->getAaaa(); /* doesn't work
$apikey = $nameserver->getApikey(); $statement = "
$apikeyPrefix = $nameserver->getApikeyPrefix(); INSERT INTO domains(id, name, a, aaaa)
$passphrase = $nameserver->getPassphrase(); VALUES(:id, :name, :a, :aaaa)
ON DUPLICATE KEY UPDATE
$current = $this->findByID(id: $id); name=COALESCE(VALUES(name), :name),
a=COALESCE(:a, a),
aaaa=COALESCE(:aaaa, aaaa)";
if (empty($name)) { */
$name = $current->getName();
} if (empty($name)) {
if (empty($a)) { $name = $current->getName();
$a = $current->getA(); }
} if (empty($a)) {
if (empty($aaaa)) { $a = $current->getA();
$aaaa = $current->getAaaa(); }
} if (empty($aaaa)) {
$aaaa = $current->getAaaa();
if (empty($passphrase)) { }
$apikey = $current->getApikey(); if (empty($apikey)) {
$apikeyPrefix = $current->getApikeyPrefix(); $apikey = $current->getApikey();
} }
$sql = "
$sql = "
UPDATE " . DatabaseConnection::TABLE_NAMESERVERS . " SET UPDATE " . DatabaseConnection::TABLE_NAMESERVERS . " SET
name = :name, name = :name,
a = :a, a = :a,
aaaa = :aaaa, aaaa = :aaaa,
apikey = :apikey, apikey = :apikey
apikey_prefix = :apikey_prefix
WHERE id = :id"; WHERE id = :id";
try { try {
$statement = $this->databaseConnection->getConnection()->prepare(query: $sql); $statement = $this->databaseConnection->getConnection()->prepare(query: $sql);
$statement->bindParam(param: 'id', var: $id); $statement->bindParam(param: 'id', var: $id);
$statement->bindParam(param: 'name', var: $name); $statement->bindParam(param: 'name', var: $name);
$statement->bindParam(param: 'a', var: $a); $statement->bindParam(param: 'a', var: $a);
$statement->bindParam(param: 'aaaa', var: $aaaa); $statement->bindParam(param: 'aaaa', var: $aaaa);
$statement->bindParam(param: 'apikey', var: $apikey); $statement->bindParam(param: 'apikey', var: $apikey);
$statement->bindParam(param: 'apikey_prefix', var: $apikeyPrefix); $statement->execute();
$statement->execute();
try { return $statement->rowCount();
sodium_memzero(string: $apikey); } catch (PDOException $e) {
} catch(SodiumException $e) { echo $e->getMessage();
die($e->getMessage() . PHP_EOL); return false;
} }
return intval(value: $statement->rowCount()); }
} catch (PDOException $e) {
echo $e->getMessage();
return false; /**
} * @param $id
} *
* @return int
*/
/** public function delete($id): int
* @param $id {
* $sql = "
* @return int|null
*/
public function delete($id): ?int
{
$sql = "
DELETE FROM " . DatabaseConnection::TABLE_NAMESERVERS . " DELETE FROM " . DatabaseConnection::TABLE_NAMESERVERS . "
WHERE id = :id"; WHERE id = :id";
try { try {
$statement = $this->databaseConnection->getConnection()->prepare(query: $sql); $statement = $this->databaseConnection->getConnection()->prepare(query: $sql);
$statement->bindParam(param: 'id', var: $id); $statement->bindParam(param: 'id', var: $id);
$statement->execute(); $statement->execute();
return $statement->rowCount(); return $statement->rowCount();
} catch (PDOException $e) { } catch (PDOException $e) {
exit($e->getMessage()); exit($e->getMessage());
} }
} }
/** /**
* @param String $field * @param String $field
* *
* @return int * @return int
*/ */
public function getLongestEntry(string $field): int public function getLongestEntry(string $field): int
{ {
$sql = " $sql = "
SELECT MAX(LENGTH(" . $field . ")) as length FROM " . DatabaseConnection::TABLE_NAMESERVERS; SELECT MAX(LENGTH(" . $field . ")) as length FROM " . DatabaseConnection::TABLE_NAMESERVERS;
try { try {
$statement = $this->databaseConnection->getConnection()->prepare(query: $sql); $statement = $this->databaseConnection->getConnection()->prepare(query: $sql);
$statement->execute(); $statement->execute();
$result = $statement->fetch(); $result = $statement->fetch();
return $result['length']; return $result['length'];
} catch (PDOException $e) { } catch (PDOException $e) {
exit($e->getMessage()); exit($e->getMessage());
} }
} }
} }

View File

@ -257,16 +257,4 @@ class PanelRepository
exit($e->getMessage()); exit($e->getMessage());
} }
} }
public function getSelf(): ?Panel
{
$panels = $this->findAll();
foreach ($panels as $panel) {
if ($panel->getSelf() === 'yes') {
return $panel;
}
}
return null;
}
} }

View File

@ -1,124 +0,0 @@
<?php
namespace Unit\Repository;
use App\Controller\ConfigController;
use App\Controller\DomainController;
use App\Entity\Domain;
use App\Repository\DomainRepository;
use DI\Container;
use DI\ContainerBuilder;
use Exception;
use Monolog\Formatter\LineFormatter;
use Monolog\Handler\StreamHandler;
use Monolog\Logger;
use PHPUnit\Framework\TestCase;
use Unit\Controller\BindApiControllerTest;
use function DI\autowire;
/**
*
*/
class DomainRepositoryTest extends BindApiControllerTest
{
private string $localZoneFile;
private string $localZonesDir;
private string $namedConfLocalFile;
/**
* @param int|string $dataName
*
* @throws Exception
* @internal This method is not covered by the backward compatibility promise for PHPUnit
*/
public function __construct(?string $name = null, array $data = [], $dataName = '')
{
parent::__construct(name: $name, data: $data, dataName: $dataName);
}
public function setUp(): void
{
$this->logger->info(message: 'Started DomainRepositoryTest');
}
public function tearDown(): void
{
$this->logger->info(message: 'Finished DomainRepositoryTest');
}
/**
*/
public function testInsert()
{
self::assertEquals(expected: true, actual: true);
/*
$domain = new Domain(name: 'inserttest.org', panel: 'keyhelp.lab.24unix.net');
$this->domainRepository->insert(domain: $domain);
$this->domainController->createSlaveZoneFile(domain: $domain);
// now get the persisted domain with id
$domainTest = $this->domainRepository->findByName(name: 'inserttest.org');
$this->assertIsNotBool(actual: $domainTest);
$this->assertEquals(expected: 'inserttest.org', actual: $domainTest->getName());
if ($namedConfLocal = file_get_contents(filename: $this->namedConfLocalFile)) {
$this->assertStringContainsString(needle: $this->localZoneFile, haystack: $namedConfLocal);
} else {
$this->fail(message: 'No permissions: ' . $this->namedConfLocalFile);
}
$this->assertNotFalse(condition: fileperms(filename: $this->localZoneFile));
$localZones = file_get_contents(filename: $this->localZoneFile);
$this->assertStringContainsString(needle: $domainTest->getName(), haystack: $localZones);
$zoneFile = $this->localZonesDir . $domain->getName();
$this->assertFileExists(filename: $zoneFile);
// clean up
$this->domainRepository->delete(domain: $domainTest);
*/
}
/**
*/
public function testDelete()
{
self::assertEquals(expected: true, actual: true);
/*
$domain = new Domain(name: 'inserttest.org', panel: 'keyhelp.lab.24unix.net');
$this->domainRepository->insert(domain: $domain);
$this->domainController->createSlaveZoneFile(domain: $domain);
$domainTest = $this->domainRepository->findByName(name: 'inserttest.org');
$this->assertIsNotBool(actual: $domainTest);
$this->assertEquals(expected: 'inserttest.org', actual: $domainTest->getName());
// domain is valid and created
// now delete and check for cleanup
$this->domainRepository->delete(domain: $domainTest);
$this->domainController->deleteZone(domain: $domainTest);
// check zone is removed
$this->assertNotFalse(condition: fileperms(filename: $this->localZoneFile));
$localZones = file_get_contents(filename: $this->localZoneFile);
$this->assertStringNotContainsString(needle: $domainTest->getName(), haystack: $localZones);
$zoneFile = $this->localZonesDir . $domain->getName();
$this->assertFileDoesNotExist(filename: $zoneFile);
*/
}
}

View File

@ -1,27 +0,0 @@
<?php
namespace Unit\Repository;
use App\Entity\Nameserver;
use Unit\Controller\BindApiControllerTest;
/**
*
*/
class NameserverRepositoryTest extends BindApiControllerTest
{
/**
*/
public function testInsert()
{
$nameserver = new Nameserver(name: 'inserttest.org', a: '1.2.3.4', aaaa: '1bad::babe');
$this->nameserverRepository->insert(nameserver: $nameserver);
$nameserverTest = $this->nameserverRepository->findByName(name: 'inserttest.org');
$this->assertIsNotBool(actual: $nameserver);
$this->assertEquals(expected: 'inserttest.org', actual: $nameserverTest->getName());
// clean up
$this->nameserverRepository->delete(id: $nameserverTest->getId());
}
}

View File

@ -1,30 +0,0 @@
<?php
namespace Unit\Repository;
use App\Controller\BindApiTestController;
use PHPUnit\Framework\TestCase;
use Unit\Controller\BindApiControllerTest;
/**
*
*/
class PanelRepositoryTest extends BindApiControllerTest
{
public function setUp(): void
{
}
public function tearDown(): void
{
}
public function testInsert()
{
self::assertEquals(expected: true, actual: true);
}
}