Portainer Update

backend/index.js

@@ -91,7 +91,7 @@ const DEFAULT_PORTAINER_UPDATE_SCRIPT = [
   'docker stop portainer',
   'docker rm portainer',
   'docker pull portainer/portainer-ee:lts',
-  'docker run -d -p 8000:8000 -p 9443:9443 --name=portainer --restart=always -v /var/run/docker.sock:/var/run/docker.sock'
+  'docker run -d -p 8000:8000 -p 9443:9443 --name=portainer --restart=always -v /var/run/docker.sock:/var/run/docker.sock -v portainer_data:/data portainer/portainer-ee:lts'
 ].join('\n');
 
 let portainerUpdateState = {
@@ -136,17 +136,19 @@ const getPortainerUpdateStatus = () => ({
 const getCustomPortainerScript = () => {
   const row = getSetting(PORTAINER_SCRIPT_SETTING_KEY);
   if (!row) return null;
-  const value = typeof row.value === 'string' ? row.value.trim() : '';
-  if (!value) return null;
+  const raw = typeof row.value === 'string' ? row.value : '';
+  if (!raw.trim()) return null;
   return {
-    script: row.value,
+    script: normalizeScriptText(raw),
     updatedAt: row.updated_at || null
   };
 };
 
+const normalizeScriptText = (script) => String(script ?? '').replace(/\r\n/g, '\n');
+
 const saveCustomPortainerScript = (script) => {
-  const normalized = String(script ?? '').replace(/\r?\n/g, '\n').trim();
-  if (!normalized) {
+  const normalized = normalizeScriptText(script);
+  if (!normalized.trim()) {
     deleteSetting(PORTAINER_SCRIPT_SETTING_KEY);
     return null;
   }
@@ -209,7 +211,8 @@ const DEFAULT_PORTAINER_SSH_CONFIG = {
   port: 22,
   username: '',
   extraSshArgs: [],
-  privateKey: ''
+  privateKey: '',
+  privateKeyPassphrase: ''
 };
 
 const normalizeString = (value, fallback = '') => {
@@ -222,6 +225,23 @@ const normalizePort = (value, fallback = DEFAULT_PORTAINER_SSH_CONFIG.port) => {
   return Number.isNaN(parsed) ? fallback : parsed;
 };
 
+const tokenizeSshArgLine = (line) => {
+  if (!line) return [];
+  const tokens = [];
+  const regex = /"([^"]*)"|'([^']*)'|(\S+)/g;
+  let match;
+  while ((match = regex.exec(line)) !== null) {
+    if (match[1] !== undefined) {
+      tokens.push(match[1]);
+    } else if (match[2] !== undefined) {
+      tokens.push(match[2]);
+    } else if (match[3] !== undefined) {
+      tokens.push(match[3]);
+    }
+  }
+  return tokens;
+};
+
 const normalizeExtraArgs = (value, fallback = []) => {
   if (Array.isArray(value)) {
     return value.map((entry) => String(entry).trim()).filter(Boolean);
@@ -242,6 +262,12 @@ const normalizePrivateKey = (value, fallback = DEFAULT_PORTAINER_SSH_CONFIG.priv
   return value.replace(/\r\n/g, '\n').replace(/\r/g, '\n').trim();
 };
 
+const normalizePrivateKeyPassphrase = (value, fallback = DEFAULT_PORTAINER_SSH_CONFIG.privateKeyPassphrase) => {
+  if (value === undefined) return fallback;
+  if (value === null) return '';
+  return String(value);
+};
+
 const getPortainerSshConfig = () => {
   const stored = getSetting(PORTAINER_SSH_CONFIG_KEY);
   if (!stored) {
@@ -255,7 +281,8 @@ const getPortainerSshConfig = () => {
       port: normalizePort(parsed.port),
       username: normalizeString(parsed.username),
       extraSshArgs: normalizeExtraArgs(parsed.extraSshArgs),
-      privateKey: decryptedKey
+      privateKey: decryptedKey,
+      privateKeyPassphrase: parsed.privateKeyPassphraseEncrypted ? decryptSensitive(parsed.privateKeyPassphraseEncrypted) : ''
     };
   } catch (err) {
     console.warn('⚠️ [Maintenance] Konnte Portainer SSH Konfiguration nicht parsen:', err.message);
@@ -269,7 +296,8 @@ const persistPortainerSshConfig = (config) => {
     port: config.port,
     username: config.username,
     extraSshArgs: config.extraSshArgs,
-    privateKeyEncrypted: config.privateKey ? encryptSensitive(config.privateKey) : null
+    privateKeyEncrypted: config.privateKey ? encryptSensitive(config.privateKey) : null,
+    privateKeyPassphraseEncrypted: config.privateKeyPassphrase ? encryptSensitive(config.privateKeyPassphrase) : null
   };
   setSetting(PORTAINER_SSH_CONFIG_KEY, JSON.stringify(payload));
 };
@@ -279,7 +307,8 @@ const mergeSshConfig = (base, overrides = {}) => ({
   port: normalizePort(overrides.port, base.port),
   username: normalizeString(overrides.username, base.username),
   extraSshArgs: normalizeExtraArgs(overrides.extraSshArgs, base.extraSshArgs),
-  privateKey: normalizePrivateKey(overrides.privateKey, base.privateKey)
+  privateKey: normalizePrivateKey(overrides.privateKey, base.privateKey),
+  privateKeyPassphrase: normalizePrivateKeyPassphrase(overrides.privateKeyPassphrase, base.privateKeyPassphrase)
 });
 
 const savePortainerSshConfig = (payload = {}) => {
@@ -313,6 +342,29 @@ const createTempPrivateKeyFile = (privateKey) => {
   };
 };
 
+const createTempAskPassScript = (passphrase) => {
+  const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'stackpulse-askpass-'));
+  const scriptPath = path.join(tmpDir, 'askpass.sh');
+  const scriptContent = "#!/bin/sh\nprintf '%s\\n' \"$STACKPULSE_SSH_PASS\"\n";
+  fs.writeFileSync(scriptPath, scriptContent, { mode: 0o700 });
+  return {
+    env: {
+      SSH_ASKPASS: scriptPath,
+      SSH_ASKPASS_REQUIRE: 'force',
+      DISPLAY: process.env.DISPLAY || ':9999',
+      STACKPULSE_SSH_PASS: passphrase
+    },
+    cleanup: () => {
+      try {
+        fs.unlinkSync(scriptPath);
+      } catch (err) { }
+      try {
+        fs.rmdirSync(tmpDir);
+      } catch (err) { }
+    }
+  };
+};
+
 const buildSshCommandArgs = (config) => {
   const sshConfig = mergeSshConfig(DEFAULT_PORTAINER_SSH_CONFIG, config);
   if (!sshConfig.host) {
@@ -324,23 +376,52 @@ const buildSshCommandArgs = (config) => {
 
   const args = [
     '-p', String(sshConfig.port),
-    '-o', 'BatchMode=yes',
     '-o', 'StrictHostKeyChecking=no'
   ];
 
-  let cleanup = () => {};
+  const cleanupTasks = [];
+  const registerCleanup = (fn) => {
+    if (typeof fn === 'function') {
+      cleanupTasks.push(fn);
+    }
+  };
+
+  if (!sshConfig.privateKeyPassphrase) {
+    args.push('-o', 'BatchMode=yes');
+  }
+
   if (sshConfig.privateKey) {
     const { filePath, cleanup: dispose } = createTempPrivateKeyFile(sshConfig.privateKey);
-    cleanup = dispose;
+    registerCleanup(dispose);
     args.push('-i', filePath);
   }
 
   if (sshConfig.extraSshArgs.length) {
-    args.push(...sshConfig.extraSshArgs);
+    const expanded = sshConfig.extraSshArgs.flatMap((entry) => tokenizeSshArgLine(entry));
+    if (expanded.length) {
+      args.push(...expanded);
+    }
+  }
+
+  let envOverrides = {};
+  if (sshConfig.privateKeyPassphrase) {
+    const { env, cleanup: dispose } = createTempAskPassScript(sshConfig.privateKeyPassphrase);
+    envOverrides = { ...envOverrides, ...env };
+    registerCleanup(dispose);
   }
 
   args.push(`${sshConfig.username}@${sshConfig.host}`);
-  return { args, sshConfig, cleanup };
+
+  const cleanup = () => {
+    while (cleanupTasks.length) {
+      const task = cleanupTasks.pop();
+      try {
+        task();
+      } catch (err) { }
+    }
+  };
+
+  return { args, sshConfig, cleanup, env: envOverrides };
 };
 
 const ensureSshConfigReady = () => getPortainerSshConfig();
@@ -354,12 +435,13 @@ const testSshConnection = async (configOverride = null) => {
     throw new Error('SSH-Konfiguration ist unvollständig (Host/Benutzer erforderlich).');
   }
 
-  const { args, cleanup } = buildSshCommandArgs(baseConfig);
+  const { args, env: envOverrides, cleanup } = buildSshCommandArgs(baseConfig);
   const sshArgs = [...args, 'echo', '__PORTAINER_SSH_TEST__'];
 
   try {
     return await new Promise((resolve, reject) => {
-      const child = spawn('ssh', sshArgs, { env: process.env, stdio: ['ignore', 'pipe', 'pipe'] });
+      const childEnv = { ...process.env, ...envOverrides };
+      const child = spawn('ssh', sshArgs, { env: childEnv, stdio: ['ignore', 'pipe', 'pipe'] });
       let output = '';
       let errorOutput = '';
       child.stdout.on('data', (chunk) => { output += chunk.toString(); });
@@ -580,26 +662,25 @@ const maintenanceGuard = (req, res, next) => {
 const logScriptOutput = (data, level) => {
   if (!data) return;
   const text = data.toString();
-  text.split(/\r?\n/)
-    .map((line) => line.trim())
-    .filter(Boolean)
-    .forEach((line) => addUpdateLog(line, level));
+  text.split(/\r?\n/).map((line) => line.trim()).filter(Boolean).forEach((line) => addUpdateLog(line, level));
 };
 
 const executePortainerUpdateScript = async (script) => {
-  const normalized = String(script ?? '').replace(/\r?\n/g, '\n').trim();
-  if (!normalized) {
+  const normalized = normalizeScriptText(script);
+  if (!normalized.trim()) {
     addUpdateLog('Kein Update-Skript definiert. Vorgang wird übersprungen.', 'warning');
     return;
   }
 
+  const scriptWithUnixNewlines = normalized.endsWith('\n') ? normalized : `${normalized}\n`;
+
   const sshConfig = getPortainerSshConfig();
   const useSsh = Boolean(sshConfig.host && sshConfig.username);
 
   if (!useSsh) {
     addUpdateLog('Führe Update-Skript lokal auf dem StackPulse-Host aus.', 'info');
     return new Promise((resolve, reject) => {
-      const child = spawn('bash', ['-lc', `set -e\n${normalized}`], {
+      const child = spawn('bash', ['-lc', `set -e\n${scriptWithUnixNewlines}`], {
         env: process.env,
         stdio: ['ignore', 'pipe', 'pipe']
       });
@@ -617,14 +698,15 @@ const executePortainerUpdateScript = async (script) => {
     });
   }
 
-  const { args, cleanup } = buildSshCommandArgs(sshConfig);
+  const { args, env: envOverrides, cleanup } = buildSshCommandArgs(sshConfig);
   const sshArgs = [...args, 'bash', '-s'];
 
   addUpdateLog(`Verbinde zu ${sshConfig.username}@${sshConfig.host} für Update-Skript`, 'info');
 
   const sshPromise = new Promise((resolve, reject) => {
+    const childEnv = { ...process.env, ...envOverrides };
     const child = spawn('ssh', sshArgs, {
-      env: process.env,
+      env: childEnv,
       stdio: ['pipe', 'pipe', 'pipe']
     });
 
@@ -640,8 +722,7 @@ const executePortainerUpdateScript = async (script) => {
     });
 
     child.stdin.write(`set -e
-${normalized}
-`);
+${scriptWithUnixNewlines}`);
     child.stdin.end();
   });
 
@@ -964,7 +1045,8 @@ app.get('/api/maintenance/config', (req, res) => {
       port: ssh.port,
       username: ssh.username,
       extraSshArgs: ssh.extraSshArgs,
-      privateKeyStored: Boolean(ssh.privateKey)
+      privateKeyStored: Boolean(ssh.privateKey),
+      privateKeyPassphraseStored: Boolean(ssh.privateKeyPassphrase)
     }
   });
 });
@@ -979,7 +1061,8 @@ app.put('/api/maintenance/ssh-config', (req, res) => {
         port: config.port,
         username: config.username,
         extraSshArgs: config.extraSshArgs,
-        privateKeyStored: Boolean(config.privateKey)
+        privateKeyStored: Boolean(config.privateKey),
+        privateKeyPassphraseStored: Boolean(config.privateKeyPassphrase)
       }
     });
   } catch (err) {
@@ -997,7 +1080,8 @@ app.delete('/api/maintenance/ssh-config', (req, res) => {
       port: config.port,
       username: config.username,
       extraSshArgs: config.extraSshArgs,
-      privateKeyStored: false
+      privateKeyStored: false,
+      privateKeyPassphraseStored: false
     }
   });
 });

frontend/src/Maintenance.jsx

@@ -32,7 +32,8 @@ const LOG_LEVEL_STYLES = {
   warning: "text-amber-300",
   error: "text-red-300",
   stdout: "text-gray-300",
-  stderr: "text-orange-300"
+  stderr: "text-orange-300",
+  debug: "text-slate-400"
 };
 
 const formatLogTimestamp = (value) => {
@@ -95,6 +96,7 @@ const createEmptySshDraft = () => ({
   port: '22',
   username: '',
   privateKey: '',
+  privateKeyPassphrase: '',
   extraSshArgs: ''
 });
 
@@ -126,7 +128,9 @@ export default function Maintenance() {
 
   const [sshDraft, setSshDraft] = useState(() => createEmptySshDraft());
   const [sshKeyStored, setSshKeyStored] = useState(false);
+  const [sshPassphraseStored, setSshPassphraseStored] = useState(false);
   const [showPrivateKey, setShowPrivateKey] = useState(false);
+  const [showPassphrase, setShowPassphrase] = useState(false);
   const [sshSaving, setSshSaving] = useState(false);
   const [sshTesting, setSshTesting] = useState(false);
   const [sshDeleting, setSshDeleting] = useState(false);
@@ -142,7 +146,9 @@ export default function Maintenance() {
     if (!sshConfig) {
       setSshDraft(createEmptySshDraft());
       setSshKeyStored(false);
+      setSshPassphraseStored(false);
       setShowPrivateKey(false);
+      setShowPassphrase(false);
       setSshTestResult(null);
       return;
     }
@@ -151,10 +157,13 @@ export default function Maintenance() {
       port: String(sshConfig.port ?? '22'),
       username: sshConfig.username ?? '',
       privateKey: '',
+      privateKeyPassphrase: '',
       extraSshArgs: Array.isArray(sshConfig.extraSshArgs) ? sshConfig.extraSshArgs.join('\n') : ''
     });
     setSshKeyStored(Boolean(sshConfig.privateKeyStored));
+    setSshPassphraseStored(Boolean(sshConfig.privateKeyPassphraseStored));
     setShowPrivateKey(false);
+    setShowPassphrase(false);
     setSshTestResult(null);
   }, [sshConfig]);
 
@@ -267,6 +276,9 @@ export default function Maintenance() {
     if (field === 'privateKey') {
       setSshKeyStored(false);
     }
+    if (field === 'privateKeyPassphrase') {
+      setSshPassphraseStored(false);
+    }
   }, []);
 
   const normalizedSshDraft = useMemo(() => {
@@ -288,8 +300,15 @@ export default function Maintenance() {
       normalized.privateKey = '';
     }
 
+    const rawPassphrase = sshDraft.privateKeyPassphrase ?? '';
+    if (rawPassphrase) {
+      normalized.privateKeyPassphrase = rawPassphrase;
+    } else if (!sshPassphraseStored) {
+      normalized.privateKeyPassphrase = '';
+    }
+
     return normalized;
-  }, [sshDraft, sshKeyStored]);
+  }, [sshDraft, sshKeyStored, sshPassphraseStored]);
 
   const handleScriptSave = useCallback(async () => {
     if (!scriptConfig) return;
@@ -332,6 +351,7 @@ export default function Maintenance() {
       await saveSshConfig(normalizedSshDraft);
       setSshTestResult(null);
       setShowPrivateKey(false);
+      setShowPassphrase(false);
       showToast({
         variant: "success",
         title: "SSH-Konfiguration gespeichert",
@@ -370,7 +390,9 @@ export default function Maintenance() {
       await deleteSshConfig();
       setSshDraft(createEmptySshDraft());
       setSshKeyStored(false);
+      setSshPassphraseStored(false);
       setShowPrivateKey(false);
+      setShowPassphrase(false);
       setSshTestResult(null);
       showToast({
         variant: "info",
@@ -772,6 +794,35 @@ export default function Maintenance() {
                   </span>
                 )}
               </div>
+              <div className="grid gap-1">
+                <div className="flex items-center justify-between text-xs uppercase tracking-wide text-gray-400">
+                  <label htmlFor="maintenance-ssh-passphrase" className="cursor-pointer">Passphrase</label>
+                  <button
+                    type="button"
+                    onClick={() => setShowPassphrase((prev) => !prev)}
+                    disabled={sshSaving || sshTesting || sshDeleting || updateRunning}
+                    className="text-[11px] font-medium text-purple-300 transition hover:text-purple-200 disabled:opacity-50"
+                  >
+                    {showPassphrase ? 'Verbergen' : 'Anzeigen'}
+                  </button>
+                </div>
+                <input
+                  id="maintenance-ssh-passphrase"
+                  type={showPassphrase ? 'text' : 'password'}
+                  value={sshDraft.privateKeyPassphrase}
+                  onChange={(event) => handleSshDraftChange('privateKeyPassphrase', event.target.value)}
+                  disabled={sshSaving || sshTesting || sshDeleting || updateRunning}
+                  className="w-full rounded-md border border-gray-700 bg-gray-950/70 px-3 py-2 text-sm text-gray-100 focus:border-purple-500 focus:outline-none"
+                  placeholder="optional"
+                  autoComplete="off"
+                  spellCheck={false}
+                />
+                {sshPassphraseStored && !sshDraft.privateKeyPassphrase && (
+                  <span className="text-[11px] text-gray-400">
+                    Eine Passphrase ist gespeichert. Neuer Wert ersetzt sie oder lösche die Konfiguration unten.
+                  </span>
+                )}
+              </div>
               <label className="grid gap-1">
                 <span className="text-xs uppercase tracking-wide text-gray-400">Weitere SSH-Argumente</span>
                 <textarea