clitrigger 0.1.18 → 0.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.env.example +2 -1
- package/README.md +15 -5
- package/README_KR.md +15 -5
- package/bin/clitrigger.js +23 -40
- package/dist/client/assets/{index-CRSNebDI.css → index-DxSgLI9D.css} +1 -1
- package/dist/client/assets/{index-BldpDcSD.js → index-fn9z65zw.js} +178 -168
- package/dist/client/index.html +2 -2
- package/dist/server/index.d.ts.map +1 -1
- package/dist/server/index.js +35 -7
- package/dist/server/index.js.map +1 -1
- package/dist/server/middleware/auth.d.ts.map +1 -1
- package/dist/server/middleware/auth.js +9 -0
- package/dist/server/middleware/auth.js.map +1 -1
- package/dist/server/routes/auth.d.ts.map +1 -1
- package/dist/server/routes/auth.js +106 -28
- package/dist/server/routes/auth.js.map +1 -1
- package/dist/server/utils/password.d.ts +3 -0
- package/dist/server/utils/password.d.ts.map +1 -0
- package/dist/server/utils/password.js +46 -0
- package/dist/server/utils/password.js.map +1 -0
- package/electron/main.cjs +16 -24
- package/package.json +35 -8
package/dist/client/index.html
CHANGED
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
</script>
|
|
17
17
|
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
|
18
18
|
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
|
|
19
|
-
<script type="module" crossorigin src="/assets/index-
|
|
20
|
-
<link rel="stylesheet" crossorigin href="/assets/index-
|
|
19
|
+
<script type="module" crossorigin src="/assets/index-fn9z65zw.js"></script>
|
|
20
|
+
<link rel="stylesheet" crossorigin href="/assets/index-DxSgLI9D.css">
|
|
21
21
|
</head>
|
|
22
22
|
<body>
|
|
23
23
|
<div id="root"></div>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAC;AA+CvB,QAAA,MAAM,GAAG,6CAAY,CAAC;AACtB,QAAA,MAAM,MAAM,oGAAoB,CAAC;AAqRjC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC"}
|
package/dist/server/index.js
CHANGED
|
@@ -18,7 +18,8 @@ import imagesRouter from './routes/images.js';
|
|
|
18
18
|
import { claudeManager } from './services/claude-manager.js';
|
|
19
19
|
import { orchestrator } from './services/orchestrator.js';
|
|
20
20
|
import { tunnelManager } from './services/tunnel-manager.js';
|
|
21
|
-
import { getSetting as getAppSetting } from './db/app-settings.js';
|
|
21
|
+
import { getSetting as getAppSetting, setSetting as setAppSetting } from './db/app-settings.js';
|
|
22
|
+
import { hashPassword } from './utils/password.js';
|
|
22
23
|
import { initWebSocket } from './websocket/index.js';
|
|
23
24
|
import tunnelRouter from './routes/tunnel.js';
|
|
24
25
|
import schedulesRouter from './routes/schedules.js';
|
|
@@ -132,11 +133,35 @@ for (const p of getAllProjects()) {
|
|
|
132
133
|
}
|
|
133
134
|
}
|
|
134
135
|
}
|
|
135
|
-
//
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
136
|
+
// Password setup gate (unless auth is explicitly disabled)
|
|
137
|
+
// - DB hash exists → normal operation.
|
|
138
|
+
// - No hash, but AUTH_PASSWORD env present → one-time migration to scrypt hash.
|
|
139
|
+
// - Neither → setup mode: server starts, but tunnel auto-start is held until
|
|
140
|
+
// the user finishes initial setup in the browser (POST /api/auth/setup).
|
|
141
|
+
let setupMode = false;
|
|
142
|
+
if (process.env.DISABLE_AUTH !== 'true') {
|
|
143
|
+
const existingHash = getAppSetting('auth.password_hash');
|
|
144
|
+
const envPwd = process.env.AUTH_PASSWORD;
|
|
145
|
+
if (!existingHash && envPwd) {
|
|
146
|
+
const migrated = await hashPassword(envPwd);
|
|
147
|
+
setAppSetting('auth.password_hash', migrated);
|
|
148
|
+
setAppSetting('auth.password_changed_at', String(Date.now()));
|
|
149
|
+
console.log('Migrated legacy AUTH_PASSWORD to hashed credential store.');
|
|
150
|
+
// Drop a marker so the launcher (bin/clitrigger.js) can scrub the
|
|
151
|
+
// plaintext field from ~/.clitrigger/config.json on next boot.
|
|
152
|
+
if (process.env.DB_PATH) {
|
|
153
|
+
try {
|
|
154
|
+
fs.writeFileSync(path.join(path.dirname(process.env.DB_PATH), '.password-migrated'), '');
|
|
155
|
+
}
|
|
156
|
+
catch { /* best-effort */ }
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
delete process.env.AUTH_PASSWORD;
|
|
160
|
+
if (!getAppSetting('auth.password_hash')) {
|
|
161
|
+
setupMode = true;
|
|
162
|
+
console.log('No password set. Open the web UI to finish setup.');
|
|
163
|
+
console.log('Tunnel auto-start is paused until setup completes.');
|
|
164
|
+
}
|
|
140
165
|
}
|
|
141
166
|
// Auth middleware
|
|
142
167
|
initAuth(app);
|
|
@@ -172,7 +197,10 @@ scheduler.initialize();
|
|
|
172
197
|
// --- WebSocket ---
|
|
173
198
|
initWebSocket(server);
|
|
174
199
|
// --- Tunnel (Phase 7) ---
|
|
175
|
-
if (process.env.TUNNEL_ENABLED === 'true') {
|
|
200
|
+
if (setupMode && process.env.TUNNEL_ENABLED === 'true') {
|
|
201
|
+
console.log('Tunnel start blocked: password not initialized — finish setup in browser first.');
|
|
202
|
+
}
|
|
203
|
+
if (process.env.TUNNEL_ENABLED === 'true' && !setupMode) {
|
|
176
204
|
const port = Number(PORT);
|
|
177
205
|
const tunnelName = getAppSetting('tunnel.name') ?? process.env.TUNNEL_NAME ?? '';
|
|
178
206
|
const customHostname = getAppSetting('tunnel.hostname') ?? process.env.TUNNEL_HOSTNAME ?? '';
|
package/dist/server/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/server/middleware/auth.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/server/middleware/auth.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAYvD,eAAO,MAAM,iBAAiB,EAAE,cAU9B,CAAC;AAGH,eAAO,MAAM,cAAc,EAAE,cAuB5B,CAAC;AAEF,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAK3C"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import crypto from 'crypto';
|
|
2
2
|
import session from 'express-session';
|
|
3
|
+
import { getSetting } from '../db/app-settings.js';
|
|
3
4
|
// Session-based password authentication middleware
|
|
4
5
|
// Uses SESSION_SECRET (or falls back to a random secret per process)
|
|
5
6
|
const sessionSecret = process.env.SESSION_SECRET
|
|
@@ -28,6 +29,14 @@ export const authMiddleware = (req, res, next) => {
|
|
|
28
29
|
return next();
|
|
29
30
|
}
|
|
30
31
|
if (req.session && req.session.authenticated) {
|
|
32
|
+
// Invalidate sessions issued before the most recent password change.
|
|
33
|
+
const changedAt = Number(getSetting('auth.password_changed_at') || 0);
|
|
34
|
+
if (changedAt && (req.session.createdAt ?? 0) < changedAt) {
|
|
35
|
+
req.session.destroy(() => {
|
|
36
|
+
res.status(401).json({ error: 'Unauthorized' });
|
|
37
|
+
});
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
31
40
|
return next();
|
|
32
41
|
}
|
|
33
42
|
res.status(401).json({ error: 'Unauthorized' });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/server/middleware/auth.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,OAAO,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/server/middleware/auth.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,OAAO,MAAM,iBAAiB,CAAC;AAEtC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,mDAAmD;AACnD,qEAAqE;AAErE,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc;OAC3C,OAAO,CAAC,GAAG,CAAC,aAAa;OACzB,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAE5C,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC;AAE3D,MAAM,CAAC,MAAM,iBAAiB,GAAmB,OAAO,CAAC;IACvD,MAAM,EAAE,aAAa;IACrB,MAAM,EAAE,KAAK;IACb,iBAAiB,EAAE,KAAK;IACxB,MAAM,EAAE;QACN,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,YAAY;QACpB,QAAQ,EAAE,QAAQ;QAClB,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAAG,WAAW;KAC1C;CACF,CAAC,CAAC;AAEH,sDAAsD;AACtD,MAAM,CAAC,MAAM,cAAc,GAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;IAC/D,uCAAuC;IACvC,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QACrE,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;IACD,6BAA6B;IAC7B,IAAI,GAAG,CAAC,IAAI,KAAK,aAAa,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACzD,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;QAC7C,qEAAqE;QACrE,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC,CAAC;QACtE,IAAI,SAAS,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,CAAC,CAAC,GAAG,SAAS,EAAE,CAAC;YAC1D,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE;gBACvB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;YAClD,CAAC,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,UAAU,QAAQ,CAAC,GAAY;IACnC,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAC3B,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,MAAM,EAAE,CAAC;QACxC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAClC,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/server/routes/auth.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/server/routes/auth.ts"],"names":[],"mappings":"AAKA,QAAA,MAAM,MAAM,4CAAW,CAAC;AA+JxB,eAAe,MAAM,CAAC"}
|
|
@@ -1,42 +1,56 @@
|
|
|
1
|
-
import crypto from 'crypto';
|
|
2
1
|
import { Router } from 'express';
|
|
3
2
|
import rateLimit from 'express-rate-limit';
|
|
3
|
+
import { getSetting, setSetting } from '../db/app-settings.js';
|
|
4
|
+
import { hashPassword, verifyPassword } from '../utils/password.js';
|
|
4
5
|
const router = Router();
|
|
5
|
-
|
|
6
|
-
const
|
|
6
|
+
const HASH_KEY = 'auth.password_hash';
|
|
7
|
+
const CHANGED_AT_KEY = 'auth.password_changed_at';
|
|
8
|
+
const MIN_LENGTH = 8;
|
|
9
|
+
// Rate limit auth attempts: max 10 per 15 minutes per IP
|
|
10
|
+
const authLimiter = rateLimit({
|
|
7
11
|
windowMs: 15 * 60 * 1000,
|
|
8
12
|
max: 10,
|
|
9
|
-
message: { error: 'Too many
|
|
13
|
+
message: { error: 'Too many auth attempts. Please try again later.' },
|
|
10
14
|
standardHeaders: true,
|
|
11
15
|
legacyHeaders: false,
|
|
12
16
|
});
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
return false;
|
|
19
|
-
}
|
|
20
|
-
|
|
17
|
+
function validatePasswordPair(password, confirmPassword) {
|
|
18
|
+
if (typeof password !== 'string' || !password) {
|
|
19
|
+
return { ok: false, status: 400, error: 'Password is required' };
|
|
20
|
+
}
|
|
21
|
+
if (password.length < MIN_LENGTH) {
|
|
22
|
+
return { ok: false, status: 400, error: `Password must be at least ${MIN_LENGTH} characters` };
|
|
23
|
+
}
|
|
24
|
+
if (typeof confirmPassword !== 'string' || password !== confirmPassword) {
|
|
25
|
+
return { ok: false, status: 400, error: 'Passwords do not match' };
|
|
26
|
+
}
|
|
27
|
+
return { ok: true, password };
|
|
28
|
+
}
|
|
29
|
+
function markPasswordChanged() {
|
|
30
|
+
setSetting(CHANGED_AT_KEY, String(Date.now()));
|
|
21
31
|
}
|
|
22
32
|
// POST /api/auth/login
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
const authPassword = process.env.AUTH_PASSWORD;
|
|
29
|
-
if (!authPassword) {
|
|
30
|
-
console.error('AUTH_PASSWORD environment variable is not configured');
|
|
31
|
-
res.status(500).json({ error: 'Server authentication not configured' });
|
|
33
|
+
router.post('/login', authLimiter, async (req, res) => {
|
|
34
|
+
const { password } = req.body ?? {};
|
|
35
|
+
const hash = getSetting(HASH_KEY);
|
|
36
|
+
if (!hash) {
|
|
37
|
+
res.status(503).json({ error: 'setup_required' });
|
|
32
38
|
return;
|
|
33
39
|
}
|
|
34
40
|
if (typeof password !== 'string' || !password) {
|
|
35
41
|
res.status(400).json({ error: 'Password is required' });
|
|
36
42
|
return;
|
|
37
43
|
}
|
|
38
|
-
|
|
44
|
+
let ok = false;
|
|
45
|
+
try {
|
|
46
|
+
ok = await verifyPassword(password, hash);
|
|
47
|
+
}
|
|
48
|
+
catch {
|
|
49
|
+
ok = false;
|
|
50
|
+
}
|
|
51
|
+
if (ok) {
|
|
39
52
|
req.session.authenticated = true;
|
|
53
|
+
req.session.createdAt = Date.now();
|
|
40
54
|
res.json({ success: true });
|
|
41
55
|
}
|
|
42
56
|
else {
|
|
@@ -44,8 +58,69 @@ router.post('/login', loginLimiter, (req, res) => {
|
|
|
44
58
|
res.status(401).json({ error: 'Invalid password' });
|
|
45
59
|
}
|
|
46
60
|
});
|
|
61
|
+
// POST /api/auth/setup
|
|
62
|
+
// Only available when no password has been set yet (initial bootstrap).
|
|
63
|
+
router.post('/setup', authLimiter, async (req, res) => {
|
|
64
|
+
if (getSetting(HASH_KEY)) {
|
|
65
|
+
res.status(409).json({ error: 'already_initialized' });
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
const { password, confirmPassword } = req.body ?? {};
|
|
69
|
+
const validation = validatePasswordPair(password, confirmPassword);
|
|
70
|
+
if (!validation.ok) {
|
|
71
|
+
res.status(validation.status).json({ error: validation.error });
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
const hash = await hashPassword(validation.password);
|
|
75
|
+
setSetting(HASH_KEY, hash);
|
|
76
|
+
markPasswordChanged();
|
|
77
|
+
req.session.authenticated = true;
|
|
78
|
+
req.session.createdAt = Date.now();
|
|
79
|
+
res.json({ success: true });
|
|
80
|
+
});
|
|
81
|
+
// PUT /api/auth/password
|
|
82
|
+
// Authenticated endpoint — middleware has already verified the session.
|
|
83
|
+
router.put('/password', authLimiter, async (req, res) => {
|
|
84
|
+
if (!req.session?.authenticated) {
|
|
85
|
+
res.status(401).json({ error: 'Unauthorized' });
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
88
|
+
const { oldPassword, newPassword, confirmPassword } = req.body ?? {};
|
|
89
|
+
const hash = getSetting(HASH_KEY);
|
|
90
|
+
if (!hash) {
|
|
91
|
+
res.status(503).json({ error: 'setup_required' });
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
if (typeof oldPassword !== 'string' || !oldPassword) {
|
|
95
|
+
res.status(400).json({ error: 'Current password is required' });
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
let oldOk = false;
|
|
99
|
+
try {
|
|
100
|
+
oldOk = await verifyPassword(oldPassword, hash);
|
|
101
|
+
}
|
|
102
|
+
catch {
|
|
103
|
+
oldOk = false;
|
|
104
|
+
}
|
|
105
|
+
if (!oldOk) {
|
|
106
|
+
res.status(401).json({ error: 'Current password is incorrect' });
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
109
|
+
const validation = validatePasswordPair(newPassword, confirmPassword);
|
|
110
|
+
if (!validation.ok) {
|
|
111
|
+
res.status(validation.status).json({ error: validation.error });
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
114
|
+
const newHash = await hashPassword(validation.password);
|
|
115
|
+
setSetting(HASH_KEY, newHash);
|
|
116
|
+
markPasswordChanged();
|
|
117
|
+
// Keep this session alive — refresh createdAt so the new password_changed_at
|
|
118
|
+
// timestamp does not invalidate the requester. Other sessions (older
|
|
119
|
+
// createdAt) will be rejected on their next request by authMiddleware.
|
|
120
|
+
req.session.createdAt = Date.now();
|
|
121
|
+
res.json({ success: true });
|
|
122
|
+
});
|
|
47
123
|
// POST /api/auth/logout
|
|
48
|
-
// Destroys session
|
|
49
124
|
router.post('/logout', (req, res) => {
|
|
50
125
|
req.session.destroy((err) => {
|
|
51
126
|
if (err) {
|
|
@@ -56,14 +131,17 @@ router.post('/logout', (req, res) => {
|
|
|
56
131
|
});
|
|
57
132
|
});
|
|
58
133
|
// GET /api/auth/status
|
|
59
|
-
// Returns { authenticated: boolean, authRequired: boolean }
|
|
60
134
|
router.get('/status', (req, res) => {
|
|
61
135
|
if (process.env.DISABLE_AUTH === 'true') {
|
|
62
|
-
res.json({ authenticated: true, authRequired: false });
|
|
63
|
-
|
|
64
|
-
else {
|
|
65
|
-
res.json({ authenticated: req.session?.authenticated === true, authRequired: true });
|
|
136
|
+
res.json({ authenticated: true, authRequired: false, setupRequired: false });
|
|
137
|
+
return;
|
|
66
138
|
}
|
|
139
|
+
const setupRequired = !getSetting(HASH_KEY);
|
|
140
|
+
res.json({
|
|
141
|
+
authenticated: req.session?.authenticated === true,
|
|
142
|
+
authRequired: true,
|
|
143
|
+
setupRequired,
|
|
144
|
+
});
|
|
67
145
|
});
|
|
68
146
|
export default router;
|
|
69
147
|
//# sourceMappingURL=auth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/server/routes/auth.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/server/routes/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"password.d.ts","sourceRoot":"","sources":["../../../src/server/utils/password.ts"],"names":[],"mappings":"AAcA,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAIrE;AAED,wBAAsB,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA6BxF"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import { randomBytes, scrypt as scryptCb, timingSafeEqual } from 'crypto';
|
|
2
|
+
import { promisify } from 'util';
|
|
3
|
+
const scrypt = promisify(scryptCb);
|
|
4
|
+
const PARAMS = { N: 16384, r: 8, p: 1 };
|
|
5
|
+
const KEYLEN = 64;
|
|
6
|
+
const SALT_BYTES = 16;
|
|
7
|
+
export async function hashPassword(plaintext) {
|
|
8
|
+
const salt = randomBytes(SALT_BYTES);
|
|
9
|
+
const derived = await scrypt(plaintext, salt, KEYLEN, PARAMS);
|
|
10
|
+
return `scrypt$N=${PARAMS.N},r=${PARAMS.r},p=${PARAMS.p}$${salt.toString('base64')}$${derived.toString('base64')}`;
|
|
11
|
+
}
|
|
12
|
+
export async function verifyPassword(plaintext, stored) {
|
|
13
|
+
const parts = stored.split('$');
|
|
14
|
+
if (parts.length !== 4 || parts[0] !== 'scrypt')
|
|
15
|
+
return false;
|
|
16
|
+
const params = {};
|
|
17
|
+
for (const kv of parts[1].split(',')) {
|
|
18
|
+
const [k, v] = kv.split('=');
|
|
19
|
+
const n = Number(v);
|
|
20
|
+
if (!Number.isFinite(n))
|
|
21
|
+
return false;
|
|
22
|
+
params[k] = n;
|
|
23
|
+
}
|
|
24
|
+
if (!params.N || !params.r || !params.p)
|
|
25
|
+
return false;
|
|
26
|
+
let salt;
|
|
27
|
+
let expected;
|
|
28
|
+
try {
|
|
29
|
+
salt = Buffer.from(parts[2], 'base64');
|
|
30
|
+
expected = Buffer.from(parts[3], 'base64');
|
|
31
|
+
}
|
|
32
|
+
catch {
|
|
33
|
+
return false;
|
|
34
|
+
}
|
|
35
|
+
if (expected.length === 0)
|
|
36
|
+
return false;
|
|
37
|
+
const derived = await scrypt(plaintext, salt, expected.length, {
|
|
38
|
+
N: params.N,
|
|
39
|
+
r: params.r,
|
|
40
|
+
p: params.p,
|
|
41
|
+
});
|
|
42
|
+
if (derived.length !== expected.length)
|
|
43
|
+
return false;
|
|
44
|
+
return timingSafeEqual(derived, expected);
|
|
45
|
+
}
|
|
46
|
+
//# sourceMappingURL=password.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"password.js","sourceRoot":"","sources":["../../../src/server/utils/password.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,IAAI,QAAQ,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAEjC,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAKb,CAAC;AAErB,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;AACxC,MAAM,MAAM,GAAG,EAAE,CAAC;AAClB,MAAM,UAAU,GAAG,EAAE,CAAC;AAEtB,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,SAAiB;IAClD,MAAM,IAAI,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;IACrC,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9D,OAAO,YAAY,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;AACrH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,SAAiB,EAAE,MAAc;IACpE,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAChC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC9D,MAAM,MAAM,GAA2B,EAAE,CAAC;IAC1C,KAAK,MAAM,EAAE,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACrC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;QACtC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAChB,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IAEtD,IAAI,IAAY,CAAC;IACjB,IAAI,QAAgB,CAAC;IACrB,IAAI,CAAC;QACH,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;QACvC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC7C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAExC,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,EAAE;QAC7D,CAAC,EAAE,MAAM,CAAC,CAAC;QACX,CAAC,EAAE,MAAM,CAAC,CAAC;QACX,CAAC,EAAE,MAAM,CAAC,CAAC;KACZ,CAAC,CAAC;IACH,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IACrD,OAAO,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC5C,CAAC"}
|
package/electron/main.cjs
CHANGED
|
@@ -1,18 +1,17 @@
|
|
|
1
|
-
const { app, BrowserWindow, dialog, shell, Menu, nativeTheme
|
|
1
|
+
const { app, BrowserWindow, dialog, shell, Menu, nativeTheme } = require('electron');
|
|
2
2
|
const path = require('node:path');
|
|
3
3
|
const fs = require('node:fs');
|
|
4
4
|
const net = require('node:net');
|
|
5
|
-
const crypto = require('node:crypto');
|
|
6
5
|
const { pathToFileURL } = require('node:url');
|
|
7
6
|
|
|
8
7
|
let mainWindow = null;
|
|
9
8
|
let serverPort = null;
|
|
10
|
-
let serverPassword = null;
|
|
11
9
|
let cleanupStarted = false;
|
|
12
10
|
|
|
13
11
|
const userDataDir = app.getPath('userData');
|
|
14
12
|
const configFile = path.join(userDataDir, 'config.json');
|
|
15
13
|
const dbPath = path.join(userDataDir, 'clitrigger.db');
|
|
14
|
+
const migratedFlag = path.join(userDataDir, '.password-migrated');
|
|
16
15
|
|
|
17
16
|
function readOrInitConfig() {
|
|
18
17
|
fs.mkdirSync(userDataDir, { recursive: true });
|
|
@@ -21,9 +20,13 @@ function readOrInitConfig() {
|
|
|
21
20
|
try { config = JSON.parse(fs.readFileSync(configFile, 'utf-8')); } catch {}
|
|
22
21
|
}
|
|
23
22
|
let mutated = false;
|
|
24
|
-
|
|
25
|
-
|
|
23
|
+
// Password is set by the user on first launch via the web UI Setup screen.
|
|
24
|
+
// Legacy plaintext field is migrated to a hash on first server boot, then
|
|
25
|
+
// cleaned up here on the next launch via the migrated flag.
|
|
26
|
+
if (fs.existsSync(migratedFlag) && config.password) {
|
|
27
|
+
delete config.password;
|
|
26
28
|
mutated = true;
|
|
29
|
+
try { fs.unlinkSync(migratedFlag); } catch { /* ignore */ }
|
|
27
30
|
}
|
|
28
31
|
if (typeof config.port !== 'number') {
|
|
29
32
|
config.port = 3737;
|
|
@@ -75,12 +78,15 @@ function resolveServerEntry() {
|
|
|
75
78
|
|
|
76
79
|
async function bootServer() {
|
|
77
80
|
const config = readOrInitConfig();
|
|
78
|
-
serverPassword = config.password;
|
|
79
81
|
serverPort = await findFreePort(config.port);
|
|
80
82
|
|
|
81
83
|
process.env.PORT = String(serverPort);
|
|
82
|
-
process.env.AUTH_PASSWORD = config.password;
|
|
83
84
|
process.env.DB_PATH = dbPath;
|
|
85
|
+
// Only forward a legacy plaintext password so the server can migrate it.
|
|
86
|
+
// Without it, the server enters setup mode and the web UI prompts the user.
|
|
87
|
+
if (config.password) {
|
|
88
|
+
process.env.AUTH_PASSWORD = config.password;
|
|
89
|
+
}
|
|
84
90
|
if (config.tunnel) process.env.TUNNEL_ENABLED = 'true';
|
|
85
91
|
if (config.tunnelName) process.env.TUNNEL_NAME = config.tunnelName;
|
|
86
92
|
if (config.tunnelHostname) process.env.TUNNEL_HOSTNAME = config.tunnelHostname;
|
|
@@ -93,7 +99,7 @@ async function bootServer() {
|
|
|
93
99
|
}
|
|
94
100
|
await import(pathToFileURL(serverEntry).href);
|
|
95
101
|
await waitForServer(serverPort);
|
|
96
|
-
return { port: serverPort
|
|
102
|
+
return { port: serverPort };
|
|
97
103
|
}
|
|
98
104
|
|
|
99
105
|
function createWindow(port) {
|
|
@@ -103,6 +109,8 @@ function createWindow(port) {
|
|
|
103
109
|
minWidth: 800,
|
|
104
110
|
minHeight: 600,
|
|
105
111
|
backgroundColor: nativeTheme.shouldUseDarkColors ? '#0f0f0f' : '#ffffff',
|
|
112
|
+
// Dev only — packaged build inherits the icon from the embedded .exe.
|
|
113
|
+
...(app.isPackaged ? {} : { icon: path.join(__dirname, '..', 'build', 'icon.png') }),
|
|
106
114
|
webPreferences: {
|
|
107
115
|
preload: path.join(__dirname, 'preload.cjs'),
|
|
108
116
|
contextIsolation: true,
|
|
@@ -133,21 +141,6 @@ function createWindow(port) {
|
|
|
133
141
|
mainWindow.on('closed', () => { mainWindow = null; });
|
|
134
142
|
}
|
|
135
143
|
|
|
136
|
-
function showPasswordDialog() {
|
|
137
|
-
const result = dialog.showMessageBoxSync(mainWindow, {
|
|
138
|
-
type: 'info',
|
|
139
|
-
title: 'CLITrigger',
|
|
140
|
-
message: 'Login password',
|
|
141
|
-
detail: serverPassword,
|
|
142
|
-
buttons: ['Copy to clipboard', 'Close'],
|
|
143
|
-
defaultId: 0,
|
|
144
|
-
cancelId: 1,
|
|
145
|
-
});
|
|
146
|
-
if (result === 0 && serverPassword) {
|
|
147
|
-
clipboard.writeText(serverPassword);
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
-
|
|
151
144
|
function buildMenu() {
|
|
152
145
|
const isMac = process.platform === 'darwin';
|
|
153
146
|
const template = [
|
|
@@ -164,7 +157,6 @@ function buildMenu() {
|
|
|
164
157
|
{
|
|
165
158
|
label: 'Help',
|
|
166
159
|
submenu: [
|
|
167
|
-
{ label: 'Show login password', click: showPasswordDialog },
|
|
168
160
|
{ label: 'Open config folder', click: () => shell.openPath(userDataDir) },
|
|
169
161
|
{ type: 'separator' },
|
|
170
162
|
{
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "clitrigger",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.2.0",
|
|
4
4
|
"description": "Spawn isolated git worktrees and orchestrate Claude/Gemini/Codex CLI tasks in parallel from a web UI.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"claude",
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"docs:erd": "tsx scripts/generate-erd.ts",
|
|
62
62
|
"docs:erd:check": "tsx scripts/generate-erd.ts --check",
|
|
63
63
|
"postuninstall": "node bin/postuninstall.js",
|
|
64
|
-
"electron:rebuild": "electron-rebuild -o better-sqlite3",
|
|
64
|
+
"electron:rebuild": "electron-rebuild -o better-sqlite3 --force --build-from-source",
|
|
65
65
|
"electron:dev": "npm run build && electron .",
|
|
66
66
|
"electron:build": "npm run build && electron-builder",
|
|
67
67
|
"electron:build:win": "npm run build && electron-builder --win",
|
|
@@ -102,6 +102,8 @@
|
|
|
102
102
|
"electron": "^33.2.0",
|
|
103
103
|
"electron-builder": "^25.1.8",
|
|
104
104
|
"esbuild": "^0.27.0",
|
|
105
|
+
"png-to-ico": "^3.0.1",
|
|
106
|
+
"sharp": "^0.34.5",
|
|
105
107
|
"tsx": "^4.19.0",
|
|
106
108
|
"typescript": "^5.7.0",
|
|
107
109
|
"vitest": "^4.1.1"
|
|
@@ -116,7 +118,8 @@
|
|
|
116
118
|
{
|
|
117
119
|
"provider": "github",
|
|
118
120
|
"owner": "HyperAITeam",
|
|
119
|
-
"repo": "CLITrigger"
|
|
121
|
+
"repo": "CLITrigger",
|
|
122
|
+
"releaseType": "release"
|
|
120
123
|
}
|
|
121
124
|
],
|
|
122
125
|
"files": [
|
|
@@ -138,19 +141,43 @@
|
|
|
138
141
|
"mac": {
|
|
139
142
|
"category": "public.app-category.developer-tools",
|
|
140
143
|
"target": [
|
|
141
|
-
{
|
|
142
|
-
|
|
144
|
+
{
|
|
145
|
+
"target": "dmg",
|
|
146
|
+
"arch": [
|
|
147
|
+
"x64",
|
|
148
|
+
"arm64"
|
|
149
|
+
]
|
|
150
|
+
},
|
|
151
|
+
{
|
|
152
|
+
"target": "zip",
|
|
153
|
+
"arch": [
|
|
154
|
+
"x64",
|
|
155
|
+
"arm64"
|
|
156
|
+
]
|
|
157
|
+
}
|
|
143
158
|
]
|
|
144
159
|
},
|
|
145
160
|
"win": {
|
|
146
161
|
"target": [
|
|
147
|
-
{
|
|
148
|
-
|
|
162
|
+
{
|
|
163
|
+
"target": "nsis",
|
|
164
|
+
"arch": [
|
|
165
|
+
"x64"
|
|
166
|
+
]
|
|
167
|
+
},
|
|
168
|
+
{
|
|
169
|
+
"target": "portable",
|
|
170
|
+
"arch": [
|
|
171
|
+
"x64"
|
|
172
|
+
]
|
|
173
|
+
}
|
|
149
174
|
]
|
|
150
175
|
},
|
|
151
176
|
"linux": {
|
|
152
177
|
"category": "Development",
|
|
153
|
-
"target": [
|
|
178
|
+
"target": [
|
|
179
|
+
"AppImage"
|
|
180
|
+
]
|
|
154
181
|
},
|
|
155
182
|
"nsis": {
|
|
156
183
|
"oneClick": false,
|