From 8861611a6730c5bdf6a62a479c8b774d0252d1fe Mon Sep 17 00:00:00 2001 From: Marek Miklewicz Date: Tue, 30 Jun 2026 20:40:41 +0200 Subject: [PATCH] fix: use directadmin-safe plugin id --- exec/lib/Settings.php | 4 ++-- hooks/user_img.html | 2 +- hooks/user_txt.html | 2 +- plugin-settings.conf | 6 +++--- plugin.conf | 4 ++-- scripts/install.sh | 4 ++-- scripts/keygen.sh | 4 ++-- scripts/package.sh | 4 ++-- scripts/uninstall.sh | 2 +- scripts/update.sh | 4 ++-- tests/package_contents_test.php | 16 ++++++++-------- tests/settings_test.php | 2 +- user/index.html | 4 ++-- user/login.raw | 2 +- 14 files changed, 30 insertions(+), 30 deletions(-) diff --git a/exec/lib/Settings.php b/exec/lib/Settings.php index 904c8b6..7b4058d 100644 --- a/exec/lib/Settings.php +++ b/exec/lib/Settings.php @@ -3,8 +3,8 @@ declare(strict_types=1); final class Settings { - public const BASE_DIR = '/usr/local/hitme_plugins/mx_autologin'; - public const PLUGIN_DIR = '/usr/local/directadmin/plugins/mx_autologin'; + public const BASE_DIR = '/usr/local/hitme_plugins/mxautologin'; + public const PLUGIN_DIR = '/usr/local/directadmin/plugins/mxautologin'; public const SECRET_DIR = self::BASE_DIR . '/secrets'; public const LOG_DIR = self::BASE_DIR . '/logs'; public const STATE_DIR = self::BASE_DIR . '/state'; diff --git a/hooks/user_img.html b/hooks/user_img.html index 585500b..a975171 100644 --- a/hooks/user_img.html +++ b/hooks/user_img.html @@ -1 +1 @@ -Zaloguj do serwera poczty +Zaloguj do serwera poczty diff --git a/hooks/user_txt.html b/hooks/user_txt.html index 61d3c41..81c8807 100644 --- a/hooks/user_txt.html +++ b/hooks/user_txt.html @@ -1 +1 @@ -Zaloguj do serwera poczty +Zaloguj do serwera poczty diff --git a/plugin-settings.conf b/plugin-settings.conf index 5d77aab..3f7fc31 100644 --- a/plugin-settings.conf +++ b/plugin-settings.conf @@ -1,6 +1,6 @@ # Ten plik jest runtime configuration pluginu. # Plugin czyta ustawienia bezpośrednio z: -# /usr/local/directadmin/plugins/mx_autologin/plugin-settings.conf +# /usr/local/directadmin/plugins/mxautologin/plugin-settings.conf # Czy plugin jest domyślnie dostępny dla wszystkich użytkowników. DEFAULT_ENABLE=true @@ -42,8 +42,8 @@ MAIL_LOGIN_REMOTE_TRANSPORT=ssh MAIL_LOGIN_SSH_HOST=mx1.mojserwer.pl MAIL_LOGIN_SSH_PORT=22 MAIL_LOGIN_SSH_USER=root -MAIL_LOGIN_SSH_IDENTITY=/usr/local/hitme_plugins/mx_autologin/secrets/mx1_ed25519 -MAIL_LOGIN_SSH_KNOWN_HOSTS=/usr/local/hitme_plugins/mx_autologin/secrets/known_hosts +MAIL_LOGIN_SSH_IDENTITY=/usr/local/hitme_plugins/mxautologin/secrets/mx1_ed25519 +MAIL_LOGIN_SSH_KNOWN_HOSTS=/usr/local/hitme_plugins/mxautologin/secrets/known_hosts MAIL_LOGIN_CONNECT_TIMEOUT_SECONDS=5 # Limity bezpieczeństwa na źródłowym serwerze DirectAdmin. diff --git a/plugin.conf b/plugin.conf index e1f2f14..5190e09 100644 --- a/plugin.conf +++ b/plugin.conf @@ -1,8 +1,8 @@ name=MX-Autologin -id=mx_autologin +id=mxautologin type=user author=HITME.PL -version=1.0.13 +version=1.0.14 active=no installed=no user_run_as=root diff --git a/scripts/install.sh b/scripts/install.sh index d3b610e..5e44552 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,8 +1,8 @@ #!/bin/sh set -eu -BASE_DIR="/usr/local/hitme_plugins/mx_autologin" -PLUGIN_DIR="/usr/local/directadmin/plugins/mx_autologin" +BASE_DIR="/usr/local/hitme_plugins/mxautologin" +PLUGIN_DIR="/usr/local/directadmin/plugins/mxautologin" mkdir -p "$BASE_DIR/secrets" "$BASE_DIR/logs" "$BASE_DIR/state/rate-limit" chmod 700 "$BASE_DIR/secrets" "$BASE_DIR/logs" "$BASE_DIR/state" "$BASE_DIR/state/rate-limit" diff --git a/scripts/keygen.sh b/scripts/keygen.sh index 1ababf1..01d982d 100755 --- a/scripts/keygen.sh +++ b/scripts/keygen.sh @@ -1,11 +1,11 @@ #!/bin/sh set -eu -KEY_DIR="${MAIL_LOGIN_KEY_DIR:-/usr/local/hitme_plugins/mx_autologin/secrets}" +KEY_DIR="${MAIL_LOGIN_KEY_DIR:-/usr/local/hitme_plugins/mxautologin/secrets}" KEY_NAME="${MAIL_LOGIN_KEY_NAME:-mx1_ed25519}" KEY_PATH="$KEY_DIR/$KEY_NAME" MX_MODE="${MX_LOGIN_MODE:-1}" -SETTINGS_FILE="${MAIL_LOGIN_SETTINGS_FILE:-/usr/local/directadmin/plugins/mx_autologin/plugin-settings.conf}" +SETTINGS_FILE="${MAIL_LOGIN_SETTINGS_FILE:-/usr/local/directadmin/plugins/mxautologin/plugin-settings.conf}" HELPER_COMMAND="${MAIL_LOGIN_HELPER_COMMAND:-/usr/local/hitme_plugins/mail-login-helper/bin/create-login-url}" config_value() { diff --git a/scripts/package.sh b/scripts/package.sh index 7304320..85abc58 100755 --- a/scripts/package.sh +++ b/scripts/package.sh @@ -11,7 +11,7 @@ ROOT_DIR="$(cd .. && pwd)" ARCHIVE_DIR="$ROOT_DIR/archives/$VERSION" mkdir -p "$ARCHIVE_DIR" -tar -czf "$ARCHIVE_DIR/mx_autologin.tar.gz" \ +tar -czf "$ARCHIVE_DIR/mxautologin.tar.gz" \ --exclude='./.git' \ --exclude='./tests' \ --exclude='./scripts/package.sh' \ @@ -22,4 +22,4 @@ tar -czf "$ARCHIVE_DIR/mx_autologin.tar.gz" \ --exclude='./.DS_Store' \ . -echo "$ARCHIVE_DIR/mx_autologin.tar.gz" +echo "$ARCHIVE_DIR/mxautologin.tar.gz" diff --git a/scripts/uninstall.sh b/scripts/uninstall.sh index 94bba2f..cccf1a0 100755 --- a/scripts/uninstall.sh +++ b/scripts/uninstall.sh @@ -1,7 +1,7 @@ #!/bin/sh set -eu -BASE_DIR="/usr/local/hitme_plugins/mx_autologin" +BASE_DIR="/usr/local/hitme_plugins/mxautologin" if [ "${PURGE_MAIL_LOGIN_DATA:-0}" = "1" ]; then rm -rf "$BASE_DIR" diff --git a/scripts/update.sh b/scripts/update.sh index 98e8c7e..a6ef5b4 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -1,8 +1,8 @@ #!/bin/sh set -eu -BASE_DIR="/usr/local/hitme_plugins/mx_autologin" -PLUGIN_DIR="/usr/local/directadmin/plugins/mx_autologin" +BASE_DIR="/usr/local/hitme_plugins/mxautologin" +PLUGIN_DIR="/usr/local/directadmin/plugins/mxautologin" mkdir -p "$BASE_DIR/secrets" "$BASE_DIR/logs" "$BASE_DIR/state/rate-limit" chmod 700 "$BASE_DIR/secrets" "$BASE_DIR/logs" "$BASE_DIR/state" "$BASE_DIR/state/rate-limit" diff --git a/tests/package_contents_test.php b/tests/package_contents_test.php index d65cf78..f93002b 100644 --- a/tests/package_contents_test.php +++ b/tests/package_contents_test.php @@ -6,19 +6,19 @@ test('plugin metadata and packaging docs match project rules', function (): void $packing = file_get_contents(PROJECT_ROOT . '/PACKING.md') ?: ''; assert_contains('name=MX-Autologin', $conf); - assert_contains('id=mx_autologin', $conf); + assert_contains('id=mxautologin', $conf); assert_contains('type=user', $conf); - assert_contains('version=1.0.13', $conf); + assert_contains('version=1.0.14', $conf); assert_contains('user_run_as=root', $conf); assert_contains('/Users/marek/GPT/ChatGPT/da_plugins/mail-login/src', $packing); - assert_contains('/Users/marek/GPT/ChatGPT/da_plugins/mail-login/archives/X.Y.Z/mx_autologin.tar.gz', $packing); + assert_contains('/Users/marek/GPT/ChatGPT/da_plugins/mail-login/archives/X.Y.Z/mxautologin.tar.gz', $packing); }); test('package source excludes local-only files and dangerous placeholders', function (): void { $package = file_get_contents(PLUGIN_ROOT . '/scripts/package.sh') ?: ''; assert_contains("--exclude='./.git'", $package); assert_contains("--exclude='./tests'", $package); - assert_contains('mx_autologin.tar.gz', $package); + assert_contains('mxautologin.tar.gz', $package); assert_true(is_file(PLUGIN_ROOT . '/scripts/keygen.sh')); $bad = []; @@ -45,10 +45,10 @@ test('directadmin entry points use mx autologin directory and display label', fu $login = file_get_contents(PLUGIN_ROOT . '/user/login.raw') ?: ''; $index = file_get_contents(PLUGIN_ROOT . '/user/index.html') ?: ''; - assert_contains('/CMD_PLUGINS/mx_autologin/login.raw', $txt); + assert_contains('/CMD_PLUGINS/mxautologin/login.raw', $txt); assert_contains('Zaloguj do serwera poczty', $txt); - assert_contains('/CMD_PLUGINS/mx_autologin/images/user_icon.svg', $img); + assert_contains('/CMD_PLUGINS/mxautologin/images/user_icon.svg', $img); assert_contains('alt="Zaloguj do serwera poczty"', $img); - assert_contains('/usr/local/directadmin/plugins/mx_autologin/php.ini', $login); - assert_contains('/CMD_PLUGINS/mx_autologin/login.raw', $index); + assert_contains('/usr/local/directadmin/plugins/mxautologin/php.ini', $login); + assert_contains('/CMD_PLUGINS/mxautologin/login.raw', $index); }); diff --git a/tests/settings_test.php b/tests/settings_test.php index 3d34ccc..9b66e1c 100644 --- a/tests/settings_test.php +++ b/tests/settings_test.php @@ -18,7 +18,7 @@ test('settings expose secure defaults from plugin-settings.conf', function (): v }); test('settings runtime file is the directadmin plugin settings file', function (): void { - assert_same('/usr/local/directadmin/plugins/mx_autologin/plugin-settings.conf', Settings::EXTERNAL_SETTINGS); + assert_same('/usr/local/directadmin/plugins/mxautologin/plugin-settings.conf', Settings::EXTERNAL_SETTINGS); }); test('settings reject login key ttl outside production range', function (): void { diff --git a/user/index.html b/user/index.html index 1e03e93..e78dc44 100755 --- a/user/index.html +++ b/user/index.html @@ -1,4 +1,4 @@ -#!/usr/local/bin/php -nc/usr/local/directadmin/plugins/mx_autologin/php.ini +#!/usr/local/bin/php -nc/usr/local/directadmin/plugins/mxautologin/php.ini '; echo ''; echo 'Zaloguj do serwera poczty'; -echo '

Zaloguj do serwera poczty

'; +echo '

Zaloguj do serwera poczty

'; echo ''; diff --git a/user/login.raw b/user/login.raw index e1c9419..691e9b1 100755 --- a/user/login.raw +++ b/user/login.raw @@ -1,4 +1,4 @@ -#!/usr/local/bin/php -nc/usr/local/directadmin/plugins/mx_autologin/php.ini +#!/usr/local/bin/php -nc/usr/local/directadmin/plugins/mxautologin/php.ini