memento-mcp-server 1.33.0 → 1.34.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/dist/node_modules/@memento/core/package.json +1 -1
- package/dist/server/http-server.d.ts.map +1 -1
- package/dist/server/http-server.js +11 -2
- package/dist/server/http-server.js.map +1 -1
- package/dist/server/middleware/http-audit.middleware.d.ts +1 -0
- package/dist/server/middleware/http-audit.middleware.d.ts.map +1 -1
- package/dist/server/middleware/http-audit.middleware.js +1 -1
- package/dist/server/middleware/http-audit.middleware.js.map +1 -1
- package/dist/server/middleware/http-rate-limit.middleware.d.ts +18 -1
- package/dist/server/middleware/http-rate-limit.middleware.d.ts.map +1 -1
- package/dist/server/middleware/http-rate-limit.middleware.js +59 -2
- package/dist/server/middleware/http-rate-limit.middleware.js.map +1 -1
- package/dist/server/middleware/index.d.ts +2 -1
- package/dist/server/middleware/index.d.ts.map +1 -1
- package/dist/server/middleware/index.js +2 -1
- package/dist/server/middleware/index.js.map +1 -1
- package/dist/server/middleware/session-auth.middleware.d.ts +6 -0
- package/dist/server/middleware/session-auth.middleware.d.ts.map +1 -1
- package/dist/server/middleware/session-auth.middleware.js +6 -1
- package/dist/server/middleware/session-auth.middleware.js.map +1 -1
- package/dist/server/middleware/trust-proxy.d.ts +20 -0
- package/dist/server/middleware/trust-proxy.d.ts.map +1 -0
- package/dist/server/middleware/trust-proxy.js +53 -0
- package/dist/server/middleware/trust-proxy.js.map +1 -0
- package/package.json +1 -1
- package/static/js/jobs-panel-fetch.js +56 -11
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-server.d.ts","sourceRoot":"","sources":["../../src/server/http-server.ts"],"names":[],"mappings":";AACA;;;GAGG;AAEH,OAAO,EAeL,KAAK,cAAc,EACpB,MAAM,eAAe,CAAC;AACvB,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AAEtC,OAAO,OAAO,MAAM,SAAS,CAAC;AAG9B,OAAO,EAAgB,KAAK,MAAM,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"http-server.d.ts","sourceRoot":"","sources":["../../src/server/http-server.ts"],"names":[],"mappings":";AACA;;;GAGG;AAEH,OAAO,EAeL,KAAK,cAAc,EACpB,MAAM,eAAe,CAAC;AACvB,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AAEtC,OAAO,OAAO,MAAM,SAAS,CAAC;AAG9B,OAAO,EAAgB,KAAK,MAAM,EAAE,MAAM,MAAM,CAAC;AAqDjD,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC;IAC5B,cAAc,EAAE,cAAc,CAAC;CAChC,CAAC;AAIF,KAAK,gBAAgB,GAAG;IACtB,QAAQ,EAAE,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC;IACnC,cAAc,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;IACvC,YAAY,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC;IAC9C,kBAAkB,CAAC,EAAE,cAAc,CAAC,oBAAoB,CAAC,CAAC;IAC1D,gBAAgB,CAAC,EAAE,cAAc,CAAC,kBAAkB,CAAC,CAAC;CACvD,CAAC;AAoCF,QAAA,MAAM,MAAM,qFAAoB,CAAC;AAyGjC,wBAAgB,2BAA2B,IAAI,MAAM,CAEpD;AAED,wBAAgB,iCAAiC,IAAI,MAAM,CAE1D;AAwND,wBAAsB,OAAO,kBAU5B;AAYD,kEAAkE;AAClE,wBAAsB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,CAgBrD;AAGD,wBAAsB,WAAW,CAAC,IAAI,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,CAyGhF;AAED,eAAO,MAAM,MAAM,EAAE;IACnB,mBAAmB,EAAE,CAAC,IAAI,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACtD,gBAAgB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC;IAClC,SAAS,EAAE,MAAM,OAAO,MAAM,CAAC;IAC/B,WAAW,EAAE,MAAM,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC;IAC5C,eAAe,EAAE,MAAM,cAAc,CAAC,cAAc,CAAC,CAAC;IACtD,qBAAqB,EAAE,MAAM,cAAc,CAAC,oBAAoB,CAAC,CAAC;IAClE,mBAAmB,EAAE,MAAM,cAAc,CAAC,kBAAkB,CAAC,CAAC;IAC9D,8BAA8B,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;CAW/D,CAAC"}
|
|
@@ -30,7 +30,7 @@ import { createQualityRouter } from './routes/quality.routes.js';
|
|
|
30
30
|
import { createToolsRouter } from './routes/tools.routes.js';
|
|
31
31
|
import { subscribeAnchorMapBroadcast } from './handlers/anchor-map.handler.js';
|
|
32
32
|
import { createApiTokenRegistry } from './auth/api-token-registry.js';
|
|
33
|
-
import { createAdminAuthMiddleware, createAdminRateLimitMiddleware, createHttpAuditMiddleware, createStrictAuditCoverageMiddleware, createOwnerScopeMiddleware, createProgrammaticAuthMiddleware, createServiceInjector, createSessionAuthMiddleware, createToolContextMiddleware, createToolsRateLimitMiddleware, errorHandler } from './middleware/index.js';
|
|
33
|
+
import { createAdminAuthMiddleware, createAdminRateLimitMiddleware, createHttpAuditMiddleware, createStrictAuditCoverageMiddleware, createOwnerScopeMiddleware, createProgrammaticAuthMiddleware, createServiceInjector, createSessionAuthMiddleware, createToolContextMiddleware, createToolsRateLimitMiddleware, resolveTrustProxySetting, DASHBOARD_SESSION_COOKIE_NAME, errorHandler } from './middleware/index.js';
|
|
34
34
|
import { createRuntimeDiagnosticsWriter, performCleanup, registerCleanupHandlers, } from './http-server-lifecycle.js';
|
|
35
35
|
import { setupWebSocketServer } from './http-server-websocket.js';
|
|
36
36
|
// 전역 변수 (서비스는 serverServices로만 접근)
|
|
@@ -58,6 +58,16 @@ const writeRuntimeDiagnosticsEvent = createRuntimeDiagnosticsWriter(() => server
|
|
|
58
58
|
const staticRoot = resolveStaticRoot();
|
|
59
59
|
// Express 앱 생성
|
|
60
60
|
const app = express();
|
|
61
|
+
// 프록시 신뢰 설정 (#1161): 미설정이면 Express 기본값 false 를 유지해 X-Forwarded-For 를
|
|
62
|
+
// 무시한다. 헤더를 신뢰하는 순간 rate limit 키를 위조할 수 있으므로 기본으로 켜지 않는다.
|
|
63
|
+
const trustProxy = resolveTrustProxySetting();
|
|
64
|
+
if (trustProxy.warning) {
|
|
65
|
+
logger.warn(trustProxy.warning);
|
|
66
|
+
}
|
|
67
|
+
if (trustProxy.setting !== undefined) {
|
|
68
|
+
app.set('trust proxy', trustProxy.setting);
|
|
69
|
+
logger.info('trust proxy 설정 적용', { trustProxy: trustProxy.setting });
|
|
70
|
+
}
|
|
61
71
|
const server = createServer(app);
|
|
62
72
|
// HTTP 보안 헤더 (FR-005/FR-006): 모든 응답에 OWASP 최소 보안 헤더 추가
|
|
63
73
|
// D3.js는 npm 의존성에서 직접 서빙하므로 scriptSrc는 'self'만 허용한다 (#874)
|
|
@@ -142,7 +152,6 @@ let adminRouter = null;
|
|
|
142
152
|
let apiRouter = null;
|
|
143
153
|
let mcpRouter = null;
|
|
144
154
|
let authRouter = null;
|
|
145
|
-
const DASHBOARD_SESSION_COOKIE_NAME = 'memento_admin_session';
|
|
146
155
|
const DASHBOARD_SESSION_IDLE_TTL_MS = 15 * 60 * 1000;
|
|
147
156
|
const DASHBOARD_SESSION_ABSOLUTE_TTL_MS = 8 * 60 * 60 * 1000;
|
|
148
157
|
const HTTP_AUTH_TRUST_MODEL_NOTICE = 'HTTP trust model: /auth/session starts the browser-session cookie flow; /admin and /api require a browser session; /api/v1/quality and /api/v1/maintenance require admin:destructive scope; /api/v1/agent, /tools, /mcp, and /messages require tools:invoke scope (Authorization Bearer or X-API-Key).';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-server.js","sourceRoot":"","sources":["../../src/server/http-server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"http-server.js","sourceRoot":"","sources":["../../src/server/http-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,7 @@ export type StrictAuditCoverageMiddlewareConfig = {
|
|
|
21
21
|
database: Database.Database;
|
|
22
22
|
transport?: AuditTransport;
|
|
23
23
|
};
|
|
24
|
+
export declare function readAuthCredential(req: Request): string | null;
|
|
24
25
|
export declare function resolveHttpAuditKeyId(req: Request): string;
|
|
25
26
|
export declare function extractHttpAuditToolName(req: Request): string | null;
|
|
26
27
|
export declare function createHttpAuditMiddleware(config?: HttpAuditMiddlewareConfig): RequestHandler;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-audit.middleware.d.ts","sourceRoot":"","sources":["../../../src/server/middleware/http-audit.middleware.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,KAAK,cAAc,EAEpB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAgB,OAAO,EAAE,cAAc,EAAY,MAAM,SAAS,CAAC;AAE/E,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC;IACxC,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC;IAC7B,SAAS,CAAC,EAAE,cAAc,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG;IAChD,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC;IAC5B,SAAS,CAAC,EAAE,cAAc,CAAC;CAC5B,CAAC;
|
|
1
|
+
{"version":3,"file":"http-audit.middleware.d.ts","sourceRoot":"","sources":["../../../src/server/middleware/http-audit.middleware.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,KAAK,cAAc,EAEpB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAgB,OAAO,EAAE,cAAc,EAAY,MAAM,SAAS,CAAC;AAE/E,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC;IACxC,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC;IAC7B,SAAS,CAAC,EAAE,cAAc,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG;IAChD,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC;IAC5B,SAAS,CAAC,EAAE,cAAc,CAAC;CAC5B,CAAC;AAeF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAc9D;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAqB1D;AAUD,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAYpE;AAsED,wBAAgB,yBAAyB,CAAC,MAAM,GAAE,yBAA8B,GAAG,cAAc,CAiEhG;AAED,gFAAgF;AAChF,wBAAgB,2BAA2B,CACzC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,GACtB,IAAI,CAmBN;AAED;;;;GAIG;AACH,wBAAgB,mCAAmC,CAAC,MAAM,EAAE,mCAAmC,GAAG,cAAc,CA8B/G"}
|
|
@@ -13,7 +13,7 @@ function resolveAuditLogPath(override) {
|
|
|
13
13
|
}
|
|
14
14
|
return join(dirname(mementoConfig.dbPath), 'http-audit.jsonl');
|
|
15
15
|
}
|
|
16
|
-
function readAuthCredential(req) {
|
|
16
|
+
export function readAuthCredential(req) {
|
|
17
17
|
const authHeader = req.headers.authorization;
|
|
18
18
|
if (typeof authHeader === 'string' && authHeader.startsWith('Bearer ')) {
|
|
19
19
|
const token = authHeader.slice(7).trim();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-audit.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/http-audit.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,YAAY,EACZ,mBAAmB,EAGnB,aAAa,GACd,MAAM,eAAe,CAAC;AA2BvB,MAAM,kBAAkB,GAAG,aAAa,CAAC;AAEzC,SAAS,mBAAmB,CAAC,QAAiB;IAC5C,MAAM,UAAU,GAAG,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,IAAI,EAAE,CAAC;IAC/E,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC,MAAM,EAAE,sBAAsB,OAAO,CAAC,GAAG,QAAQ,CAAC,CAAC;IACjE,CAAC;IACD,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAC,CAAC;AACjE,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"http-audit.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/http-audit.middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,22 @@
|
|
|
1
|
-
import type { RequestHandler } from 'express';
|
|
1
|
+
import type { Request, RequestHandler } from 'express';
|
|
2
2
|
export declare function isHttpRateLimitDisabled(): boolean;
|
|
3
|
+
/**
|
|
4
|
+
* Issue #1161: express-rate-limit 의 기본 키는 `req.ip` 하나다. Docker 포트 퍼블리싱이나
|
|
5
|
+
* 리버스 프록시 뒤에서는 모든 클라이언트가 같은 출발지로 보여 서버 전체가 버킷 1개가 된다
|
|
6
|
+
* (한 브라우저 탭이 예산을 태우면 다른 기기까지 429).
|
|
7
|
+
*
|
|
8
|
+
* 그래서 이미 있는 신원 정보를 먼저 쓴다 — 우선순위는 감사 로그(`resolveHttpAuditKeyId`)와
|
|
9
|
+
* 같지만, 브라우저 세션은 `'session'` 상수로 뭉치지 않고 **세션 id 해시**까지 내려간다.
|
|
10
|
+
* 서로 다른 세션은 독립 예산을, 같은 세션의 여러 탭은 한 예산을 쓴다.
|
|
11
|
+
*
|
|
12
|
+
* rate limit 은 인증 **앞**에 있으므로(무인증 폭주 차단) `req.programmaticAuth` 가 아직
|
|
13
|
+
* 없는 경우가 많다. 자격증명 원문에서 직접 키를 만들되 해시만 저장한다.
|
|
14
|
+
*/
|
|
15
|
+
export declare function resolveRateLimitKey(req: Request): string;
|
|
3
16
|
export declare function createToolsRateLimitMiddleware(): RequestHandler;
|
|
17
|
+
/**
|
|
18
|
+
* Admin routes use two independent buckets keyed by HTTP method (#1158):
|
|
19
|
+
* reads get a dashboard-sized budget, writes keep the tighter one.
|
|
20
|
+
*/
|
|
4
21
|
export declare function createAdminRateLimitMiddleware(): RequestHandler;
|
|
5
22
|
//# sourceMappingURL=http-rate-limit.middleware.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-rate-limit.middleware.d.ts","sourceRoot":"","sources":["../../../src/server/middleware/http-rate-limit.middleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"http-rate-limit.middleware.d.ts","sourceRoot":"","sources":["../../../src/server/middleware/http-rate-limit.middleware.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAgB,OAAO,EAAE,cAAc,EAAY,MAAM,SAAS,CAAC;AAuB/E,wBAAgB,uBAAuB,IAAI,OAAO,CAEjD;AAMD;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAmBxD;AA+CD,wBAAgB,8BAA8B,IAAI,cAAc,CAE/D;AAED;;;GAGG;AACH,wBAAgB,8BAA8B,IAAI,cAAc,CAkB/D"}
|
|
@@ -1,8 +1,50 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { createHash } from 'node:crypto';
|
|
2
|
+
import rateLimit, { ipKeyGenerator } from 'express-rate-limit';
|
|
3
|
+
import { readAuthCredential } from './http-audit.middleware.js';
|
|
4
|
+
import { DASHBOARD_SESSION_COOKIE_NAME, readCookie } from './session-auth.middleware.js';
|
|
2
5
|
const FIFTEEN_MINUTES_MS = 15 * 60 * 1000;
|
|
6
|
+
/**
|
|
7
|
+
* Issue #1158: the dashboard fans a single page view out over many GET /admin/*
|
|
8
|
+
* calls (status, batch stats/runs/logs, review candidates, graph, embedding map…),
|
|
9
|
+
* so reads and writes cannot share one budget — otherwise browsing exhausts it and
|
|
10
|
+
* the operator can no longer trigger a job.
|
|
11
|
+
*/
|
|
12
|
+
const ADMIN_READ_METHODS = new Set(['GET', 'HEAD', 'OPTIONS']);
|
|
3
13
|
export function isHttpRateLimitDisabled() {
|
|
4
14
|
return process.env.NODE_ENV === 'test' || process.env.MEMENTO_HTTP_RATE_LIMIT_DISABLED === '1';
|
|
5
15
|
}
|
|
16
|
+
function hashIdentity(value) {
|
|
17
|
+
return createHash('sha256').update(value).digest('hex').slice(0, 16);
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Issue #1161: express-rate-limit 의 기본 키는 `req.ip` 하나다. Docker 포트 퍼블리싱이나
|
|
21
|
+
* 리버스 프록시 뒤에서는 모든 클라이언트가 같은 출발지로 보여 서버 전체가 버킷 1개가 된다
|
|
22
|
+
* (한 브라우저 탭이 예산을 태우면 다른 기기까지 429).
|
|
23
|
+
*
|
|
24
|
+
* 그래서 이미 있는 신원 정보를 먼저 쓴다 — 우선순위는 감사 로그(`resolveHttpAuditKeyId`)와
|
|
25
|
+
* 같지만, 브라우저 세션은 `'session'` 상수로 뭉치지 않고 **세션 id 해시**까지 내려간다.
|
|
26
|
+
* 서로 다른 세션은 독립 예산을, 같은 세션의 여러 탭은 한 예산을 쓴다.
|
|
27
|
+
*
|
|
28
|
+
* rate limit 은 인증 **앞**에 있으므로(무인증 폭주 차단) `req.programmaticAuth` 가 아직
|
|
29
|
+
* 없는 경우가 많다. 자격증명 원문에서 직접 키를 만들되 해시만 저장한다.
|
|
30
|
+
*/
|
|
31
|
+
export function resolveRateLimitKey(req) {
|
|
32
|
+
const programmaticKeyId = req.programmaticAuth?.keyId?.trim();
|
|
33
|
+
if (programmaticKeyId) {
|
|
34
|
+
return `key:${programmaticKeyId}`;
|
|
35
|
+
}
|
|
36
|
+
const credential = readAuthCredential(req);
|
|
37
|
+
if (credential) {
|
|
38
|
+
return `key:${hashIdentity(credential)}`;
|
|
39
|
+
}
|
|
40
|
+
const sessionId = readCookie(req.headers.cookie, DASHBOARD_SESSION_COOKIE_NAME);
|
|
41
|
+
if (sessionId) {
|
|
42
|
+
return `session:${hashIdentity(sessionId)}`;
|
|
43
|
+
}
|
|
44
|
+
// 미인증 요청만 IP 로 떨어진다. `req.ip` 가 프록시 헤더를 반영할지는 `trust proxy`
|
|
45
|
+
// 설정이 결정한다 — 미설정이면 X-Forwarded-For 를 무시한다 (trust-proxy.ts).
|
|
46
|
+
return `ip:${ipKeyGenerator(req.ip ?? '')}`;
|
|
47
|
+
}
|
|
6
48
|
function parseRateLimitMax(envValue, defaultMax) {
|
|
7
49
|
if (!envValue?.trim()) {
|
|
8
50
|
return defaultMax;
|
|
@@ -34,13 +76,28 @@ function createBucketRateLimitMiddleware(bucket, defaultMax, envKey) {
|
|
|
34
76
|
limit: max,
|
|
35
77
|
standardHeaders: true,
|
|
36
78
|
legacyHeaders: false,
|
|
79
|
+
keyGenerator: resolveRateLimitKey,
|
|
37
80
|
handler: createRateLimitHandler(bucket),
|
|
38
81
|
});
|
|
39
82
|
}
|
|
40
83
|
export function createToolsRateLimitMiddleware() {
|
|
41
84
|
return createBucketRateLimitMiddleware('tools', 100, 'MEMENTO_HTTP_RATE_LIMIT_TOOLS');
|
|
42
85
|
}
|
|
86
|
+
/**
|
|
87
|
+
* Admin routes use two independent buckets keyed by HTTP method (#1158):
|
|
88
|
+
* reads get a dashboard-sized budget, writes keep the tighter one.
|
|
89
|
+
*/
|
|
43
90
|
export function createAdminRateLimitMiddleware() {
|
|
44
|
-
|
|
91
|
+
if (isHttpRateLimitDisabled()) {
|
|
92
|
+
return (_req, _res, next) => {
|
|
93
|
+
next();
|
|
94
|
+
};
|
|
95
|
+
}
|
|
96
|
+
const readLimit = createBucketRateLimitMiddleware('admin_read', 300, 'MEMENTO_HTTP_RATE_LIMIT_ADMIN_READ');
|
|
97
|
+
const writeLimit = createBucketRateLimitMiddleware('admin', 30, 'MEMENTO_HTTP_RATE_LIMIT_ADMIN');
|
|
98
|
+
return (req, res, next) => {
|
|
99
|
+
const limiter = ADMIN_READ_METHODS.has(req.method) ? readLimit : writeLimit;
|
|
100
|
+
limiter(req, res, next);
|
|
101
|
+
};
|
|
45
102
|
}
|
|
46
103
|
//# sourceMappingURL=http-rate-limit.middleware.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-rate-limit.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/http-rate-limit.middleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"http-rate-limit.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/http-rate-limit.middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,10 +5,11 @@
|
|
|
5
5
|
export { createServiceInjector } from './service-injector.middleware.js';
|
|
6
6
|
export { createToolContextMiddleware } from './tool-context.middleware.js';
|
|
7
7
|
export { createAdminAuthMiddleware } from './admin-auth.middleware.js';
|
|
8
|
-
export { createSessionAuthMiddleware } from './session-auth.middleware.js';
|
|
8
|
+
export { createSessionAuthMiddleware, DASHBOARD_SESSION_COOKIE_NAME, } from './session-auth.middleware.js';
|
|
9
9
|
export { createOwnerScopeMiddleware } from './owner-scope.middleware.js';
|
|
10
10
|
export { createProgrammaticAuthMiddleware } from './programmatic-auth.middleware.js';
|
|
11
11
|
export { createHttpAuditMiddleware, createStrictAuditCoverageMiddleware } from './http-audit.middleware.js';
|
|
12
12
|
export { createAdminRateLimitMiddleware, createToolsRateLimitMiddleware, isHttpRateLimitDisabled, } from './http-rate-limit.middleware.js';
|
|
13
|
+
export { resolveTrustProxySetting, type TrustProxyResolution } from './trust-proxy.js';
|
|
13
14
|
export { errorHandler, asyncHandler } from './error-handler.middleware.js';
|
|
14
15
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/server/middleware/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/server/middleware/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EACL,2BAA2B,EAC3B,6BAA6B,GAC9B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,gCAAgC,EAAE,MAAM,mCAAmC,CAAC;AACrF,OAAO,EAAE,yBAAyB,EAAE,mCAAmC,EAAE,MAAM,4BAA4B,CAAC;AAC5G,OAAO,EACL,8BAA8B,EAC9B,8BAA8B,EAC9B,uBAAuB,GACxB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,wBAAwB,EAAE,KAAK,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACvF,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC"}
|
|
@@ -5,10 +5,11 @@
|
|
|
5
5
|
export { createServiceInjector } from './service-injector.middleware.js';
|
|
6
6
|
export { createToolContextMiddleware } from './tool-context.middleware.js';
|
|
7
7
|
export { createAdminAuthMiddleware } from './admin-auth.middleware.js';
|
|
8
|
-
export { createSessionAuthMiddleware } from './session-auth.middleware.js';
|
|
8
|
+
export { createSessionAuthMiddleware, DASHBOARD_SESSION_COOKIE_NAME, } from './session-auth.middleware.js';
|
|
9
9
|
export { createOwnerScopeMiddleware } from './owner-scope.middleware.js';
|
|
10
10
|
export { createProgrammaticAuthMiddleware } from './programmatic-auth.middleware.js';
|
|
11
11
|
export { createHttpAuditMiddleware, createStrictAuditCoverageMiddleware } from './http-audit.middleware.js';
|
|
12
12
|
export { createAdminRateLimitMiddleware, createToolsRateLimitMiddleware, isHttpRateLimitDisabled, } from './http-rate-limit.middleware.js';
|
|
13
|
+
export { resolveTrustProxySetting } from './trust-proxy.js';
|
|
13
14
|
export { errorHandler, asyncHandler } from './error-handler.middleware.js';
|
|
14
15
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/middleware/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/middleware/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EACL,2BAA2B,EAC3B,6BAA6B,GAC9B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,gCAAgC,EAAE,MAAM,mCAAmC,CAAC;AACrF,OAAO,EAAE,yBAAyB,EAAE,mCAAmC,EAAE,MAAM,4BAA4B,CAAC;AAC5G,OAAO,EACL,8BAA8B,EAC9B,8BAA8B,EAC9B,uBAAuB,GACxB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,wBAAwB,EAA6B,MAAM,kBAAkB,CAAC;AACvF,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC"}
|
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
import type { NextFunction, Request, Response } from 'express';
|
|
2
2
|
import type { SessionStore } from '../auth/session-store.js';
|
|
3
|
+
/**
|
|
4
|
+
* 대시보드 세션 쿠키 이름. rate limit 키 생성(#1161)·감사 로그도 같은 쿠키를 읽으므로
|
|
5
|
+
* 리터럴을 흩뿌리지 않고 여기서 내보낸다.
|
|
6
|
+
*/
|
|
7
|
+
export declare const DASHBOARD_SESSION_COOKIE_NAME = "memento_admin_session";
|
|
3
8
|
export type SessionAuthMiddlewareConfig = {
|
|
4
9
|
store: SessionStore;
|
|
5
10
|
cookieName: string;
|
|
6
11
|
};
|
|
12
|
+
export declare function readCookie(cookieHeader: string | undefined, cookieName: string): string | null;
|
|
7
13
|
export declare function createSessionAuthMiddleware(config: SessionAuthMiddlewareConfig): (req: Request, res: Response, next: NextFunction) => void;
|
|
8
14
|
//# sourceMappingURL=session-auth.middleware.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-auth.middleware.d.ts","sourceRoot":"","sources":["../../../src/server/middleware/session-auth.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE7D,MAAM,MAAM,2BAA2B,GAAG;IACxC,KAAK,EAAE,YAAY,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;
|
|
1
|
+
{"version":3,"file":"session-auth.middleware.d.ts","sourceRoot":"","sources":["../../../src/server/middleware/session-auth.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;;GAGG;AACH,eAAO,MAAM,6BAA6B,0BAA0B,CAAC;AAErE,MAAM,MAAM,2BAA2B,GAAG;IACxC,KAAK,EAAE,YAAY,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,wBAAgB,UAAU,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAa9F;AAUD,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,2BAA2B,IACrE,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,IAAI,CAe/D"}
|
|
@@ -1,4 +1,9 @@
|
|
|
1
|
-
|
|
1
|
+
/**
|
|
2
|
+
* 대시보드 세션 쿠키 이름. rate limit 키 생성(#1161)·감사 로그도 같은 쿠키를 읽으므로
|
|
3
|
+
* 리터럴을 흩뿌리지 않고 여기서 내보낸다.
|
|
4
|
+
*/
|
|
5
|
+
export const DASHBOARD_SESSION_COOKIE_NAME = 'memento_admin_session';
|
|
6
|
+
export function readCookie(cookieHeader, cookieName) {
|
|
2
7
|
if (!cookieHeader) {
|
|
3
8
|
return null;
|
|
4
9
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-auth.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/session-auth.middleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session-auth.middleware.js","sourceRoot":"","sources":["../../../src/server/middleware/session-auth.middleware.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG,uBAAuB,CAAC;AAOrE,MAAM,UAAU,UAAU,CAAC,YAAgC,EAAE,UAAkB;IAC7E,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,MAAM,UAAU,IAAI,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACjD,MAAM,CAAC,IAAI,EAAE,GAAG,UAAU,CAAC,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3D,IAAI,IAAI,KAAK,UAAU,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjD,OAAO,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QACrC,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAa;IACtC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;QACnB,KAAK,EAAE,cAAc;QACrB,OAAO,EAAE,gDAAgD;QACzD,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;KACpC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,MAAmC;IAC7E,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAQ,EAAE;QAC/D,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QACpE,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,iBAAiB,CAAC,GAAG,CAAC,CAAC;YACvB,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,iBAAiB,CAAC,GAAG,CAAC,CAAC;YACvB,OAAO;QACT,CAAC;QAED,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Issue #1161: Express 기본값은 `trust proxy: false` 라 `req.ip` 가 소켓 원격 주소다.
|
|
3
|
+
*
|
|
4
|
+
* - 리버스 프록시(nginx) 뒤에서는 모든 클라이언트의 `req.ip` 가 프록시 컨테이너 IP 하나로
|
|
5
|
+
* 합쳐진다 → 미인증 몫의 rate limit 이 전원 공유 버킷이 된다.
|
|
6
|
+
* - 반대로 무조건 `true` 로 켜면 누구나 `X-Forwarded-For` 를 위조해 rate limit 키를 바꿔
|
|
7
|
+
* 한도를 우회할 수 있다.
|
|
8
|
+
*
|
|
9
|
+
* 그래서 기본값은 `false`(헤더 무시)를 유지하고, 운영자가 `MEMENTO_TRUST_PROXY` 로
|
|
10
|
+
* 명시할 때만 켠다. 허용 형식은 Express `trust proxy` 와 같다 — 홉 수(`1`),
|
|
11
|
+
* 프리셋(`loopback`·`linklocal`·`uniquelocal`), IP/CIDR 목록(쉼표 구분), `true`/`false`.
|
|
12
|
+
*/
|
|
13
|
+
export type TrustProxyResolution = {
|
|
14
|
+
/** `undefined` 면 호출부가 `app.set` 을 하지 않는다 — Express 기본값 `false` 유지. */
|
|
15
|
+
setting?: boolean | number | string;
|
|
16
|
+
/** 운영자에게 알릴 경고. 값이 위험하거나 해석 불가일 때만 채워진다. */
|
|
17
|
+
warning?: string;
|
|
18
|
+
};
|
|
19
|
+
export declare function resolveTrustProxySetting(raw?: string | undefined): TrustProxyResolution;
|
|
20
|
+
//# sourceMappingURL=trust-proxy.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"trust-proxy.d.ts","sourceRoot":"","sources":["../../../src/server/middleware/trust-proxy.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,sEAAsE;IACtE,OAAO,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;IACpC,4CAA4C;IAC5C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AA+BF,wBAAgB,wBAAwB,CACtC,GAAG,GAAE,MAAM,GAAG,SAA2C,GACxD,oBAAoB,CAkCtB"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { isIP } from 'node:net';
|
|
2
|
+
const NAMED_PRESETS = new Set(['loopback', 'linklocal', 'uniquelocal']);
|
|
3
|
+
/** `10.0.0.0/8`·`::1` 처럼 Express 가 받는 단일 토큰인지 검사한다. */
|
|
4
|
+
function isTrustedAddressToken(token) {
|
|
5
|
+
if (NAMED_PRESETS.has(token)) {
|
|
6
|
+
return true;
|
|
7
|
+
}
|
|
8
|
+
const [address, prefix, ...rest] = token.split('/');
|
|
9
|
+
if (rest.length > 0 || address === undefined) {
|
|
10
|
+
return false;
|
|
11
|
+
}
|
|
12
|
+
const family = isIP(address);
|
|
13
|
+
if (family === 0) {
|
|
14
|
+
return false;
|
|
15
|
+
}
|
|
16
|
+
if (prefix === undefined) {
|
|
17
|
+
return true;
|
|
18
|
+
}
|
|
19
|
+
if (!/^\d{1,3}$/.test(prefix)) {
|
|
20
|
+
return false;
|
|
21
|
+
}
|
|
22
|
+
return Number.parseInt(prefix, 10) <= (family === 6 ? 128 : 32);
|
|
23
|
+
}
|
|
24
|
+
export function resolveTrustProxySetting(raw = process.env.MEMENTO_TRUST_PROXY) {
|
|
25
|
+
const value = raw?.trim();
|
|
26
|
+
if (!value) {
|
|
27
|
+
return {};
|
|
28
|
+
}
|
|
29
|
+
const lowered = value.toLowerCase();
|
|
30
|
+
if (lowered === 'false' || lowered === 'off') {
|
|
31
|
+
return { setting: false };
|
|
32
|
+
}
|
|
33
|
+
if (lowered === 'true' || lowered === 'on') {
|
|
34
|
+
return {
|
|
35
|
+
setting: true,
|
|
36
|
+
warning: 'MEMENTO_TRUST_PROXY=true 는 모든 X-Forwarded-For 를 신뢰합니다. 누구나 헤더를 위조해 rate limit 을 우회할 수 있으므로 홉 수(예: 1)나 프록시 IP/CIDR 를 지정하세요.',
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
if (/^\d+$/.test(lowered)) {
|
|
40
|
+
return { setting: Number.parseInt(lowered, 10) };
|
|
41
|
+
}
|
|
42
|
+
const tokens = lowered
|
|
43
|
+
.split(',')
|
|
44
|
+
.map((token) => token.trim())
|
|
45
|
+
.filter((token) => token !== '');
|
|
46
|
+
if (tokens.length > 0 && tokens.every(isTrustedAddressToken)) {
|
|
47
|
+
return { setting: tokens.join(', ') };
|
|
48
|
+
}
|
|
49
|
+
return {
|
|
50
|
+
warning: `MEMENTO_TRUST_PROXY 값을 해석할 수 없어 무시합니다(X-Forwarded-For 미신뢰): "${value}". 홉 수·loopback/linklocal/uniquelocal·IP/CIDR 목록만 허용합니다.`,
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
//# sourceMappingURL=trust-proxy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"trust-proxy.js","sourceRoot":"","sources":["../../../src/server/middleware/trust-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAqBhC,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC;AAExE,uDAAuD;AACvD,SAAS,qBAAqB,CAAC,KAAa;IAC1C,IAAI,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACpD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC7C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7B,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;QACjB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,MAA0B,OAAO,CAAC,GAAG,CAAC,mBAAmB;IAEzD,MAAM,KAAK,GAAG,GAAG,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IACpC,IAAI,OAAO,KAAK,OAAO,IAAI,OAAO,KAAK,KAAK,EAAE,CAAC;QAC7C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC5B,CAAC;IAED,IAAI,OAAO,KAAK,MAAM,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QAC3C,OAAO;YACL,OAAO,EAAE,IAAI;YACb,OAAO,EACL,4HAA4H;SAC/H,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC;IACnD,CAAC;IAED,MAAM,MAAM,GAAG,OAAO;SACnB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;SAC5B,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;IACnC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,EAAE,CAAC;QAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IACxC,CAAC;IAED,OAAO;QACL,OAAO,EAAE,gEAAgE,KAAK,0DAA0D;KACzI,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -10,6 +10,37 @@
|
|
|
10
10
|
return;
|
|
11
11
|
}
|
|
12
12
|
|
|
13
|
+
/**
|
|
14
|
+
* Issue #1158: 429 는 원문(`HTTP 429 for /admin/...`)을 그대로 보여주면
|
|
15
|
+
* 운영자가 언제 다시 시도할지 알 수 없다. 서버가 주는 재시도 대기시간을 쓴다.
|
|
16
|
+
*/
|
|
17
|
+
function retryAfterSeconds(response, data) {
|
|
18
|
+
const fromBody = data ? Number(data.retry_after_seconds) : NaN;
|
|
19
|
+
if (Number.isFinite(fromBody) && fromBody > 0) {
|
|
20
|
+
return Math.ceil(fromBody);
|
|
21
|
+
}
|
|
22
|
+
const headers = response && response.headers;
|
|
23
|
+
const header = headers && typeof headers.get === 'function' ? headers.get('Retry-After') : null;
|
|
24
|
+
const parsed = header ? Number.parseInt(header, 10) : NaN;
|
|
25
|
+
return Number.isFinite(parsed) && parsed > 0 ? parsed : null;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
function rateLimitMessage(response, data) {
|
|
29
|
+
const seconds = retryAfterSeconds(response, data);
|
|
30
|
+
if (seconds === null) {
|
|
31
|
+
return '요청이 너무 많습니다 — 잠시 후 다시 시도하세요.';
|
|
32
|
+
}
|
|
33
|
+
return '요청이 너무 많습니다 — ' + seconds + '초 후 다시 시도하세요.';
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
async function readJsonBody(response) {
|
|
37
|
+
try {
|
|
38
|
+
return await response.json();
|
|
39
|
+
} catch (_err) {
|
|
40
|
+
return {};
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
|
|
13
44
|
async function fetchJson(url) {
|
|
14
45
|
const response = await global.fetch(url, {
|
|
15
46
|
method: 'GET',
|
|
@@ -17,6 +48,9 @@
|
|
|
17
48
|
credentials: 'same-origin',
|
|
18
49
|
});
|
|
19
50
|
if (!response.ok) {
|
|
51
|
+
if (response.status === 429) {
|
|
52
|
+
throw new Error(rateLimitMessage(response, await readJsonBody(response)));
|
|
53
|
+
}
|
|
20
54
|
throw new Error('HTTP ' + response.status + ' for ' + url);
|
|
21
55
|
}
|
|
22
56
|
return response.json();
|
|
@@ -32,21 +66,24 @@
|
|
|
32
66
|
credentials: 'same-origin',
|
|
33
67
|
body: JSON.stringify(body),
|
|
34
68
|
});
|
|
35
|
-
|
|
36
|
-
try {
|
|
37
|
-
data = await response.json();
|
|
38
|
-
} catch (_err) {
|
|
39
|
-
data = {};
|
|
40
|
-
}
|
|
69
|
+
const data = await readJsonBody(response);
|
|
41
70
|
if (!response.ok) {
|
|
71
|
+
if (response.status === 429) {
|
|
72
|
+
throw new Error(rateLimitMessage(response, data));
|
|
73
|
+
}
|
|
42
74
|
const message = data.error || data.message || 'HTTP ' + response.status;
|
|
43
75
|
throw new Error(String(message));
|
|
44
76
|
}
|
|
45
77
|
return data;
|
|
46
78
|
}
|
|
47
79
|
|
|
80
|
+
/**
|
|
81
|
+
* @returns {Promise<'ok'|'failed'|'superseded'>} 호출자가 상태줄을 덮어써도 되는지 판단한다 (#1158).
|
|
82
|
+
*/
|
|
48
83
|
ns.refresh = async function () {
|
|
49
84
|
const generation = ++ns.state.refreshGeneration;
|
|
85
|
+
// loadLogs 가 자기 generation 을 올리므로 finally 의 generation 비교로는 로딩을 끌 수 없다.
|
|
86
|
+
let outcome = 'superseded';
|
|
50
87
|
ns.setStatus('새로고침 중…');
|
|
51
88
|
ns.setLoading(true);
|
|
52
89
|
try {
|
|
@@ -56,7 +93,7 @@
|
|
|
56
93
|
fetchJson(ns.buildRunsUrl(ns.state.selectedJob)),
|
|
57
94
|
]);
|
|
58
95
|
if (generation !== ns.state.refreshGeneration) {
|
|
59
|
-
return;
|
|
96
|
+
return outcome;
|
|
60
97
|
}
|
|
61
98
|
const stats = results[0] || {};
|
|
62
99
|
const history = results[1] || {};
|
|
@@ -76,19 +113,22 @@
|
|
|
76
113
|
ns.renderLogs([], null);
|
|
77
114
|
}
|
|
78
115
|
ns.setStatus('갱신 ' + (stats.timestamp || new Date().toISOString()));
|
|
116
|
+
outcome = 'ok';
|
|
79
117
|
} catch (err) {
|
|
80
118
|
if (generation !== ns.state.refreshGeneration) {
|
|
81
|
-
return;
|
|
119
|
+
return outcome;
|
|
82
120
|
}
|
|
83
121
|
// Keep prior successful snapshot; surface error only.
|
|
84
122
|
const message = err && err.message ? String(err.message) : '배치 작업 새로고침 실패';
|
|
85
123
|
ns.setError(message);
|
|
86
124
|
ns.setStatus('새로고침 실패 — 이전 스냅샷 유지');
|
|
125
|
+
outcome = 'failed';
|
|
87
126
|
} finally {
|
|
88
|
-
if (
|
|
127
|
+
if (outcome !== 'superseded') {
|
|
89
128
|
ns.setLoading(false);
|
|
90
129
|
}
|
|
91
130
|
}
|
|
131
|
+
return outcome;
|
|
92
132
|
};
|
|
93
133
|
|
|
94
134
|
/** Issue #833: click/select a schedule job row → fetch durable timeline for that job only. */
|
|
@@ -176,8 +216,13 @@
|
|
|
176
216
|
ns.state.writeInFlight = false;
|
|
177
217
|
ns.syncActionButtons();
|
|
178
218
|
}
|
|
179
|
-
|
|
180
|
-
ns.
|
|
219
|
+
// #1158: 갱신이 실패했는데도 '완료'로 덮으면 오류 배너와 상태줄이 서로 다른 말을 한다.
|
|
220
|
+
const outcome = await ns.refresh();
|
|
221
|
+
if (outcome === 'ok') {
|
|
222
|
+
ns.setStatus(statusLabel + ' 완료');
|
|
223
|
+
} else if (outcome === 'failed') {
|
|
224
|
+
ns.setStatus(statusLabel + ' 완료 — 화면 갱신 실패, 새로고침하세요');
|
|
225
|
+
}
|
|
181
226
|
}
|
|
182
227
|
|
|
183
228
|
ns.pauseSelectedJob = async function () {
|