Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 MrBlake
|
10acdaeb0b | ||
 MrBlakeandClaude Opus 5.5
|
daff240aa6 | ||
|
MrBlakeandClaude Opus 5.5
|
66d4350221 | ||
|
MrBlake
|
6c6e25df36 | ||
|
MrBlakeandClaude Opus 5.5
|
32bf502ffa | ||
|
MrBlake
|
a2a0893b8c | ||
|
MrBlakeandClaude Opus 5.5
|
45b0be8557 |
@@ -0,0 +1,8 @@
|
||||
node_modules
|
||||
dist
|
||||
mobile
|
||||
build
|
||||
docs
|
||||
.git
|
||||
.gitea-token
|
||||
web-data
|
||||
@@ -8,3 +8,4 @@ mobile/vendor/
|
||||
mobile/www/
|
||||
mobile/android/keystore.properties
|
||||
mobile/android/*.jks
|
||||
web-data/
|
||||
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
# MrTerm Web – die MrTerm-Oberfläche im Browser, selbst gehostet.
|
||||
# docker compose up -d → http://<server>:8080 (beim ersten Aufruf Admin-Konto anlegen)
|
||||
|
||||
# ---- Build: Server samt ssh2/ws in eine Datei bündeln
|
||||
FROM node:22-alpine AS build
|
||||
WORKDIR /src
|
||||
COPY package.json package-lock.json ./
|
||||
RUN npm ci --ignore-scripts --no-audit --no-fund
|
||||
COPY src ./src
|
||||
RUN npx esbuild src/web/server.js --bundle --platform=node --target=node22 --minify --legal-comments=none \
|
||||
--external:electron --external:cpu-features --external:bufferutil --external:utf-8-validate \
|
||||
--outfile=dist/server.js
|
||||
|
||||
# ---- Laufzeit: nur Node, gebündelter Server und die Dateien der Oberfläche
|
||||
FROM node:22-alpine
|
||||
ENV NODE_ENV=production PORT=8080 DATA_DIR=/data MRTERM_ROOT=/app
|
||||
WORKDIR /app
|
||||
COPY package.json ./
|
||||
COPY --from=build /src/dist/server.js dist/server.js
|
||||
COPY src/i18n.js src/i18n.js
|
||||
COPY src/renderer src/renderer
|
||||
COPY src/web/public src/web/public
|
||||
COPY --from=build /src/node_modules/@xterm node_modules/@xterm
|
||||
RUN mkdir -p /data && chown node:node /data
|
||||
USER node
|
||||
VOLUME /data
|
||||
EXPOSE 8080
|
||||
HEALTHCHECK --interval=30s --timeout=5s CMD wget -qO- http://127.0.0.1:8080/healthz >/dev/null || exit 1
|
||||
CMD ["node", "dist/server.js"]
|
||||
@@ -63,6 +63,7 @@ RDP, SFTP, port forwarding and VPN are only available in the desktop app.
|
||||
- **History** of recent connections
|
||||
- **Import** from `~/.ssh/config` and from **Devolutions Remote Desktop Manager** (`.rdm`/XML, JSON or CSV)
|
||||
- **Backup** export and import
|
||||
- **Web version** for your own server (Docker), usable in any browser. See [Web version (Docker)](#web-version-docker)
|
||||
- **LAN sync**: keep several MrTerm devices in sync over your local network, end-to-end encrypted and without a server
|
||||
- **7 app themes** (Midnight, Navy, Nord, Dracula, Catppuccin, Forest, Light) plus a custom accent color
|
||||
- **Encrypted vault** using your operating system's keyring (Windows DPAPI, Linux libsecret/KWallet)
|
||||
@@ -82,6 +83,39 @@ RDP, SFTP, port forwarding and VPN are only available in the desktop app.
|
||||
|  | |
|
||||
| **Settings**: language, app lock, LAN sync and themes | |
|
||||
|
||||
## Web version (Docker)
|
||||
|
||||
MrTerm also runs as a self-hosted web app, similar to Termix: you use the familiar MrTerm interface in the browser, from any computer.
|
||||
|
||||
```bash
|
||||
curl -O https://git.mrblake.cc/MrBlake/MrTerm/raw/branch/main/docker-compose.yml
|
||||
docker compose up -d
|
||||
```
|
||||
|
||||
Then open `http://<your-server>:8080` and create the administrator account. As an administrator you can add more users under **Settings → Account**.
|
||||
|
||||
- **Included:** hosts and groups, SSH terminal tabs, SFTP file manager (upload by button or drag & drop, download to your computer), keys, snippets, known hosts, Docker, firewall and network management, themes.
|
||||
- **Not included:** RDP, VPN, port forwarding, LAN sync and the app lock. These need direct access to your computer.
|
||||
- **Security:** every user has their own vault, encrypted with a key that only their login password can unlock. The server stores no readable passwords or keys. If a user forgets their password, their vault cannot be recovered.
|
||||
- **HTTPS:** put MrTerm behind a reverse proxy with HTTPS (Traefik, Caddy, nginx …) before you use it over the internet, and set `TRUST_PROXY=1` in `docker-compose.yml`. The proxy must forward WebSockets.
|
||||
- **Data** lives in the `mrterm-data` volume (`/data` in the container). Back it up regularly. A restored vault still needs its user's password to open.
|
||||
- **SSH connections** start from the server, so the server must be able to reach your hosts.
|
||||
|
||||
### Updating the web version
|
||||
|
||||
Run these commands in the folder that contains your `docker-compose.yml`:
|
||||
|
||||
```bash
|
||||
docker compose build --pull --no-cache
|
||||
docker compose up -d
|
||||
```
|
||||
|
||||
This fetches the latest MrTerm from the repository, rebuilds the image and restarts the container. Your users and vaults stay in the `mrterm-data` volume and are kept. Everyone has to sign in again after the restart.
|
||||
|
||||
To check which version is running, look at the bottom of the sign-in page. If a release note mentions changes to `docker-compose.yml`, download it again first (`curl -O …` as above) and copy over your own changes, such as ports or `TRUST_PROXY`.
|
||||
|
||||
To remove images left over from earlier builds: `docker image prune`.
|
||||
|
||||
## Getting started
|
||||
|
||||
1. Click **New host**, enter the address, username and password or key, and click **Save**.
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
# MrTerm Web
|
||||
# docker compose up -d
|
||||
# Danach http://<server>:8080 öffnen und das Admin-Konto anlegen.
|
||||
# Hinter einem Reverse-Proxy mit HTTPS (empfohlen): TRUST_PROXY=1 setzen und den Port nur lokal freigeben.
|
||||
services:
|
||||
mrterm:
|
||||
build:
|
||||
# Baut direkt aus dem Repository – kein Klonen nötig. Alternativ "context: ." in einem Klon.
|
||||
context: https://git.mrblake.cc/MrBlake/MrTerm.git
|
||||
image: mrterm-web
|
||||
container_name: mrterm
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "8080:8080"
|
||||
environment:
|
||||
- TZ=Europe/Berlin
|
||||
# - TRUST_PROXY=1
|
||||
volumes:
|
||||
- mrterm-data:/data
|
||||
|
||||
volumes:
|
||||
mrterm-data:
|
||||
+17
-168
@@ -1,16 +1,11 @@
|
||||
// Node-Backend der Android-App. Nutzt dieselben Module wie der Electron-Hauptprozess
|
||||
// (Tresor, SSH, LAN-Sync, Docker, Firewall, Netzwerk) und spricht über die Capacitor-Bridge mit der Oberfläche.
|
||||
// Node-Backend der Android-App. Die Kanäle kommen aus src/core/backend.js (gemeinsam mit der Web-Version);
|
||||
// hier nur, was Android betrifft: Bridge-Anbindung, Entsperren per Fingerabdruck, Pause/Fortsetzen.
|
||||
// Protokoll: Oberfläche → 'call' [reqId, Kanal, Argumente] bzw. 'send' [Kanal, Argumente];
|
||||
// Backend → 'reply' [reqId, ok, Wert|Fehler] und 'evt' [Kanal, Argumente].
|
||||
const { channel } = require('bridge');
|
||||
const crypto = require('crypto');
|
||||
const { utils: sshUtils } = require('ssh2');
|
||||
const { Store } = require('../../src/main/store');
|
||||
const { SshManager } = require('../../src/main/ssh');
|
||||
const { DockerManager } = require('../../src/main/docker');
|
||||
const { FirewallManager } = require('../../src/main/firewall');
|
||||
const { NetworkConfigManager } = require('../../src/main/network');
|
||||
const { SyncService } = require('../../src/main/sync');
|
||||
const { createBackend } = require('../../src/core/backend');
|
||||
const i18n = require('../../src/i18n');
|
||||
|
||||
const send = (ch, ...args) => channel.send('evt', ch, args);
|
||||
@@ -18,182 +13,36 @@ process.on('uncaughtException', (e) => { console.error(e); send('toast', e?.mess
|
||||
process.on('unhandledRejection', (e) => console.error('Unhandled rejection:', e));
|
||||
|
||||
const store = new Store();
|
||||
const applyLanguage = () => i18n.setLanguage(store.get().settings.language, process.env.MRTERM_LOCALE || 'en');
|
||||
|
||||
// Rückfragen an die Oberfläche (Hostschlüssel, Passwörter, Kopplungscode)
|
||||
const pending = new Map();
|
||||
function ask(ch, req, timeout = 0) {
|
||||
return new Promise((resolve) => {
|
||||
const reqId = crypto.randomUUID();
|
||||
pending.set(reqId, resolve);
|
||||
send(ch, { reqId, ...req });
|
||||
if (timeout) setTimeout(() => { if (pending.delete(reqId)) resolve(null); }, timeout);
|
||||
});
|
||||
}
|
||||
const answer = (reqId, value) => { const r = pending.get(reqId); pending.delete(reqId); r?.(value); };
|
||||
|
||||
const confirmHostKey = async (target, fingerprint, known) =>
|
||||
!!(await ask('hostkey:request', { host: `${target.host}:${target.port}`, fingerprint, previous: known?.fingerprint || '' }));
|
||||
const askSecret = (sessionId, req) => ask('secret:request', { sessionId, ...req });
|
||||
|
||||
const ssh = new SshManager(store, confirmHostKey, askSecret);
|
||||
const docker = new DockerManager(ssh);
|
||||
const firewall = new FirewallManager(ssh);
|
||||
const network = new NetworkConfigManager(ssh);
|
||||
const sync = new SyncService(store, send, async (req) => !!(await ask('sync:pairPrompt', req, 115000)));
|
||||
store.onChange = () => sync.schedule();
|
||||
|
||||
const handlers = new Map();
|
||||
const OPEN_WHILE_LOCKED = new Set(['app:version']);
|
||||
const handle = (ch, fn) => handlers.set(ch, fn);
|
||||
const applyLanguage = (lang = store.get().settings.language) => i18n.setLanguage(lang, process.env.MRTERM_LOCALE || 'en');
|
||||
const be = createBackend({ store, send, platform: 'android', version: process.env.MRTERM_VERSION || '0.0.0', withSync: true, onLanguage: applyLanguage });
|
||||
|
||||
channel.addListener('call', async (reqId, ch, args = []) => {
|
||||
try {
|
||||
const fn = handlers.get(ch);
|
||||
if (!fn) throw new Error(`Unknown channel ${ch}`);
|
||||
if (store.locked && !ch.startsWith('lock:') && !OPEN_WHILE_LOCKED.has(ch)) throw new Error(i18n.t('MrTerm is locked.'));
|
||||
channel.send('reply', reqId, true, await fn(...args));
|
||||
} catch (e) { channel.send('reply', reqId, false, e?.message || String(e)); }
|
||||
try { channel.send('reply', reqId, true, await be.call(ch, args)); } catch (e) { channel.send('reply', reqId, false, e?.message || String(e)); }
|
||||
});
|
||||
const listeners = {
|
||||
'ssh:write': (id, d) => ssh.write(id, d),
|
||||
'ssh:resize': (id, c, r) => ssh.resize(id, c, r),
|
||||
'ssh:close': (id) => ssh.close(id),
|
||||
'ask:reply': answer,
|
||||
};
|
||||
channel.addListener('send', (ch, args = []) => { try { listeners[ch]?.(...args); } catch (e) { console.error(e); } });
|
||||
channel.addListener('send', (ch, args = []) => be.notify(ch, args));
|
||||
|
||||
// ---------- App-Sperre: Passwort, zusätzlich Fingerabdruck (Geheimnis aus dem Android Keystore) ----------
|
||||
const kdf = (pw, salt, N) => new Promise((resolve, reject) =>
|
||||
crypto.scrypt(String(pw), salt, 32, { N, r: 8, p: 1, maxmem: 256 * N * 8 }, (e, k) => (e ? reject(e) : resolve(k))));
|
||||
// ---------- Fingerabdruck (Geheimnis aus dem Android Keystore, nur zusätzlich zum Passwort) ----------
|
||||
const bioKek = (b64) => Buffer.from(crypto.hkdfSync('sha256', Buffer.from(b64, 'base64'), Buffer.alloc(0), 'mrterm-bio-kek', 32));
|
||||
function lockStatus() {
|
||||
const { language, appTheme, accent } = store.get().settings;
|
||||
return { enabled: store.lockEnabled, locked: store.locked, hasPassword: !!store.lock?.password, bio: !!store.lock?.bio, meta: { language, appTheme, accent } };
|
||||
}
|
||||
const requireUnlocked = () => { if (store.locked) throw new Error(i18n.t('MrTerm is locked.')); };
|
||||
const afterUnlock = () => { applyLanguage(); sync.start().catch(() => {}); };
|
||||
|
||||
handle('lock:status', lockStatus);
|
||||
handle('lock:lock', () => { if (store.lockEnabled) store.locked = true; return lockStatus(); });
|
||||
handle('lock:unlockPassword', async (pw) => {
|
||||
const p = store.lock?.password;
|
||||
if (!p) throw new Error(i18n.t('No password set.'));
|
||||
const kek = await kdf(pw, Buffer.from(p.salt, 'base64'), p.N);
|
||||
try { store.unlockWith(kek, p.wrap); } catch { throw new Error(i18n.t('Wrong password.')); }
|
||||
afterUnlock();
|
||||
return true;
|
||||
});
|
||||
handle('lock:unlockBio', (secret) => {
|
||||
be.handle('lock:unlockBio', (secret) => {
|
||||
if (!store.lock?.bio) throw new Error(i18n.t('Fingerprint unlock is not set up.'));
|
||||
try { store.unlockWith(bioKek(secret), store.lock.bio.wrap); } catch { throw new Error(i18n.t('Fingerprint unlock failed. Use your password.')); }
|
||||
afterUnlock();
|
||||
applyLanguage();
|
||||
be.sync.start().catch(() => {});
|
||||
return true;
|
||||
});
|
||||
handle('lock:setPassword', async (pw) => {
|
||||
requireUnlocked();
|
||||
if (!pw || String(pw).length < 6) throw new Error(i18n.t('The password must be at least 6 characters long.'));
|
||||
const salt = crypto.randomBytes(16), N = 2 ** 15;
|
||||
const kek = await kdf(pw, salt, N);
|
||||
store.lock = store.lock || { password: null, fido: [] };
|
||||
store.lock.password = { salt: salt.toString('base64'), N, wrap: store.wrapDek(kek) };
|
||||
store.save();
|
||||
return lockStatus();
|
||||
});
|
||||
handle('lock:removePassword', () => {
|
||||
requireUnlocked();
|
||||
if (store.lock) { store.lock.password = null; store.lock.bio = null; } // Fingerabdruck nur zusätzlich zum Passwort
|
||||
store.dropLockIfEmpty();
|
||||
store.save();
|
||||
return lockStatus();
|
||||
});
|
||||
handle('lock:setBio', (secret) => {
|
||||
requireUnlocked();
|
||||
be.handle('lock:setBio', (secret) => {
|
||||
be.requireUnlocked();
|
||||
if (!store.lock?.password) throw new Error(i18n.t('Set a password first.'));
|
||||
store.lock.bio = secret ? { wrap: store.wrapDek(bioKek(secret)) } : null;
|
||||
store.save();
|
||||
return lockStatus();
|
||||
return be.lockStatus();
|
||||
});
|
||||
|
||||
// ---------- Tresor ----------
|
||||
const publicData = () => { const { sync: _s, tombstones: _t, ...rest } = store.get(); return rest; };
|
||||
handle('vault:get', () => ({ ...publicData(), encrypted: store.encrypted, platform: 'android' }));
|
||||
handle('vault:upsert', (col, item) => store.upsert(col, item));
|
||||
handle('vault:remove', (col, id) => {
|
||||
if (col === 'vpns') store.get().hosts.forEach((h) => { if (h.vpnId === id) { h.vpnId = null; h.updatedAt = Date.now(); } });
|
||||
return store.remove(col, id);
|
||||
});
|
||||
handle('vault:settings', (s) => { store.setSettings(s); if ('language' in s) applyLanguage(); });
|
||||
handle('vault:forgetHost', (id) => store.forgetKnownHost(id));
|
||||
handle('app:version', () => process.env.MRTERM_VERSION || '0.0.0');
|
||||
|
||||
// ---------- Schlüssel ----------
|
||||
handle('key:generate', ({ type, bits, comment, passphrase }) => {
|
||||
const opts = { comment: comment || 'mrterm@android' };
|
||||
if (type === 'rsa') opts.bits = Number(bits) || 4096;
|
||||
if (passphrase) { opts.passphrase = passphrase; opts.cipher = 'aes256-cbc'; }
|
||||
const k = sshUtils.generateKeyPairSync(type === 'rsa' ? 'rsa' : type === 'ecdsa' ? 'ecdsa' : 'ed25519', opts);
|
||||
return { privateKey: k.private, publicKey: k.public };
|
||||
});
|
||||
handle('key:parse', ({ privateKey, passphrase }) => {
|
||||
const k = sshUtils.parseKey(privateKey, passphrase || undefined);
|
||||
if (k instanceof Error) throw k;
|
||||
const key = Array.isArray(k) ? k[0] : k;
|
||||
return { type: key.type, publicKey: `${key.type} ${key.getPublicSSH().toString('base64')} ${key.comment || ''}`.trim() };
|
||||
});
|
||||
|
||||
// ---------- SSH-Terminal ----------
|
||||
function hostWithOverrides(ref) {
|
||||
if (typeof ref === 'string') {
|
||||
const h = store.resolveHost(ref);
|
||||
if (!h) throw new Error(i18n.t('Host not found'));
|
||||
return h;
|
||||
}
|
||||
if (ref?.ref) return { ...hostWithOverrides(ref.ref), execCommand: ref.execCommand, label: ref.label };
|
||||
return ref;
|
||||
}
|
||||
handle('ssh:open', async (sessionId, ref, size) => {
|
||||
const host = hostWithOverrides(ref);
|
||||
if (host.id && !host.execCommand) store.addHistory({ hostId: host.id, at: Date.now() });
|
||||
await ssh.openShell(sessionId, host, size, (type, payload) => send('ssh:event', sessionId, type, payload));
|
||||
return true;
|
||||
});
|
||||
|
||||
// ---------- Docker / Firewall / Netzwerk (gleiche Module wie am Desktop) ----------
|
||||
handle('docker:open', (id, ref) => docker.open(id, hostWithOverrides(ref), () => send('docker:closed', id)));
|
||||
handle('docker:list', (id) => docker.list(id));
|
||||
handle('docker:stats', (id) => docker.stats(id));
|
||||
handle('docker:action', (id, action, cid) => docker.action(id, action, cid));
|
||||
handle('docker:command', (id, kind, cid) => docker.command(id, kind, cid));
|
||||
handle('docker:close', (id) => docker.close(id));
|
||||
handle('firewall:open', (id, ref) => firewall.open(id, hostWithOverrides(ref), () => send('firewall:closed', id)));
|
||||
handle('firewall:list', (id, backend) => firewall.list(id, backend));
|
||||
handle('firewall:ufw', (id, op, args) => firewall.ufw(id, op, args));
|
||||
handle('firewall:ipt', (id, op, args) => firewall.ipt(id, op, args));
|
||||
handle('firewall:close', (id) => firewall.close(id));
|
||||
handle('network:open', (id, ref) => network.open(id, hostWithOverrides(ref), () => send('network:closed', id)));
|
||||
handle('network:read', (id) => network.read(id));
|
||||
handle('network:save', (id, model, verify) => network.saveInterface(id, model, verify));
|
||||
handle('network:remove', (id, model) => network.removeInterface(id, model));
|
||||
handle('network:hostname', (id, name) => network.setHostname(id, name));
|
||||
handle('network:resolv', (id, servers, search) => network.setResolv(id, servers, search));
|
||||
handle('network:close', (id) => network.close(id));
|
||||
|
||||
// ---------- Synchronisation ----------
|
||||
handle('sync:status', () => sync.status());
|
||||
handle('sync:enable', (on, name) => sync.setEnabled(on, name));
|
||||
handle('sync:pairable', (on) => { sync.setPairable(on); return sync.status(); });
|
||||
handle('sync:pair', (id) => sync.pair(id));
|
||||
handle('sync:unpair', (id) => sync.unpair(id));
|
||||
handle('sync:now', () => sync.syncAll());
|
||||
handle('sync:share', (sel) => sync.setShare(sel));
|
||||
handle('sync:shareItem', (c, id, yes) => sync.shareItem(c, id, yes));
|
||||
handle('sync:probe', (address) => sync.probe(address));
|
||||
// App im Hintergrund: Sync-Sockets schließen, im Vordergrund wieder öffnen
|
||||
handle('app:pause', () => sync.stop());
|
||||
handle('app:resume', () => sync.start().catch(() => {}));
|
||||
be.handle('app:pause', () => be.sync.stop());
|
||||
be.handle('app:resume', () => be.sync.start().catch(() => {}));
|
||||
|
||||
store.load();
|
||||
applyLanguage();
|
||||
sync.start().catch(() => {});
|
||||
be.sync.start().catch(() => {});
|
||||
channel.send('ready');
|
||||
|
||||
Generated
+511
-3
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "mrterm",
|
||||
"version": "0.12.0",
|
||||
"version": "0.13.2",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "mrterm",
|
||||
"version": "0.12.0",
|
||||
"version": "0.13.2",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@xterm/addon-fit": "^0.11.0",
|
||||
@@ -18,7 +18,9 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"electron": "^44.4.5",
|
||||
"electron-builder": "^26.15.3"
|
||||
"electron-builder": "^26.15.3",
|
||||
"esbuild": "^0.28.2",
|
||||
"ws": "^8.21.3"
|
||||
}
|
||||
},
|
||||
"node_modules/@electron-internal/extract-zip": {
|
||||
@@ -325,6 +327,448 @@
|
||||
"node": ">=14.14"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/aix-ppc64": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.2.tgz",
|
||||
"integrity": "sha512-XExcO+dvLKvVtNTibSTBej1NCAbaGhWn9Ww1ZPx80qsahhPFe/8jgWP0IchNe0F3HwkU7n8ejhH8bjonqht8mQ==",
|
||||
"cpu": [
|
||||
"ppc64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"aix"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/android-arm": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.2.tgz",
|
||||
"integrity": "sha512-kXXoiPVVGQcnIYGOeaovwOURpniDBpSq4A03qkQ+BMQqtGG6HYap3xne9C1O1yo4TR3qxlCX5IqqmX6fFo2Lqg==",
|
||||
"cpu": [
|
||||
"arm"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"android"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/android-arm64": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.2.tgz",
|
||||
"integrity": "sha512-5YfKeeI8qWfBZIX+u2xZC3Zlb3Os/gLS2sbEKM+I4ZOcsWmHS2WLysCcQZDAFRslDUU5Oiq44gf6PYN1vGwG5A==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"android"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/android-x64": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.2.tgz",
|
||||
"integrity": "sha512-O387ite7SzUyCcy3JQX4P4bLtEA7bLLkx+esve5JHnyYfNTxcVpXZo9jhdB0lTKN44gztELTdU7nS8Nr16Fs1Q==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"android"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/darwin-arm64": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.2.tgz",
|
||||
"integrity": "sha512-n4KqkOQrraxHJcgjM1RvwbigfQKIKJVpM7xp+KsxiyUSrRdIXnt73VhrPAx0fV44hgfmIVKjxMN9J1t5jySVkw==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"darwin"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/darwin-x64": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.2.tgz",
|
||||
"integrity": "sha512-uq6suIWYP37qzGddBKPw5QEQPi6HiLGsO7UmkpfyaYNQ3D+rN6w6WfwH+nuqcGXWvawGwxOEroO4YGnFh95azw==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"darwin"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/freebsd-arm64": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.2.tgz",
|
||||
"integrity": "sha512-n+I0BTSRIoy+d6RPKnEVwql5UwBJolytvY4mAOIEJorKlqgPII8ix6slVVrfZ5Tnj7glIZvloylbB/EJPMWEXw==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"freebsd"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/freebsd-x64": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.2.tgz",
|
||||
"integrity": "sha512-78XJTJkvPs0kz2w61301PJjXl4g7q3JqiYMZ/M/yVI73EHBrCRTgkhu9oqG7vPqq+a/yadEW8aD+agKlk5xrmg==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"freebsd"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/linux-arm": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.2.tgz",
|
||||
"integrity": "sha512-XlDnu2q5yoqems+xay6wSAcg9DDD7K9RLKZEBOMZm3ckNpJBvOX20tSfby8KfrrhINDyv9V2YVZKY/SpoGJI8w==",
|
||||
"cpu": [
|
||||
"arm"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/linux-arm64": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.2.tgz",
|
||||
"integrity": "sha512-pW4AC0P3it8c7do9MVM4p51FzHzdM/TZrerurgRcHJ2WTa1VQ1CIq18xncfpBJw4ojkiZZrKW2yIBWBP92j6Ug==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/linux-ia32": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.2.tgz",
|
||||
"integrity": "sha512-CYbnj78HsIeA+DhgUKgFCfvNsTHFhMMrinUrMZpDXJXKN8T3XViTZ/+wtHeVxEWY8ewSzTFN+nRmSwO2tZaLUQ==",
|
||||
"cpu": [
|
||||
"ia32"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/linux-loong64": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.2.tgz",
|
||||
"integrity": "sha512-buwkd8nsph4R+ajRvw0qM5Hja/TXQow3ptzWO2EbG/cqcIkHloRrdlBtQlshyYGTNFvfkfJ5tpPLVkY4DtsPfQ==",
|
||||
"cpu": [
|
||||
"loong64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/linux-mips64el": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.2.tgz",
|
||||
"integrity": "sha512-ZVykbDyk7519VwiNb9Lcj9m8XM6v5V9uKPvrEMkkEedVewf+0itkhahp4HDpgERXhwLRpWFypsGbG/J8s0QjJA==",
|
||||
"cpu": [
|
||||
"mips64el"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/linux-ppc64": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.2.tgz",
|
||||
"integrity": "sha512-CAXl+Dtd9UUuJd8pKKdwh6MLm3MUMiqMPmhZ3tTSXPqfyQ3vDl6R5hZdZ/kYojK4ofXtdfSv1tFq8XzWx3heNQ==",
|
||||
"cpu": [
|
||||
"ppc64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/linux-riscv64": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.2.tgz",
|
||||
"integrity": "sha512-GeXCej4IQtU1B+QlDV8W/RRvbzI3O/Stss+/bCXv4lZls5WGRtu2a+3JkA3i4qIUlMXpcHebWpF8AkJhATowuA==",
|
||||
"cpu": [
|
||||
"riscv64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/linux-s390x": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.2.tgz",
|
||||
"integrity": "sha512-3H1weTYZPxt/WOhByszQZybS9w5lKzUn1FDMsgEChbHWQwHYQQRfBxgCcZvPhjHfKyJjIievvMmEUawJrdY9Dg==",
|
||||
"cpu": [
|
||||
"s390x"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/linux-x64": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.2.tgz",
|
||||
"integrity": "sha512-4xTZr1FUmSoQW4XIWmit3tzQrUTZM+N3P0XV8xROKYF50XfI7xeO90+1bZvNwxIufQ9hDQVRJH5YhgPVF8A/HQ==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/netbsd-arm64": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.2.tgz",
|
||||
"integrity": "sha512-sSATRjPeDBg3pdgHoQfoYBob11Kk1FGa9lui5RIHZCoCkJa9QKlvl3/vKz2usCmYYjs7ymJR/2Nnsqe+Hjt5nw==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"netbsd"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/netbsd-x64": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.2.tgz",
|
||||
"integrity": "sha512-lqnzCV+mM0gIADaKihiCg6ifgfU2L3h5E33rNQBN1Y4MaVGnzryzmvvf7UHxprpQdE8hpqLolJ9Rl+SkIRDpyw==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"netbsd"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/openbsd-arm64": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.2.tgz",
|
||||
"integrity": "sha512-AL2qJILH7lNjrDmCQDvdxMfAUIv8KMNZOvrwAQ8i8//ntL9FflhOyMJ8OZSMBb8/AWXe3/5v5S20y3zCoZWKoQ==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"openbsd"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/openbsd-x64": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.2.tgz",
|
||||
"integrity": "sha512-QtiuPytchRyC4rwUKhexJdQKvDuZ6hWloi3igqPQNUJCS1/v9EiO3UTOXR6A3FoMo4fnAKbWJdqaIwhOzh8qEw==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"openbsd"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/openharmony-arm64": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.2.tgz",
|
||||
"integrity": "sha512-WkhYDmpTjLvGlScA1rwjRUmhl4k8oXR3cIbtqWmELgU/dFeHHlEllxDvdWcNJV9rbzCexB5vz8gtNewWLgCT7Q==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"openharmony"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/sunos-x64": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.2.tgz",
|
||||
"integrity": "sha512-GPMSkTOtMnv2U2F8gxe4Io6qmVs+YKyp832Etqqxr0hFngmXQ3rzwytelm3GIn7T4VviRUlf3sOgBOiTdvaf7g==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"sunos"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/win32-arm64": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.2.tgz",
|
||||
"integrity": "sha512-PIhhEkE9uPBleRBrQEJpUn7MBnibZzbGzYWPmY3x+YoVg/95zbjB4CxPPOQ8l5tYYM4mMaCthF8/1DIfBQQyWQ==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"win32"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/win32-ia32": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.2.tgz",
|
||||
"integrity": "sha512-YmJbfTlvU7Sdn9BB+4PRES4oB6pxgS37MAONj+hBr/cpXS1aBPKXxNnDbu+QCWPj0o9dgyxeq79g6c5P8KeuYA==",
|
||||
"cpu": [
|
||||
"ia32"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"win32"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/win32-x64": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.2.tgz",
|
||||
"integrity": "sha512-5ebpxr3nWMzrL/rnUI755Jkuee0bHL/Gq0WTF9lvcpv73wAp5eu8MfBUgWK9bhWvZjj7yX8etf/8tI8Ney695g==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"win32"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@isaacs/fs-minipass": {
|
||||
"version": "4.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
|
||||
@@ -2071,6 +2515,48 @@
|
||||
"license": "MIT",
|
||||
"optional": true
|
||||
},
|
||||
"node_modules/esbuild": {
|
||||
"version": "0.28.2",
|
||||
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.2.tgz",
|
||||
"integrity": "sha512-HKVLS8dvII+xoKW9kmqxbRKrnWEXfJJr/FZhhJmiqIB0e053QNYFqOBouTMO/k5sID4MvCiUCvv8b9M4h32wIA==",
|
||||
"dev": true,
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"bin": {
|
||||
"esbuild": "bin/esbuild"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"@esbuild/aix-ppc64": "0.28.2",
|
||||
"@esbuild/android-arm": "0.28.2",
|
||||
"@esbuild/android-arm64": "0.28.2",
|
||||
"@esbuild/android-x64": "0.28.2",
|
||||
"@esbuild/darwin-arm64": "0.28.2",
|
||||
"@esbuild/darwin-x64": "0.28.2",
|
||||
"@esbuild/freebsd-arm64": "0.28.2",
|
||||
"@esbuild/freebsd-x64": "0.28.2",
|
||||
"@esbuild/linux-arm": "0.28.2",
|
||||
"@esbuild/linux-arm64": "0.28.2",
|
||||
"@esbuild/linux-ia32": "0.28.2",
|
||||
"@esbuild/linux-loong64": "0.28.2",
|
||||
"@esbuild/linux-mips64el": "0.28.2",
|
||||
"@esbuild/linux-ppc64": "0.28.2",
|
||||
"@esbuild/linux-riscv64": "0.28.2",
|
||||
"@esbuild/linux-s390x": "0.28.2",
|
||||
"@esbuild/linux-x64": "0.28.2",
|
||||
"@esbuild/netbsd-arm64": "0.28.2",
|
||||
"@esbuild/netbsd-x64": "0.28.2",
|
||||
"@esbuild/openbsd-arm64": "0.28.2",
|
||||
"@esbuild/openbsd-x64": "0.28.2",
|
||||
"@esbuild/openharmony-arm64": "0.28.2",
|
||||
"@esbuild/sunos-x64": "0.28.2",
|
||||
"@esbuild/win32-arm64": "0.28.2",
|
||||
"@esbuild/win32-ia32": "0.28.2",
|
||||
"@esbuild/win32-x64": "0.28.2"
|
||||
}
|
||||
},
|
||||
"node_modules/escalade": {
|
||||
"version": "3.2.0",
|
||||
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
|
||||
@@ -3992,6 +4478,28 @@
|
||||
"dev": true,
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/ws": {
|
||||
"version": "8.21.3",
|
||||
"resolved": "https://registry.npmjs.org/ws/-/ws-8.21.3.tgz",
|
||||
"integrity": "sha512-201TZ/kPWxoPr/OKWjquZR1SWKXcvxdH+e1xrx89b3YbmzLMFCLfnaG1HFIgWzJOEWZ7MvpK++odZufgYR50Rw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=10.0.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"bufferutil": "^4.0.1",
|
||||
"utf-8-validate": ">=5.0.2"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"bufferutil": {
|
||||
"optional": true
|
||||
},
|
||||
"utf-8-validate": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/xmlbuilder": {
|
||||
"version": "15.1.1",
|
||||
"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
|
||||
|
||||
+6
-3
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "mrterm",
|
||||
"productName": "MrTerm",
|
||||
"version": "0.12.0",
|
||||
"version": "0.13.2",
|
||||
"description": "Moderner SSH-, SFTP- und RDP-Client",
|
||||
"main": "src/main/main.js",
|
||||
"author": "MrBlake",
|
||||
@@ -68,12 +68,15 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"electron": "^44.4.5",
|
||||
"electron-builder": "^26.15.3"
|
||||
"electron-builder": "^26.15.3",
|
||||
"esbuild": "^0.28.2",
|
||||
"ws": "^8.21.3"
|
||||
},
|
||||
"allowScripts": {
|
||||
"electron@44.4.5": true,
|
||||
"electron-winstaller@5.4.0": true,
|
||||
"ssh2@1.17.0": true,
|
||||
"koffi@3.3.1": true
|
||||
"koffi@3.3.1": true,
|
||||
"esbuild@0.28.2": true
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,223 @@
|
||||
// Gemeinsame Backend-Kanäle für die Android-App und die Web-Version (Docker).
|
||||
// Der Electron-Hauptprozess (src/main/main.js) registriert seine Kanäle selbst, nutzt aber dieselben Module.
|
||||
//
|
||||
// createBackend({ store, send, platform, version, withSync, onLanguage })
|
||||
// store Store-Instanz (bereits geladen)
|
||||
// send (kanal, ...args) → Ereignis an die Oberfläche
|
||||
// → { call(kanal, args), notify(kanal, args), close(), ssh, sync, handle }
|
||||
const crypto = require('crypto');
|
||||
const { utils: sshUtils } = require('ssh2');
|
||||
const { SshManager } = require('../main/ssh');
|
||||
const { DockerManager } = require('../main/docker');
|
||||
const { FirewallManager } = require('../main/firewall');
|
||||
const { NetworkConfigManager } = require('../main/network');
|
||||
const i18n = require('../i18n');
|
||||
|
||||
function createBackend({ store, send, platform, version = '0.0.0', withSync = false, onLanguage = () => {} }) {
|
||||
// Rückfragen an die Oberfläche (Hostschlüssel, Passwörter, Kopplungscode)
|
||||
const pending = new Map();
|
||||
const ask = (ch, req, timeout = 0) => new Promise((resolve) => {
|
||||
const reqId = crypto.randomUUID();
|
||||
pending.set(reqId, resolve);
|
||||
send(ch, { reqId, ...req });
|
||||
if (timeout) setTimeout(() => { if (pending.delete(reqId)) resolve(null); }, timeout);
|
||||
});
|
||||
const answer = (reqId, value) => { const r = pending.get(reqId); pending.delete(reqId); r?.(value); };
|
||||
|
||||
const confirmHostKey = async (target, fingerprint, known) =>
|
||||
!!(await ask('hostkey:request', { host: `${target.host}:${target.port}`, fingerprint, previous: known?.fingerprint || '' }));
|
||||
const askSecret = (sessionId, req) => ask('secret:request', { sessionId, ...req });
|
||||
|
||||
const ssh = new SshManager(store, confirmHostKey, askSecret);
|
||||
const docker = new DockerManager(ssh);
|
||||
const firewall = new FirewallManager(ssh);
|
||||
const network = new NetworkConfigManager(ssh);
|
||||
let sync = null;
|
||||
if (withSync) {
|
||||
const { SyncService } = require('../main/sync');
|
||||
sync = new SyncService(store, send, async (req) => !!(await ask('sync:pairPrompt', req, 115000)));
|
||||
store.onChange = () => sync.schedule();
|
||||
}
|
||||
|
||||
const handlers = new Map();
|
||||
const handle = (ch, fn) => handlers.set(ch, fn);
|
||||
const OPEN_WHILE_LOCKED = new Set(['app:version']);
|
||||
|
||||
async function call(ch, args = []) {
|
||||
const fn = handlers.get(ch);
|
||||
if (!fn) throw new Error(`Unknown channel ${ch}`);
|
||||
if (store.locked && !ch.startsWith('lock:') && !OPEN_WHILE_LOCKED.has(ch)) throw new Error(i18n.t('MrTerm is locked.'));
|
||||
return fn(...args);
|
||||
}
|
||||
const listeners = {
|
||||
'ssh:write': (id, d) => ssh.write(id, d),
|
||||
'ssh:resize': (id, c, r) => ssh.resize(id, c, r),
|
||||
'ssh:close': (id) => ssh.close(id),
|
||||
'ask:reply': answer,
|
||||
// Namen der Desktop-Vorlage (preload.js)
|
||||
'secret:reply': answer,
|
||||
'sync:pairReply': answer,
|
||||
};
|
||||
const notify = (ch, args = []) => { try { listeners[ch]?.(...args); } catch (e) { console.error(e); } };
|
||||
|
||||
// ---------- App-Sperre (Passwort) ----------
|
||||
const kdf = (pw, salt, N) => new Promise((resolve, reject) =>
|
||||
crypto.scrypt(String(pw), salt, 32, { N, r: 8, p: 1, maxmem: 256 * N * 8 }, (e, k) => (e ? reject(e) : resolve(k))));
|
||||
const lockStatus = () => {
|
||||
const { language, appTheme, accent } = store.get().settings;
|
||||
return { enabled: store.lockEnabled, locked: store.locked, hasPassword: !!store.lock?.password, bio: !!store.lock?.bio, fido: [], meta: { language, appTheme, accent } };
|
||||
};
|
||||
const requireUnlocked = () => { if (store.locked) throw new Error(i18n.t('MrTerm is locked.')); };
|
||||
const afterUnlock = () => { onLanguage(store.get().settings.language); sync?.start().catch(() => {}); };
|
||||
handle('lock:status', lockStatus);
|
||||
handle('lock:lock', () => { if (store.lockEnabled) store.locked = true; return lockStatus(); });
|
||||
handle('lock:unlockPassword', async (pw) => {
|
||||
const p = store.lock?.password;
|
||||
if (!p) throw new Error(i18n.t('No password set.'));
|
||||
const kek = await kdf(pw, Buffer.from(p.salt, 'base64'), p.N);
|
||||
try { store.unlockWith(kek, p.wrap); } catch { throw new Error(i18n.t('Wrong password.')); }
|
||||
afterUnlock();
|
||||
return true;
|
||||
});
|
||||
handle('lock:setPassword', async (pw) => {
|
||||
requireUnlocked();
|
||||
if (!pw || String(pw).length < 6) throw new Error(i18n.t('The password must be at least 6 characters long.'));
|
||||
const salt = crypto.randomBytes(16), N = 2 ** 15;
|
||||
const kek = await kdf(pw, salt, N);
|
||||
store.lock = store.lock || { password: null, fido: [] };
|
||||
store.lock.password = { salt: salt.toString('base64'), N, wrap: store.wrapDek(kek) };
|
||||
store.save();
|
||||
return lockStatus();
|
||||
});
|
||||
handle('lock:removePassword', () => {
|
||||
requireUnlocked();
|
||||
if (store.lock) { store.lock.password = null; store.lock.bio = null; }
|
||||
store.dropLockIfEmpty();
|
||||
store.save();
|
||||
return lockStatus();
|
||||
});
|
||||
|
||||
// ---------- Tresor ----------
|
||||
const publicData = () => { const { sync: _s, tombstones: _t, ...rest } = store.get(); return rest; };
|
||||
handle('vault:get', () => ({ ...publicData(), encrypted: store.encrypted, platform }));
|
||||
handle('vault:upsert', (col, item) => store.upsert(col, item));
|
||||
handle('vault:remove', (col, id) => {
|
||||
if (col === 'vpns') store.get().hosts.forEach((h) => { if (h.vpnId === id) { h.vpnId = null; h.updatedAt = Date.now(); } });
|
||||
return store.remove(col, id);
|
||||
});
|
||||
handle('vault:settings', (s) => { store.setSettings(s); if ('language' in s) onLanguage(s.language); });
|
||||
handle('vault:forgetHost', (id) => store.forgetKnownHost(id));
|
||||
handle('vault:exportData', () => publicData());
|
||||
handle('vault:importData', (data) => {
|
||||
for (const col of ['groups', 'hosts', 'keys', 'snippets', 'forwards', 'vpns'])
|
||||
for (const item of data?.[col] || []) store.upsert(col, item);
|
||||
return true;
|
||||
});
|
||||
// entries: [{ folder: ['A','B'], host?: {...} }] – wie am Desktop (Import aus Remote Desktop Manager)
|
||||
handle('vault:bulkImport', (entries) => {
|
||||
const groups = store.get().groups;
|
||||
const ensure = (parts) => {
|
||||
let parent = null;
|
||||
for (const label of parts) {
|
||||
let g = groups.find((x) => (x.parentId || null) === parent && x.label.toLowerCase() === label.toLowerCase());
|
||||
if (!g) { g = { id: crypto.randomUUID(), label, parentId: parent, createdAt: Date.now() }; groups.push(g); }
|
||||
parent = g.id;
|
||||
}
|
||||
return parent;
|
||||
};
|
||||
let hosts = 0, skipped = 0;
|
||||
for (const e of entries) {
|
||||
const groupId = ensure(e.folder || []);
|
||||
if (!e.host) continue;
|
||||
const dup = store.get().hosts.find((h) => h.address === e.host.address && (h.groupId || null) === groupId && (h.label || '') === (e.host.label || '') && (h.protocol || 'ssh') === e.host.protocol);
|
||||
if (dup) { skipped++; continue; }
|
||||
store.get().hosts.push({ ...e.host, id: crypto.randomUUID(), groupId, createdAt: Date.now(), updatedAt: Date.now() });
|
||||
hosts++;
|
||||
}
|
||||
store.save();
|
||||
return { hosts, skipped, groups: groups.length };
|
||||
});
|
||||
handle('app:version', () => version);
|
||||
|
||||
// ---------- Schlüssel ----------
|
||||
handle('key:generate', ({ type, bits, comment, passphrase }) => {
|
||||
const opts = { comment: comment || `mrterm@${platform}` };
|
||||
if (type === 'rsa') opts.bits = Number(bits) || 4096;
|
||||
if (passphrase) { opts.passphrase = passphrase; opts.cipher = 'aes256-cbc'; }
|
||||
const k = sshUtils.generateKeyPairSync(type === 'rsa' ? 'rsa' : type === 'ecdsa' ? 'ecdsa' : 'ed25519', opts);
|
||||
return { privateKey: k.private, publicKey: k.public };
|
||||
});
|
||||
handle('key:parse', ({ privateKey, passphrase }) => {
|
||||
const k = sshUtils.parseKey(privateKey, passphrase || undefined);
|
||||
if (k instanceof Error) throw k;
|
||||
const key = Array.isArray(k) ? k[0] : k;
|
||||
return { type: key.type, publicKey: `${key.type} ${key.getPublicSSH().toString('base64')} ${key.comment || ''}`.trim() };
|
||||
});
|
||||
|
||||
// ---------- SSH-Terminal & SFTP ----------
|
||||
function hostWithOverrides(ref) {
|
||||
if (typeof ref === 'string') {
|
||||
const h = store.resolveHost(ref);
|
||||
if (!h) throw new Error(i18n.t('Host not found'));
|
||||
return h;
|
||||
}
|
||||
if (ref?.ref) return { ...hostWithOverrides(ref.ref), execCommand: ref.execCommand, label: ref.label };
|
||||
return ref;
|
||||
}
|
||||
handle('ssh:open', async (sessionId, ref, size) => {
|
||||
const host = hostWithOverrides(ref);
|
||||
if (host.id && !host.execCommand) store.addHistory({ hostId: host.id, at: Date.now() });
|
||||
await ssh.openShell(sessionId, host, size, (type, payload) => send('ssh:event', sessionId, type, payload));
|
||||
return true;
|
||||
});
|
||||
handle('sftp:open', (id, ref) => ssh.openSftp(id, hostWithOverrides(ref)));
|
||||
handle('sftp:list', (id, dir) => ssh.sftpList(id, dir));
|
||||
handle('sftp:op', (id, op, a, b) => ssh.sftpOp(id, op, a, b));
|
||||
handle('sftp:close', (id) => ssh.close(id));
|
||||
|
||||
// ---------- Docker / Firewall / Netzwerk ----------
|
||||
handle('docker:open', (id, ref) => docker.open(id, hostWithOverrides(ref), () => send('docker:closed', id)));
|
||||
handle('docker:list', (id) => docker.list(id));
|
||||
handle('docker:stats', (id) => docker.stats(id));
|
||||
handle('docker:action', (id, action, cid) => docker.action(id, action, cid));
|
||||
handle('docker:command', (id, kind, cid) => docker.command(id, kind, cid));
|
||||
handle('docker:close', (id) => docker.close(id));
|
||||
handle('firewall:open', (id, ref) => firewall.open(id, hostWithOverrides(ref), () => send('firewall:closed', id)));
|
||||
handle('firewall:list', (id, backend) => firewall.list(id, backend));
|
||||
handle('firewall:ufw', (id, op, args) => firewall.ufw(id, op, args));
|
||||
handle('firewall:ipt', (id, op, args) => firewall.ipt(id, op, args));
|
||||
handle('firewall:close', (id) => firewall.close(id));
|
||||
handle('network:open', (id, ref) => network.open(id, hostWithOverrides(ref), () => send('network:closed', id)));
|
||||
handle('network:read', (id) => network.read(id));
|
||||
handle('network:save', (id, model, verify) => network.saveInterface(id, model, verify));
|
||||
handle('network:remove', (id, model) => network.removeInterface(id, model));
|
||||
handle('network:hostname', (id, name) => network.setHostname(id, name));
|
||||
handle('network:resolv', (id, servers, search) => network.setResolv(id, servers, search));
|
||||
handle('network:readFile', (id, path) => network.readFile(id, path));
|
||||
handle('network:writeFile', (id, path, content, verify) => network.writeFile(id, path, content, verify));
|
||||
handle('network:close', (id) => network.close(id));
|
||||
|
||||
// ---------- Synchronisation ----------
|
||||
if (sync) {
|
||||
handle('sync:status', () => sync.status());
|
||||
handle('sync:enable', (on, name) => sync.setEnabled(on, name));
|
||||
handle('sync:pairable', (on) => { sync.setPairable(on); return sync.status(); });
|
||||
handle('sync:pair', (id) => sync.pair(id));
|
||||
handle('sync:unpair', (id) => sync.unpair(id));
|
||||
handle('sync:now', () => sync.syncAll());
|
||||
handle('sync:share', (sel) => sync.setShare(sel));
|
||||
handle('sync:shareItem', (c, id, yes) => sync.shareItem(c, id, yes));
|
||||
handle('sync:probe', (address) => sync.probe(address));
|
||||
}
|
||||
|
||||
function close() {
|
||||
ssh.closeAll?.();
|
||||
sync?.stop();
|
||||
for (const r of pending.values()) r(null);
|
||||
pending.clear();
|
||||
}
|
||||
|
||||
return { call, notify, close, handle, ssh, sync, store, kdf, requireUnlocked, lockStatus };
|
||||
}
|
||||
|
||||
module.exports = { createBackend };
|
||||
+37
@@ -351,6 +351,11 @@
|
||||
'Touch your security key to unlock MrTerm.': 'Berühre deinen Sicherheitsschlüssel, um MrTerm zu entsperren.',
|
||||
'Security key prompt was cancelled or timed out.': 'Die Abfrage des Sicherheitsschlüssels wurde abgebrochen oder ist abgelaufen.',
|
||||
'This security key does not support the hmac-secret/PRF extension.': 'Dieser Sicherheitsschlüssel unterstützt die hmac-secret/PRF-Erweiterung nicht.',
|
||||
'Connecting to security key …': 'Verbinde mit dem Sicherheitsschlüssel …',
|
||||
'Enter the PIN of your security key.': 'Gib die PIN deines Sicherheitsschlüssels ein.',
|
||||
'Wrong PIN.': 'Falsche PIN.',
|
||||
'{n} attempts left.': 'Noch {n} Versuche.',
|
||||
'The PIN of this security key is blocked. Remove and reinsert the key, or reset it.': 'Die PIN dieses Sicherheitsschlüssels ist gesperrt. Ziehe den Schlüssel ab und stecke ihn neu ein oder setze ihn zurück.',
|
||||
|
||||
// VPN
|
||||
'— No VPN —': '— Kein VPN —',
|
||||
@@ -650,6 +655,38 @@
|
||||
'Fingerprint unlock is not set up.': 'Entsperren per Fingerabdruck ist nicht eingerichtet.',
|
||||
'Fingerprint unlock failed. Use your password.': 'Entsperren per Fingerabdruck fehlgeschlagen. Verwende dein Passwort.',
|
||||
'Set a password first.': 'Lege zuerst ein Passwort fest.',
|
||||
// Web-Version
|
||||
'RDP is not available in the web version.': 'RDP ist in der Web-Version nicht verfügbar.',
|
||||
'Account': 'Konto',
|
||||
'Signed in as {name}': 'Angemeldet als {name}',
|
||||
'Administrator': 'Administrator',
|
||||
'Current password': 'Aktuelles Passwort',
|
||||
'Sign out': 'Abmelden',
|
||||
'Users': 'Benutzer',
|
||||
'User': 'Benutzer',
|
||||
'Delete user?': 'Benutzer löschen?',
|
||||
'“{name}” and their vault will be permanently deleted.': '„{name}“ und der zugehörige Tresor werden endgültig gelöscht.',
|
||||
'Add user': 'Benutzer hinzufügen',
|
||||
'Your vault is stored on the server, encrypted with a key that only your login password can unlock.': 'Dein Tresor liegt auf dem Server, verschlüsselt mit einem Schlüssel, den nur dein Login-Passwort entsperren kann.',
|
||||
'Folders cannot be downloaded in the browser: {name}': 'Ordner können im Browser nicht heruntergeladen werden: {name}',
|
||||
'Welcome! Create the administrator account for this MrTerm server.': 'Willkommen! Lege das Administrator-Konto für diesen MrTerm-Server an.',
|
||||
'Sign in to your MrTerm server.': 'Melde dich an deinem MrTerm-Server an.',
|
||||
'Create account': 'Konto anlegen',
|
||||
'Sign in': 'Anmelden',
|
||||
'Administrators only.': 'Nur für Administratoren.',
|
||||
'Forbidden': 'Nicht erlaubt',
|
||||
'Not signed in': 'Nicht angemeldet',
|
||||
'Setup is already complete.': 'Die Einrichtung ist bereits abgeschlossen.',
|
||||
'The current password is wrong.': 'Das aktuelle Passwort ist falsch.',
|
||||
'The last administrator cannot be deleted.': 'Der letzte Administrator kann nicht gelöscht werden.',
|
||||
'Too many failed attempts. Try again in 15 minutes.': 'Zu viele Fehlversuche. Versuche es in 15 Minuten erneut.',
|
||||
'User not found.': 'Benutzer nicht gefunden.',
|
||||
'Wrong username or password.': 'Benutzername oder Passwort falsch.',
|
||||
'You cannot delete yourself.': 'Du kannst dich nicht selbst löschen.',
|
||||
'The password must be at least 8 characters long.': 'Das Passwort muss mindestens 8 Zeichen lang sein.',
|
||||
'This username is already taken.': 'Dieser Benutzername ist bereits vergeben.',
|
||||
'Usernames may contain letters, digits and . _ @ - (max. 64).': 'Benutzernamen dürfen Buchstaben, Ziffern und . _ @ - enthalten (max. 64).',
|
||||
'Connection lost – reconnecting …': 'Verbindung verloren – verbinde neu …',
|
||||
// Main-Prozess
|
||||
'Host key has changed!': 'Host-Schlüssel hat sich geändert!',
|
||||
'Unknown host': 'Unbekannter Host',
|
||||
|
||||
@@ -0,0 +1,213 @@
|
||||
// Minimaler CTAP2-Client über Linux-hidraw (ohne native Module).
|
||||
// Nötig, weil Chromium/Electron keine PIN-Eingabe für WebAuthn hat: Schlüssel mit gesetzter FIDO2-PIN
|
||||
// (z. B. YubiKey 5 ohne makeCredUvNotRqd) verlangen die PIN beim Registrieren, und Chromium bricht dann
|
||||
// nach dem Berühren mit NotAllowedError ab. Hier läuft makeCredential direkt, mit PIN-Token (Protokoll 1).
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const crypto = require('crypto');
|
||||
|
||||
// ---- CBOR (nur was CTAP2 braucht; Map-Schlüssel kanonisch sortiert) ----
|
||||
function head(major, n) {
|
||||
if (n < 24) return Buffer.from([(major << 5) | n]);
|
||||
if (n < 0x100) return Buffer.from([(major << 5) | 24, n]);
|
||||
if (n < 0x10000) { const b = Buffer.alloc(3); b[0] = (major << 5) | 25; b.writeUInt16BE(n, 1); return b; }
|
||||
const b = Buffer.alloc(5); b[0] = (major << 5) | 26; b.writeUInt32BE(n, 1); return b;
|
||||
}
|
||||
function enc(v) {
|
||||
if (typeof v === 'number') return v >= 0 ? head(0, v) : head(1, -1 - v);
|
||||
if (typeof v === 'boolean') return Buffer.from([v ? 0xf5 : 0xf4]);
|
||||
if (typeof v === 'string') { const s = Buffer.from(v, 'utf8'); return Buffer.concat([head(3, s.length), s]); }
|
||||
if (Buffer.isBuffer(v) || v instanceof Uint8Array) return Buffer.concat([head(2, v.length), Buffer.from(v)]);
|
||||
if (Array.isArray(v)) return Buffer.concat([head(4, v.length), ...v.map(enc)]);
|
||||
if (v instanceof Map) {
|
||||
const items = [...v].map(([k, x]) => [enc(k), enc(x)])
|
||||
.sort(([a], [b]) => a.length - b.length || Buffer.compare(a, b));
|
||||
return Buffer.concat([head(5, items.length), ...items.flat()]);
|
||||
}
|
||||
throw new Error('CBOR: unsupported value');
|
||||
}
|
||||
function dec(buf, pos = 0) {
|
||||
const ib = buf[pos++], major = ib >> 5, ai = ib & 31;
|
||||
let n = ai;
|
||||
if (ai === 24) n = buf[pos++];
|
||||
else if (ai === 25) { n = buf.readUInt16BE(pos); pos += 2; }
|
||||
else if (ai === 26) { n = buf.readUInt32BE(pos); pos += 4; }
|
||||
else if (ai === 27) { n = Number(buf.readBigUInt64BE(pos)); pos += 8; }
|
||||
switch (major) {
|
||||
case 0: return [n, pos];
|
||||
case 1: return [-1 - n, pos];
|
||||
case 2: return [buf.subarray(pos, pos + n), pos + n];
|
||||
case 3: return [buf.toString('utf8', pos, pos + n), pos + n];
|
||||
case 4: { const a = []; for (let i = 0; i < n; i++) { let x; [x, pos] = dec(buf, pos); a.push(x); } return [a, pos]; }
|
||||
case 5: { const m = new Map(); for (let i = 0; i < n; i++) { let k, x; [k, pos] = dec(buf, pos); [x, pos] = dec(buf, pos); m.set(k, x); } return [m, pos]; }
|
||||
case 6: return dec(buf, pos);
|
||||
default: return [ai === 20 ? false : ai === 21 ? true : null, pos];
|
||||
}
|
||||
}
|
||||
|
||||
// ---- CTAPHID ----
|
||||
const CMD = { CBOR: 0x10, INIT: 0x06, CANCEL: 0x11, KEEPALIVE: 0x3b, ERROR: 0x3f };
|
||||
|
||||
class CtapError extends Error {
|
||||
constructor(code) { super(`CTAP2 error 0x${code.toString(16).padStart(2, '0')}`); this.code = code; }
|
||||
}
|
||||
|
||||
function findDevice() {
|
||||
const base = '/sys/class/hidraw';
|
||||
let names = [];
|
||||
try { names = fs.readdirSync(base); } catch { return null; }
|
||||
for (const n of names) {
|
||||
try {
|
||||
const rd = fs.readFileSync(path.join(base, n, 'device', 'report_descriptor'));
|
||||
if (rd.includes(Buffer.from([0x06, 0xd0, 0xf1]))) return '/dev/' + n; // Usage Page 0xF1D0 (FIDO)
|
||||
} catch { /* ignorieren */ }
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
class Device {
|
||||
static open() {
|
||||
const p = findDevice();
|
||||
if (!p) return null;
|
||||
const d = new Device();
|
||||
d.fd = fs.openSync(p, 'r+');
|
||||
d.cid = Buffer.from([0xff, 0xff, 0xff, 0xff]);
|
||||
return d;
|
||||
}
|
||||
close() {
|
||||
this.closed = true;
|
||||
try { fs.closeSync(this.fd); } catch { /* ignorieren */ }
|
||||
}
|
||||
// Nur lesen, während eine Antwort erwartet wird – so hängt nach close() kein blockierender Read im Threadpool
|
||||
readPacket() {
|
||||
const b = Buffer.alloc(64);
|
||||
return new Promise((resolve, reject) => fs.read(this.fd, b, 0, 64, null, (e, n) => (e ? reject(e) : resolve(b.subarray(0, n)))));
|
||||
}
|
||||
write(cmd, data) {
|
||||
const pkt = (b) => { const r = Buffer.alloc(65); b.copy(r, 1); fs.writeSync(this.fd, r); };
|
||||
const first = Buffer.alloc(64);
|
||||
this.cid.copy(first, 0); first[4] = 0x80 | cmd; first.writeUInt16BE(data.length, 5);
|
||||
data.copy(first, 7, 0, 57); pkt(first);
|
||||
for (let off = 57, seq = 0; off < data.length; off += 59, seq++) {
|
||||
const c = Buffer.alloc(64);
|
||||
this.cid.copy(c, 0); c[4] = seq; data.copy(c, 5, off, off + 59); pkt(c);
|
||||
}
|
||||
}
|
||||
async transact(cmd, data) {
|
||||
this.write(cmd, data);
|
||||
for (;;) {
|
||||
const r = await this.readPacket();
|
||||
if (!r.subarray(0, 4).equals(this.cid)) continue;
|
||||
const rcmd = r[4] & 0x7f;
|
||||
if (rcmd === CMD.KEEPALIVE) continue;
|
||||
const len = r.readUInt16BE(5);
|
||||
const parts = [r.subarray(7)];
|
||||
let got = r.length - 7;
|
||||
while (got < len) { const c = await this.readPacket(); parts.push(c.subarray(5)); got += c.length - 5; }
|
||||
const body = Buffer.concat(parts).subarray(0, len);
|
||||
if (rcmd === CMD.ERROR) throw new Error(`CTAPHID error 0x${body[0].toString(16)}`);
|
||||
return body;
|
||||
}
|
||||
}
|
||||
async init() {
|
||||
const nonce = crypto.randomBytes(8);
|
||||
for (;;) {
|
||||
const r = await this.transact(CMD.INIT, nonce);
|
||||
if (r.subarray(0, 8).equals(nonce)) { this.cid = Buffer.from(r.subarray(8, 12)); return; }
|
||||
}
|
||||
}
|
||||
cancel() { try { if (!this.closed) this.write(CMD.CANCEL, Buffer.alloc(0)); } catch { /* ignorieren */ } }
|
||||
async cbor(cmd, params) {
|
||||
const r = await this.transact(CMD.CBOR, Buffer.concat([Buffer.from([cmd]), params ? enc(params) : Buffer.alloc(0)]));
|
||||
if (r[0] !== 0) throw new CtapError(r[0]);
|
||||
return r.length > 1 ? dec(r, 1)[0] : new Map();
|
||||
}
|
||||
}
|
||||
|
||||
// ---- PIN-Protokoll 1 ----
|
||||
const aes = (mode, key, data) => {
|
||||
const c = mode === 'enc' ? crypto.createCipheriv('aes-256-cbc', key, Buffer.alloc(16)) : crypto.createDecipheriv('aes-256-cbc', key, Buffer.alloc(16));
|
||||
c.setAutoPadding(false);
|
||||
return Buffer.concat([c.update(data), c.final()]);
|
||||
};
|
||||
|
||||
async function sharedSecret(dev) {
|
||||
const ka = (await dev.cbor(0x06, new Map([[1, 1], [2, 2]]))).get(1);
|
||||
const ecdh = crypto.createECDH('prime256v1');
|
||||
ecdh.generateKeys();
|
||||
const z = ecdh.computeSecret(Buffer.concat([Buffer.from([4]), ka.get(-2), ka.get(-3)]));
|
||||
const pub = ecdh.getPublicKey();
|
||||
const platformKey = new Map([[1, 2], [3, -25], [-1, 1], [-2, pub.subarray(1, 33)], [-3, pub.subarray(33, 65)]]);
|
||||
return { key: crypto.createHash('sha256').update(z).digest(), platformKey };
|
||||
}
|
||||
|
||||
async function pinToken(dev, pin) {
|
||||
const { key, platformKey } = await sharedSecret(dev);
|
||||
const pinHash = crypto.createHash('sha256').update(pin, 'utf8').digest().subarray(0, 16);
|
||||
const r = await dev.cbor(0x06, new Map([[1, 1], [2, 5], [3, platformKey], [6, aes('enc', key, pinHash)]]));
|
||||
return aes('dec', key, r.get(2));
|
||||
}
|
||||
|
||||
async function pinRetries(dev) {
|
||||
try { return (await dev.cbor(0x06, new Map([[1, 1], [2, 1]]))).get(3); } catch { return undefined; }
|
||||
}
|
||||
|
||||
// Status-Codes, die für "abgebrochen / nicht bestätigt / Zeit abgelaufen" stehen
|
||||
const CANCEL_CODES = new Set([0x27, 0x2d, 0x2f, 0x3a]);
|
||||
const PIN = { INVALID: 0x31, BLOCKED: 0x32, AUTH_BLOCKED: 0x34 };
|
||||
|
||||
// Registriert ein nicht-residentes Credential mit hmac-secret für rpId "localhost" (kompatibel zur
|
||||
// WebAuthn-PRF-Abfrage in fido.js). ui: { askPin(retries, wrong) -> Promise<string|null>, touch() }
|
||||
// Liefert die Credential-ID als Buffer, oder null, wenn kein FIDO2-Gerät per hidraw erreichbar ist.
|
||||
async function makeCredential(ui, { timeoutMs = 60000 } = {}) {
|
||||
let dev;
|
||||
try { dev = Device.open(); } catch { return null; }
|
||||
if (!dev) return null;
|
||||
let timer;
|
||||
const abort = () => dev.cancel();
|
||||
try {
|
||||
await dev.init();
|
||||
const info = await dev.cbor(0x04);
|
||||
if (!(info.get(1) || []).some((v) => String(v).startsWith('FIDO_2'))) return null;
|
||||
if (!(info.get(2) || []).includes('hmac-secret')) throw new CtapError(-1);
|
||||
const opts = info.get(4) || new Map();
|
||||
|
||||
const params = new Map([
|
||||
[2, new Map([['id', 'localhost'], ['name', 'MrTerm']])],
|
||||
[3, new Map([['id', crypto.randomBytes(16)], ['name', 'MrTerm'], ['displayName', 'MrTerm']])],
|
||||
[4, [-7, -8, -257].map((alg) => new Map([['alg', alg], ['type', 'public-key']]))],
|
||||
[6, new Map([['hmac-secret', true]])],
|
||||
]);
|
||||
const cdh = crypto.randomBytes(32);
|
||||
params.set(1, cdh);
|
||||
|
||||
if (opts.get('clientPin') === true && opts.get('makeCredUvNotRqd') !== true) {
|
||||
let wrong = false;
|
||||
for (;;) {
|
||||
const pin = await ui.askPin(await pinRetries(dev), wrong);
|
||||
if (pin == null) throw new CtapError(0x2d);
|
||||
try {
|
||||
const tok = await pinToken(dev, pin);
|
||||
params.set(8, crypto.createHmac('sha256', tok).update(cdh).digest().subarray(0, 16));
|
||||
params.set(9, 1);
|
||||
break;
|
||||
} catch (e) {
|
||||
if (e.code === PIN.INVALID) { wrong = true; continue; }
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ui.touch(abort);
|
||||
timer = setTimeout(abort, timeoutMs);
|
||||
const r = await dev.cbor(0x01, params);
|
||||
const authData = r.get(2);
|
||||
const idLen = authData.readUInt16BE(53);
|
||||
return Buffer.from(authData.subarray(55, 55 + idLen));
|
||||
} finally {
|
||||
clearTimeout(timer);
|
||||
dev.close();
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = { makeCredential, CtapError, CANCEL_CODES, PIN };
|
||||
+63
-8
@@ -4,8 +4,11 @@
|
||||
// abgefangen wird (kein echter Server). rpId ist damit immer "localhost".
|
||||
// Aus dem Schlüssel wird per PRF-Erweiterung (CTAP hmac-secret) ein geheimer Wert abgeleitet, der den
|
||||
// Datenschlüssel des Vaults verpackt. userVerification "discouraged": Berühren genügt (Electron hat keine PIN-Eingabe).
|
||||
// Registrieren läuft unter Linux direkt per CTAP2 (ctap2.js), weil Electron keine PIN-Abfrage kennt und
|
||||
// Schlüssel mit gesetzter PIN sonst nach dem Berühren mit NotAllowedError scheitern.
|
||||
const { BrowserWindow, session } = require('electron');
|
||||
const i18n = require('../i18n');
|
||||
const ctap2 = require('./ctap2');
|
||||
|
||||
const PAGE = `<!DOCTYPE html><html><head><meta charset="utf-8"><style>
|
||||
html,body{margin:0;height:100%;background:#1a1d27;color:#e6e8ef;font:14px system-ui,sans-serif;-webkit-app-region:drag}
|
||||
@@ -13,7 +16,10 @@ const PAGE = `<!DOCTYPE html><html><head><meta charset="utf-8"><style>
|
||||
.ic{font-size:34px} #t{max-width:340px;line-height:1.4}
|
||||
button{-webkit-app-region:no-drag;background:#2a2f40;color:#e6e8ef;border:1px solid #3a4054;border-radius:8px;padding:7px 16px;font:inherit;cursor:pointer}
|
||||
button:hover{background:#343a4f}
|
||||
</style></head><body><div class="ic">🔑</div><div id="t"></div><button id="c"></button></body></html>`;
|
||||
form{display:flex;gap:8px;-webkit-app-region:no-drag} form[hidden]{display:none}
|
||||
input{background:#10131b;color:#e6e8ef;border:1px solid #3a4054;border-radius:8px;padding:7px 10px;font:inherit;width:170px}
|
||||
.row{display:flex;gap:8px}
|
||||
</style></head><body><div class="ic">🔑</div><div id="t"></div><form id="f" hidden><input id="p" type="password" autocomplete="off"><button id="ok"></button></form><div class="row"><button id="c"></button></div></body></html>`;
|
||||
|
||||
let fidoSession;
|
||||
function getSession() {
|
||||
@@ -29,17 +35,23 @@ const HELPERS = `
|
||||
const unb64 = (s) => Uint8Array.from(atob(s.replace(/-/g, '+').replace(/_/g, '/')), (c) => c.charCodeAt(0));
|
||||
`;
|
||||
|
||||
async function ceremony(parent, text, script) {
|
||||
async function openWindow(parent, text) {
|
||||
const w = new BrowserWindow({
|
||||
parent, modal: !!parent, width: 420, height: 210, frame: false, resizable: false, show: false,
|
||||
parent, modal: !!parent, width: 420, height: 230, frame: false, resizable: false, show: false,
|
||||
backgroundColor: '#1a1d27', webPreferences: { session: getSession(), contextIsolation: true, sandbox: true },
|
||||
});
|
||||
await w.loadURL('http://localhost/');
|
||||
await w.webContents.executeJavaScript(`document.getElementById('t').textContent = ${JSON.stringify(text)};
|
||||
document.getElementById('ok').textContent = ${JSON.stringify(i18n.t('OK'))};
|
||||
const c = document.getElementById('c'); c.textContent = ${JSON.stringify(i18n.t('Cancel'))}; c.onclick = () => window.close(); 0;`);
|
||||
w.show();
|
||||
w.focus();
|
||||
return w;
|
||||
}
|
||||
|
||||
async function ceremony(parent, text, script) {
|
||||
const w = await openWindow(parent, text);
|
||||
try {
|
||||
await w.loadURL('http://localhost/');
|
||||
await w.webContents.executeJavaScript(`document.getElementById('t').textContent = ${JSON.stringify(text)};
|
||||
const c = document.getElementById('c'); c.textContent = ${JSON.stringify(i18n.t('Cancel'))}; c.onclick = () => window.close(); 0;`);
|
||||
w.show();
|
||||
w.focus();
|
||||
const closed = new Promise((resolve) => w.once('closed', () => resolve({ error: 'cancelled' })));
|
||||
const r = await Promise.race([w.webContents.executeJavaScript(`(async () => { try { ${HELPERS} ${script} } catch (e) { return { error: e.name + ': ' + e.message }; } })()`, true), closed]);
|
||||
if (r?.error === 'cancelled' || /NotAllowedError|AbortError/.test(r?.error || '')) throw new Error(i18n.t('Security key prompt was cancelled or timed out.'));
|
||||
@@ -50,8 +62,51 @@ async function ceremony(parent, text, script) {
|
||||
}
|
||||
}
|
||||
|
||||
// Registrierung direkt per CTAP2 (Linux). Liefert die Credential-ID (base64url) oder null, wenn kein
|
||||
// FIDO2-Gerät per hidraw erreichbar ist (dann übernimmt Chromium).
|
||||
async function registerNative(parent) {
|
||||
const w = await openWindow(parent, i18n.t('Connecting to security key …'));
|
||||
let abort = () => {};
|
||||
let cancelled = false;
|
||||
w.once('closed', () => { cancelled = true; abort(); });
|
||||
const js = (code) => (w.isDestroyed() ? Promise.resolve(null) : w.webContents.executeJavaScript(code).catch(() => null));
|
||||
const setText = (t) => js(`document.getElementById('t').textContent = ${JSON.stringify(t)}; 0;`);
|
||||
const ui = {
|
||||
async askPin(retries, wrong) {
|
||||
let t = i18n.t('Enter the PIN of your security key.');
|
||||
if (wrong) t = i18n.t('Wrong PIN.') + ' ' + t;
|
||||
if (retries != null) t += ' ' + i18n.t('{n} attempts left.', { n: retries });
|
||||
await setText(t);
|
||||
const closed = new Promise((resolve) => w.once('closed', () => resolve(null)));
|
||||
return Promise.race([closed, js(`new Promise((resolve) => {
|
||||
const f = document.getElementById('f'), p = document.getElementById('p');
|
||||
f.hidden = false; p.value = ''; p.focus();
|
||||
f.onsubmit = (e) => { e.preventDefault(); f.hidden = true; resolve(p.value); };
|
||||
})`)]);
|
||||
},
|
||||
touch(a) { abort = a; if (cancelled) a(); setText(i18n.t('Touch your security key to register it.')); },
|
||||
};
|
||||
try {
|
||||
const id = await ctap2.makeCredential(ui);
|
||||
return id && b64url(id);
|
||||
} catch (e) {
|
||||
if (cancelled || ctap2.CANCEL_CODES.has(e.code)) throw new Error(i18n.t('Security key prompt was cancelled or timed out.'));
|
||||
if (e.code === ctap2.PIN.BLOCKED || e.code === ctap2.PIN.AUTH_BLOCKED) throw new Error(i18n.t('The PIN of this security key is blocked. Remove and reinsert the key, or reset it.'));
|
||||
if (e.code === -1) throw new Error(i18n.t('This security key does not support the hmac-secret/PRF extension.'));
|
||||
throw e;
|
||||
} finally {
|
||||
if (!w.isDestroyed()) w.destroy();
|
||||
}
|
||||
}
|
||||
|
||||
const b64url = (buf) => Buffer.from(buf).toString('base64url');
|
||||
|
||||
// Neuen Schlüssel registrieren; liefert die Credential-ID (base64url)
|
||||
async function register(parent) {
|
||||
if (process.platform === 'linux') {
|
||||
const id = await registerNative(parent);
|
||||
if (id) return id;
|
||||
}
|
||||
const r = await ceremony(parent, i18n.t('Touch your security key to register it.'), `
|
||||
const cred = await navigator.credentials.create({ publicKey: {
|
||||
challenge: crypto.getRandomValues(new Uint8Array(32)),
|
||||
|
||||
+10
-7
@@ -1,6 +1,7 @@
|
||||
// Persistenter Vault: Hosts, Keys, Snippets, Forwards, Settings.
|
||||
// Wird mit Electron safeStorage (DPAPI unter Windows, libsecret/kwallet unter Linux) verschlüsselt.
|
||||
const { app, safeStorage } = require('electron');
|
||||
// Im Web-Server gibt es kein Electron: dort übergibt der Aufrufer Verzeichnis und Verschlüsselung (opts)
|
||||
const electron = (() => { try { const e = require('electron'); return typeof e === 'object' ? e : {}; } catch { return {}; } })();
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const crypto = require('crypto');
|
||||
@@ -57,8 +58,10 @@ function unbox(key, b) {
|
||||
}
|
||||
|
||||
class Store {
|
||||
constructor() {
|
||||
this.dir = app.getPath('userData');
|
||||
// opts: { dir, crypto } – crypto hat die Schnittstelle von Electrons safeStorage
|
||||
constructor(opts = {}) {
|
||||
this.dir = opts.dir || electron.app.getPath('userData');
|
||||
this.crypto = opts.crypto || electron.safeStorage;
|
||||
this.file = path.join(this.dir, 'vault.dat');
|
||||
this.data = structuredClone(DEFAULTS);
|
||||
this.encrypted = false;
|
||||
@@ -97,9 +100,9 @@ class Store {
|
||||
|
||||
canEncrypt() {
|
||||
try {
|
||||
if (!safeStorage.isEncryptionAvailable()) return false;
|
||||
if (!this.crypto.isEncryptionAvailable()) return false;
|
||||
// Unter Linux ohne Keyring fällt Electron auf "basic_text" zurück – das ist keine echte Verschlüsselung.
|
||||
if (process.platform === 'linux' && safeStorage.getSelectedStorageBackend?.() === 'basic_text') return false;
|
||||
if (process.platform === 'linux' && this.crypto.getSelectedStorageBackend?.() === 'basic_text') return false;
|
||||
return true;
|
||||
} catch { return false; }
|
||||
}
|
||||
@@ -110,7 +113,7 @@ class Store {
|
||||
const raw = fs.readFileSync(this.file);
|
||||
let json;
|
||||
if (raw.slice(0, 4).toString() === 'ENC1') {
|
||||
json = safeStorage.decryptString(raw.slice(4));
|
||||
json = this.crypto.decryptString(raw.slice(4));
|
||||
this.encrypted = true;
|
||||
} else {
|
||||
json = raw.toString('utf8');
|
||||
@@ -136,7 +139,7 @@ class Store {
|
||||
}
|
||||
const tmp = this.file + '.tmp';
|
||||
if (this.canEncrypt()) {
|
||||
fs.writeFileSync(tmp, Buffer.concat([Buffer.from('ENC1'), safeStorage.encryptString(json)]));
|
||||
fs.writeFileSync(tmp, Buffer.concat([Buffer.from('ENC1'), this.crypto.encryptString(json)]));
|
||||
this.encrypted = true;
|
||||
} else {
|
||||
fs.writeFileSync(tmp, json, { mode: 0o600 });
|
||||
|
||||
+135
-10
@@ -5,9 +5,12 @@
|
||||
const $ = (sel, root = document) => root.querySelector(sel);
|
||||
const $$ = (sel, root = document) => [...root.querySelectorAll(sel)];
|
||||
const esc = (s) => String(s ?? '').replace(/[&<>"']/g, (c) => ({ '&': '&', '<': '<', '>': '>', '"': '"', "'": ''' }[c]));
|
||||
const uid = () => crypto.randomUUID();
|
||||
// crypto.randomUUID gibt es nur in sicheren Kontexten (HTTPS/localhost) – die Web-Version läuft oft per http://<server>
|
||||
const uid = () => (crypto.randomUUID ? crypto.randomUUID() : ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, (c) => (c ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (c / 4)))).toString(16)));
|
||||
function h(html) { const t = document.createElement('template'); t.innerHTML = html.trim(); return t.content.firstElementChild; }
|
||||
const T = I18N.t;
|
||||
// Web-Version (Docker, src/web): gleiche Oberfläche im Browser; ohne RDP, VPN, Port-Forwarding und lokale Dateien
|
||||
const WEB = api.platform === 'web';
|
||||
|
||||
const ICONS = {
|
||||
search: '<svg viewBox="0 0 24 24"><circle cx="11" cy="11" r="7"/><path d="M20 20l-4-4"/></svg>',
|
||||
@@ -407,6 +410,7 @@ function connectHost(hst) {
|
||||
}
|
||||
|
||||
async function openRdp(hst) {
|
||||
if (WEB) return toast(T('RDP is not available in the web version.'), 'error');
|
||||
if (settings().rdpEmbed !== false) {
|
||||
const s = await api.call('rdp:embedSupported').catch((e) => ({ ok: false, reason: e.message }));
|
||||
if (s.ok) return new RdpSession(hst);
|
||||
@@ -863,6 +867,60 @@ function viewHistory(page) {
|
||||
}
|
||||
|
||||
// ============================================================ Einstellungen
|
||||
// ---------- Web-Version: Konto und Benutzerverwaltung (HTTP-API des Web-Servers)
|
||||
async function webApi(path, body) {
|
||||
const r = await fetch(path, { method: body === undefined ? 'GET' : 'POST', headers: { 'Content-Type': 'application/json', 'X-MrTerm': '1' }, body: body === undefined ? undefined : JSON.stringify(body) });
|
||||
const j = await r.json().catch(() => ({}));
|
||||
if (!r.ok) throw new Error(T(j.error || r.statusText));
|
||||
return j;
|
||||
}
|
||||
function webAccountCard() {
|
||||
const card = h(`<div class="settings-card"><h3>${T('Account')}</h3><div class="acc"></div></div>`);
|
||||
const draw = async () => {
|
||||
const box = $('.acc', card);
|
||||
let me;
|
||||
try { me = await webApi('/api/me'); } catch (e) { box.textContent = e.message; return; }
|
||||
box.innerHTML = `<p style="color:var(--muted);margin-top:0">${esc(T('Signed in as {name}', { name: me.name }))}${me.admin ? ` · ${esc(T('Administrator'))}` : ''}</p><div class="row" style="flex-wrap:wrap"></div>`;
|
||||
const pw = h(`<button class="btn">${esc(T('Change password'))}</button>`);
|
||||
pw.onclick = async () => {
|
||||
const r = await modal({ title: T('Change password'), body: `<div class="field"><label>${esc(T('Current password'))}</label><input name="old" type="password"/></div><div class="field"><label>${esc(T('New password'))}</label><input name="a" type="password"/></div><div class="field"><label>${esc(T('Repeat password'))}</label><input name="b" type="password"/></div>`,
|
||||
buttons: [{ label: T('Cancel'), value: null, cls: 'ghost' }, { label: T('Save'), value: 'form', cls: 'primary' }] });
|
||||
if (!r) return;
|
||||
if (r.a !== r.b) return toast(T('The passwords do not match.'), 'error');
|
||||
try { await webApi('/api/password', { old: r.old, password: r.a }); toast(T('Saved'), 'ok'); } catch (e) { toast(e.message, 'error'); }
|
||||
};
|
||||
const out = h(`<button class="btn">${esc(T('Sign out'))}</button>`);
|
||||
out.onclick = async () => { await webApi('/api/logout', {}).catch(() => {}); location.href = '/'; };
|
||||
$('.row', box).append(pw, out);
|
||||
if (!me.admin) return;
|
||||
const users = await webApi('/api/users').catch(() => ({ users: [] }));
|
||||
const list = h(`<div style="margin-top:16px"><h4 style="margin:0 0 8px">${esc(T('Users'))}</h4></div>`);
|
||||
for (const u of users.users) {
|
||||
const row = h(`<div class="lock-row"><div class="grow"><b>${esc(u.name)}</b><div class="sub">${u.admin ? esc(T('Administrator')) : esc(T('User'))}</div></div></div>`);
|
||||
if (u.id !== me.id) {
|
||||
const del = h(`<button class="btn ghost" title="${esc(T('Delete'))}">${ICONS.trash}</button>`);
|
||||
del.onclick = async () => {
|
||||
if (!(await confirmBox(T('Delete user?'), T('“{name}” and their vault will be permanently deleted.', { name: u.name })))) return;
|
||||
try { await webApi('/api/users/delete', { id: u.id }); draw(); } catch (e) { toast(e.message, 'error'); }
|
||||
};
|
||||
row.append(del);
|
||||
}
|
||||
list.append(row);
|
||||
}
|
||||
const add = h(`<button class="btn" style="margin-top:10px">${ICONS.plus}${esc(T('Add user'))}</button>`);
|
||||
add.onclick = async () => {
|
||||
const r = await modal({ title: T('Add user'), body: `<div class="field"><label>${esc(T('Username'))}</label><input name="name" autocomplete="off"/></div><div class="field"><label>${esc(T('Password'))}</label><input name="password" type="password" autocomplete="new-password"/></div><label class="check"><input type="checkbox" name="admin"/>${esc(T('Administrator'))}</label>`,
|
||||
buttons: [{ label: T('Cancel'), value: null, cls: 'ghost' }, { label: T('Add user'), value: 'form', cls: 'primary' }] });
|
||||
if (!r) return;
|
||||
try { await webApi('/api/users', r); toast(T('Saved'), 'ok'); draw(); } catch (e) { toast(e.message, 'error'); }
|
||||
};
|
||||
list.append(add);
|
||||
box.append(list);
|
||||
};
|
||||
draw();
|
||||
return card;
|
||||
}
|
||||
|
||||
async function viewSettings(page) {
|
||||
const st = settings();
|
||||
page.append(h(`<div class="toolbar"><h2 style="margin:0;font-size:18px">${T('Settings')}</h2></div>`));
|
||||
@@ -931,9 +989,9 @@ async function viewSettings(page) {
|
||||
if (!d.available) $('.rdp-info', rdpCard).style.color = 'var(--orange)';
|
||||
}).catch(() => {});
|
||||
|
||||
const dataCard = h(`<div class="settings-card"><h3>${T('Data')}</h3><p style="color:var(--muted);margin-top:0">${S.vault.encrypted ? T('The vault is encrypted with the operating system keyring (Windows DPAPI / libsecret or KWallet).') : T('The vault is not encrypted because no keyring is available. On Arch/CachyOS: install <code>gnome-keyring</code> or <code>kwallet</code>.')}</p><div class="row" style="flex-wrap:wrap"></div></div>`);
|
||||
const dataCard = h(`<div class="settings-card"><h3>${T('Data')}</h3><p style="color:var(--muted);margin-top:0">${WEB ? T('Your vault is stored on the server, encrypted with a key that only your login password can unlock.') : S.vault.encrypted ? T('The vault is encrypted with the operating system keyring (Windows DPAPI / libsecret or KWallet).') : T('The vault is not encrypted because no keyring is available. On Arch/CachyOS: install <code>gnome-keyring</code> or <code>kwallet</code>.')}</p><div class="row" style="flex-wrap:wrap"></div></div>`);
|
||||
const btns = [
|
||||
[T('Import ~/.ssh/config'), importSshConfig],
|
||||
...(WEB ? [] : [[T('Import ~/.ssh/config'), importSshConfig]]),
|
||||
[T('Export backup'), async () => { const p = await call('vault:export'); if (p) toast(T('Exported to {path}', { path: p }), 'ok'); }],
|
||||
[T('Import backup'), async () => { if (await call('vault:import')) { toast(T('Import complete'), 'ok'); reload(); } }],
|
||||
];
|
||||
@@ -985,7 +1043,8 @@ async function viewSettings(page) {
|
||||
<span>${C}+<kbd>Shift</kbd>+<kbd>F</kbd></span><span>${T('Search in terminal')}</span>
|
||||
<span>${C}+<kbd>+/−/0</kbd></span><span>${T('Font size')}</span>
|
||||
<span>${C}+<kbd>Shift</kbd>+<kbd>L</kbd></span><span>${T('Lock now')}</span></div></div>`);
|
||||
c.append(langCard, secCard, syncCard, designCard, themeCard, termCard, rdpCard, importCard, dataCard, updCard, keysCard);
|
||||
if (WEB) c.append(langCard, webAccountCard(), designCard, themeCard, termCard, importCard, dataCard, keysCard);
|
||||
else c.append(langCard, secCard, syncCard, designCard, themeCard, termCard, rdpCard, importCard, dataCard, updCard, keysCard);
|
||||
}
|
||||
|
||||
// ============================================================ App-Sperre
|
||||
@@ -1643,7 +1702,7 @@ class FilePane {
|
||||
<input class="path" spellcheck="false"/>
|
||||
<button class="btn ghost sm" data-p="refresh" title="${T('Refresh')}">${ICONS.refresh}</button>
|
||||
<button class="btn ghost sm" data-p="mkdir" title="${T('New folder')}">${ICONS.newdir}</button>
|
||||
<button class="btn ghost sm" data-p="xfer" title="${side === 'local' ? T('Upload →') : T('← Download')}">${side === 'local' ? ICONS.arrowR : ICONS.arrowL}</button></div>
|
||||
${WEB ? `<button class="btn ghost sm" data-p="upload" title="${T('Upload')}">${ICONS.upload}</button><button class="btn ghost sm" data-p="xfer" title="${T('Download')}">${ICONS.download}</button>` : `<button class="btn ghost sm" data-p="xfer" title="${side === 'local' ? T('Upload →') : T('← Download')}">${side === 'local' ? ICONS.arrowR : ICONS.arrowL}</button>`}</div>
|
||||
<div class="files"></div></div>`);
|
||||
this.el.addEventListener('click', (e) => {
|
||||
const p = e.target.closest('[data-p]')?.dataset.p;
|
||||
@@ -1652,16 +1711,34 @@ class FilePane {
|
||||
if (p === 'refresh') this.go(this.cwd);
|
||||
if (p === 'mkdir') this.mkdir();
|
||||
if (p === 'xfer') this.transferSelected();
|
||||
if (p === 'upload') this.pickUpload();
|
||||
});
|
||||
$('.path', this.el).addEventListener('keydown', (e) => { if (e.key === 'Enter') this.go(e.target.value); });
|
||||
const files = $('.files', this.el);
|
||||
files.addEventListener('contextmenu', (e) => { if (!e.target.closest('tr[data-i]')) { e.preventDefault(); ctxMenu(e.clientX, e.clientY, [{ label: T('New folder'), icon: 'newdir', run: () => this.mkdir() }, { label: T('Refresh'), icon: 'refresh', run: () => this.go(this.cwd) }]); } });
|
||||
// Drag & Drop zwischen den Panes
|
||||
this.el.addEventListener('dragover', (e) => { if (S.drag && S.drag.pane !== this) { e.preventDefault(); this.el.classList.add('dragover'); } });
|
||||
// Web-Version: Dateien aus dem Betriebssystem in den Server-Bereich ziehen = hochladen
|
||||
const osFiles = (e) => WEB && [...(e.dataTransfer?.types || [])].includes('Files');
|
||||
this.el.addEventListener('dragover', (e) => { if ((S.drag && S.drag.pane !== this) || osFiles(e)) { e.preventDefault(); this.el.classList.add('dragover'); } });
|
||||
this.el.addEventListener('dragleave', (e) => { if (!this.el.contains(e.relatedTarget)) this.el.classList.remove('dragover'); });
|
||||
this.el.addEventListener('drop', (e) => { e.preventDefault(); this.el.classList.remove('dragover'); if (S.drag && S.drag.pane !== this) S.drag.pane.transferSelected(); S.drag = null; });
|
||||
this.el.addEventListener('drop', (e) => {
|
||||
e.preventDefault(); this.el.classList.remove('dragover');
|
||||
if (osFiles(e)) return this.uploadFiles([...e.dataTransfer.files]);
|
||||
if (S.drag && S.drag.pane !== this) S.drag.pane.transferSelected();
|
||||
S.drag = null;
|
||||
});
|
||||
}
|
||||
get other() { return this.side === 'local' ? this.sftp.remote : this.sftp.local; }
|
||||
pickUpload() {
|
||||
const inp = h('<input type="file" multiple style="display:none"/>');
|
||||
inp.onchange = () => { this.uploadFiles([...inp.files]); inp.remove(); };
|
||||
document.body.append(inp);
|
||||
inp.click();
|
||||
}
|
||||
async uploadFiles(files) {
|
||||
for (const f of files) await this.sftp.webTransfer('upload', f, `${this.cwd.replace(/\/$/, '')}/${f.name}`, f.name);
|
||||
this.go(this.cwd);
|
||||
}
|
||||
async join(...p) { return this.side === 'local' ? api.call('local:join', ...p) : p.join('/').replace(/\/+/g, '/'); }
|
||||
async parent(p) { return this.side === 'local' ? api.call('local:parent', p) : (p.replace(/\/[^/]+\/?$/, '') || '/'); }
|
||||
async list(dir) { return this.side === 'local' ? api.call('local:list', dir) : api.call('sftp:list', this.sftp.id, dir); }
|
||||
@@ -1756,6 +1833,14 @@ class FilePane {
|
||||
async transferSelected() {
|
||||
const names = [...this.sel];
|
||||
if (!names.length) return toast(T('Nothing selected'));
|
||||
if (WEB) {
|
||||
for (const n of names) {
|
||||
const f = this.files.find((x) => x.name === n);
|
||||
if (f?.isDir) { toast(T('Folders cannot be downloaded in the browser: {name}', { name: n })); continue; }
|
||||
this.sftp.webTransfer('download', null, await this.join(this.cwd, n), n);
|
||||
}
|
||||
return;
|
||||
}
|
||||
const target = this.other;
|
||||
for (const n of names) {
|
||||
const src = await this.join(this.cwd, n), dst = await target.join(target.cwd, n);
|
||||
@@ -1771,17 +1856,18 @@ class SftpSession {
|
||||
this.kind = 'sftp'; this.id = uid(); this.host = host;
|
||||
this.title = `SFTP · ${host.label || host.address}`;
|
||||
this.el = h(`<div class="session"><div class="sftp"></div><div class="transfers"></div></div>`);
|
||||
this.local = new FilePane(this, 'local');
|
||||
this.local = WEB ? null : new FilePane(this, 'local');
|
||||
this.remote = new FilePane(this, 'remote');
|
||||
const wrap = $('.sftp', this.el);
|
||||
wrap.append(this.local.el, h(`<div class="pane"><div class="pane-empty"><div class="spinner" style="width:30px;height:30px;border:3px solid var(--border);border-top-color:var(--accent);border-radius:50%;animation:spin .9s linear infinite"></div><div>${esc(T('Connecting to {host} …', { host: host.address }))}</div></div></div>`));
|
||||
if (this.local) wrap.append(this.local.el);
|
||||
wrap.append(h(`<div class="pane"><div class="pane-empty"><div class="spinner" style="width:30px;height:30px;border:3px solid var(--border);border-top-color:var(--accent);border-radius:50%;animation:spin .9s linear infinite"></div><div>${esc(T('Connecting to {host} …', { host: host.address }))}</div></div></div>`));
|
||||
this.unsub = api.on('sftp:progress', (tid, done, total) => this.progress(tid, done, total));
|
||||
this.xfers = new Map();
|
||||
addTab(this);
|
||||
this.open();
|
||||
}
|
||||
async open() {
|
||||
this.local.init(await api.call('local:home'));
|
||||
if (this.local) this.local.init(await api.call('local:home'));
|
||||
try {
|
||||
const { home } = await api.call('sftp:open', this.id, this.host.id || this.host);
|
||||
$('.sftp', this.el).lastElementChild.replaceWith(this.remote.el);
|
||||
@@ -1810,6 +1896,32 @@ class SftpSession {
|
||||
setTimeout(() => row.remove(), 10000);
|
||||
}
|
||||
}
|
||||
// Web-Version: Upload per HTTP (mit Fortschritt), Download als Browser-Download
|
||||
webTransfer(dir, file, remotePath, name) {
|
||||
const q = `sid=${encodeURIComponent(this.id)}&path=${encodeURIComponent(remotePath)}`;
|
||||
if (dir === 'download') {
|
||||
const a = h(`<a href="/web/download?${q}" download="${esc(name)}" style="display:none"></a>`);
|
||||
document.body.append(a); a.click(); a.remove();
|
||||
return Promise.resolve();
|
||||
}
|
||||
const tid = uid();
|
||||
const row = h(`<div class="transfer"><span>${ICONS.upload}</span><span class="nm">${esc(name)}</span><span class="pct">0%</span><div class="bar"><i></i></div></div>`);
|
||||
$('.transfers', this.el).prepend(row);
|
||||
this.xfers.set(tid, row);
|
||||
return new Promise((resolve) => {
|
||||
const x = new XMLHttpRequest();
|
||||
x.open('POST', `/web/upload?${q}`);
|
||||
x.setRequestHeader('X-MrTerm', '1');
|
||||
x.upload.onprogress = (e) => this.progress(tid, e.loaded, e.total);
|
||||
x.onload = () => {
|
||||
if (x.status < 300) { row.classList.add('done'); $('.bar i', row).style.width = '100%'; $('.pct', row).textContent = T('done'); setTimeout(() => row.remove(), 5000); }
|
||||
else { row.classList.add('fail'); $('.pct', row).textContent = T('Error'); const m = (() => { try { return JSON.parse(x.responseText).error; } catch { return x.statusText; } })(); toast(`${name}: ${m}`, 'error'); setTimeout(() => row.remove(), 10000); }
|
||||
resolve();
|
||||
};
|
||||
x.onerror = () => { row.classList.add('fail'); $('.pct', row).textContent = T('Error'); resolve(); };
|
||||
x.send(file);
|
||||
});
|
||||
}
|
||||
progress(tid, done, total) {
|
||||
const row = this.xfers.get(tid); if (!row) return;
|
||||
const p = total ? Math.round((done / total) * 100) : 0;
|
||||
@@ -2466,6 +2578,19 @@ document.addEventListener('keydown', (e) => {
|
||||
}
|
||||
});
|
||||
|
||||
// Web-Version: Hostschlüssel bestätigen (in Electron zeigt der Hauptprozess dafür einen Systemdialog)
|
||||
api.on('hostkey:request', async (req) => {
|
||||
const changed = !!req.previous;
|
||||
const r = await modal({
|
||||
title: changed ? T('Host key has changed!') : T('Unknown host'),
|
||||
body: `<p style="margin-top:0">${esc(changed ? T('WARNING: The host key of {target} has changed. This may indicate a man-in-the-middle attack.', { target: req.host }) : T('The authenticity of {target} cannot be verified.', { target: req.host }))}</p>
|
||||
<div class="mono" style="word-break:break-all;background:var(--panel);padding:8px 10px;border-radius:8px">${esc(req.fingerprint)}</div>
|
||||
${changed ? `<p>${esc(T('Previously stored:'))}</p><div class="mono" style="word-break:break-all;background:var(--panel);padding:8px 10px;border-radius:8px">${esc(req.previous)}</div>` : ''}`,
|
||||
buttons: [{ label: T('Cancel'), value: false, cls: 'ghost' }, { label: changed ? T('Connect anyway & replace') : T('Trust & connect'), value: true, cls: changed ? 'danger' : 'primary' }],
|
||||
noEnter: changed,
|
||||
});
|
||||
api.replySecret(req.reqId, r === true);
|
||||
});
|
||||
api.on('secret:request', async (req) => {
|
||||
const r = await modal({
|
||||
title: req.title || T('Authentication'),
|
||||
|
||||
@@ -406,3 +406,6 @@ kbd { background: var(--card); border: 1px solid var(--border); border-bottom-wi
|
||||
[data-theme='macos'] .btn.primary { background: linear-gradient(rgba(40, 145, 255, .92), rgba(0, 110, 240, .92)); border-color: rgba(255, 255, 255, .45); box-shadow: inset 0 1px 0 rgba(255, 255, 255, .55), 0 4px 14px rgba(0, 122, 255, .3); }
|
||||
[data-theme='macos'] .modal-bg { -webkit-backdrop-filter: blur(6px); backdrop-filter: blur(6px); }
|
||||
[data-theme='macos'] .nav.active { box-shadow: inset 0 1px 0 rgba(255, 255, 255, .9), 0 2px 8px rgba(30, 40, 80, .08); }
|
||||
|
||||
/* Web-Version (Browser): Desktop-Funktionen ausblenden */
|
||||
.web .win-ctrls, .web #lockBtn, .web .nav[data-view='vpns'], .web .nav[data-view='forwards'], .web #updateBadge { display: none !important; }
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
* { box-sizing: border-box; }
|
||||
html, body { margin: 0; min-height: 100%; }
|
||||
body { background: var(--bg); color: var(--text); font-family: var(--font); display: grid; place-items: center; min-height: 100vh; padding: 16px; }
|
||||
.box { width: 100%; max-width: 380px; background: var(--card); border: 1px solid var(--border); border-radius: 16px; padding: 32px 28px 22px; text-align: center; box-shadow: 0 20px 60px #0006; }
|
||||
.logo { width: 72px; height: 72px; border-radius: 18px; }
|
||||
h1 { margin: 10px 0 4px; font-size: 26px; }
|
||||
h1 span { color: var(--green); }
|
||||
p { color: var(--muted); margin: 0 0 22px; font-size: 14px; }
|
||||
form { display: flex; flex-direction: column; gap: 14px; text-align: left; }
|
||||
label span { display: block; font-size: 11px; font-weight: 700; letter-spacing: .5px; text-transform: uppercase; color: var(--muted); margin-bottom: 6px; }
|
||||
input { width: 100%; background: var(--panel); color: var(--text); border: 1px solid var(--border); border-radius: 10px; padding: 11px 12px; font: inherit; outline: none; }
|
||||
input:focus { border-color: var(--accent); }
|
||||
button { margin-top: 6px; background: var(--accent); color: var(--on-accent); border: 0; border-radius: 10px; padding: 12px; font: 600 15px var(--font); cursor: pointer; }
|
||||
button:disabled { opacity: .6; }
|
||||
.err { color: var(--red); font-size: 13px; }
|
||||
.ver { margin-top: 18px; color: var(--faint); font-size: 11px; }
|
||||
@@ -0,0 +1,28 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<title>MrTerm</title>
|
||||
<link rel="icon" href="/favicon.png" />
|
||||
<link rel="stylesheet" href="/app/src/renderer/app-themes.css" />
|
||||
<link rel="stylesheet" href="/web/login.css" />
|
||||
</head>
|
||||
<body>
|
||||
<main class="box">
|
||||
<img src="/favicon.png" alt="" class="logo" />
|
||||
<h1>Mr<span>Term</span></h1>
|
||||
<p id="intro"></p>
|
||||
<form id="form" autocomplete="on">
|
||||
<label><span data-t="Username">Username</span><input name="name" autocomplete="username" required autofocus /></label>
|
||||
<label><span data-t="Password">Password</span><input name="password" type="password" autocomplete="current-password" required /></label>
|
||||
<label id="repeatRow" hidden><span data-t="Repeat password">Repeat password</span><input name="repeat" type="password" autocomplete="new-password" /></label>
|
||||
<div id="err" class="err" hidden></div>
|
||||
<button id="submit" type="submit"></button>
|
||||
</form>
|
||||
<div class="ver" id="ver"></div>
|
||||
</main>
|
||||
<script src="/app/src/i18n.js"></script>
|
||||
<script src="/web/login.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,36 @@
|
||||
// Anmeldung bzw. Ersteinrichtung (Admin-Konto) der Web-Version
|
||||
(async () => {
|
||||
'use strict';
|
||||
I18N.setLanguage('auto', navigator.language);
|
||||
const T = I18N.t;
|
||||
const $ = (s) => document.querySelector(s);
|
||||
document.querySelectorAll('[data-t]').forEach((e) => { e.textContent = T(e.dataset.t); });
|
||||
|
||||
const st = await fetch('/api/state').then((r) => r.json());
|
||||
if (st.user) { location.href = '/app/src/renderer/index.html'; return; }
|
||||
const setup = st.setup;
|
||||
$('#ver').textContent = `MrTerm Web ${st.version}`;
|
||||
$('#intro').textContent = setup ? T('Welcome! Create the administrator account for this MrTerm server.') : T('Sign in to your MrTerm server.');
|
||||
$('#submit').textContent = setup ? T('Create account') : T('Sign in');
|
||||
$('#repeatRow').hidden = !setup;
|
||||
if (setup) $('[name=password]').autocomplete = 'new-password';
|
||||
|
||||
$('#form').onsubmit = async (e) => {
|
||||
e.preventDefault();
|
||||
const f = Object.fromEntries(new FormData(e.target));
|
||||
const err = $('#err');
|
||||
err.hidden = true;
|
||||
if (setup && f.password !== f.repeat) { err.textContent = T('The passwords do not match.'); err.hidden = false; return; }
|
||||
$('#submit').disabled = true;
|
||||
try {
|
||||
const r = await fetch(setup ? '/api/setup' : '/api/login', { method: 'POST', headers: { 'Content-Type': 'application/json', 'X-MrTerm': '1' }, body: JSON.stringify({ name: f.name, password: f.password }) });
|
||||
const j = await r.json().catch(() => ({}));
|
||||
if (!r.ok) throw new Error(j.error || r.statusText);
|
||||
location.href = '/app/src/renderer/index.html';
|
||||
} catch (ex) {
|
||||
err.textContent = T(ex.message);
|
||||
err.hidden = false;
|
||||
$('#submit').disabled = false;
|
||||
}
|
||||
};
|
||||
})();
|
||||
@@ -0,0 +1,109 @@
|
||||
// window.api für die Web-Version: gleiche Schnittstelle wie src/preload.js (Electron),
|
||||
// aber über einen WebSocket zum MrTerm-Web-Server. Dateidialoge, Zwischenablage und Links laufen im Browser.
|
||||
(() => {
|
||||
'use strict';
|
||||
const listeners = new Map();
|
||||
const waits = new Map();
|
||||
let ws, seq = 0, queue = [], retry = 0, banner;
|
||||
const emit = (ch, args) => listeners.get(ch)?.forEach((fn) => { try { fn(...args); } catch (e) { console.error(e); } });
|
||||
|
||||
function showBanner(text) {
|
||||
if (!document.body) return;
|
||||
if (!banner) {
|
||||
banner = document.createElement('div');
|
||||
banner.style.cssText = 'position:fixed;left:50%;top:10px;transform:translateX(-50%);z-index:9999;background:var(--card,#222);color:var(--text,#eee);border:1px solid var(--border,#444);border-radius:10px;padding:8px 14px;font:13px system-ui;box-shadow:0 6px 24px #0006';
|
||||
document.body.append(banner);
|
||||
}
|
||||
banner.textContent = text;
|
||||
banner.hidden = !text;
|
||||
}
|
||||
|
||||
function connect() {
|
||||
ws = new WebSocket(`${location.protocol === 'https:' ? 'wss' : 'ws'}://${location.host}/ws`);
|
||||
ws.onopen = () => { retry = 0; showBanner(''); for (const m of queue) ws.send(m); queue = []; };
|
||||
ws.onmessage = (e) => {
|
||||
const m = JSON.parse(e.data);
|
||||
if (m.t === 'reply') {
|
||||
const w = waits.get(m.id);
|
||||
if (!w) return;
|
||||
waits.delete(m.id);
|
||||
m.ok ? w.resolve(m.v) : w.reject(new Error(m.v));
|
||||
} else if (m.t === 'evt') emit(m.ch, m.args || []);
|
||||
};
|
||||
ws.onclose = (e) => {
|
||||
for (const w of waits.values()) w.reject(new Error('Connection to the MrTerm server lost.'));
|
||||
waits.clear();
|
||||
if (e.code === 4001) { location.href = '/'; return; }
|
||||
// Sitzung abgelaufen? Dann zur Anmeldung, sonst neu verbinden
|
||||
fetch('/api/me', { headers: { 'X-MrTerm': '1' } }).then((r) => {
|
||||
if (r.status === 401) { location.href = '/'; return; }
|
||||
showBanner(window.I18N ? I18N.t('Connection lost – reconnecting …') : 'Connection lost – reconnecting …');
|
||||
setTimeout(connect, Math.min(1000 * 2 ** retry++, 15000));
|
||||
}).catch(() => { showBanner(window.I18N ? I18N.t('Connection lost – reconnecting …') : 'Connection lost – reconnecting …'); setTimeout(connect, Math.min(1000 * 2 ** retry++, 15000)); });
|
||||
};
|
||||
}
|
||||
const post = (m) => { const s = JSON.stringify(m); if (ws.readyState === 1) ws.send(s); else queue.push(s); };
|
||||
const remote = (ch, args) => new Promise((resolve, reject) => { const id = ++seq; waits.set(id, { resolve, reject }); post({ t: 'call', id, ch, args }); });
|
||||
|
||||
// Datei im Browser auswählen und als Text lesen
|
||||
function pickFile(accept) {
|
||||
return new Promise((resolve) => {
|
||||
const inp = document.createElement('input');
|
||||
inp.type = 'file';
|
||||
if (accept) inp.accept = accept;
|
||||
inp.style.display = 'none';
|
||||
inp.onchange = async () => { const f = inp.files[0]; inp.remove(); resolve(f ? { name: f.name, content: await f.text() } : null); };
|
||||
inp.addEventListener('cancel', () => { inp.remove(); resolve(null); });
|
||||
document.body.append(inp);
|
||||
inp.click();
|
||||
});
|
||||
}
|
||||
function downloadText(name, text) {
|
||||
const url = URL.createObjectURL(new Blob([text], { type: 'application/json' }));
|
||||
const a = Object.assign(document.createElement('a'), { href: url, download: name });
|
||||
document.body.append(a); a.click(); a.remove();
|
||||
setTimeout(() => URL.revokeObjectURL(url), 1000);
|
||||
}
|
||||
|
||||
// Kanäle, die im Browser selbst erledigt werden
|
||||
const local = {
|
||||
// Ohne HTTPS gibt es navigator.clipboard nicht: Kopieren per execCommand, Einfügen dann nur per Strg+V
|
||||
'clipboard:write': (t) => {
|
||||
if (navigator.clipboard && window.isSecureContext) return navigator.clipboard.writeText(String(t));
|
||||
const ta = Object.assign(document.createElement('textarea'), { value: String(t) });
|
||||
ta.style.cssText = 'position:fixed;opacity:0';
|
||||
document.body.append(ta); ta.select(); document.execCommand('copy'); ta.remove();
|
||||
},
|
||||
'clipboard:read': () => {
|
||||
if (navigator.clipboard && window.isSecureContext) return navigator.clipboard.readText();
|
||||
throw new Error('Pasting from the menu needs HTTPS. Use Ctrl+Shift+V or Ctrl+V instead.');
|
||||
},
|
||||
'shell:open': (url) => { if (/^https?:\/\//i.test(url)) window.open(url, '_blank', 'noopener'); },
|
||||
'vault:export': async () => { downloadText('mrterm-backup.json', JSON.stringify(await remote('vault:exportData', []), null, 2)); return 'mrterm-backup.json'; },
|
||||
'vault:import': async () => { const f = await pickFile('.json,application/json'); if (!f) return false; return remote('vault:importData', [JSON.parse(f.content)]); },
|
||||
'key:pickFile': async () => { const f = await pickFile(); return f ? { name: f.name, content: f.content, publicKey: '' } : null; },
|
||||
'import:pickFile': async () => pickFile(),
|
||||
'vault:importSshConfig': () => { throw new Error('Not available in the web version.'); },
|
||||
};
|
||||
|
||||
window.api = {
|
||||
platform: 'web',
|
||||
call: (ch, ...args) => (local[ch] ? Promise.resolve().then(() => local[ch](...args)) : remote(ch, args)),
|
||||
on(ch, fn) {
|
||||
if (!listeners.has(ch)) listeners.set(ch, new Set());
|
||||
listeners.get(ch).add(fn);
|
||||
return () => listeners.get(ch).delete(fn);
|
||||
},
|
||||
win: { min() {}, max() {}, close() {} },
|
||||
ssh: {
|
||||
write: (id, d) => post({ t: 'send', ch: 'ssh:write', args: [id, d] }),
|
||||
resize: (id, c, r) => post({ t: 'send', ch: 'ssh:resize', args: [id, c, r] }),
|
||||
close: (id) => post({ t: 'send', ch: 'ssh:close', args: [id] }),
|
||||
},
|
||||
rdp: { bounds() {}, show() {}, hide() {}, focus() {}, close() {} },
|
||||
replySecret: (reqId, v) => post({ t: 'send', ch: 'secret:reply', args: [reqId, v] }),
|
||||
pairReply: (reqId, ok) => post({ t: 'send', ch: 'sync:pairReply', args: [reqId, ok] }),
|
||||
};
|
||||
document.documentElement.classList.add('web');
|
||||
connect();
|
||||
})();
|
||||
@@ -0,0 +1,376 @@
|
||||
// MrTerm Web: die Desktop-Oberfläche im Browser, selbst gehostet (Docker).
|
||||
// - Benutzerkonten; jeder Tresor ist mit einem eigenen Datenschlüssel (DEK) verschlüsselt,
|
||||
// den nur das Login-Passwort des Benutzers entpackt (scrypt → AES-256-GCM).
|
||||
// - Oberfläche ↔ Server über WebSocket (/ws), gleiche Kanäle wie Electron/Android (src/core/backend.js).
|
||||
// - SFTP-Up-/Downloads über HTTP (/web/upload, /web/download).
|
||||
//
|
||||
// Umgebung: PORT (8080), DATA_DIR (/data), TRUST_PROXY=1 (X-Forwarded-Proto/-For auswerten, z. B. hinter Traefik)
|
||||
const http = require('http');
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const crypto = require('crypto');
|
||||
const { WebSocketServer } = require('ws');
|
||||
const { Store } = require('../main/store');
|
||||
const { createBackend } = require('../core/backend');
|
||||
const i18n = require('../i18n');
|
||||
|
||||
const ROOT = process.env.MRTERM_ROOT || path.resolve(__dirname, '..', '..');
|
||||
const DATA = path.resolve(process.env.DATA_DIR || path.join(ROOT, 'web-data'));
|
||||
const PORT = Number(process.env.PORT) || 8080;
|
||||
const TRUST_PROXY = process.env.TRUST_PROXY === '1';
|
||||
const VERSION = (() => { try { return JSON.parse(fs.readFileSync(path.join(ROOT, 'package.json'), 'utf8')).version; } catch { return '0.0.0'; } })();
|
||||
const SESSION_IDLE = 12 * 3600e3;
|
||||
const SESSION_MAX = 7 * 24 * 3600e3;
|
||||
const COOKIE = 'mrterm_sid';
|
||||
|
||||
process.on('uncaughtException', (e) => console.error('Uncaught exception:', e));
|
||||
process.on('unhandledRejection', (e) => console.error('Unhandled rejection:', e));
|
||||
fs.mkdirSync(path.join(DATA, 'users'), { recursive: true, mode: 0o700 });
|
||||
|
||||
// ============================================================ Krypto-Helfer
|
||||
const scrypt = (pw, salt, N = 2 ** 15) => new Promise((resolve, reject) =>
|
||||
crypto.scrypt(String(pw), salt, 32, { N, r: 8, p: 1, maxmem: 256 * N * 8 }, (e, k) => (e ? reject(e) : resolve(k))));
|
||||
function box(key, plain) {
|
||||
const iv = crypto.randomBytes(12);
|
||||
const c = crypto.createCipheriv('aes-256-gcm', key, iv);
|
||||
const ct = Buffer.concat([c.update(plain), c.final()]);
|
||||
return { iv: iv.toString('base64'), tag: c.getAuthTag().toString('base64'), ct: ct.toString('base64') };
|
||||
}
|
||||
function unbox(key, b) {
|
||||
const d = crypto.createDecipheriv('aes-256-gcm', key, Buffer.from(b.iv, 'base64'));
|
||||
d.setAuthTag(Buffer.from(b.tag, 'base64'));
|
||||
return Buffer.concat([d.update(Buffer.from(b.ct, 'base64')), d.final()]);
|
||||
}
|
||||
// Verschlüsselung des Tresors mit dem DEK (Schnittstelle wie Electrons safeStorage)
|
||||
const vaultCrypto = (dek) => ({
|
||||
isEncryptionAvailable: () => true,
|
||||
encryptString(s) {
|
||||
const iv = crypto.randomBytes(12);
|
||||
const c = crypto.createCipheriv('aes-256-gcm', dek, iv);
|
||||
const ct = Buffer.concat([c.update(String(s), 'utf8'), c.final()]);
|
||||
return Buffer.concat([iv, c.getAuthTag(), ct]);
|
||||
},
|
||||
decryptString(buf) {
|
||||
const d = crypto.createDecipheriv('aes-256-gcm', dek, buf.subarray(0, 12));
|
||||
d.setAuthTag(buf.subarray(12, 28));
|
||||
return Buffer.concat([d.update(buf.subarray(28)), d.final()]).toString('utf8');
|
||||
},
|
||||
});
|
||||
|
||||
// ============================================================ Benutzer
|
||||
const USERS_FILE = path.join(DATA, 'users.json');
|
||||
let users = (() => { try { return JSON.parse(fs.readFileSync(USERS_FILE, 'utf8')).users || []; } catch { return []; } })();
|
||||
function saveUsers() {
|
||||
fs.writeFileSync(USERS_FILE + '.tmp', JSON.stringify({ users }, null, 2), { mode: 0o600 });
|
||||
fs.renameSync(USERS_FILE + '.tmp', USERS_FILE);
|
||||
}
|
||||
const validName = (n) => /^[A-Za-z0-9._@-]{1,64}$/.test(String(n || ''));
|
||||
const validPw = (p) => typeof p === 'string' && p.length >= 8 && p.length <= 1024;
|
||||
const publicUser = (u) => ({ id: u.id, name: u.name, admin: !!u.admin });
|
||||
|
||||
async function createUser(name, password, admin) {
|
||||
if (!validName(name)) throw new Error('Usernames may contain letters, digits and . _ @ - (max. 64).');
|
||||
if (!validPw(password)) throw new Error('The password must be at least 8 characters long.');
|
||||
if (users.some((u) => u.name.toLowerCase() === name.toLowerCase())) throw new Error('This username is already taken.');
|
||||
const authSalt = crypto.randomBytes(16), kekSalt = crypto.randomBytes(16);
|
||||
const dek = crypto.randomBytes(32);
|
||||
const u = {
|
||||
id: crypto.randomUUID(), name, admin: !!admin, createdAt: Date.now(),
|
||||
auth: { salt: authSalt.toString('base64'), hash: (await scrypt(password, authSalt)).toString('base64') },
|
||||
kek: { salt: kekSalt.toString('base64') },
|
||||
dek: box(await scrypt(password, kekSalt), dek),
|
||||
};
|
||||
users.push(u);
|
||||
saveUsers();
|
||||
return u;
|
||||
}
|
||||
// Prüft das Passwort und liefert den entpackten DEK (oder null)
|
||||
async function verify(u, password) {
|
||||
const hash = await scrypt(password, Buffer.from(u.auth.salt, 'base64'));
|
||||
if (!crypto.timingSafeEqual(hash, Buffer.from(u.auth.hash, 'base64'))) return null;
|
||||
try { return unbox(await scrypt(password, Buffer.from(u.kek.salt, 'base64')), u.dek); } catch { return null; }
|
||||
}
|
||||
async function setPassword(u, dek, password) {
|
||||
if (!validPw(password)) throw new Error('The password must be at least 8 characters long.');
|
||||
const authSalt = crypto.randomBytes(16), kekSalt = crypto.randomBytes(16);
|
||||
u.auth = { salt: authSalt.toString('base64'), hash: (await scrypt(password, authSalt)).toString('base64') };
|
||||
u.kek = { salt: kekSalt.toString('base64') };
|
||||
u.dek = box(await scrypt(password, kekSalt), dek);
|
||||
saveUsers();
|
||||
}
|
||||
|
||||
// ============================================================ Sitzungen
|
||||
const sessions = new Map(); // token -> { userId, dek, created, last }
|
||||
function newSession(u, dek) {
|
||||
const token = crypto.randomBytes(32).toString('base64url');
|
||||
sessions.set(token, { userId: u.id, dek, created: Date.now(), last: Date.now() });
|
||||
return token;
|
||||
}
|
||||
function sessionOf(req) {
|
||||
const m = String(req.headers.cookie || '').match(new RegExp(`(?:^|;\\s*)${COOKIE}=([A-Za-z0-9_-]+)`));
|
||||
const s = m && sessions.get(m[1]);
|
||||
if (!s) return null;
|
||||
const now = Date.now();
|
||||
if (now - s.last > SESSION_IDLE || now - s.created > SESSION_MAX || !users.some((u) => u.id === s.userId)) { sessions.delete(m[1]); return null; }
|
||||
s.last = now;
|
||||
return { token: m[1], ...s, user: users.find((u) => u.id === s.userId) };
|
||||
}
|
||||
setInterval(() => { for (const [t, s] of sessions) if (Date.now() - s.last > SESSION_IDLE || Date.now() - s.created > SESSION_MAX) sessions.delete(t); }, 600e3).unref();
|
||||
|
||||
const secure = (req) => req.socket.encrypted || (TRUST_PROXY && String(req.headers['x-forwarded-proto'] || '').split(',')[0].trim() === 'https');
|
||||
const cookie = (req, token, maxAge) => `${COOKIE}=${token}; Path=/; HttpOnly; SameSite=Strict; Max-Age=${maxAge}${secure(req) ? '; Secure' : ''}`;
|
||||
const clientIp = (req) => (TRUST_PROXY && String(req.headers['x-forwarded-for'] || '').split(',')[0].trim()) || req.socket.remoteAddress || '';
|
||||
|
||||
// Anmeldeversuche begrenzen: 10 Fehlversuche je IP in 15 Minuten
|
||||
const failures = new Map();
|
||||
const blocked = (ip) => { const f = failures.get(ip); return f && f.n >= 10 && Date.now() - f.first < 900e3; };
|
||||
const fail = (ip) => { const f = failures.get(ip); if (!f || Date.now() - f.first > 900e3) failures.set(ip, { n: 1, first: Date.now() }); else f.n++; };
|
||||
|
||||
// ============================================================ Laufzeit je Benutzer (Tresor + Backend)
|
||||
const runtimes = new Map(); // userId -> { store, be, sockets, timer }
|
||||
function runtimeFor(sess) {
|
||||
let rt = runtimes.get(sess.userId);
|
||||
if (rt) { clearTimeout(rt.timer); return rt; }
|
||||
const dir = path.join(DATA, 'users', sess.userId);
|
||||
fs.mkdirSync(dir, { recursive: true, mode: 0o700 });
|
||||
const store = new Store({ dir, crypto: vaultCrypto(sess.dek) });
|
||||
store.load();
|
||||
const sockets = new Set();
|
||||
const send = (ch, ...args) => { const msg = JSON.stringify({ t: 'evt', ch, args }); for (const ws of sockets) if (ws.readyState === 1) ws.send(msg); };
|
||||
const be = createBackend({ store, send, platform: 'web', version: VERSION });
|
||||
// Desktop-Funktionen, die es im Browser nicht gibt: neutrale Antworten, damit die Oberfläche nicht stolpert
|
||||
be.handle('vpn:status', () => ({}));
|
||||
be.handle('fw:active', () => []);
|
||||
be.handle('rdp:detect', () => ({}));
|
||||
be.handle('rdp:embedSupported', () => ({ ok: false, reason: 'web' }));
|
||||
be.handle('update:check', () => ({ available: false }));
|
||||
be.handle('sync:status', () => ({ enabled: false, running: false, peers: [], nearby: [], share: { keys: [], hosts: [], vpns: [] } }));
|
||||
rt = { store, be, sockets, timer: null };
|
||||
runtimes.set(sess.userId, rt);
|
||||
return rt;
|
||||
}
|
||||
// Letzter Browser-Tab zu: SSH-Verbindungen nach kurzer Zeit schließen und den Tresor aus dem Speicher nehmen
|
||||
function release(userId) {
|
||||
const rt = runtimes.get(userId);
|
||||
if (!rt || rt.sockets.size) return;
|
||||
rt.timer = setTimeout(() => { if (!rt.sockets.size) { rt.be.close(); runtimes.delete(userId); } }, 60e3);
|
||||
}
|
||||
function dropUser(userId) {
|
||||
for (const [t, s] of sessions) if (s.userId === userId) sessions.delete(t);
|
||||
const rt = runtimes.get(userId);
|
||||
if (rt) { for (const ws of rt.sockets) ws.close(4001, 'signed out'); rt.be.close(); runtimes.delete(userId); }
|
||||
}
|
||||
|
||||
// ============================================================ HTTP
|
||||
const MIME = { '.html': 'text/html; charset=utf-8', '.js': 'text/javascript; charset=utf-8', '.css': 'text/css; charset=utf-8', '.png': 'image/png', '.svg': 'image/svg+xml', '.json': 'application/json', '.ico': 'image/x-icon', '.woff2': 'font/woff2' };
|
||||
const CSP = "default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:; connect-src 'self'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'";
|
||||
function headers(extra = {}) {
|
||||
return { 'Content-Security-Policy': CSP, 'X-Content-Type-Options': 'nosniff', 'X-Frame-Options': 'DENY', 'Referrer-Policy': 'no-referrer', 'Cache-Control': 'no-store', ...extra };
|
||||
}
|
||||
const json = (res, code, obj, extra = {}) => { res.writeHead(code, headers({ 'Content-Type': 'application/json', ...extra })); res.end(JSON.stringify(obj)); };
|
||||
const redirect = (res, to) => { res.writeHead(302, headers({ Location: to })); res.end(); };
|
||||
|
||||
// Freigegebene statische Dateien: URL-Präfix → Verzeichnis
|
||||
const STATIC = [
|
||||
['/app/src/renderer/', path.join(ROOT, 'src', 'renderer')],
|
||||
['/app/src/i18n.js', path.join(ROOT, 'src', 'i18n.js')],
|
||||
['/app/node_modules/@xterm/', path.join(ROOT, 'node_modules', '@xterm')],
|
||||
['/web/', path.join(ROOT, 'src', 'web', 'public')],
|
||||
];
|
||||
function staticFile(urlPath) {
|
||||
for (const [prefix, dir] of STATIC) {
|
||||
if (urlPath === prefix && !prefix.endsWith('/')) return dir;
|
||||
if (!prefix.endsWith('/') || !urlPath.startsWith(prefix)) continue;
|
||||
const file = path.resolve(dir, '.' + path.posix.normalize('/' + decodeURIComponent(urlPath.slice(prefix.length))));
|
||||
if (!file.startsWith(dir + path.sep)) return null;
|
||||
if (dir.endsWith('@xterm') && !/[\\/](lib|css)[\\/][^\\/]+$/.test(file)) return null;
|
||||
if (dir.endsWith('renderer') && /\.(rdm|md)$/.test(file)) return null;
|
||||
return file;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
function serveFile(res, file, transform) {
|
||||
fs.stat(file, (err, st) => {
|
||||
if (err || !st.isFile()) return json(res, 404, { error: 'Not found' });
|
||||
const type = MIME[path.extname(file)] || 'application/octet-stream';
|
||||
const cache = type.startsWith('text/html') ? 'no-store' : 'private, max-age=300';
|
||||
if (transform) {
|
||||
const body = transform(fs.readFileSync(file, 'utf8'));
|
||||
res.writeHead(200, headers({ 'Content-Type': type, 'Cache-Control': cache }));
|
||||
return res.end(body);
|
||||
}
|
||||
res.writeHead(200, headers({ 'Content-Type': type, 'Content-Length': st.size, 'Cache-Control': cache }));
|
||||
fs.createReadStream(file).pipe(res);
|
||||
});
|
||||
}
|
||||
function readJson(req, limit = 64 * 1024) {
|
||||
return new Promise((resolve, reject) => {
|
||||
let size = 0; const parts = [];
|
||||
req.on('data', (c) => { size += c.length; if (size > limit) { reject(new Error('Request too large')); req.destroy(); } else parts.push(c); });
|
||||
req.on('end', () => { try { resolve(parts.length ? JSON.parse(Buffer.concat(parts).toString('utf8')) : {}); } catch { reject(new Error('Invalid JSON')); } });
|
||||
req.on('error', reject);
|
||||
});
|
||||
}
|
||||
|
||||
const APP_URL = '/app/src/renderer/index.html';
|
||||
|
||||
async function api(req, res, url, sess) {
|
||||
const p = url.pathname;
|
||||
// Schreibende Anfragen nur mit eigenem Header (Browser senden ihn nicht seitenübergreifend ohne CORS-Freigabe)
|
||||
if (req.method === 'POST' && req.headers['x-mrterm'] !== '1') return json(res, 403, { error: 'Forbidden' });
|
||||
if (p === '/api/state' && req.method === 'GET') return json(res, 200, { setup: !users.length, user: sess ? publicUser(sess.user) : null, version: VERSION });
|
||||
if (p === '/api/setup' && req.method === 'POST') {
|
||||
if (users.length) return json(res, 409, { error: 'Setup is already complete.' });
|
||||
const b = await readJson(req);
|
||||
const u = await createUser(b.name, b.password, true);
|
||||
const dek = await verify(u, b.password);
|
||||
return json(res, 200, { ok: true }, { 'Set-Cookie': cookie(req, newSession(u, dek), SESSION_MAX / 1000) });
|
||||
}
|
||||
if (p === '/api/login' && req.method === 'POST') {
|
||||
const ip = clientIp(req);
|
||||
if (blocked(ip)) return json(res, 429, { error: 'Too many failed attempts. Try again in 15 minutes.' });
|
||||
const b = await readJson(req);
|
||||
const u = users.find((x) => x.name.toLowerCase() === String(b.name || '').toLowerCase());
|
||||
const dek = u ? await verify(u, String(b.password || '')) : (await scrypt('x', crypto.randomBytes(16)), null);
|
||||
if (!dek) { fail(ip); return json(res, 401, { error: 'Wrong username or password.' }); }
|
||||
failures.delete(ip);
|
||||
return json(res, 200, { ok: true }, { 'Set-Cookie': cookie(req, newSession(u, dek), SESSION_MAX / 1000) });
|
||||
}
|
||||
if (!sess) return json(res, 401, { error: 'Not signed in' });
|
||||
if (p === '/api/me') return json(res, 200, publicUser(sess.user));
|
||||
if (p === '/api/logout' && req.method === 'POST') {
|
||||
sessions.delete(sess.token);
|
||||
return json(res, 200, { ok: true }, { 'Set-Cookie': cookie(req, '', 0) });
|
||||
}
|
||||
if (p === '/api/password' && req.method === 'POST') {
|
||||
const b = await readJson(req);
|
||||
if (!(await verify(sess.user, String(b.old || '')))) return json(res, 400, { error: 'The current password is wrong.' });
|
||||
await setPassword(sess.user, sess.dek, b.password);
|
||||
for (const [t, s] of sessions) if (s.userId === sess.userId && t !== sess.token) sessions.delete(t);
|
||||
return json(res, 200, { ok: true });
|
||||
}
|
||||
if (p.startsWith('/api/users')) {
|
||||
if (!sess.user.admin) return json(res, 403, { error: 'Administrators only.' });
|
||||
if (p === '/api/users' && req.method === 'GET') return json(res, 200, { users: users.map(publicUser) });
|
||||
if (p === '/api/users' && req.method === 'POST') {
|
||||
const b = await readJson(req);
|
||||
return json(res, 200, publicUser(await createUser(b.name, b.password, !!b.admin)));
|
||||
}
|
||||
if (p === '/api/users/delete' && req.method === 'POST') {
|
||||
const b = await readJson(req);
|
||||
const u = users.find((x) => x.id === b.id);
|
||||
if (!u) return json(res, 404, { error: 'User not found.' });
|
||||
if (u.id === sess.userId) return json(res, 400, { error: 'You cannot delete yourself.' });
|
||||
if (u.admin && users.filter((x) => x.admin).length === 1) return json(res, 400, { error: 'The last administrator cannot be deleted.' });
|
||||
dropUser(u.id);
|
||||
users = users.filter((x) => x.id !== u.id);
|
||||
saveUsers();
|
||||
fs.rmSync(path.join(DATA, 'users', u.id), { recursive: true, force: true });
|
||||
return json(res, 200, { ok: true });
|
||||
}
|
||||
}
|
||||
return json(res, 404, { error: 'Not found' });
|
||||
}
|
||||
|
||||
// SFTP-Dateien des angemeldeten Benutzers streamen
|
||||
function sftpFor(sess, url) {
|
||||
const rt = runtimes.get(sess.userId);
|
||||
const sid = url.searchParams.get('sid') || '';
|
||||
const file = url.searchParams.get('path') || '';
|
||||
if (!rt || !file.startsWith('/')) throw new Error('Invalid request');
|
||||
return { sftp: rt.be.ssh.sftpOf(sid), file };
|
||||
}
|
||||
function download(req, res, sess, url) {
|
||||
let t;
|
||||
try { t = sftpFor(sess, url); } catch (e) { return json(res, 400, { error: e.message }); }
|
||||
t.sftp.stat(t.file, (err, st) => {
|
||||
if (err) return json(res, 404, { error: err.message });
|
||||
const name = path.posix.basename(t.file);
|
||||
res.writeHead(200, headers({
|
||||
'Content-Type': 'application/octet-stream', 'Content-Length': st.size, 'Cache-Control': 'no-store',
|
||||
'Content-Disposition': `attachment; filename="${name.replace(/[^\x20-\x7e]|["\\]/g, '_')}"; filename*=UTF-8''${encodeURIComponent(name)}`,
|
||||
}));
|
||||
const rs = t.sftp.createReadStream(t.file);
|
||||
rs.on('error', () => res.destroy());
|
||||
rs.pipe(res);
|
||||
});
|
||||
}
|
||||
function upload(req, res, sess, url) {
|
||||
let t;
|
||||
try { t = sftpFor(sess, url); } catch (e) { return json(res, 400, { error: e.message }); }
|
||||
const ws = t.sftp.createWriteStream(t.file);
|
||||
let done = false;
|
||||
const finish = (err) => { if (done) return; done = true; err ? json(res, 500, { error: err.message }) : json(res, 200, { ok: true }); };
|
||||
ws.on('error', finish);
|
||||
ws.on('close', () => finish());
|
||||
req.on('error', finish);
|
||||
req.pipe(ws);
|
||||
}
|
||||
|
||||
const server = http.createServer(async (req, res) => {
|
||||
try {
|
||||
const url = new URL(req.url, 'http://x');
|
||||
const p = url.pathname;
|
||||
const sess = sessionOf(req);
|
||||
if (p === '/healthz') return json(res, 200, { ok: true });
|
||||
if (p.startsWith('/api/')) return await api(req, res, url, sess);
|
||||
if (p === '/web/download' && req.method === 'GET') return sess ? download(req, res, sess, url) : json(res, 401, { error: 'Not signed in' });
|
||||
if (p === '/web/upload' && req.method === 'POST') {
|
||||
if (!sess) return json(res, 401, { error: 'Not signed in' });
|
||||
if (req.headers['x-mrterm'] !== '1') return json(res, 403, { error: 'Forbidden' });
|
||||
return upload(req, res, sess, url);
|
||||
}
|
||||
if (req.method !== 'GET' && req.method !== 'HEAD') return json(res, 405, { error: 'Method not allowed' });
|
||||
if (p === '/' || p === '/login') return sess && p === '/' ? redirect(res, APP_URL) : serveFile(res, path.join(ROOT, 'src', 'web', 'public', 'login.html'));
|
||||
if (p === '/favicon.ico' || p === '/favicon.png') return serveFile(res, path.join(ROOT, 'src', 'renderer', 'logo.png'));
|
||||
if (p === APP_URL) {
|
||||
if (!sess) return redirect(res, '/');
|
||||
// Browser-Anbindung (window.api) vor den übrigen Skripten laden
|
||||
return serveFile(res, staticFile(p), (html) => html.replace('<script ', '<script src="/web/web-api.js"></script>\n <script '));
|
||||
}
|
||||
const file = staticFile(p);
|
||||
if (!file) return json(res, 404, { error: 'Not found' });
|
||||
// Nur die Anmeldeseite und ihre Dateien sind ohne Sitzung erreichbar
|
||||
const PUBLIC = ['/web/login.js', '/web/login.css', '/app/src/i18n.js', '/app/src/renderer/app-themes.css', '/app/src/renderer/logo.png'];
|
||||
if (!sess && !PUBLIC.includes(p)) return json(res, 401, { error: 'Not signed in' });
|
||||
return serveFile(res, file);
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
if (!res.headersSent) json(res, 500, { error: e.message || 'Server error' });
|
||||
}
|
||||
});
|
||||
|
||||
// ============================================================ WebSocket
|
||||
const wss = new WebSocketServer({ noServer: true, maxPayload: 8 * 1024 * 1024 });
|
||||
server.on('upgrade', (req, socket, head) => {
|
||||
const url = new URL(req.url, 'http://x');
|
||||
const sess = sessionOf(req);
|
||||
// Nur Verbindungen von der eigenen Seite (Schutz vor Cross-Site-WebSocket-Hijacking)
|
||||
const origin = req.headers.origin ? new URL(req.headers.origin).host : '';
|
||||
const host = (TRUST_PROXY && req.headers['x-forwarded-host']) || req.headers.host;
|
||||
if (url.pathname !== '/ws' || !sess || origin !== host) { socket.write('HTTP/1.1 401 Unauthorized\r\n\r\n'); return socket.destroy(); }
|
||||
wss.handleUpgrade(req, socket, head, (ws) => {
|
||||
const rt = runtimeFor(sess);
|
||||
rt.sockets.add(ws);
|
||||
const lang = String(req.headers['accept-language'] || 'en').split(',')[0];
|
||||
ws.on('message', async (raw) => {
|
||||
let m;
|
||||
try { m = JSON.parse(raw.toString('utf8')); } catch { return; }
|
||||
if (!sessions.has(sess.token)) return ws.close(4001, 'signed out');
|
||||
if (m.t === 'send') return rt.be.notify(String(m.ch), Array.isArray(m.args) ? m.args : []);
|
||||
if (m.t !== 'call') return;
|
||||
try {
|
||||
i18n.setLanguage(rt.store.get().settings.language, lang);
|
||||
const v = await rt.be.call(String(m.ch), Array.isArray(m.args) ? m.args : []);
|
||||
ws.send(JSON.stringify({ t: 'reply', id: m.id, ok: true, v: v === undefined ? null : v }));
|
||||
} catch (e) {
|
||||
if (ws.readyState === 1) ws.send(JSON.stringify({ t: 'reply', id: m.id, ok: false, v: e?.message || String(e) }));
|
||||
}
|
||||
});
|
||||
ws.on('close', () => { rt.sockets.delete(ws); release(sess.userId); });
|
||||
ws.send(JSON.stringify({ t: 'hello', user: publicUser(sess.user), version: VERSION }));
|
||||
});
|
||||
});
|
||||
|
||||
server.on('error', (e) => { console.error(`Cannot listen on port ${PORT}: ${e.message}`); process.exit(1); });
|
||||
server.listen(PORT, () => console.log(`MrTerm Web ${VERSION} on port ${PORT} (data: ${DATA})${users.length ? '' : ' – open it in the browser to create the admin account'}`));
|
||||
Reference in New Issue
Block a user