@structured-world/gitlab-mcp 6.45.1 → 6.46.1
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/README.md +1 -1
- package/dist/src/cli-utils.js +4 -4
- package/dist/src/cli-utils.js.map +1 -1
- package/dist/src/discovery/auto.js +14 -14
- package/dist/src/discovery/auto.js.map +1 -1
- package/dist/src/discovery/git-remote.js +7 -7
- package/dist/src/discovery/git-remote.js.map +1 -1
- package/dist/src/discovery/profile-matcher.js +11 -3
- package/dist/src/discovery/profile-matcher.js.map +1 -1
- package/dist/src/entities/context/context-manager.js +13 -9
- package/dist/src/entities/context/context-manager.js.map +1 -1
- package/dist/src/entities/context/handlers.d.ts +4 -3
- package/dist/src/entities/context/handlers.js +7 -0
- package/dist/src/entities/context/handlers.js.map +1 -1
- package/dist/src/entities/context/registry.js +1 -1
- package/dist/src/entities/context/registry.js.map +1 -1
- package/dist/src/entities/context/schema.d.ts +6 -0
- package/dist/src/entities/context/schema.js +9 -0
- package/dist/src/entities/context/schema.js.map +1 -1
- package/dist/src/entities/context/types.d.ts +63 -0
- package/dist/src/entities/context/whoami.d.ts +2 -0
- package/dist/src/entities/context/whoami.js +267 -0
- package/dist/src/entities/context/whoami.js.map +1 -0
- package/dist/src/entities/pipelines/registry.js +9 -2
- package/dist/src/entities/pipelines/registry.js.map +1 -1
- package/dist/src/graphql/DynamicWorkItemsQuery.js +2 -2
- package/dist/src/graphql/DynamicWorkItemsQuery.js.map +1 -1
- package/dist/src/handlers.js +17 -13
- package/dist/src/handlers.js.map +1 -1
- package/dist/src/logger.d.ts +4 -0
- package/dist/src/logger.js +64 -0
- package/dist/src/logger.js.map +1 -1
- package/dist/src/logging/connection-tracker.js +4 -4
- package/dist/src/logging/connection-tracker.js.map +1 -1
- package/dist/src/logging/request-tracker.js +8 -4
- package/dist/src/logging/request-tracker.js.map +1 -1
- package/dist/src/main.js +30 -21
- package/dist/src/main.js.map +1 -1
- package/dist/src/middleware/oauth-auth.js +11 -5
- package/dist/src/middleware/oauth-auth.js.map +1 -1
- package/dist/src/middleware/rate-limiter.js +9 -9
- package/dist/src/middleware/rate-limiter.js.map +1 -1
- package/dist/src/oauth/config.js +3 -3
- package/dist/src/oauth/config.js.map +1 -1
- package/dist/src/oauth/endpoints/authorize.js +10 -10
- package/dist/src/oauth/endpoints/authorize.js.map +1 -1
- package/dist/src/oauth/endpoints/callback.js +7 -5
- package/dist/src/oauth/endpoints/callback.js.map +1 -1
- package/dist/src/oauth/endpoints/register.js +3 -3
- package/dist/src/oauth/endpoints/register.js.map +1 -1
- package/dist/src/oauth/endpoints/token.js +8 -8
- package/dist/src/oauth/endpoints/token.js.map +1 -1
- package/dist/src/oauth/gitlab-device-flow.js +15 -15
- package/dist/src/oauth/gitlab-device-flow.js.map +1 -1
- package/dist/src/oauth/session-store.js +38 -29
- package/dist/src/oauth/session-store.js.map +1 -1
- package/dist/src/oauth/storage/factory.js +3 -5
- package/dist/src/oauth/storage/factory.js.map +1 -1
- package/dist/src/oauth/storage/file.d.ts +0 -2
- package/dist/src/oauth/storage/file.js +39 -19
- package/dist/src/oauth/storage/file.js.map +1 -1
- package/dist/src/oauth/storage/memory.js +22 -19
- package/dist/src/oauth/storage/memory.js.map +1 -1
- package/dist/src/oauth/storage/postgresql.js +12 -7
- package/dist/src/oauth/storage/postgresql.js.map +1 -1
- package/dist/src/oauth/storage/types.d.ts +0 -1
- package/dist/src/oauth/storage/types.js.map +1 -1
- package/dist/src/profiles/applicator.js +13 -11
- package/dist/src/profiles/applicator.js.map +1 -1
- package/dist/src/profiles/loader.js +11 -8
- package/dist/src/profiles/loader.js.map +1 -1
- package/dist/src/profiles/project-loader.js +10 -10
- package/dist/src/profiles/project-loader.js.map +1 -1
- package/dist/src/profiles/scope-enforcer.js +10 -8
- package/dist/src/profiles/scope-enforcer.js.map +1 -1
- package/dist/src/registry-manager.d.ts +10 -0
- package/dist/src/registry-manager.js +70 -9
- package/dist/src/registry-manager.js.map +1 -1
- package/dist/src/server.js +66 -54
- package/dist/src/server.js.map +1 -1
- package/dist/src/services/ConnectionManager.d.ts +1 -0
- package/dist/src/services/ConnectionManager.js +56 -18
- package/dist/src/services/ConnectionManager.js.map +1 -1
- package/dist/src/services/GitLabVersionDetector.js +12 -4
- package/dist/src/services/GitLabVersionDetector.js.map +1 -1
- package/dist/src/services/SchemaIntrospector.js +6 -4
- package/dist/src/services/SchemaIntrospector.js.map +1 -1
- package/dist/src/services/TokenScopeDetector.js +29 -15
- package/dist/src/services/TokenScopeDetector.js.map +1 -1
- package/dist/src/services/ToolAvailability.js +12 -5
- package/dist/src/services/ToolAvailability.js.map +1 -1
- package/dist/src/services/WidgetAvailability.js +1 -1
- package/dist/src/services/WidgetAvailability.js.map +1 -1
- package/dist/src/session-manager.js +14 -11
- package/dist/src/session-manager.js.map +1 -1
- package/dist/src/utils/fetch.js +36 -21
- package/dist/src/utils/fetch.js.map +1 -1
- package/dist/src/utils/schema-utils.js +11 -8
- package/dist/src/utils/schema-utils.js.map +1 -1
- package/dist/structured-world-gitlab-mcp-6.46.1.tgz +0 -0
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/dist/structured-world-gitlab-mcp-6.45.1.tgz +0 -0
package/dist/src/logger.js
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.logger = exports.createLogger = exports.LOG_JSON = void 0;
|
|
4
|
+
exports.logInfo = logInfo;
|
|
5
|
+
exports.logWarn = logWarn;
|
|
6
|
+
exports.logError = logError;
|
|
7
|
+
exports.logDebug = logDebug;
|
|
4
8
|
const pino_1 = require("pino");
|
|
5
9
|
const isTestEnv = process.env.NODE_ENV === "test" || process.env.JEST_WORKER_ID !== undefined;
|
|
6
10
|
exports.LOG_JSON = process.env.LOG_JSON === "true";
|
|
@@ -24,4 +28,64 @@ const createLogger = (name) => {
|
|
|
24
28
|
};
|
|
25
29
|
exports.createLogger = createLogger;
|
|
26
30
|
exports.logger = (0, exports.createLogger)("gitlab-mcp");
|
|
31
|
+
function formatDataPairs(data) {
|
|
32
|
+
return Object.entries(data)
|
|
33
|
+
.map(([k, v]) => {
|
|
34
|
+
if (v instanceof Error) {
|
|
35
|
+
return `${k}=${v.stack ?? v.message}`;
|
|
36
|
+
}
|
|
37
|
+
if (v === null || v === undefined) {
|
|
38
|
+
return `${k}=${String(v)}`;
|
|
39
|
+
}
|
|
40
|
+
if (typeof v === "object") {
|
|
41
|
+
return `${k}=${JSON.stringify(v)}`;
|
|
42
|
+
}
|
|
43
|
+
return `${k}=${String(v)}`;
|
|
44
|
+
})
|
|
45
|
+
.join(" ");
|
|
46
|
+
}
|
|
47
|
+
function logInfo(message, data) {
|
|
48
|
+
if (exports.LOG_JSON) {
|
|
49
|
+
exports.logger.info(data ?? {}, message);
|
|
50
|
+
}
|
|
51
|
+
else if (data && Object.keys(data).length > 0) {
|
|
52
|
+
exports.logger.info(`${message} ${formatDataPairs(data)}`);
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
exports.logger.info(message);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
function logWarn(message, data) {
|
|
59
|
+
if (exports.LOG_JSON) {
|
|
60
|
+
exports.logger.warn(data ?? {}, message);
|
|
61
|
+
}
|
|
62
|
+
else if (data && Object.keys(data).length > 0) {
|
|
63
|
+
exports.logger.warn(`${message} ${formatDataPairs(data)}`);
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
exports.logger.warn(message);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
function logError(message, data) {
|
|
70
|
+
if (exports.LOG_JSON) {
|
|
71
|
+
exports.logger.error(data ?? {}, message);
|
|
72
|
+
}
|
|
73
|
+
else if (data && Object.keys(data).length > 0) {
|
|
74
|
+
exports.logger.error(`${message} ${formatDataPairs(data)}`);
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
exports.logger.error(message);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
function logDebug(message, data) {
|
|
81
|
+
if (exports.LOG_JSON) {
|
|
82
|
+
exports.logger.debug(data ?? {}, message);
|
|
83
|
+
}
|
|
84
|
+
else if (data && Object.keys(data).length > 0) {
|
|
85
|
+
exports.logger.debug(`${message} ${formatDataPairs(data)}`);
|
|
86
|
+
}
|
|
87
|
+
else {
|
|
88
|
+
exports.logger.debug(message);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
27
91
|
//# sourceMappingURL=logger.js.map
|
package/dist/src/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ class ConnectionTracker {
|
|
|
29
29
|
errorCount: 0,
|
|
30
30
|
};
|
|
31
31
|
this.connections.set(sessionId, stats);
|
|
32
|
-
logger_js_1.
|
|
32
|
+
(0, logger_js_1.logDebug)("Connection opened for tracking", { sessionId, clientIp });
|
|
33
33
|
}
|
|
34
34
|
getStats(sessionId) {
|
|
35
35
|
return this.connections.get(sessionId);
|
|
@@ -57,7 +57,7 @@ class ConnectionTracker {
|
|
|
57
57
|
const stats = this.connections.get(sessionId);
|
|
58
58
|
if (!stats) {
|
|
59
59
|
if (this.enabled) {
|
|
60
|
-
logger_js_1.
|
|
60
|
+
(0, logger_js_1.logDebug)("Connection not found on close", { sessionId });
|
|
61
61
|
}
|
|
62
62
|
return undefined;
|
|
63
63
|
}
|
|
@@ -68,10 +68,10 @@ class ConnectionTracker {
|
|
|
68
68
|
const entry = (0, access_log_js_1.createConnectionCloseEntry)(stats, reason);
|
|
69
69
|
const logLine = (0, access_log_js_1.formatConnectionClose)(entry);
|
|
70
70
|
if (logger_js_1.LOG_JSON) {
|
|
71
|
-
logger_js_1.
|
|
71
|
+
(0, logger_js_1.logInfo)(logLine, { connectionClose: entry });
|
|
72
72
|
}
|
|
73
73
|
else {
|
|
74
|
-
logger_js_1.
|
|
74
|
+
(0, logger_js_1.logInfo)(logLine);
|
|
75
75
|
}
|
|
76
76
|
return logLine;
|
|
77
77
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection-tracker.js","sourceRoot":"","sources":["../../../src/logging/connection-tracker.ts"],"names":[],"mappings":";;;AAqMA,oDAGC;AAKD,wDAEC;AA/LD,mDAAoF;AACpF,
|
|
1
|
+
{"version":3,"file":"connection-tracker.js","sourceRoot":"","sources":["../../../src/logging/connection-tracker.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,7 @@ class RequestTracker {
|
|
|
43
43
|
details: {},
|
|
44
44
|
};
|
|
45
45
|
this.stacks.set(requestId, stack);
|
|
46
|
-
logger_js_1.
|
|
46
|
+
(0, logger_js_1.logDebug)("Request stack opened", { requestId, clientIp, method, path });
|
|
47
47
|
}
|
|
48
48
|
getStack(requestId) {
|
|
49
49
|
return this.stacks.get(requestId);
|
|
@@ -56,7 +56,7 @@ class RequestTracker {
|
|
|
56
56
|
if (action) {
|
|
57
57
|
stack.action = action;
|
|
58
58
|
}
|
|
59
|
-
logger_js_1.
|
|
59
|
+
(0, logger_js_1.logDebug)("Tool set on request stack", { requestId, tool, action });
|
|
60
60
|
}
|
|
61
61
|
setGitLabResponse(requestId, status, durationMs) {
|
|
62
62
|
const stack = this.stacks.get(requestId);
|
|
@@ -66,7 +66,11 @@ class RequestTracker {
|
|
|
66
66
|
if (durationMs !== undefined) {
|
|
67
67
|
stack.gitlabDuration = durationMs;
|
|
68
68
|
}
|
|
69
|
-
logger_js_1.
|
|
69
|
+
(0, logger_js_1.logDebug)("GitLab response set on request stack", {
|
|
70
|
+
requestId,
|
|
71
|
+
gitlabStatus: status,
|
|
72
|
+
gitlabDuration: durationMs,
|
|
73
|
+
});
|
|
70
74
|
}
|
|
71
75
|
addDetail(requestId, key, value) {
|
|
72
76
|
const stack = this.stacks.get(requestId);
|
|
@@ -108,7 +112,7 @@ class RequestTracker {
|
|
|
108
112
|
closeStack(requestId, status) {
|
|
109
113
|
const stack = this.stacks.get(requestId);
|
|
110
114
|
if (!stack) {
|
|
111
|
-
logger_js_1.
|
|
115
|
+
(0, logger_js_1.logDebug)("Request stack not found on close", { requestId });
|
|
112
116
|
return undefined;
|
|
113
117
|
}
|
|
114
118
|
this.stacks.delete(requestId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-tracker.js","sourceRoot":"","sources":["../../../src/logging/request-tracker.ts"],"names":[],"mappings":";;;AAuCA,kDAEC;AAKD,sDAEC;AAKD,gEAKC;
|
|
1
|
+
{"version":3,"file":"request-tracker.js","sourceRoot":"","sources":["../../../src/logging/request-tracker.ts"],"names":[],"mappings":"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"}
|
package/dist/src/main.js
CHANGED
|
@@ -79,7 +79,7 @@ async function main() {
|
|
|
79
79
|
}
|
|
80
80
|
catch (error) {
|
|
81
81
|
const message = error instanceof Error ? error.message : String(error);
|
|
82
|
-
logger_1.
|
|
82
|
+
(0, logger_1.logError)("Failed to load project config", { error: message });
|
|
83
83
|
process.exit(1);
|
|
84
84
|
}
|
|
85
85
|
}
|
|
@@ -97,19 +97,19 @@ async function main() {
|
|
|
97
97
|
console.log((0, discovery_1.formatDiscoveryResult)(autoDiscoveryResult));
|
|
98
98
|
process.exit(0);
|
|
99
99
|
}
|
|
100
|
-
logger_1.
|
|
100
|
+
(0, logger_1.logInfo)("Auto-discovery detected GitLab configuration", {
|
|
101
101
|
host: autoDiscoveryResult.host,
|
|
102
102
|
project: autoDiscoveryResult.projectPath,
|
|
103
103
|
profile: autoDiscoveryResult.matchedProfile?.profileName,
|
|
104
|
-
}
|
|
104
|
+
});
|
|
105
105
|
}
|
|
106
106
|
else {
|
|
107
|
-
logger_1.
|
|
107
|
+
(0, logger_1.logWarn)("Auto-discovery failed: not in a git repository or no remote found");
|
|
108
108
|
}
|
|
109
109
|
}
|
|
110
110
|
catch (error) {
|
|
111
111
|
const message = error instanceof Error ? error.message : String(error);
|
|
112
|
-
logger_1.
|
|
112
|
+
(0, logger_1.logError)("Auto-discovery failed", { error: message });
|
|
113
113
|
process.exit(1);
|
|
114
114
|
}
|
|
115
115
|
}
|
|
@@ -118,23 +118,26 @@ async function main() {
|
|
|
118
118
|
const result = await (0, profiles_1.tryApplyProfileFromEnv)(cliArgs.profileName);
|
|
119
119
|
if (result) {
|
|
120
120
|
if ("profileName" in result) {
|
|
121
|
-
|
|
121
|
+
(0, logger_1.logInfo)("Using CLI-specified profile", {
|
|
122
|
+
profile: result.profileName,
|
|
123
|
+
host: result.host,
|
|
124
|
+
});
|
|
122
125
|
}
|
|
123
126
|
else {
|
|
124
|
-
logger_1.
|
|
127
|
+
(0, logger_1.logInfo)("Using CLI-specified preset", { preset: result.presetName });
|
|
125
128
|
}
|
|
126
129
|
if (autoDiscoveryResult?.matchedProfile &&
|
|
127
130
|
autoDiscoveryResult.matchedProfile.profileName !== cliArgs.profileName) {
|
|
128
|
-
logger_1.
|
|
131
|
+
(0, logger_1.logWarn)("Auto-discovered profile ignored: --profile takes precedence", {
|
|
129
132
|
cliProfile: cliArgs.profileName,
|
|
130
133
|
autoProfile: autoDiscoveryResult.matchedProfile.profileName,
|
|
131
|
-
}
|
|
134
|
+
});
|
|
132
135
|
}
|
|
133
136
|
}
|
|
134
137
|
}
|
|
135
138
|
catch (error) {
|
|
136
139
|
const message = error instanceof Error ? error.message : String(error);
|
|
137
|
-
logger_1.
|
|
140
|
+
(0, logger_1.logError)("Failed to load profile", { error: message });
|
|
138
141
|
process.exit(1);
|
|
139
142
|
}
|
|
140
143
|
}
|
|
@@ -142,12 +145,15 @@ async function main() {
|
|
|
142
145
|
try {
|
|
143
146
|
const result = await (0, profiles_1.tryApplyProfileFromEnv)(autoDiscoveryResult.matchedProfile.profileName);
|
|
144
147
|
if (result && "profileName" in result) {
|
|
145
|
-
|
|
148
|
+
(0, logger_1.logInfo)("Using auto-discovered profile", {
|
|
149
|
+
profile: result.profileName,
|
|
150
|
+
host: result.host,
|
|
151
|
+
});
|
|
146
152
|
}
|
|
147
153
|
}
|
|
148
154
|
catch (error) {
|
|
149
155
|
const message = error instanceof Error ? error.message : String(error);
|
|
150
|
-
logger_1.
|
|
156
|
+
(0, logger_1.logWarn)("Failed to apply auto-discovered profile", { error: message });
|
|
151
157
|
}
|
|
152
158
|
}
|
|
153
159
|
else {
|
|
@@ -155,16 +161,19 @@ async function main() {
|
|
|
155
161
|
const result = await (0, profiles_1.tryApplyProfileFromEnv)();
|
|
156
162
|
if (result) {
|
|
157
163
|
if ("profileName" in result) {
|
|
158
|
-
|
|
164
|
+
(0, logger_1.logInfo)("Using configuration profile", {
|
|
165
|
+
profile: result.profileName,
|
|
166
|
+
host: result.host,
|
|
167
|
+
});
|
|
159
168
|
}
|
|
160
169
|
else {
|
|
161
|
-
logger_1.
|
|
170
|
+
(0, logger_1.logInfo)("Using configuration preset", { preset: result.presetName });
|
|
162
171
|
}
|
|
163
172
|
}
|
|
164
173
|
}
|
|
165
174
|
catch (error) {
|
|
166
175
|
const message = error instanceof Error ? error.message : String(error);
|
|
167
|
-
logger_1.
|
|
176
|
+
(0, logger_1.logError)("Failed to load profile", { error: message });
|
|
168
177
|
process.exit(1);
|
|
169
178
|
}
|
|
170
179
|
}
|
|
@@ -173,16 +182,16 @@ async function main() {
|
|
|
173
182
|
const projectConfig = await (0, profiles_1.findProjectConfig)(process.cwd());
|
|
174
183
|
if (projectConfig) {
|
|
175
184
|
const summary = (0, profiles_1.getProjectConfigSummary)(projectConfig);
|
|
176
|
-
logger_1.
|
|
185
|
+
(0, logger_1.logInfo)("Loaded project configuration (restrictions applied)", {
|
|
177
186
|
path: projectConfig.configPath,
|
|
178
187
|
preset: summary.presetSummary,
|
|
179
188
|
profile: summary.profileSummary,
|
|
180
|
-
}
|
|
189
|
+
});
|
|
181
190
|
}
|
|
182
191
|
}
|
|
183
192
|
catch (error) {
|
|
184
193
|
const message = error instanceof Error ? error.message : String(error);
|
|
185
|
-
logger_1.
|
|
194
|
+
(0, logger_1.logWarn)("Failed to load project config, continuing without it", { error: message });
|
|
186
195
|
}
|
|
187
196
|
}
|
|
188
197
|
if (autoDiscoveryResult) {
|
|
@@ -191,10 +200,10 @@ async function main() {
|
|
|
191
200
|
if (namespace) {
|
|
192
201
|
process.env.GITLAB_DEFAULT_NAMESPACE ??= namespace;
|
|
193
202
|
}
|
|
194
|
-
logger_1.
|
|
203
|
+
(0, logger_1.logDebug)("Default context set from auto-discovery", {
|
|
195
204
|
defaultProject: process.env.GITLAB_DEFAULT_PROJECT,
|
|
196
205
|
defaultNamespace: process.env.GITLAB_DEFAULT_NAMESPACE,
|
|
197
|
-
}
|
|
206
|
+
});
|
|
198
207
|
}
|
|
199
208
|
await (0, server_1.startServer)();
|
|
200
209
|
}
|
|
@@ -203,7 +212,7 @@ main().catch((error) => {
|
|
|
203
212
|
console.error(error.guidance);
|
|
204
213
|
}
|
|
205
214
|
else {
|
|
206
|
-
logger_1.
|
|
215
|
+
(0, logger_1.logError)("Failed to start GitLab MCP Server", { error: String(error) });
|
|
207
216
|
}
|
|
208
217
|
process.exit(1);
|
|
209
218
|
});
|
package/dist/src/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,qCAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,10 +53,12 @@ async function oauthAuthMiddleware(req, res, next) {
|
|
|
53
53
|
gitlabRefreshToken: newTokens.refresh_token,
|
|
54
54
|
gitlabTokenExpiry: (0, token_utils_1.calculateTokenExpiry)(newTokens.expires_in),
|
|
55
55
|
});
|
|
56
|
-
|
|
56
|
+
(0, logger_1.logDebug)("GitLab token refreshed during request", {
|
|
57
|
+
sessionId: sessionId.substring(0, 8) + "...",
|
|
58
|
+
});
|
|
57
59
|
}
|
|
58
60
|
catch (error) {
|
|
59
|
-
logger_1.
|
|
61
|
+
(0, logger_1.logError)("Failed to refresh GitLab token during request", { err: error });
|
|
60
62
|
sendUnauthorized(req, res, "invalid_token", "GitLab token refresh failed. Please re-authenticate.");
|
|
61
63
|
return;
|
|
62
64
|
}
|
|
@@ -70,7 +72,11 @@ async function oauthAuthMiddleware(req, res, next) {
|
|
|
70
72
|
res.locals.gitlabToken = updatedSession.gitlabAccessToken;
|
|
71
73
|
res.locals.gitlabUserId = updatedSession.gitlabUserId;
|
|
72
74
|
res.locals.gitlabUsername = updatedSession.gitlabUsername;
|
|
73
|
-
|
|
75
|
+
(0, logger_1.logDebug)("OAuth session validated, passing to route handler", {
|
|
76
|
+
sessionId: updatedSession.id.substring(0, 8) + "...",
|
|
77
|
+
method: req.method,
|
|
78
|
+
path: req.path,
|
|
79
|
+
});
|
|
74
80
|
next();
|
|
75
81
|
}
|
|
76
82
|
function createOAuthMiddleware() {
|
|
@@ -109,12 +115,12 @@ async function optionalOAuthMiddleware(req, res, next) {
|
|
|
109
115
|
next();
|
|
110
116
|
}
|
|
111
117
|
function sendUnauthorized(req, res, error, description) {
|
|
112
|
-
logger_1.
|
|
118
|
+
(0, logger_1.logWarn)("Authentication rejected", {
|
|
113
119
|
event: "auth_rejected",
|
|
114
120
|
...(0, request_logger_1.getMinimalRequestContext)(req),
|
|
115
121
|
reason: error,
|
|
116
122
|
description,
|
|
117
|
-
}
|
|
123
|
+
});
|
|
118
124
|
const response = {
|
|
119
125
|
error,
|
|
120
126
|
error_description: description,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-auth.js","sourceRoot":"","sources":["../../../src/middleware/oauth-auth.ts"],"names":[],"mappings":";;AAkCA,kDAiHC;AAQD,sDAEC;AAWD,0DA8CC;AAvMD,4CAAkD;AAClD,0DAAsD;AACtD,sDAAiG;AACjG,oEAAiE;AACjE,0DAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"oauth-auth.js","sourceRoot":"","sources":["../../../src/middleware/oauth-auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ function startCleanup() {
|
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
if (cleaned > 0) {
|
|
25
|
-
logger_1.
|
|
25
|
+
(0, logger_1.logDebug)("Rate limiter cleanup: removed expired entries", { cleaned });
|
|
26
26
|
}
|
|
27
27
|
}, CLEANUP_INTERVAL_MS);
|
|
28
28
|
cleanupInterval.unref();
|
|
@@ -94,22 +94,22 @@ function rateLimiterMiddleware() {
|
|
|
94
94
|
const usagePercent = (info.used / info.total) * 100;
|
|
95
95
|
if (info.allowed && usagePercent >= 80) {
|
|
96
96
|
const rateLimitInfo = (0, request_logger_1.buildRateLimitInfo)("session", sessionId, info.used, info.total, info.resetAt);
|
|
97
|
-
logger_1.
|
|
97
|
+
(0, logger_1.logDebug)("Approaching session rate limit threshold", {
|
|
98
98
|
event: "rate_limit_warning",
|
|
99
99
|
...(0, request_logger_1.getMinimalRequestContext)(req),
|
|
100
100
|
rateLimit: rateLimitInfo,
|
|
101
|
-
}
|
|
101
|
+
});
|
|
102
102
|
}
|
|
103
103
|
if (!info.allowed) {
|
|
104
104
|
const retryAfter = Math.ceil((info.resetAt - Date.now()) / 1000);
|
|
105
105
|
const rateLimitInfo = (0, request_logger_1.buildRateLimitInfo)("session", sessionId, info.used, info.total, info.resetAt);
|
|
106
|
-
logger_1.
|
|
106
|
+
(0, logger_1.logWarn)("Session rate limit exceeded", {
|
|
107
107
|
event: "rate_limit_exceeded",
|
|
108
108
|
...(0, request_logger_1.getMinimalRequestContext)(req),
|
|
109
109
|
rateLimit: rateLimitInfo,
|
|
110
110
|
hasOAuthSession: !!res.locals.oauthSessionId,
|
|
111
111
|
hasMcpSessionHeader: !!req.headers["mcp-session-id"],
|
|
112
|
-
}
|
|
112
|
+
});
|
|
113
113
|
res.set("Retry-After", retryAfter.toString());
|
|
114
114
|
res.status(429).json({
|
|
115
115
|
error: "Too Many Requests",
|
|
@@ -135,26 +135,26 @@ function rateLimiterMiddleware() {
|
|
|
135
135
|
const usagePercent = (info.used / info.total) * 100;
|
|
136
136
|
if (info.allowed && usagePercent >= 80) {
|
|
137
137
|
const rateLimitInfo = (0, request_logger_1.buildRateLimitInfo)("ip", ip, info.used, info.total, info.resetAt);
|
|
138
|
-
logger_1.
|
|
138
|
+
(0, logger_1.logDebug)("Approaching IP rate limit threshold", {
|
|
139
139
|
event: "rate_limit_warning",
|
|
140
140
|
...(0, request_logger_1.getMinimalRequestContext)(req),
|
|
141
141
|
rateLimit: rateLimitInfo,
|
|
142
142
|
authClassification: "anonymous",
|
|
143
143
|
authReason: "no OAuth session and no MCP-Session-Id header",
|
|
144
|
-
}
|
|
144
|
+
});
|
|
145
145
|
}
|
|
146
146
|
if (!info.allowed) {
|
|
147
147
|
const retryAfter = Math.ceil((info.resetAt - Date.now()) / 1000);
|
|
148
148
|
const rateLimitInfo = (0, request_logger_1.buildRateLimitInfo)("ip", ip, info.used, info.total, info.resetAt);
|
|
149
149
|
const mcpSessionHeader = req.headers["mcp-session-id"];
|
|
150
|
-
logger_1.
|
|
150
|
+
(0, logger_1.logWarn)("IP rate limit exceeded", {
|
|
151
151
|
event: "rate_limit_exceeded",
|
|
152
152
|
...(0, request_logger_1.getMinimalRequestContext)(req),
|
|
153
153
|
rateLimit: rateLimitInfo,
|
|
154
154
|
authClassification: "anonymous",
|
|
155
155
|
authReason: "no OAuth session and no MCP-Session-Id header",
|
|
156
156
|
mcpSessionId: (0, request_logger_1.truncateId)(mcpSessionHeader),
|
|
157
|
-
}
|
|
157
|
+
});
|
|
158
158
|
res.set("Retry-After", retryAfter.toString());
|
|
159
159
|
res.status(429).json({
|
|
160
160
|
error: "Too Many Requests",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limiter.js","sourceRoot":"","sources":["../../../src/middleware/rate-limiter.ts"],"names":[],"mappings":";;AAiEA,kCAKC;AA+FD,
|
|
1
|
+
{"version":3,"file":"rate-limiter.js","sourceRoot":"","sources":["../../../src/middleware/rate-limiter.ts"],"names":[],"mappings":"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"}
|
package/dist/src/oauth/config.js
CHANGED
|
@@ -26,7 +26,7 @@ function loadOAuthConfig() {
|
|
|
26
26
|
}
|
|
27
27
|
if (process.env.OAUTH_ENABLED !== "true") {
|
|
28
28
|
cachedOAuthConfig = null;
|
|
29
|
-
logger_1.
|
|
29
|
+
(0, logger_1.logDebug)("OAuth mode disabled (OAUTH_ENABLED !== 'true')");
|
|
30
30
|
return null;
|
|
31
31
|
}
|
|
32
32
|
const result = OAuthConfigSchema.safeParse({
|
|
@@ -47,7 +47,7 @@ function loadOAuthConfig() {
|
|
|
47
47
|
throw new Error(`Invalid OAuth configuration: ${errorMessages}`);
|
|
48
48
|
}
|
|
49
49
|
cachedOAuthConfig = result.data;
|
|
50
|
-
logger_1.
|
|
50
|
+
(0, logger_1.logInfo)("OAuth mode enabled with valid configuration");
|
|
51
51
|
return result.data;
|
|
52
52
|
}
|
|
53
53
|
class ConfigurationError extends Error {
|
|
@@ -81,7 +81,7 @@ function validateStaticConfig() {
|
|
|
81
81
|
if (!process.env.GITLAB_TOKEN) {
|
|
82
82
|
throw new ConfigurationError(MISSING_TOKEN_GUIDANCE);
|
|
83
83
|
}
|
|
84
|
-
logger_1.
|
|
84
|
+
(0, logger_1.logDebug)("Static token mode: GITLAB_TOKEN configured");
|
|
85
85
|
}
|
|
86
86
|
function isOAuthEnabled() {
|
|
87
87
|
return loadOAuthConfig() !== null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/oauth/config.ts"],"names":[],"mappings":";;;AAqDA,0CAoCC;AA2CD,oDAKC;AAOD,wCAEC;AAKD,sDAEC;AAOD,wDAKC;AA9JD,6BAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/oauth/config.ts"],"names":[],"mappings":"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"}
|