@structured-world/gitlab-mcp 6.27.1 → 6.28.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/src/middleware/oauth-auth.js +7 -0
- package/dist/src/middleware/oauth-auth.js.map +1 -1
- package/dist/src/middleware/rate-limiter.js +40 -2
- package/dist/src/middleware/rate-limiter.js.map +1 -1
- package/dist/src/oauth/endpoints/authorize.js +21 -24
- package/dist/src/oauth/endpoints/authorize.js.map +1 -1
- package/dist/src/oauth/endpoints/token.js +22 -14
- package/dist/src/oauth/endpoints/token.js.map +1 -1
- package/dist/src/server.js +4 -4
- package/dist/src/server.js.map +1 -1
- package/dist/src/utils/request-logger.d.ts +24 -0
- package/dist/src/utils/request-logger.js +56 -0
- package/dist/src/utils/request-logger.js.map +1 -0
- package/dist/structured-world-gitlab-mcp-6.28.0.tgz +0 -0
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/dist/structured-world-gitlab-mcp-6.27.1.tgz +0 -0
|
@@ -9,6 +9,7 @@ const token_utils_1 = require("../oauth/token-utils");
|
|
|
9
9
|
const gitlab_device_flow_1 = require("../oauth/gitlab-device-flow");
|
|
10
10
|
const metadata_1 = require("../oauth/endpoints/metadata");
|
|
11
11
|
const logger_1 = require("../logger");
|
|
12
|
+
const request_logger_1 = require("../utils/request-logger");
|
|
12
13
|
async function oauthAuthMiddleware(req, res, next) {
|
|
13
14
|
const config = (0, config_1.loadOAuthConfig)();
|
|
14
15
|
if (!config) {
|
|
@@ -108,6 +109,12 @@ async function optionalOAuthMiddleware(req, res, next) {
|
|
|
108
109
|
next();
|
|
109
110
|
}
|
|
110
111
|
function sendUnauthorized(req, res, error, description) {
|
|
112
|
+
logger_1.logger.warn({
|
|
113
|
+
event: "auth_rejected",
|
|
114
|
+
...(0, request_logger_1.getMinimalRequestContext)(req),
|
|
115
|
+
reason: error,
|
|
116
|
+
description,
|
|
117
|
+
}, "Authentication rejected");
|
|
111
118
|
const response = {
|
|
112
119
|
error,
|
|
113
120
|
error_description: description,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-auth.js","sourceRoot":"","sources":["../../../src/middleware/oauth-auth.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"oauth-auth.js","sourceRoot":"","sources":["../../../src/middleware/oauth-auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ exports.rateLimiterMiddleware = rateLimiterMiddleware;
|
|
|
5
5
|
exports.getRateLimitStats = getRateLimitStats;
|
|
6
6
|
const config_1 = require("../config");
|
|
7
7
|
const logger_1 = require("../logger");
|
|
8
|
+
const request_logger_1 = require("../utils/request-logger");
|
|
8
9
|
const rateLimitStore = new Map();
|
|
9
10
|
const CLEANUP_INTERVAL_MS = 60000;
|
|
10
11
|
let cleanupInterval = null;
|
|
@@ -65,6 +66,7 @@ function checkRateLimit(key, windowMs, maxRequests) {
|
|
|
65
66
|
remaining: Math.max(0, maxRequests - entry.count),
|
|
66
67
|
resetAt: entry.resetAt,
|
|
67
68
|
total: maxRequests,
|
|
69
|
+
used: entry.count,
|
|
68
70
|
};
|
|
69
71
|
}
|
|
70
72
|
function setRateLimitHeaders(res, info) {
|
|
@@ -89,9 +91,25 @@ function rateLimiterMiddleware() {
|
|
|
89
91
|
const key = `session:${sessionId}`;
|
|
90
92
|
const info = checkRateLimit(key, config_1.RATE_LIMIT_SESSION_WINDOW_MS, config_1.RATE_LIMIT_SESSION_MAX_REQUESTS);
|
|
91
93
|
setRateLimitHeaders(res, info);
|
|
94
|
+
const usagePercent = (info.used / info.total) * 100;
|
|
95
|
+
if (info.allowed && usagePercent >= 80) {
|
|
96
|
+
const rateLimitInfo = (0, request_logger_1.buildRateLimitInfo)("session", sessionId, info.used, info.total, info.resetAt);
|
|
97
|
+
logger_1.logger.debug({
|
|
98
|
+
event: "rate_limit_warning",
|
|
99
|
+
...(0, request_logger_1.getMinimalRequestContext)(req),
|
|
100
|
+
rateLimit: rateLimitInfo,
|
|
101
|
+
}, "Approaching session rate limit threshold");
|
|
102
|
+
}
|
|
92
103
|
if (!info.allowed) {
|
|
93
104
|
const retryAfter = Math.ceil((info.resetAt - Date.now()) / 1000);
|
|
94
|
-
|
|
105
|
+
const rateLimitInfo = (0, request_logger_1.buildRateLimitInfo)("session", sessionId, info.used, info.total, info.resetAt);
|
|
106
|
+
logger_1.logger.warn({
|
|
107
|
+
event: "rate_limit_exceeded",
|
|
108
|
+
...(0, request_logger_1.getMinimalRequestContext)(req),
|
|
109
|
+
rateLimit: rateLimitInfo,
|
|
110
|
+
hasOAuthSession: !!res.locals.oauthSessionId,
|
|
111
|
+
hasMcpSessionHeader: !!req.headers["mcp-session-id"],
|
|
112
|
+
}, "Session rate limit exceeded");
|
|
95
113
|
res.set("Retry-After", retryAfter.toString());
|
|
96
114
|
res.status(429).json({
|
|
97
115
|
error: "Too Many Requests",
|
|
@@ -114,9 +132,29 @@ function rateLimiterMiddleware() {
|
|
|
114
132
|
const key = `ip:${ip}`;
|
|
115
133
|
const info = checkRateLimit(key, config_1.RATE_LIMIT_IP_WINDOW_MS, config_1.RATE_LIMIT_IP_MAX_REQUESTS);
|
|
116
134
|
setRateLimitHeaders(res, info);
|
|
135
|
+
const usagePercent = (info.used / info.total) * 100;
|
|
136
|
+
if (info.allowed && usagePercent >= 80) {
|
|
137
|
+
const rateLimitInfo = (0, request_logger_1.buildRateLimitInfo)("ip", ip, info.used, info.total, info.resetAt);
|
|
138
|
+
logger_1.logger.debug({
|
|
139
|
+
event: "rate_limit_warning",
|
|
140
|
+
...(0, request_logger_1.getMinimalRequestContext)(req),
|
|
141
|
+
rateLimit: rateLimitInfo,
|
|
142
|
+
authClassification: "anonymous",
|
|
143
|
+
authReason: "no OAuth session and no MCP-Session-Id header",
|
|
144
|
+
}, "Approaching IP rate limit threshold");
|
|
145
|
+
}
|
|
117
146
|
if (!info.allowed) {
|
|
118
147
|
const retryAfter = Math.ceil((info.resetAt - Date.now()) / 1000);
|
|
119
|
-
|
|
148
|
+
const rateLimitInfo = (0, request_logger_1.buildRateLimitInfo)("ip", ip, info.used, info.total, info.resetAt);
|
|
149
|
+
const mcpSessionHeader = req.headers["mcp-session-id"];
|
|
150
|
+
logger_1.logger.warn({
|
|
151
|
+
event: "rate_limit_exceeded",
|
|
152
|
+
...(0, request_logger_1.getMinimalRequestContext)(req),
|
|
153
|
+
rateLimit: rateLimitInfo,
|
|
154
|
+
authClassification: "anonymous",
|
|
155
|
+
authReason: "no OAuth session and no MCP-Session-Id header",
|
|
156
|
+
mcpSessionId: (0, request_logger_1.truncateId)(mcpSessionHeader),
|
|
157
|
+
}, "IP rate limit exceeded");
|
|
120
158
|
res.set("Retry-After", retryAfter.toString());
|
|
121
159
|
res.status(429).json({
|
|
122
160
|
error: "Too Many Requests",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limiter.js","sourceRoot":"","sources":["../../../src/middleware/rate-limiter.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"rate-limiter.js","sourceRoot":"","sources":["../../../src/middleware/rate-limiter.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,42 +8,28 @@ const gitlab_device_flow_1 = require("../gitlab-device-flow");
|
|
|
8
8
|
const token_utils_1 = require("../token-utils");
|
|
9
9
|
const metadata_1 = require("./metadata");
|
|
10
10
|
const logger_1 = require("../../logger");
|
|
11
|
+
const request_logger_1 = require("../../utils/request-logger");
|
|
11
12
|
async function authorizeHandler(req, res) {
|
|
12
13
|
const config = (0, config_1.loadOAuthConfig)();
|
|
13
14
|
if (!config) {
|
|
14
|
-
res
|
|
15
|
-
error: "server_error",
|
|
16
|
-
error_description: "OAuth not configured",
|
|
17
|
-
});
|
|
15
|
+
sendError(req, res, 500, "server_error", "OAuth not configured");
|
|
18
16
|
return;
|
|
19
17
|
}
|
|
20
18
|
const { client_id, redirect_uri, response_type, state, code_challenge, code_challenge_method } = req.query;
|
|
21
19
|
if (response_type !== "code") {
|
|
22
|
-
res
|
|
23
|
-
error: "unsupported_response_type",
|
|
24
|
-
error_description: 'Only "code" response type is supported',
|
|
25
|
-
});
|
|
20
|
+
sendError(req, res, 400, "unsupported_response_type", 'Only "code" response type is supported');
|
|
26
21
|
return;
|
|
27
22
|
}
|
|
28
23
|
if (!client_id) {
|
|
29
|
-
res
|
|
30
|
-
error: "invalid_request",
|
|
31
|
-
error_description: "client_id is required",
|
|
32
|
-
});
|
|
24
|
+
sendError(req, res, 400, "invalid_request", "client_id is required");
|
|
33
25
|
return;
|
|
34
26
|
}
|
|
35
27
|
if (!code_challenge) {
|
|
36
|
-
res
|
|
37
|
-
error: "invalid_request",
|
|
38
|
-
error_description: "code_challenge is required (PKCE)",
|
|
39
|
-
});
|
|
28
|
+
sendError(req, res, 400, "invalid_request", "code_challenge is required (PKCE)");
|
|
40
29
|
return;
|
|
41
30
|
}
|
|
42
31
|
if (code_challenge_method !== "S256") {
|
|
43
|
-
res
|
|
44
|
-
error: "invalid_request",
|
|
45
|
-
error_description: 'code_challenge_method must be "S256"',
|
|
46
|
-
});
|
|
32
|
+
sendError(req, res, 400, "invalid_request", 'code_challenge_method must be "S256"');
|
|
47
33
|
return;
|
|
48
34
|
}
|
|
49
35
|
if (redirect_uri) {
|
|
@@ -120,10 +106,7 @@ async function handleDeviceFlow(req, res, config, params) {
|
|
|
120
106
|
}
|
|
121
107
|
catch (error) {
|
|
122
108
|
logger_1.logger.error({ err: error }, "Failed to initiate device flow");
|
|
123
|
-
res
|
|
124
|
-
error: "server_error",
|
|
125
|
-
error_description: "Failed to initiate authentication",
|
|
126
|
-
});
|
|
109
|
+
sendError(req, res, 500, "server_error", "Failed to initiate authentication");
|
|
127
110
|
}
|
|
128
111
|
}
|
|
129
112
|
async function pollHandler(req, res) {
|
|
@@ -212,6 +195,20 @@ async function pollHandler(req, res) {
|
|
|
212
195
|
}
|
|
213
196
|
}
|
|
214
197
|
}
|
|
198
|
+
function sendError(req, res, status, error, description) {
|
|
199
|
+
logger_1.logger.warn({
|
|
200
|
+
event: "oauth_error",
|
|
201
|
+
endpoint: "/authorize",
|
|
202
|
+
ip: (0, request_logger_1.getIpAddress)(req),
|
|
203
|
+
error,
|
|
204
|
+
description,
|
|
205
|
+
}, "OAuth authorize request failed");
|
|
206
|
+
const response = {
|
|
207
|
+
error,
|
|
208
|
+
error_description: description,
|
|
209
|
+
};
|
|
210
|
+
res.status(status).json(response);
|
|
211
|
+
}
|
|
215
212
|
function getDeviceFlowHTML(params) {
|
|
216
213
|
const linkUrl = params.verificationUriComplete ?? params.verificationUri;
|
|
217
214
|
return `<!DOCTYPE html>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authorize.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/authorize.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"authorize.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/authorize.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,10 +7,11 @@ const token_utils_1 = require("../token-utils");
|
|
|
7
7
|
const gitlab_device_flow_1 = require("../gitlab-device-flow");
|
|
8
8
|
const metadata_1 = require("./metadata");
|
|
9
9
|
const logger_1 = require("../../logger");
|
|
10
|
+
const request_logger_1 = require("../../utils/request-logger");
|
|
10
11
|
async function tokenHandler(req, res) {
|
|
11
12
|
const config = (0, config_1.loadOAuthConfig)();
|
|
12
13
|
if (!config) {
|
|
13
|
-
sendError(res, 500, "server_error", "OAuth not configured");
|
|
14
|
+
sendError(req, res, 500, "server_error", "OAuth not configured");
|
|
14
15
|
return;
|
|
15
16
|
}
|
|
16
17
|
const { grant_type } = req.body;
|
|
@@ -22,40 +23,40 @@ async function tokenHandler(req, res) {
|
|
|
22
23
|
await handleRefreshToken(req, res, config);
|
|
23
24
|
break;
|
|
24
25
|
default:
|
|
25
|
-
sendError(res, 400, "unsupported_grant_type", `Grant type "${grant_type}" is not supported`);
|
|
26
|
+
sendError(req, res, 400, "unsupported_grant_type", `Grant type "${grant_type}" is not supported`);
|
|
26
27
|
}
|
|
27
28
|
}
|
|
28
29
|
async function handleAuthorizationCode(req, res, config) {
|
|
29
30
|
const { code, code_verifier, redirect_uri } = req.body;
|
|
30
31
|
if (!code) {
|
|
31
|
-
sendError(res, 400, "invalid_request", "Missing authorization code");
|
|
32
|
+
sendError(req, res, 400, "invalid_request", "Missing authorization code");
|
|
32
33
|
return;
|
|
33
34
|
}
|
|
34
35
|
if (!code_verifier) {
|
|
35
|
-
sendError(res, 400, "invalid_request", "Missing code_verifier (PKCE required)");
|
|
36
|
+
sendError(req, res, 400, "invalid_request", "Missing code_verifier (PKCE required)");
|
|
36
37
|
return;
|
|
37
38
|
}
|
|
38
39
|
const authCode = session_store_1.sessionStore.getAuthCode(code);
|
|
39
40
|
if (!authCode) {
|
|
40
|
-
sendError(res, 400, "invalid_grant", "Invalid or expired authorization code");
|
|
41
|
+
sendError(req, res, 400, "invalid_grant", "Invalid or expired authorization code");
|
|
41
42
|
return;
|
|
42
43
|
}
|
|
43
44
|
if (Date.now() > authCode.expiresAt) {
|
|
44
45
|
session_store_1.sessionStore.deleteAuthCode(code);
|
|
45
|
-
sendError(res, 400, "invalid_grant", "Authorization code has expired");
|
|
46
|
+
sendError(req, res, 400, "invalid_grant", "Authorization code has expired");
|
|
46
47
|
return;
|
|
47
48
|
}
|
|
48
49
|
if (!(0, token_utils_1.verifyCodeChallenge)(code_verifier, authCode.codeChallenge, authCode.codeChallengeMethod)) {
|
|
49
|
-
sendError(res, 400, "invalid_grant", "Invalid code_verifier");
|
|
50
|
+
sendError(req, res, 400, "invalid_grant", "Invalid code_verifier");
|
|
50
51
|
return;
|
|
51
52
|
}
|
|
52
53
|
if (authCode.redirectUri && redirect_uri !== authCode.redirectUri) {
|
|
53
|
-
sendError(res, 400, "invalid_grant", "redirect_uri does not match");
|
|
54
|
+
sendError(req, res, 400, "invalid_grant", "redirect_uri does not match");
|
|
54
55
|
return;
|
|
55
56
|
}
|
|
56
57
|
const session = session_store_1.sessionStore.getSession(authCode.sessionId);
|
|
57
58
|
if (!session) {
|
|
58
|
-
sendError(res, 400, "invalid_grant", "Session not found");
|
|
59
|
+
sendError(req, res, 400, "invalid_grant", "Session not found");
|
|
59
60
|
return;
|
|
60
61
|
}
|
|
61
62
|
const baseUrl = (0, metadata_1.getBaseUrl)(req);
|
|
@@ -90,12 +91,12 @@ async function handleAuthorizationCode(req, res, config) {
|
|
|
90
91
|
async function handleRefreshToken(req, res, config) {
|
|
91
92
|
const { refresh_token } = req.body;
|
|
92
93
|
if (!refresh_token) {
|
|
93
|
-
sendError(res, 400, "invalid_request", "Missing refresh_token");
|
|
94
|
+
sendError(req, res, 400, "invalid_request", "Missing refresh_token");
|
|
94
95
|
return;
|
|
95
96
|
}
|
|
96
97
|
const session = session_store_1.sessionStore.getSessionByRefreshToken(refresh_token);
|
|
97
98
|
if (!session) {
|
|
98
|
-
sendError(res, 400, "invalid_grant", "Invalid refresh token");
|
|
99
|
+
sendError(req, res, 400, "invalid_grant", "Invalid refresh token");
|
|
99
100
|
return;
|
|
100
101
|
}
|
|
101
102
|
let updatedSession = session;
|
|
@@ -109,7 +110,7 @@ async function handleRefreshToken(req, res, config) {
|
|
|
109
110
|
});
|
|
110
111
|
const refreshedSession = session_store_1.sessionStore.getSession(session.id);
|
|
111
112
|
if (!refreshedSession) {
|
|
112
|
-
sendError(res, 400, "invalid_grant", "Session lost during refresh");
|
|
113
|
+
sendError(req, res, 400, "invalid_grant", "Session lost during refresh");
|
|
113
114
|
return;
|
|
114
115
|
}
|
|
115
116
|
updatedSession = refreshedSession;
|
|
@@ -117,7 +118,7 @@ async function handleRefreshToken(req, res, config) {
|
|
|
117
118
|
}
|
|
118
119
|
catch (error) {
|
|
119
120
|
logger_1.logger.error({ err: error }, "Failed to refresh GitLab token");
|
|
120
|
-
sendError(res, 400, "invalid_grant", "Failed to refresh underlying GitLab token");
|
|
121
|
+
sendError(req, res, 400, "invalid_grant", "Failed to refresh underlying GitLab token");
|
|
121
122
|
return;
|
|
122
123
|
}
|
|
123
124
|
}
|
|
@@ -149,7 +150,14 @@ async function handleRefreshToken(req, res, config) {
|
|
|
149
150
|
};
|
|
150
151
|
res.json(response);
|
|
151
152
|
}
|
|
152
|
-
function sendError(res, status, error, description) {
|
|
153
|
+
function sendError(req, res, status, error, description) {
|
|
154
|
+
logger_1.logger.warn({
|
|
155
|
+
event: "oauth_error",
|
|
156
|
+
endpoint: "/token",
|
|
157
|
+
ip: (0, request_logger_1.getIpAddress)(req),
|
|
158
|
+
error,
|
|
159
|
+
description,
|
|
160
|
+
}, "OAuth token request failed");
|
|
153
161
|
const response = {
|
|
154
162
|
error,
|
|
155
163
|
error_description: description,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/token.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/token.ts"],"names":[],"mappings":"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"}
|
package/dist/src/server.js
CHANGED
|
@@ -53,6 +53,7 @@ const logger_1 = require("./logger");
|
|
|
53
53
|
const index_1 = require("./oauth/index");
|
|
54
54
|
const index_2 = require("./middleware/index");
|
|
55
55
|
const schema_utils_1 = require("./utils/schema-utils");
|
|
56
|
+
const request_logger_1 = require("./utils/request-logger");
|
|
56
57
|
exports.server = new index_js_1.Server({
|
|
57
58
|
name: config_2.packageName,
|
|
58
59
|
version: config_2.packageVersion,
|
|
@@ -363,11 +364,10 @@ async function startServer() {
|
|
|
363
364
|
const gitlabToken = res.locals.gitlabToken;
|
|
364
365
|
const gitlabUserId = res.locals.gitlabUserId;
|
|
365
366
|
const gitlabUsername = res.locals.gitlabUsername;
|
|
367
|
+
const requestContext = (0, request_logger_1.getRequestContext)(req, res);
|
|
366
368
|
logger_1.logger.info({
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
mcpSessionId: sessionId || "none",
|
|
370
|
-
hasOAuthSession: !!oauthSessionId,
|
|
369
|
+
event: "mcp_request",
|
|
370
|
+
...requestContext,
|
|
371
371
|
hasToken: !!gitlabToken,
|
|
372
372
|
}, "MCP endpoint request received");
|
|
373
373
|
const handleWithContext = async (transport) => {
|
package/dist/src/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { Request, Response } from "express";
|
|
2
|
+
export interface RequestContext {
|
|
3
|
+
requestId: string;
|
|
4
|
+
ip: string;
|
|
5
|
+
method: string;
|
|
6
|
+
path: string;
|
|
7
|
+
userAgent?: string;
|
|
8
|
+
hasOAuthSession: boolean;
|
|
9
|
+
hasMcpSessionHeader: boolean;
|
|
10
|
+
oauthSessionId?: string;
|
|
11
|
+
mcpSessionId?: string;
|
|
12
|
+
}
|
|
13
|
+
export interface RateLimitInfo {
|
|
14
|
+
type: "ip" | "session";
|
|
15
|
+
key: string;
|
|
16
|
+
used: number;
|
|
17
|
+
limit: number;
|
|
18
|
+
resetInSec: number;
|
|
19
|
+
}
|
|
20
|
+
export declare function getIpAddress(req: Request): string;
|
|
21
|
+
export declare function truncateId(id: string | undefined): string | undefined;
|
|
22
|
+
export declare function getRequestContext(req: Request, res: Response): RequestContext;
|
|
23
|
+
export declare function getMinimalRequestContext(req: Request): Pick<RequestContext, "requestId" | "ip" | "method" | "path" | "userAgent">;
|
|
24
|
+
export declare function buildRateLimitInfo(type: "ip" | "session", key: string, used: number, limit: number, resetAt: number): RateLimitInfo;
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getIpAddress = getIpAddress;
|
|
4
|
+
exports.truncateId = truncateId;
|
|
5
|
+
exports.getRequestContext = getRequestContext;
|
|
6
|
+
exports.getMinimalRequestContext = getMinimalRequestContext;
|
|
7
|
+
exports.buildRateLimitInfo = buildRateLimitInfo;
|
|
8
|
+
const crypto_1 = require("crypto");
|
|
9
|
+
function generateRequestId() {
|
|
10
|
+
return (0, crypto_1.randomUUID)().substring(0, 8);
|
|
11
|
+
}
|
|
12
|
+
function getIpAddress(req) {
|
|
13
|
+
return req.ip ?? req.socket?.remoteAddress ?? "unknown";
|
|
14
|
+
}
|
|
15
|
+
function truncateId(id) {
|
|
16
|
+
if (!id)
|
|
17
|
+
return undefined;
|
|
18
|
+
if (id.length <= 8)
|
|
19
|
+
return id;
|
|
20
|
+
return id.substring(0, 8) + "...";
|
|
21
|
+
}
|
|
22
|
+
function getRequestContext(req, res) {
|
|
23
|
+
const mcpSessionId = req.headers["mcp-session-id"];
|
|
24
|
+
const oauthSessionId = res.locals.oauthSessionId;
|
|
25
|
+
return {
|
|
26
|
+
requestId: generateRequestId(),
|
|
27
|
+
ip: getIpAddress(req),
|
|
28
|
+
method: req.method,
|
|
29
|
+
path: req.path,
|
|
30
|
+
userAgent: req.headers["user-agent"],
|
|
31
|
+
hasOAuthSession: !!oauthSessionId,
|
|
32
|
+
hasMcpSessionHeader: !!mcpSessionId,
|
|
33
|
+
oauthSessionId: truncateId(oauthSessionId),
|
|
34
|
+
mcpSessionId: truncateId(mcpSessionId),
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
function getMinimalRequestContext(req) {
|
|
38
|
+
return {
|
|
39
|
+
requestId: generateRequestId(),
|
|
40
|
+
ip: getIpAddress(req),
|
|
41
|
+
method: req.method,
|
|
42
|
+
path: req.path,
|
|
43
|
+
userAgent: req.headers["user-agent"],
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
function buildRateLimitInfo(type, key, used, limit, resetAt) {
|
|
47
|
+
const resetInSec = Math.max(0, Math.ceil((resetAt - Date.now()) / 1000));
|
|
48
|
+
return {
|
|
49
|
+
type,
|
|
50
|
+
key: type === "session" ? (truncateId(key) ?? key) : key,
|
|
51
|
+
used,
|
|
52
|
+
limit,
|
|
53
|
+
resetInSec,
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
//# sourceMappingURL=request-logger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request-logger.js","sourceRoot":"","sources":["../../../src/utils/request-logger.ts"],"names":[],"mappings":";;AAmEA,oCAEC;AAOD,gCAIC;AAYD,8CAkBC;AAUD,4DAUC;AAcD,gDAgBC;AAvJD,mCAAoC;AAgDpC,SAAS,iBAAiB;IAExB,OAAO,IAAA,mBAAU,GAAE,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACtC,CAAC;AAOD,SAAgB,YAAY,CAAC,GAAY;IACvC,OAAO,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,MAAM,EAAE,aAAa,IAAI,SAAS,CAAC;AAC1D,CAAC;AAOD,SAAgB,UAAU,CAAC,EAAsB;IAC/C,IAAI,CAAC,EAAE;QAAE,OAAO,SAAS,CAAC;IAC1B,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IAC9B,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC;AACpC,CAAC;AAYD,SAAgB,iBAAiB,CAAC,GAAY,EAAE,GAAa;IAE3D,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAuB,CAAC;IAGzE,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,cAAoC,CAAC;IAEvE,OAAO;QACL,SAAS,EAAE,iBAAiB,EAAE;QAC9B,EAAE,EAAE,YAAY,CAAC,GAAG,CAAC;QACrB,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC;QACpC,eAAe,EAAE,CAAC,CAAC,cAAc;QACjC,mBAAmB,EAAE,CAAC,CAAC,YAAY;QACnC,cAAc,EAAE,UAAU,CAAC,cAAc,CAAC;QAC1C,YAAY,EAAE,UAAU,CAAC,YAAY,CAAC;KACvC,CAAC;AACJ,CAAC;AAUD,SAAgB,wBAAwB,CACtC,GAAY;IAEZ,OAAO;QACL,SAAS,EAAE,iBAAiB,EAAE;QAC9B,EAAE,EAAE,YAAY,CAAC,GAAG,CAAC;QACrB,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC;KACrC,CAAC;AACJ,CAAC;AAcD,SAAgB,kBAAkB,CAChC,IAAsB,EACtB,GAAW,EACX,IAAY,EACZ,KAAa,EACb,OAAe;IAEf,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IAEzE,OAAO;QACL,IAAI;QACJ,GAAG,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG;QACxD,IAAI;QACJ,KAAK;QACL,UAAU;KACX,CAAC;AACJ,CAAC"}
|
|
Binary file
|