tty
This commit is contained in:
@@ -41,6 +41,7 @@ $mm->registerFunction($moduleName, 'ensure_schema', function () use ($moduleName
|
|||||||
$hostTable = $table('hosts');
|
$hostTable = $table('hosts');
|
||||||
$cmdTable = $table('commands');
|
$cmdTable = $table('commands');
|
||||||
$runTable = $table('runs');
|
$runTable = $table('runs');
|
||||||
|
$sessionTable = $table('sessions');
|
||||||
|
|
||||||
if ($driver === 'pgsql') {
|
if ($driver === 'pgsql') {
|
||||||
$pdo->exec("CREATE TABLE IF NOT EXISTS {$hostTable} (
|
$pdo->exec("CREATE TABLE IF NOT EXISTS {$hostTable} (
|
||||||
@@ -71,6 +72,16 @@ $mm->registerFunction($moduleName, 'ensure_schema', function () use ($moduleName
|
|||||||
created_by VARCHAR(120) NULL,
|
created_by VARCHAR(120) NULL,
|
||||||
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
|
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||||
)");
|
)");
|
||||||
|
$pdo->exec("CREATE TABLE IF NOT EXISTS {$sessionTable} (
|
||||||
|
id SERIAL PRIMARY KEY,
|
||||||
|
token VARCHAR(64) NOT NULL UNIQUE,
|
||||||
|
host_id INTEGER NOT NULL,
|
||||||
|
provider VARCHAR(20) NOT NULL DEFAULT 'ttyd',
|
||||||
|
created_by VARCHAR(120) NULL,
|
||||||
|
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
expires_at TIMESTAMP NOT NULL,
|
||||||
|
last_used_at TIMESTAMP NULL
|
||||||
|
)");
|
||||||
} else {
|
} else {
|
||||||
$pdo->exec("CREATE TABLE IF NOT EXISTS {$hostTable} (
|
$pdo->exec("CREATE TABLE IF NOT EXISTS {$hostTable} (
|
||||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
@@ -100,6 +111,16 @@ $mm->registerFunction($moduleName, 'ensure_schema', function () use ($moduleName
|
|||||||
created_by VARCHAR(120) NULL,
|
created_by VARCHAR(120) NULL,
|
||||||
created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
|
created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||||
)");
|
)");
|
||||||
|
$pdo->exec("CREATE TABLE IF NOT EXISTS {$sessionTable} (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
token VARCHAR(64) NOT NULL UNIQUE,
|
||||||
|
host_id INTEGER NOT NULL,
|
||||||
|
provider VARCHAR(20) NOT NULL DEFAULT 'ttyd',
|
||||||
|
created_by VARCHAR(120) NULL,
|
||||||
|
created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
expires_at DATETIME NOT NULL,
|
||||||
|
last_used_at DATETIME NULL
|
||||||
|
)");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Seed default commands (only when empty)
|
// Seed default commands (only when empty)
|
||||||
|
|||||||
@@ -30,7 +30,12 @@
|
|||||||
{ "name": "db.dbname", "label": "DB Name", "type": "text", "required": false },
|
{ "name": "db.dbname", "label": "DB Name", "type": "text", "required": false },
|
||||||
{ "name": "db.schema", "label": "DB Schema", "type": "text", "required": false },
|
{ "name": "db.schema", "label": "DB Schema", "type": "text", "required": false },
|
||||||
{ "name": "db.user", "label": "DB User", "type": "text", "required": false },
|
{ "name": "db.user", "label": "DB User", "type": "text", "required": false },
|
||||||
{ "name": "db.password", "label": "DB Passwort", "type": "password", "required": false }
|
{ "name": "db.password", "label": "DB Passwort", "type": "password", "required": false },
|
||||||
|
{ "name": "ttyd_url", "label": "ttyd URL", "type": "text", "required": false, "help": "z.B. https://staging.nexus.int.kusche.berlin/ttyd" },
|
||||||
|
{ "name": "wetty_url", "label": "WeTTY URL", "type": "text", "required": false, "help": "z.B. https://staging.nexus.int.kusche.berlin/wetty" },
|
||||||
|
{ "name": "terminal_default_provider", "label": "Standard-Konsole", "type": "text", "required": false, "help": "ttyd oder wetty" },
|
||||||
|
{ "name": "terminal_token_ttl", "label": "Token TTL (Minuten)", "type": "number", "required": false, "help": "Gültigkeit der Konsole-Token, z.B. 10" },
|
||||||
|
{ "name": "terminal_shared_secret", "label": "Terminal Shared Secret", "type": "password", "required": false, "help": "Zusätzliche Absicherung für terminal_info (Header X-Terminal-Secret)" }
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"db_defaults": {
|
"db_defaults": {
|
||||||
|
|||||||
@@ -5,11 +5,57 @@ $table = fn(string $name) => module_fn('pi_control', 'table', $name);
|
|||||||
|
|
||||||
$notice = null;
|
$notice = null;
|
||||||
$error = null;
|
$error = null;
|
||||||
|
$terminalNotice = null;
|
||||||
|
$terminalError = null;
|
||||||
|
$terminalUrl = null;
|
||||||
|
|
||||||
|
$settings = modules()->settings('pi_control');
|
||||||
|
$ttydUrl = trim((string)($settings['ttyd_url'] ?? '/ttyd'));
|
||||||
|
$wettyUrl = trim((string)($settings['wetty_url'] ?? '/wetty'));
|
||||||
|
$defaultProvider = (string)($settings['terminal_default_provider'] ?? 'ttyd');
|
||||||
|
$tokenTtl = (int)($settings['terminal_token_ttl'] ?? 10);
|
||||||
|
$tokenTtl = $tokenTtl > 0 ? $tokenTtl : 10;
|
||||||
|
|
||||||
$hosts = $pdo->query('SELECT * FROM ' . $table('hosts') . ' ORDER BY name ASC')->fetchAll(PDO::FETCH_ASSOC);
|
$hosts = $pdo->query('SELECT * FROM ' . $table('hosts') . ' ORDER BY name ASC')->fetchAll(PDO::FETCH_ASSOC);
|
||||||
$commands = $pdo->query('SELECT * FROM ' . $table('commands') . ' ORDER BY label ASC')->fetchAll(PDO::FETCH_ASSOC);
|
$commands = $pdo->query('SELECT * FROM ' . $table('commands') . ' ORDER BY label ASC')->fetchAll(PDO::FETCH_ASSOC);
|
||||||
|
|
||||||
if ($_SERVER['REQUEST_METHOD'] === 'POST') {
|
if ($_SERVER['REQUEST_METHOD'] === 'POST') {
|
||||||
|
$action = (string)($_POST['action'] ?? '');
|
||||||
|
|
||||||
|
if ($action === 'open_console') {
|
||||||
|
$hostId = (int)($_POST['terminal_host_id'] ?? 0);
|
||||||
|
$provider = (string)($_POST['terminal_provider'] ?? $defaultProvider);
|
||||||
|
$provider = in_array($provider, ['ttyd', 'wetty'], true) ? $provider : 'ttyd';
|
||||||
|
|
||||||
|
if ($hostId <= 0) {
|
||||||
|
$terminalError = 'Bitte einen Host wählen.';
|
||||||
|
} else {
|
||||||
|
$driver = (string)$pdo->getAttribute(PDO::ATTR_DRIVER_NAME);
|
||||||
|
$expiresSql = $driver === 'pgsql'
|
||||||
|
? "NOW() + INTERVAL '{$tokenTtl} minutes'"
|
||||||
|
: "DATETIME('now', '+{$tokenTtl} minutes')";
|
||||||
|
|
||||||
|
$token = bin2hex(random_bytes(24));
|
||||||
|
$stmt = $pdo->prepare(
|
||||||
|
'INSERT INTO ' . $table('sessions') . ' (token, host_id, provider, created_by, expires_at)
|
||||||
|
VALUES (:token, :host_id, :provider, :created_by, ' . $expiresSql . ')'
|
||||||
|
);
|
||||||
|
$stmt->execute([
|
||||||
|
'token' => $token,
|
||||||
|
'host_id' => $hostId,
|
||||||
|
'provider' => $provider,
|
||||||
|
'created_by' => auth_display_name() ?: null,
|
||||||
|
]);
|
||||||
|
|
||||||
|
if ($provider === 'ttyd') {
|
||||||
|
$sep = str_contains($ttydUrl, '?') ? '&' : '?';
|
||||||
|
$terminalUrl = rtrim($ttydUrl, '/') . '/' . $sep . 'arg=' . rawurlencode($token);
|
||||||
|
} else {
|
||||||
|
$terminalUrl = $wettyUrl;
|
||||||
|
$terminalNotice = 'WeTTY nutzt den Standard-Host aus der Container-Konfiguration. Für Host-Auswahl bitte ttyd nutzen.';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
$hostId = (int)($_POST['host_id'] ?? 0);
|
$hostId = (int)($_POST['host_id'] ?? 0);
|
||||||
$commandId = (int)($_POST['command_id'] ?? 0);
|
$commandId = (int)($_POST['command_id'] ?? 0);
|
||||||
$rawCommand = trim((string)($_POST['command_text'] ?? ''));
|
$rawCommand = trim((string)($_POST['command_text'] ?? ''));
|
||||||
@@ -49,6 +95,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
|
|||||||
$notice = 'Befehl wurde erfasst. (Execution-Backend folgt)';
|
$notice = 'Befehl wurde erfasst. (Execution-Backend folgt)';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$runs = $pdo->query('SELECT * FROM ' . $table('runs') . ' ORDER BY id DESC LIMIT 20')->fetchAll(PDO::FETCH_ASSOC);
|
$runs = $pdo->query('SELECT * FROM ' . $table('runs') . ' ORDER BY id DESC LIMIT 20')->fetchAll(PDO::FETCH_ASSOC);
|
||||||
@@ -69,16 +116,66 @@ $runs = $pdo->query('SELECT * FROM ' . $table('runs') . ' ORDER BY id DESC LIMIT
|
|||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
|
|
||||||
<div class="grid" style="margin-top:1rem;">
|
<div class="grid" style="margin-top:1rem;">
|
||||||
<div class="card" style="background:var(--panel-2);">
|
<div class="card form-card" style="background:var(--panel-2);">
|
||||||
<strong>Ausführen</strong>
|
<strong>Live-Konsole</strong>
|
||||||
<form method="post" style="display:grid; gap:10px; margin-top:.75rem;">
|
<?php if ($terminalError): ?>
|
||||||
|
<div class="card" style="margin-top:1rem; border-color:#ffb4a8; background:#fff5f3; color:#7a2114;">
|
||||||
|
<?= e($terminalError) ?>
|
||||||
|
</div>
|
||||||
|
<?php elseif ($terminalNotice): ?>
|
||||||
|
<div class="card" style="margin-top:1rem; border-color:var(--accent-2);">
|
||||||
|
<?= e($terminalNotice) ?>
|
||||||
|
</div>
|
||||||
|
<?php endif; ?>
|
||||||
|
<form method="post" class="form-grid" style="margin-top:.75rem;">
|
||||||
|
<input type="hidden" name="action" value="open_console">
|
||||||
|
<label class="form-field">
|
||||||
|
<span class="muted">Host</span>
|
||||||
|
<select name="terminal_host_id" required title="Pi auswählen, zu dem die Konsole verbindet.">
|
||||||
|
<option value="">Host wählen</option>
|
||||||
|
<?php foreach ($hosts as $h): ?>
|
||||||
|
<option value="<?= e((string)$h['id']) ?>"><?= e($h['name'] ?? $h['host']) ?></option>
|
||||||
|
<?php endforeach; ?>
|
||||||
|
</select>
|
||||||
|
</label>
|
||||||
|
<label class="form-field">
|
||||||
|
<span class="muted">Konsole</span>
|
||||||
|
<select name="terminal_provider" title="Wähle die Terminal-Engine.">
|
||||||
|
<option value="ttyd" <?= $defaultProvider === 'ttyd' ? 'selected' : '' ?>>ttyd (empfohlen)</option>
|
||||||
|
<option value="wetty" <?= $defaultProvider === 'wetty' ? 'selected' : '' ?>>WeTTY</option>
|
||||||
|
</select>
|
||||||
|
</label>
|
||||||
|
<button class="cta-button" type="submit">Konsole öffnen</button>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<?php if ($terminalUrl): ?>
|
||||||
|
<div class="card" style="margin-top:1rem;">
|
||||||
|
<div style="display:flex; align-items:center; justify-content:space-between; gap:12px; flex-wrap:wrap;">
|
||||||
|
<strong>Aktive Konsole</strong>
|
||||||
|
<a class="nav-link" href="<?= e($terminalUrl) ?>" target="_blank" rel="noopener">In neuem Tab öffnen</a>
|
||||||
|
</div>
|
||||||
|
<div style="margin-top:.75rem; border-radius:12px; overflow:hidden; border:1px solid var(--line); background:#0b0f17;">
|
||||||
|
<iframe src="<?= e($terminalUrl) ?>" title="Pi Konsole" style="width:100%; height:520px; border:0;"></iframe>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<?php endif; ?>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="card form-card" style="background:var(--panel-2);">
|
||||||
|
<strong>Befehl ausführen</strong>
|
||||||
|
<form method="post" class="form-grid" style="margin-top:.75rem;">
|
||||||
|
<input type="hidden" name="action" value="run_command">
|
||||||
|
<label class="form-field">
|
||||||
|
<span class="muted">Host</span>
|
||||||
<select name="host_id" required>
|
<select name="host_id" required>
|
||||||
<option value="">Host wählen</option>
|
<option value="">Host wählen</option>
|
||||||
<?php foreach ($hosts as $h): ?>
|
<?php foreach ($hosts as $h): ?>
|
||||||
<option value="<?= e((string)$h['id']) ?>"><?= e($h['name'] ?? $h['host']) ?></option>
|
<option value="<?= e((string)$h['id']) ?>"><?= e($h['name'] ?? $h['host']) ?></option>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
</select>
|
</select>
|
||||||
|
</label>
|
||||||
|
<label class="form-field">
|
||||||
|
<span class="muted">Preset</span>
|
||||||
<select name="command_id">
|
<select name="command_id">
|
||||||
<option value="">Preset auswählen (optional)</option>
|
<option value="">Preset auswählen (optional)</option>
|
||||||
<?php foreach ($commands as $c): ?>
|
<?php foreach ($commands as $c): ?>
|
||||||
@@ -86,14 +183,17 @@ $runs = $pdo->query('SELECT * FROM ' . $table('runs') . ' ORDER BY id DESC LIMIT
|
|||||||
<option value="<?= e((string)$c['id']) ?>"><?= e($c['label'] ?? '') ?></option>
|
<option value="<?= e((string)$c['id']) ?>"><?= e($c['label'] ?? '') ?></option>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
</select>
|
</select>
|
||||||
|
</label>
|
||||||
|
<label class="form-field">
|
||||||
|
<span class="muted">Direkter Command</span>
|
||||||
<textarea name="command_text" rows="3" placeholder="Oder Command direkt eingeben"></textarea>
|
<textarea name="command_text" rows="3" placeholder="Oder Command direkt eingeben"></textarea>
|
||||||
|
</label>
|
||||||
<button class="cta-button" type="submit">Befehl senden</button>
|
<button class="cta-button" type="submit">Befehl senden</button>
|
||||||
</form>
|
</form>
|
||||||
<p class="muted" style="margin-top:.5rem;">Hinweis: Execution-Backend wird im nächsten Schritt ergänzt.</p>
|
<p class="muted" style="margin-top:.5rem;">Hinweis: Execution-Backend wird im nächsten Schritt ergänzt.</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="card" style="background:var(--panel-2);">
|
<div class="card form-card" style="background:var(--panel-2);">
|
||||||
<strong>Letzte Runs</strong>
|
<strong>Letzte Runs</strong>
|
||||||
<div style="margin-top:.75rem; overflow:auto;">
|
<div style="margin-top:.75rem; overflow:auto;">
|
||||||
<table class="table" style="min-width:560px;">
|
<table class="table" style="min-width:560px;">
|
||||||
|
|||||||
74
modules/pi_control/pages/terminal_info.php
Normal file
74
modules/pi_control/pages/terminal_info.php
Normal file
@@ -0,0 +1,74 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
$pdo = module_fn('pi_control', 'pdo');
|
||||||
|
module_fn('pi_control', 'ensure_schema');
|
||||||
|
$table = fn(string $name) => module_fn('pi_control', 'table', $name);
|
||||||
|
|
||||||
|
header('Content-Type: application/json; charset=utf-8');
|
||||||
|
|
||||||
|
$settings = modules()->settings('pi_control');
|
||||||
|
$sharedSecret = trim((string)($settings['terminal_shared_secret'] ?? ''));
|
||||||
|
if ($sharedSecret !== '') {
|
||||||
|
$provided = trim((string)($_SERVER['HTTP_X_TERMINAL_SECRET'] ?? ''));
|
||||||
|
if (!hash_equals($sharedSecret, $provided)) {
|
||||||
|
http_response_code(401);
|
||||||
|
echo json_encode(['ok' => false, 'error' => 'unauthorized']);
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$token = '';
|
||||||
|
if (!empty($_GET['token'])) {
|
||||||
|
$token = trim((string)$_GET['token']);
|
||||||
|
} elseif (!empty($_SERVER['HTTP_X_TERMINAL_TOKEN'])) {
|
||||||
|
$token = trim((string)$_SERVER['HTTP_X_TERMINAL_TOKEN']);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($token === '') {
|
||||||
|
http_response_code(400);
|
||||||
|
echo json_encode(['ok' => false, 'error' => 'missing_token']);
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
$driver = (string)$pdo->getAttribute(PDO::ATTR_DRIVER_NAME);
|
||||||
|
$nowSql = $driver === 'pgsql' ? 'NOW()' : "DATETIME('now')";
|
||||||
|
|
||||||
|
$sessionStmt = $pdo->prepare(
|
||||||
|
'SELECT * FROM ' . $table('sessions') . ' WHERE token = :token AND expires_at > ' . $nowSql . ' LIMIT 1'
|
||||||
|
);
|
||||||
|
$sessionStmt->execute(['token' => $token]);
|
||||||
|
$session = $sessionStmt->fetch(PDO::FETCH_ASSOC);
|
||||||
|
|
||||||
|
if (!$session) {
|
||||||
|
http_response_code(404);
|
||||||
|
echo json_encode(['ok' => false, 'error' => 'invalid_or_expired']);
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
$hostStmt = $pdo->prepare('SELECT * FROM ' . $table('hosts') . ' WHERE id = :id LIMIT 1');
|
||||||
|
$hostStmt->execute(['id' => (int)$session['host_id']]);
|
||||||
|
$host = $hostStmt->fetch(PDO::FETCH_ASSOC);
|
||||||
|
|
||||||
|
if (!$host) {
|
||||||
|
http_response_code(404);
|
||||||
|
echo json_encode(['ok' => false, 'error' => 'host_not_found']);
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
$pdo->prepare('UPDATE ' . $table('sessions') . ' SET last_used_at = ' . $nowSql . ' WHERE id = :id')
|
||||||
|
->execute(['id' => (int)$session['id']]);
|
||||||
|
|
||||||
|
echo json_encode([
|
||||||
|
'ok' => true,
|
||||||
|
'host' => [
|
||||||
|
'name' => (string)($host['name'] ?? ''),
|
||||||
|
'host' => (string)($host['host'] ?? ''),
|
||||||
|
'port' => (int)($host['port'] ?? 22),
|
||||||
|
'username' => (string)($host['username'] ?? ''),
|
||||||
|
'auth_type' => (string)($host['auth_type'] ?? 'key'),
|
||||||
|
'key_path' => (string)($host['key_path'] ?? ''),
|
||||||
|
'password' => (string)($host['password'] ?? ''),
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
exit;
|
||||||
@@ -27,6 +27,7 @@ $publicPaths = [
|
|||||||
'auth/login',
|
'auth/login',
|
||||||
'auth/callback',
|
'auth/callback',
|
||||||
'auth/logout',
|
'auth/logout',
|
||||||
|
'module/pi_control/terminal_info',
|
||||||
];
|
];
|
||||||
if (defined('APP_AUTH_ENABLED') && APP_AUTH_ENABLED && !in_array($uriPath, $publicPaths, true)) {
|
if (defined('APP_AUTH_ENABLED') && APP_AUTH_ENABLED && !in_array($uriPath, $publicPaths, true)) {
|
||||||
$user = auth_user();
|
$user = auth_user();
|
||||||
|
|||||||
50
tools/pi_control/terminal_entry.sh
Normal file
50
tools/pi_control/terminal_entry.sh
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
TOKEN="${1:-}"
|
||||||
|
if [[ -z "${TOKEN}" ]]; then
|
||||||
|
echo "Missing token."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
API_BASE="${PI_CONTROL_API_URL:-http://gui_nexus}"
|
||||||
|
API_BASE="${API_BASE%/}"
|
||||||
|
INFO_URL="${API_BASE}/module/pi_control/terminal_info?token=${TOKEN}"
|
||||||
|
|
||||||
|
AUTH_HEADER=()
|
||||||
|
if [[ -n "${STAGING_AUTH_USER:-}" && -n "${STAGING_AUTH_PASS:-}" ]]; then
|
||||||
|
BASIC="$(printf "%s:%s" "${STAGING_AUTH_USER}" "${STAGING_AUTH_PASS}" | base64)"
|
||||||
|
AUTH_HEADER=(-H "Authorization: Basic ${BASIC}")
|
||||||
|
fi
|
||||||
|
if [[ -n "${PI_CONTROL_SHARED_SECRET:-}" ]]; then
|
||||||
|
AUTH_HEADER+=(-H "X-Terminal-Secret: ${PI_CONTROL_SHARED_SECRET}")
|
||||||
|
fi
|
||||||
|
|
||||||
|
JSON="$(curl -sS "${AUTH_HEADER[@]}" "${INFO_URL}")"
|
||||||
|
OK="$(echo "${JSON}" | jq -r '.ok')"
|
||||||
|
if [[ "${OK}" != "true" ]]; then
|
||||||
|
echo "Invalid or expired token."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
HOST="$(echo "${JSON}" | jq -r '.host.host')"
|
||||||
|
PORT="$(echo "${JSON}" | jq -r '.host.port')"
|
||||||
|
USER="$(echo "${JSON}" | jq -r '.host.username')"
|
||||||
|
AUTH_TYPE="$(echo "${JSON}" | jq -r '.host.auth_type')"
|
||||||
|
KEY_PATH="$(echo "${JSON}" | jq -r '.host.key_path')"
|
||||||
|
PASSWORD="$(echo "${JSON}" | jq -r '.host.password')"
|
||||||
|
|
||||||
|
if [[ -z "${HOST}" || -z "${USER}" ]]; then
|
||||||
|
echo "Host data incomplete."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
SSH_OPTS=(-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null)
|
||||||
|
|
||||||
|
if [[ "${AUTH_TYPE}" == "key" && -n "${KEY_PATH}" ]]; then
|
||||||
|
exec ssh "${SSH_OPTS[@]}" -i "${KEY_PATH}" -p "${PORT:-22}" "${USER}@${HOST}"
|
||||||
|
elif [[ "${AUTH_TYPE}" == "pass" && -n "${PASSWORD}" ]]; then
|
||||||
|
exec sshpass -p "${PASSWORD}" ssh "${SSH_OPTS[@]}" -p "${PORT:-22}" "${USER}@${HOST}"
|
||||||
|
else
|
||||||
|
exec ssh "${SSH_OPTS[@]}" -p "${PORT:-22}" "${USER}@${HOST}"
|
||||||
|
fi
|
||||||
17
tools/pi_control/ttyd/Dockerfile
Normal file
17
tools/pi_control/ttyd/Dockerfile
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
FROM alpine:3.20
|
||||||
|
|
||||||
|
RUN apk add --no-cache \
|
||||||
|
ttyd \
|
||||||
|
bash \
|
||||||
|
openssh-client \
|
||||||
|
curl \
|
||||||
|
jq \
|
||||||
|
sshpass
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
COPY tools/pi_control/terminal_entry.sh /app/tools/pi_control/terminal_entry.sh
|
||||||
|
RUN chmod +x /app/tools/pi_control/terminal_entry.sh
|
||||||
|
|
||||||
|
EXPOSE 7681
|
||||||
|
|
||||||
|
ENTRYPOINT ["ttyd", "--url-arg", "--base-path", "/ttyd", "/app/tools/pi_control/terminal_entry.sh"]
|
||||||
Reference in New Issue
Block a user