@structured-world/gitlab-mcp 7.7.0 → 8.0.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/README.md +6 -6
- package/dist/src/cli/list-tools.js +2 -8
- package/dist/src/cli/list-tools.js.map +1 -1
- package/dist/src/cli/setup/presets.js +1 -1
- package/dist/src/cli/setup/presets.js.map +1 -1
- package/dist/src/entities/access_tokens/registry.d.ts +3 -0
- package/dist/src/entities/access_tokens/registry.js +147 -0
- package/dist/src/entities/access_tokens/registry.js.map +1 -0
- package/dist/src/entities/access_tokens/schema-readonly.d.ts +40 -0
- package/dist/src/entities/access_tokens/schema-readonly.js +60 -0
- package/dist/src/entities/access_tokens/schema-readonly.js.map +1 -0
- package/dist/src/entities/access_tokens/schema.d.ts +28 -0
- package/dist/src/entities/access_tokens/schema.js +68 -0
- package/dist/src/entities/access_tokens/schema.js.map +1 -0
- package/dist/src/entities/audit_events/registry.d.ts +3 -0
- package/dist/src/entities/audit_events/registry.js +93 -0
- package/dist/src/entities/audit_events/registry.js.map +1 -0
- package/dist/src/entities/audit_events/schema-readonly.d.ts +33 -0
- package/dist/src/entities/audit_events/schema-readonly.js +78 -0
- package/dist/src/entities/audit_events/schema-readonly.js.map +1 -0
- package/dist/src/entities/container_registry/registry.js +3 -2
- package/dist/src/entities/container_registry/registry.js.map +1 -1
- package/dist/src/entities/context/whoami.js +2 -1
- package/dist/src/entities/context/whoami.js.map +1 -1
- package/dist/src/entities/core/registry.js +3 -2
- package/dist/src/entities/core/registry.js.map +1 -1
- package/dist/src/entities/pipelines/registry.js +5 -23
- package/dist/src/entities/pipelines/registry.js.map +1 -1
- package/dist/src/entities/pipelines/schema.d.ts +4 -6
- package/dist/src/entities/pipelines/schema.js +9 -11
- package/dist/src/entities/pipelines/schema.js.map +1 -1
- package/dist/src/entities/runners/registry.d.ts +3 -0
- package/dist/src/entities/runners/registry.js +226 -0
- package/dist/src/entities/runners/registry.js.map +1 -0
- package/dist/src/entities/runners/schema-readonly.d.ts +99 -0
- package/dist/src/entities/runners/schema-readonly.js +99 -0
- package/dist/src/entities/runners/schema-readonly.js.map +1 -0
- package/dist/src/entities/runners/schema.d.ts +49 -0
- package/dist/src/entities/runners/schema.js +81 -0
- package/dist/src/entities/runners/schema.js.map +1 -0
- package/dist/src/entities/vulnerabilities/registry.d.ts +3 -0
- package/dist/src/entities/vulnerabilities/registry.js +171 -0
- package/dist/src/entities/vulnerabilities/registry.js.map +1 -0
- package/dist/src/entities/vulnerabilities/schema-readonly.d.ts +48 -0
- package/dist/src/entities/vulnerabilities/schema-readonly.js +77 -0
- package/dist/src/entities/vulnerabilities/schema-readonly.js.map +1 -0
- package/dist/src/entities/vulnerabilities/schema.d.ts +23 -0
- package/dist/src/entities/vulnerabilities/schema.js +43 -0
- package/dist/src/entities/vulnerabilities/schema.js.map +1 -0
- package/dist/src/entities/workitems/registry.js +11 -10
- package/dist/src/entities/workitems/registry.js.map +1 -1
- package/dist/src/graphql/runners.d.ts +162 -0
- package/dist/src/graphql/runners.js +144 -0
- package/dist/src/graphql/runners.js.map +1 -0
- package/dist/src/graphql/vulnerabilities.d.ts +90 -0
- package/dist/src/graphql/vulnerabilities.js +105 -0
- package/dist/src/graphql/vulnerabilities.js.map +1 -0
- package/dist/src/registry-manager.js +44 -0
- package/dist/src/registry-manager.js.map +1 -1
- package/dist/src/services/TokenScopeDetector.js +7 -1
- package/dist/src/services/TokenScopeDetector.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +60 -18
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
export declare const ManageAccessTokenSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
3
|
+
action: z.ZodLiteral<"create_project">;
|
|
4
|
+
project_id: z.ZodPreprocess<z.ZodCoercedString<unknown>>;
|
|
5
|
+
name: z.ZodString;
|
|
6
|
+
scopes: z.ZodArray<z.ZodString>;
|
|
7
|
+
access_level: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<10>, z.ZodLiteral<20>, z.ZodLiteral<30>, z.ZodLiteral<40>, z.ZodLiteral<50>]>>;
|
|
8
|
+
expires_at: z.ZodOptional<z.ZodString>;
|
|
9
|
+
}, z.core.$strip>, z.ZodObject<{
|
|
10
|
+
action: z.ZodLiteral<"create_group">;
|
|
11
|
+
group_id: z.ZodPreprocess<z.ZodCoercedString<unknown>>;
|
|
12
|
+
name: z.ZodString;
|
|
13
|
+
scopes: z.ZodArray<z.ZodString>;
|
|
14
|
+
access_level: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<10>, z.ZodLiteral<20>, z.ZodLiteral<30>, z.ZodLiteral<40>, z.ZodLiteral<50>]>>;
|
|
15
|
+
expires_at: z.ZodOptional<z.ZodString>;
|
|
16
|
+
}, z.core.$strip>, z.ZodObject<{
|
|
17
|
+
action: z.ZodLiteral<"rotate">;
|
|
18
|
+
token_id: z.ZodCoercedNumber<unknown>;
|
|
19
|
+
project_id: z.ZodOptional<z.ZodPreprocess<z.ZodCoercedString<unknown>>>;
|
|
20
|
+
group_id: z.ZodOptional<z.ZodPreprocess<z.ZodCoercedString<unknown>>>;
|
|
21
|
+
expires_at: z.ZodOptional<z.ZodString>;
|
|
22
|
+
}, z.core.$strip>, z.ZodObject<{
|
|
23
|
+
action: z.ZodLiteral<"revoke">;
|
|
24
|
+
token_id: z.ZodCoercedNumber<unknown>;
|
|
25
|
+
project_id: z.ZodOptional<z.ZodPreprocess<z.ZodCoercedString<unknown>>>;
|
|
26
|
+
group_id: z.ZodOptional<z.ZodPreprocess<z.ZodCoercedString<unknown>>>;
|
|
27
|
+
}, z.core.$strip>], "action">;
|
|
28
|
+
export type ManageAccessTokenInput = z.infer<typeof ManageAccessTokenSchema>;
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ManageAccessTokenSchema = void 0;
|
|
4
|
+
const zod_1 = require("zod");
|
|
5
|
+
const utils_1 = require("../utils");
|
|
6
|
+
const schema_readonly_1 = require("./schema-readonly");
|
|
7
|
+
const scopesField = zod_1.z
|
|
8
|
+
.array(zod_1.z.string().trim().min(1, 'scope entries must be non-empty'))
|
|
9
|
+
.min(1)
|
|
10
|
+
.describe("Token scopes, e.g. ['api'], ['read_repository','write_repository']. At least one required.");
|
|
11
|
+
const accessLevelField = zod_1.z
|
|
12
|
+
.union([zod_1.z.literal(10), zod_1.z.literal(20), zod_1.z.literal(30), zod_1.z.literal(40), zod_1.z.literal(50)])
|
|
13
|
+
.optional()
|
|
14
|
+
.describe('Access level: 10 Guest, 20 Reporter, 30 Developer, 40 Maintainer, 50 Owner.');
|
|
15
|
+
const expiresAtField = zod_1.z
|
|
16
|
+
.string()
|
|
17
|
+
.regex(/^\d{4}-\d{2}-\d{2}$/, 'expires_at must be a YYYY-MM-DD date')
|
|
18
|
+
.optional()
|
|
19
|
+
.describe('Expiry date in YYYY-MM-DD format (e.g. "2026-12-31").');
|
|
20
|
+
const CreateProjectTokenSchema = zod_1.z.object({
|
|
21
|
+
action: zod_1.z
|
|
22
|
+
.literal('create_project')
|
|
23
|
+
.describe('Create a project access token (returns the value once)'),
|
|
24
|
+
project_id: schema_readonly_1.projectIdField,
|
|
25
|
+
name: zod_1.z.string().describe('Human-readable token name.'),
|
|
26
|
+
scopes: scopesField,
|
|
27
|
+
access_level: accessLevelField,
|
|
28
|
+
expires_at: expiresAtField,
|
|
29
|
+
});
|
|
30
|
+
const CreateGroupTokenSchema = zod_1.z.object({
|
|
31
|
+
action: zod_1.z
|
|
32
|
+
.literal('create_group')
|
|
33
|
+
.describe('Create a group access token (returns the value once)'),
|
|
34
|
+
group_id: schema_readonly_1.groupIdField,
|
|
35
|
+
name: zod_1.z.string().describe('Human-readable token name.'),
|
|
36
|
+
scopes: scopesField,
|
|
37
|
+
access_level: accessLevelField,
|
|
38
|
+
expires_at: expiresAtField,
|
|
39
|
+
});
|
|
40
|
+
const RotateTokenSchema = zod_1.z.object({
|
|
41
|
+
action: zod_1.z
|
|
42
|
+
.literal('rotate')
|
|
43
|
+
.describe('Rotate a token: revoke the old one and return a new value. Pass project_id for a project token, group_id for a group token, or neither for a personal token.'),
|
|
44
|
+
token_id: schema_readonly_1.tokenIdField,
|
|
45
|
+
project_id: utils_1.requiredId.optional().describe('Set for a project access token.'),
|
|
46
|
+
group_id: utils_1.requiredId.optional().describe('Set for a group access token.'),
|
|
47
|
+
expires_at: expiresAtField,
|
|
48
|
+
});
|
|
49
|
+
const RevokeTokenSchema = zod_1.z.object({
|
|
50
|
+
action: zod_1.z
|
|
51
|
+
.literal('revoke')
|
|
52
|
+
.describe('Revoke a token permanently. Pass project_id for a project token, group_id for a group token, or neither for a personal token.'),
|
|
53
|
+
token_id: schema_readonly_1.tokenIdField,
|
|
54
|
+
project_id: utils_1.requiredId.optional().describe('Set for a project access token.'),
|
|
55
|
+
group_id: utils_1.requiredId.optional().describe('Set for a group access token.'),
|
|
56
|
+
});
|
|
57
|
+
exports.ManageAccessTokenSchema = zod_1.z
|
|
58
|
+
.discriminatedUnion('action', [
|
|
59
|
+
CreateProjectTokenSchema,
|
|
60
|
+
CreateGroupTokenSchema,
|
|
61
|
+
RotateTokenSchema,
|
|
62
|
+
RevokeTokenSchema,
|
|
63
|
+
])
|
|
64
|
+
.refine((data) => (data.action !== 'rotate' && data.action !== 'revoke') || !(data.project_id && data.group_id), {
|
|
65
|
+
message: 'Pass at most one of project_id or group_id (a token belongs to a single scope)',
|
|
66
|
+
path: ['project_id'],
|
|
67
|
+
});
|
|
68
|
+
//# sourceMappingURL=schema.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../src/entities/access_tokens/schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.auditEventsToolRegistry = void 0;
|
|
37
|
+
exports.getAuditEventsReadOnlyToolNames = getAuditEventsReadOnlyToolNames;
|
|
38
|
+
const z = __importStar(require("zod"));
|
|
39
|
+
const schema_readonly_1 = require("./schema-readonly");
|
|
40
|
+
const gitlab_api_1 = require("../../utils/gitlab-api");
|
|
41
|
+
const utils_1 = require("../utils");
|
|
42
|
+
const PREMIUM_REQ = { tier: 'premium', minVersion: '12.4', notes: 'Audit Events' };
|
|
43
|
+
function auditBasePath(input) {
|
|
44
|
+
if (input.project_id) {
|
|
45
|
+
return `projects/${encodeURIComponent(input.project_id)}/audit_events`;
|
|
46
|
+
}
|
|
47
|
+
if (input.group_id) {
|
|
48
|
+
return `groups/${encodeURIComponent(input.group_id)}/audit_events`;
|
|
49
|
+
}
|
|
50
|
+
return 'audit_events';
|
|
51
|
+
}
|
|
52
|
+
exports.auditEventsToolRegistry = new Map([
|
|
53
|
+
[
|
|
54
|
+
'browse_audit_events',
|
|
55
|
+
{
|
|
56
|
+
name: 'browse_audit_events',
|
|
57
|
+
description: 'Inspect audit events: the immutable record of who did what, when. Actions: list_instance (instance-wide, admin-only), list_group / list_project (a group or project audit trail), get (a single event by ID - pass project_id or group_id for group/project events, neither for an instance event). Premium/Ultimate feature; there is no write counterpart because audit events cannot be modified.',
|
|
58
|
+
inputSchema: z.toJSONSchema(schema_readonly_1.BrowseAuditEventsSchema),
|
|
59
|
+
requirements: { default: PREMIUM_REQ },
|
|
60
|
+
gate: { envVar: 'USE_AUDIT_EVENTS', defaultValue: true },
|
|
61
|
+
handler: async (args) => {
|
|
62
|
+
const input = schema_readonly_1.BrowseAuditEventsSchema.parse(args);
|
|
63
|
+
(0, utils_1.assertActionAllowed)('browse_audit_events', input.action);
|
|
64
|
+
switch (input.action) {
|
|
65
|
+
case 'list_instance': {
|
|
66
|
+
const { action: _action, ...query } = input;
|
|
67
|
+
return gitlab_api_1.gitlab.get('audit_events', { query: (0, gitlab_api_1.toQuery)(query, []) });
|
|
68
|
+
}
|
|
69
|
+
case 'list_group': {
|
|
70
|
+
const { action: _action, group_id, ...query } = input;
|
|
71
|
+
return gitlab_api_1.gitlab.get(`groups/${encodeURIComponent(group_id)}/audit_events`, {
|
|
72
|
+
query: (0, gitlab_api_1.toQuery)(query, []),
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
case 'list_project': {
|
|
76
|
+
const { action: _action, project_id, ...query } = input;
|
|
77
|
+
return gitlab_api_1.gitlab.get(`projects/${encodeURIComponent(project_id)}/audit_events`, {
|
|
78
|
+
query: (0, gitlab_api_1.toQuery)(query, []),
|
|
79
|
+
});
|
|
80
|
+
}
|
|
81
|
+
case 'get':
|
|
82
|
+
return gitlab_api_1.gitlab.get(`${auditBasePath(input)}/${input.audit_event_id}`);
|
|
83
|
+
default:
|
|
84
|
+
throw new Error(`Unknown action: ${input.action}`);
|
|
85
|
+
}
|
|
86
|
+
},
|
|
87
|
+
},
|
|
88
|
+
],
|
|
89
|
+
]);
|
|
90
|
+
function getAuditEventsReadOnlyToolNames() {
|
|
91
|
+
return ['browse_audit_events'];
|
|
92
|
+
}
|
|
93
|
+
//# sourceMappingURL=registry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../../src/entities/audit_events/registry.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkFA,0EAEC;AApFD,uCAAyB;AACzB,uDAA4D;AAC5D,uDAAyD;AAEzD,oCAA+C;AAK/C,MAAM,WAAW,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAW,CAAC;AAM5F,SAAS,aAAa,CAAC,KAAiD;IACtE,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;QACrB,OAAO,YAAY,kBAAkB,CAAC,KAAK,CAAC,UAAU,CAAC,eAAe,CAAC;IACzE,CAAC;IACD,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACnB,OAAO,UAAU,kBAAkB,CAAC,KAAK,CAAC,QAAQ,CAAC,eAAe,CAAC;IACrE,CAAC;IACD,OAAO,cAAc,CAAC;AACxB,CAAC;AAYY,QAAA,uBAAuB,GAAiB,IAAI,GAAG,CAAiC;IAC3F;QACE,qBAAqB;QACrB;YACE,IAAI,EAAE,qBAAqB;YAC3B,WAAW,EACT,sYAAsY;YACxY,WAAW,EAAE,CAAC,CAAC,YAAY,CAAC,yCAAuB,CAAC;YACpD,YAAY,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE;YACtC,IAAI,EAAE,EAAE,MAAM,EAAE,kBAAkB,EAAE,YAAY,EAAE,IAAI,EAAE;YACxD,OAAO,EAAE,KAAK,EAAE,IAAa,EAAoB,EAAE;gBACjD,MAAM,KAAK,GAAG,yCAAuB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAClD,IAAA,2BAAmB,EAAC,qBAAqB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;gBAEzD,QAAQ,KAAK,CAAC,MAAM,EAAE,CAAC;oBACrB,KAAK,eAAe,CAAC,CAAC,CAAC;wBACrB,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,GAAG,KAAK,CAAC;wBAC5C,OAAO,mBAAM,CAAC,GAAG,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,IAAA,oBAAO,EAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;oBACnE,CAAC;oBAED,KAAK,YAAY,CAAC,CAAC,CAAC;wBAClB,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,GAAG,KAAK,CAAC;wBACtD,OAAO,mBAAM,CAAC,GAAG,CAAC,UAAU,kBAAkB,CAAC,QAAQ,CAAC,eAAe,EAAE;4BACvE,KAAK,EAAE,IAAA,oBAAO,EAAC,KAAK,EAAE,EAAE,CAAC;yBAC1B,CAAC,CAAC;oBACL,CAAC;oBAED,KAAK,cAAc,CAAC,CAAC,CAAC;wBACpB,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,KAAK,EAAE,GAAG,KAAK,CAAC;wBACxD,OAAO,mBAAM,CAAC,GAAG,CAAC,YAAY,kBAAkB,CAAC,UAAU,CAAC,eAAe,EAAE;4BAC3E,KAAK,EAAE,IAAA,oBAAO,EAAC,KAAK,EAAE,EAAE,CAAC;yBAC1B,CAAC,CAAC;oBACL,CAAC;oBAED,KAAK,KAAK;wBACR,OAAO,mBAAM,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;oBAGvE;wBACE,MAAM,IAAI,KAAK,CAAC,mBAAoB,KAA4B,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC/E,CAAC;YACH,CAAC;SACF;KACF;CACF,CAAC,CAAC;AAGH,SAAgB,+BAA+B;IAC7C,OAAO,CAAC,qBAAqB,CAAC,CAAC;AACjC,CAAC"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
export declare const projectIdField: z.ZodPreprocess<z.ZodCoercedString<unknown>>;
|
|
3
|
+
export declare const groupIdField: z.ZodPreprocess<z.ZodCoercedString<unknown>>;
|
|
4
|
+
export declare const auditEventIdField: z.ZodCoercedNumber<unknown>;
|
|
5
|
+
export declare const BrowseAuditEventsSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
6
|
+
per_page: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
|
|
7
|
+
page: z.ZodOptional<z.ZodNumber>;
|
|
8
|
+
action: z.ZodLiteral<"list_instance">;
|
|
9
|
+
entity_type: z.ZodOptional<z.ZodString>;
|
|
10
|
+
entity_id: z.ZodOptional<z.ZodCoercedNumber<unknown>>;
|
|
11
|
+
created_after: z.ZodOptional<z.ZodString>;
|
|
12
|
+
created_before: z.ZodOptional<z.ZodString>;
|
|
13
|
+
}, z.core.$strip>, z.ZodObject<{
|
|
14
|
+
per_page: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
|
|
15
|
+
page: z.ZodOptional<z.ZodNumber>;
|
|
16
|
+
action: z.ZodLiteral<"list_group">;
|
|
17
|
+
group_id: z.ZodPreprocess<z.ZodCoercedString<unknown>>;
|
|
18
|
+
created_after: z.ZodOptional<z.ZodString>;
|
|
19
|
+
created_before: z.ZodOptional<z.ZodString>;
|
|
20
|
+
}, z.core.$strip>, z.ZodObject<{
|
|
21
|
+
per_page: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
|
|
22
|
+
page: z.ZodOptional<z.ZodNumber>;
|
|
23
|
+
action: z.ZodLiteral<"list_project">;
|
|
24
|
+
project_id: z.ZodPreprocess<z.ZodCoercedString<unknown>>;
|
|
25
|
+
created_after: z.ZodOptional<z.ZodString>;
|
|
26
|
+
created_before: z.ZodOptional<z.ZodString>;
|
|
27
|
+
}, z.core.$strip>, z.ZodObject<{
|
|
28
|
+
action: z.ZodLiteral<"get">;
|
|
29
|
+
audit_event_id: z.ZodCoercedNumber<unknown>;
|
|
30
|
+
project_id: z.ZodOptional<z.ZodPreprocess<z.ZodCoercedString<unknown>>>;
|
|
31
|
+
group_id: z.ZodOptional<z.ZodPreprocess<z.ZodCoercedString<unknown>>>;
|
|
32
|
+
}, z.core.$strip>], "action">;
|
|
33
|
+
export type BrowseAuditEventsInput = z.infer<typeof BrowseAuditEventsSchema>;
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.BrowseAuditEventsSchema = exports.auditEventIdField = exports.groupIdField = exports.projectIdField = void 0;
|
|
4
|
+
const zod_1 = require("zod");
|
|
5
|
+
const utils_1 = require("../utils");
|
|
6
|
+
exports.projectIdField = utils_1.requiredId.describe("Project ID or URL-encoded path (e.g. 'group/project' or '123').");
|
|
7
|
+
exports.groupIdField = utils_1.requiredId.describe("Group ID or URL-encoded path (e.g. 'my-group' or '42').");
|
|
8
|
+
exports.auditEventIdField = zod_1.z.coerce
|
|
9
|
+
.number()
|
|
10
|
+
.int()
|
|
11
|
+
.positive()
|
|
12
|
+
.describe('Numeric audit-event ID (from a list action).');
|
|
13
|
+
const createdAfterField = zod_1.z
|
|
14
|
+
.string()
|
|
15
|
+
.regex(/^\d{4}-\d{2}-\d{2}$/, 'created_after must be a YYYY-MM-DD date')
|
|
16
|
+
.optional()
|
|
17
|
+
.describe('Return events created on or after this date (YYYY-MM-DD).');
|
|
18
|
+
const createdBeforeField = zod_1.z
|
|
19
|
+
.string()
|
|
20
|
+
.regex(/^\d{4}-\d{2}-\d{2}$/, 'created_before must be a YYYY-MM-DD date')
|
|
21
|
+
.optional()
|
|
22
|
+
.describe('Return events created on or before this date (YYYY-MM-DD).');
|
|
23
|
+
const ListInstanceSchema = zod_1.z.object({
|
|
24
|
+
action: zod_1.z
|
|
25
|
+
.literal('list_instance')
|
|
26
|
+
.describe('List instance-wide audit events (requires admin; Premium+)'),
|
|
27
|
+
entity_type: zod_1.z
|
|
28
|
+
.string()
|
|
29
|
+
.optional()
|
|
30
|
+
.describe("Filter by entity type, e.g. 'User', 'Group', 'Project', 'Key'."),
|
|
31
|
+
entity_id: zod_1.z.coerce
|
|
32
|
+
.number()
|
|
33
|
+
.int()
|
|
34
|
+
.positive()
|
|
35
|
+
.optional()
|
|
36
|
+
.describe('Filter by the numeric ID of the entity (used with entity_type).'),
|
|
37
|
+
created_after: createdAfterField,
|
|
38
|
+
created_before: createdBeforeField,
|
|
39
|
+
...(0, utils_1.paginationFields)(),
|
|
40
|
+
});
|
|
41
|
+
const ListGroupSchema = zod_1.z.object({
|
|
42
|
+
action: zod_1.z
|
|
43
|
+
.literal('list_group')
|
|
44
|
+
.describe('List a group audit events (Premium+, group owner/admin)'),
|
|
45
|
+
group_id: exports.groupIdField,
|
|
46
|
+
created_after: createdAfterField,
|
|
47
|
+
created_before: createdBeforeField,
|
|
48
|
+
...(0, utils_1.paginationFields)(),
|
|
49
|
+
});
|
|
50
|
+
const ListProjectSchema = zod_1.z.object({
|
|
51
|
+
action: zod_1.z
|
|
52
|
+
.literal('list_project')
|
|
53
|
+
.describe('List a project audit events (Premium+, project owner/admin)'),
|
|
54
|
+
project_id: exports.projectIdField,
|
|
55
|
+
created_after: createdAfterField,
|
|
56
|
+
created_before: createdBeforeField,
|
|
57
|
+
...(0, utils_1.paginationFields)(),
|
|
58
|
+
});
|
|
59
|
+
const GetAuditEventSchema = zod_1.z.object({
|
|
60
|
+
action: zod_1.z
|
|
61
|
+
.literal('get')
|
|
62
|
+
.describe('Get a single audit event by ID. Pass project_id for a project event, group_id for a group event, or neither for an instance event (admin).'),
|
|
63
|
+
audit_event_id: exports.auditEventIdField,
|
|
64
|
+
project_id: utils_1.requiredId.optional().describe('Set for a project audit event.'),
|
|
65
|
+
group_id: utils_1.requiredId.optional().describe('Set for a group audit event.'),
|
|
66
|
+
});
|
|
67
|
+
exports.BrowseAuditEventsSchema = zod_1.z
|
|
68
|
+
.discriminatedUnion('action', [
|
|
69
|
+
ListInstanceSchema,
|
|
70
|
+
ListGroupSchema,
|
|
71
|
+
ListProjectSchema,
|
|
72
|
+
GetAuditEventSchema,
|
|
73
|
+
])
|
|
74
|
+
.refine((data) => data.action !== 'get' || !(data.project_id && data.group_id), {
|
|
75
|
+
message: 'Pass at most one of project_id or group_id (an event belongs to a single scope)',
|
|
76
|
+
path: ['project_id'],
|
|
77
|
+
});
|
|
78
|
+
//# sourceMappingURL=schema-readonly.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schema-readonly.js","sourceRoot":"","sources":["../../../../src/entities/audit_events/schema-readonly.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AACxB,oCAAwD;AAa3C,QAAA,cAAc,GAAG,kBAAU,CAAC,QAAQ,CAC/C,iEAAiE,CAClE,CAAC;AACW,QAAA,YAAY,GAAG,kBAAU,CAAC,QAAQ,CAC7C,yDAAyD,CAC1D,CAAC;AACW,QAAA,iBAAiB,GAAG,OAAC,CAAC,MAAM;KACtC,MAAM,EAAE;KACR,GAAG,EAAE;KACL,QAAQ,EAAE;KACV,QAAQ,CAAC,8CAA8C,CAAC,CAAC;AAE5D,MAAM,iBAAiB,GAAG,OAAC;KACxB,MAAM,EAAE;KACR,KAAK,CAAC,qBAAqB,EAAE,yCAAyC,CAAC;KACvE,QAAQ,EAAE;KACV,QAAQ,CAAC,2DAA2D,CAAC,CAAC;AACzE,MAAM,kBAAkB,GAAG,OAAC;KACzB,MAAM,EAAE;KACR,KAAK,CAAC,qBAAqB,EAAE,0CAA0C,CAAC;KACxE,QAAQ,EAAE;KACV,QAAQ,CAAC,4DAA4D,CAAC,CAAC;AAG1E,MAAM,kBAAkB,GAAG,OAAC,CAAC,MAAM,CAAC;IAClC,MAAM,EAAE,OAAC;SACN,OAAO,CAAC,eAAe,CAAC;SACxB,QAAQ,CAAC,4DAA4D,CAAC;IACzE,WAAW,EAAE,OAAC;SACX,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,gEAAgE,CAAC;IAC7E,SAAS,EAAE,OAAC,CAAC,MAAM;SAChB,MAAM,EAAE;SACR,GAAG,EAAE;SACL,QAAQ,EAAE;SACV,QAAQ,EAAE;SACV,QAAQ,CAAC,iEAAiE,CAAC;IAC9E,aAAa,EAAE,iBAAiB;IAChC,cAAc,EAAE,kBAAkB;IAClC,GAAG,IAAA,wBAAgB,GAAE;CACtB,CAAC,CAAC;AAGH,MAAM,eAAe,GAAG,OAAC,CAAC,MAAM,CAAC;IAC/B,MAAM,EAAE,OAAC;SACN,OAAO,CAAC,YAAY,CAAC;SACrB,QAAQ,CAAC,yDAAyD,CAAC;IACtE,QAAQ,EAAE,oBAAY;IACtB,aAAa,EAAE,iBAAiB;IAChC,cAAc,EAAE,kBAAkB;IAClC,GAAG,IAAA,wBAAgB,GAAE;CACtB,CAAC,CAAC;AAGH,MAAM,iBAAiB,GAAG,OAAC,CAAC,MAAM,CAAC;IACjC,MAAM,EAAE,OAAC;SACN,OAAO,CAAC,cAAc,CAAC;SACvB,QAAQ,CAAC,6DAA6D,CAAC;IAC1E,UAAU,EAAE,sBAAc;IAC1B,aAAa,EAAE,iBAAiB;IAChC,cAAc,EAAE,kBAAkB;IAClC,GAAG,IAAA,wBAAgB,GAAE;CACtB,CAAC,CAAC;AAGH,MAAM,mBAAmB,GAAG,OAAC,CAAC,MAAM,CAAC;IACnC,MAAM,EAAE,OAAC;SACN,OAAO,CAAC,KAAK,CAAC;SACd,QAAQ,CACP,4IAA4I,CAC7I;IACH,cAAc,EAAE,yBAAiB;IACjC,UAAU,EAAE,kBAAU,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,gCAAgC,CAAC;IAC5E,QAAQ,EAAE,kBAAU,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,8BAA8B,CAAC;CACzE,CAAC,CAAC;AAGU,QAAA,uBAAuB,GAAG,OAAC;KACrC,kBAAkB,CAAC,QAAQ,EAAE;IAC5B,kBAAkB;IAClB,eAAe;IACf,iBAAiB;IACjB,mBAAmB;CACpB,CAAC;KAED,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE;IAC9E,OAAO,EAAE,iFAAiF;IAC1F,IAAI,EAAE,CAAC,YAAY,CAAC;CACrB,CAAC,CAAC"}
|
|
@@ -41,6 +41,7 @@ const schema_1 = require("./schema");
|
|
|
41
41
|
const utils_1 = require("../utils");
|
|
42
42
|
const ConnectionManager_1 = require("../../services/ConnectionManager");
|
|
43
43
|
const idConversion_1 = require("../../utils/idConversion");
|
|
44
|
+
const token_context_1 = require("../../oauth/token-context");
|
|
44
45
|
const containerRegistry_1 = require("../../graphql/containerRegistry");
|
|
45
46
|
const REPOSITORY_GID_PREFIX = 'gid://gitlab/ContainerRepository/';
|
|
46
47
|
const repositoryGid = (id) => `${REPOSITORY_GID_PREFIX}${id}`;
|
|
@@ -84,7 +85,7 @@ exports.containerRegistryToolRegistry = new Map([
|
|
|
84
85
|
handler: async (args) => {
|
|
85
86
|
const input = schema_readonly_1.BrowseRegistrySchema.parse(args);
|
|
86
87
|
(0, utils_1.assertActionAllowed)('browse_registry', input.action);
|
|
87
|
-
const client = ConnectionManager_1.ConnectionManager.getInstance().getClient();
|
|
88
|
+
const client = ConnectionManager_1.ConnectionManager.getInstance().getClient((0, token_context_1.getGitLabApiUrlFromContext)());
|
|
88
89
|
switch (input.action) {
|
|
89
90
|
case 'list_repositories': {
|
|
90
91
|
const res = await client.request(containerRegistry_1.LIST_CONTAINER_REPOSITORIES, {
|
|
@@ -159,7 +160,7 @@ exports.containerRegistryToolRegistry = new Map([
|
|
|
159
160
|
handler: async (args) => {
|
|
160
161
|
const input = schema_1.ManageRegistrySchema.parse(args);
|
|
161
162
|
(0, utils_1.assertActionAllowed)('manage_registry', input.action);
|
|
162
|
-
const client = ConnectionManager_1.ConnectionManager.getInstance().getClient();
|
|
163
|
+
const client = ConnectionManager_1.ConnectionManager.getInstance().getClient((0, token_context_1.getGitLabApiUrlFromContext)());
|
|
163
164
|
const gid = repositoryGid(input.repository_id);
|
|
164
165
|
switch (input.action) {
|
|
165
166
|
case 'delete_repository': {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../../src/entities/container_registry/registry.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../../src/entities/container_registry/registry.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmTA,sFAEC;AArTD,uCAAyB;AACzB,uDAAyD;AACzD,qCAAgD;AAEhD,oCAA+C;AAC/C,wEAAqE;AACrE,2DAA+D;AAC/D,6DAAuE;AACvE,uEAQyC;AAczC,MAAM,qBAAqB,GAAG,mCAAmC,CAAC;AAClE,MAAM,aAAa,GAAG,CAAC,EAAU,EAAU,EAAE,CAAC,GAAG,qBAAqB,GAAG,EAAE,EAAE,CAAC;AAG9E,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAG9B,MAAM,iBAAiB,GAAG,IAAI,CAAC;AAE/B,MAAM,kBAAkB,GAA2B;IACjD,CAAC,EAAE,IAAI;IACP,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,SAAS;IACZ,CAAC,EAAE,UAAU;CACd,CAAC;AAGF,SAAS,YAAY,CAAC,UAAkB;IACtC,MAAM,KAAK,GAAG,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAElD,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,UAAU,EAAE,CAAC,CAAC;IAC/D,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/D,CAAC;AAQD,SAAS,qBAAqB,CAC5B,IAAwB,EACxB,IAKC;IAED,MAAM,QAAQ,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAE9E,IAAI,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAGpF,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC;IAEhF,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC9B,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QAClC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1D,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,CAAC;IAClG,CAAC;IAED,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AACvC,CAAC;AAEY,QAAA,6BAA6B,GAAiB,IAAI,GAAG,CAAiC;IAIjG;QACE,iBAAiB;QACjB;YACE,IAAI,EAAE,iBAAiB;YACvB,WAAW,EACT,2UAA2U;YAC7U,WAAW,EAAE,CAAC,CAAC,YAAY,CAAC,sCAAoB,CAAC;YACjD,YAAY,EAAE,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE;YAC/D,IAAI,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,IAAI,EAAE;YACpD,OAAO,EAAE,KAAK,EAAE,IAAa,EAAoB,EAAE;gBACjD,MAAM,KAAK,GAAG,sCAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAE/C,IAAA,2BAAmB,EAAC,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;gBAErD,MAAM,MAAM,GAAG,qCAAiB,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,IAAA,0CAA0B,GAAE,CAAC,CAAC;gBAEvF,QAAQ,KAAK,CAAC,MAAM,EAAE,CAAC;oBACrB,KAAK,mBAAmB,CAAC,CAAC,CAAC;wBACzB,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,+CAA2B,EAAE;4BAC5D,QAAQ,EAAE,KAAK,CAAC,UAAU;4BAC1B,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,IAAI;4BACxB,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,EAAE;4BACxB,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,IAAI;yBAC3B,CAAC,CAAC;wBACH,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;4BACjB,MAAM,IAAI,KAAK,CAAC,YAAY,KAAK,CAAC,UAAU,+BAA+B,CAAC,CAAC;wBAC/E,CAAC;wBACD,OAAO,IAAA,kCAAmB,EAAC,GAAG,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;oBAChE,CAAC;oBAED,KAAK,gBAAgB,CAAC,CAAC,CAAC;wBACtB,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,4CAAwB,EAAE;4BACzD,EAAE,EAAE,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC;yBACvC,CAAC,CAAC;wBACH,IAAI,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;4BAC7B,MAAM,IAAI,KAAK,CAAC,wBAAwB,KAAK,CAAC,aAAa,YAAY,CAAC,CAAC;wBAC3E,CAAC;wBACD,OAAO,IAAA,kCAAmB,EAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;oBACtD,CAAC;oBAED,KAAK,WAAW,CAAC,CAAC,CAAC;wBACjB,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,kDAA8B,EAAE;4BAC/D,EAAE,EAAE,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC;4BACtC,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,IAAI;4BACxB,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,EAAE;4BACxB,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,IAAI;yBAC3B,CAAC,CAAC;wBACH,IAAI,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;4BAC7B,MAAM,IAAI,KAAK,CAAC,wBAAwB,KAAK,CAAC,aAAa,YAAY,CAAC,CAAC;wBAC3E,CAAC;wBACD,OAAO,IAAA,kCAAmB,EAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;oBAC3D,CAAC;oBAED,KAAK,SAAS,CAAC,CAAC,CAAC;wBAGf,MAAM,GAAG,GAAG,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;wBAC/C,IAAI,KAAK,GAAkB,IAAI,CAAC;wBAChC,SAAS,CAAC;4BAGR,MAAM,GAAG,GAAmB,MAAM,MAAM,CAAC,OAAO,CAAC,kDAA8B,EAAE;gCAC/E,EAAE,EAAE,GAAG;gCACP,IAAI,EAAE,KAAK,CAAC,QAAQ;gCACpB,KAAK,EAAE,GAAG;gCACV,KAAK;6BACN,CAAC,CAAC;4BACH,IAAI,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;gCAC7B,MAAM,IAAI,KAAK,CAAC,wBAAwB,KAAK,CAAC,aAAa,YAAY,CAAC,CAAC;4BAC3E,CAAC;4BACD,MAAM,IAAI,GAAG,GAAG,CAAC,mBAAmB,CAAC,IAAI,CAAC;4BAC1C,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,QAAQ,CAAC,CAAC;4BAC9D,IAAI,GAAG;gCAAE,OAAO,IAAA,kCAAmB,EAAC,GAAG,CAAC,CAAC;4BACzC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS;gCAAE,MAAM;4BAClE,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;wBAClC,CAAC;wBACD,MAAM,IAAI,KAAK,CACb,QAAQ,KAAK,CAAC,QAAQ,uCAAuC,KAAK,CAAC,aAAa,EAAE,CACnF,CAAC;oBACJ,CAAC;oBAGD;wBACE,MAAM,IAAI,KAAK,CAAC,mBAAoB,KAA4B,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC/E,CAAC;YACH,CAAC;SACF;KACF;IAKD;QACE,iBAAiB;QACjB;YACE,IAAI,EAAE,iBAAiB;YACvB,WAAW,EACT,oRAAoR;YACtR,WAAW,EAAE,CAAC,CAAC,YAAY,CAAC,6BAAoB,CAAC;YACjD,YAAY,EAAE,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE;YAC/D,IAAI,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,IAAI,EAAE;YACpD,OAAO,EAAE,KAAK,EAAE,IAAa,EAAoB,EAAE;gBACjD,MAAM,KAAK,GAAG,6BAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAE/C,IAAA,2BAAmB,EAAC,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;gBAErD,MAAM,MAAM,GAAG,qCAAiB,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,IAAA,0CAA0B,GAAE,CAAC,CAAC;gBACvF,MAAM,GAAG,GAAG,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;gBAE/C,QAAQ,KAAK,CAAC,MAAM,EAAE,CAAC;oBACrB,KAAK,mBAAmB,CAAC,CAAC,CAAC;wBACzB,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,gDAA4B,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;wBAC5E,MAAM,MAAM,GAAG,GAAG,CAAC,0BAA0B,EAAE,MAAM,IAAI,EAAE,CAAC;wBAC5D,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BACtB,MAAM,IAAI,KAAK,CAAC,qBAAqB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;wBAC5D,CAAC;wBACD,OAAO;4BACL,OAAO,EAAE,IAAI;4BACb,aAAa,EAAE,KAAK,CAAC,aAAa;4BAClC,MAAM,EAAE,GAAG,CAAC,0BAA0B,EAAE,mBAAmB,EAAE,MAAM,IAAI,IAAI;yBAC5E,CAAC;oBACJ,CAAC;oBAED,KAAK,YAAY,CAAC,CAAC,CAAC;wBAClB,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,qDAAiC,EAAE;4BAClE,EAAE,EAAE,GAAG;4BACP,QAAQ,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC;yBAC3B,CAAC,CAAC;wBACH,MAAM,MAAM,GAAG,GAAG,CAAC,8BAA8B,EAAE,MAAM,IAAI,EAAE,CAAC;wBAChE,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BACtB,MAAM,IAAI,KAAK,CAAC,qBAAqB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;wBAC5D,CAAC;wBACD,OAAO;4BACL,OAAO,EAAE,IAAI;4BACb,aAAa,EAAE,KAAK,CAAC,aAAa;4BAClC,QAAQ,EAAE,KAAK,CAAC,QAAQ;yBACzB,CAAC;oBACJ,CAAC;oBAED,KAAK,kBAAkB,CAAC,CAAC,CAAC;wBAGxB,MAAM,IAAI,GAAuB,EAAE,CAAC;wBACpC,IAAI,MAAM,GAAG,KAAK,CAAC;wBACnB,IAAI,KAAK,GAAkB,IAAI,CAAC;wBAChC,SAAS,CAAC;4BAGR,MAAM,IAAI,GAAmB,MAAM,MAAM,CAAC,OAAO,CAAC,kDAA8B,EAAE;gCAChF,EAAE,EAAE,GAAG;gCACP,IAAI,EAAE,IAAI;gCACV,KAAK,EAAE,GAAG;gCACV,KAAK;6BACN,CAAC,CAAC;4BAGH,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC;gCAC9B,MAAM,IAAI,KAAK,CAAC,wBAAwB,KAAK,CAAC,aAAa,YAAY,CAAC,CAAC;4BAC3E,CAAC;4BACD,MAAM,IAAI,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC;4BAC3C,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;4BACzB,IAAI,IAAI,CAAC,MAAM,IAAI,iBAAiB,EAAE,CAAC;gCACrC,IAAI,CAAC,MAAM,GAAG,iBAAiB,CAAC;gCAChC,MAAM,GAAG,IAAI,CAAC;gCACd,MAAM;4BACR,CAAC;4BACD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS;gCAAE,MAAM;4BAClE,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;wBAClC,CAAC;wBAED,MAAM,QAAQ,GAAG,qBAAqB,CAAC,IAAI,EAAE;4BAC3C,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;4BAC1C,eAAe,EAAE,KAAK,CAAC,eAAe;4BACtC,MAAM,EAAE,KAAK,CAAC,MAAM;4BACpB,UAAU,EAAE,KAAK,CAAC,UAAU;yBAC7B,CAAC,CAAC;wBAEH,MAAM,OAAO,GAAa,EAAE,CAAC;wBAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,kBAAkB,EAAE,CAAC;4BAC7D,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,kBAAkB,CAAC,CAAC;4BACxD,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,qDAAiC,EAAE;gCAClE,EAAE,EAAE,GAAG;gCACP,QAAQ,EAAE,KAAK;6BAChB,CAAC,CAAC;4BACH,MAAM,MAAM,GAAG,GAAG,CAAC,8BAA8B,EAAE,MAAM,IAAI,EAAE,CAAC;4BAChE,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gCACtB,MAAM,IAAI,KAAK,CAAC,qBAAqB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;4BAC5D,CAAC;4BACD,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;wBACzB,CAAC;wBAED,OAAO;4BACL,OAAO,EAAE,IAAI;4BACb,aAAa,EAAE,KAAK,CAAC,aAAa;4BAClC,aAAa,EAAE,OAAO,CAAC,MAAM;4BAC7B,YAAY,EAAE,OAAO;4BAGrB,WAAW,EAAE,MAAM;yBACpB,CAAC;oBACJ,CAAC;oBAGD;wBACE,MAAM,IAAI,KAAK,CAAC,mBAAoB,KAA4B,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC/E,CAAC;YACH,CAAC;SACF;KACF;CACF,CAAC,CAAC;AAKH,SAAgB,qCAAqC;IACnD,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAC7B,CAAC"}
|
|
@@ -4,6 +4,7 @@ exports.executeWhoami = executeWhoami;
|
|
|
4
4
|
const config_1 = require("../../config");
|
|
5
5
|
const logger_1 = require("../../logger");
|
|
6
6
|
const index_js_1 = require("../../oauth/index.js");
|
|
7
|
+
const token_context_1 = require("../../oauth/token-context");
|
|
7
8
|
const ConnectionManager_1 = require("../../services/ConnectionManager");
|
|
8
9
|
const TokenScopeDetector_1 = require("../../services/TokenScopeDetector");
|
|
9
10
|
const registry_manager_1 = require("../../registry-manager");
|
|
@@ -86,7 +87,7 @@ function buildServerInfo() {
|
|
|
86
87
|
const edition = 'unknown';
|
|
87
88
|
try {
|
|
88
89
|
const connectionManager = ConnectionManager_1.ConnectionManager.getInstance();
|
|
89
|
-
const instanceInfo = connectionManager.getInstanceInfo();
|
|
90
|
+
const instanceInfo = connectionManager.getInstanceInfo((0, token_context_1.getGitLabApiUrlFromContext)());
|
|
90
91
|
version = instanceInfo.version;
|
|
91
92
|
tier = instanceInfo.tier;
|
|
92
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../../../src/entities/context/whoami.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../../../src/entities/context/whoami.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,6 +46,7 @@ const smart_user_search_1 = require("../../utils/smart-user-search");
|
|
|
46
46
|
const idConversion_1 = require("../../utils/idConversion");
|
|
47
47
|
const utils_1 = require("../utils");
|
|
48
48
|
const ConnectionManager_1 = require("../../services/ConnectionManager");
|
|
49
|
+
const token_context_1 = require("../../oauth/token-context");
|
|
49
50
|
const version_1 = require("../../utils/version");
|
|
50
51
|
const RestoredEntitySchema = z
|
|
51
52
|
.object({
|
|
@@ -161,7 +162,7 @@ exports.coreToolRegistry = new Map([
|
|
|
161
162
|
queryParams.set('per_page', '20');
|
|
162
163
|
let activeFilterSupported = true;
|
|
163
164
|
try {
|
|
164
|
-
const version = ConnectionManager_1.ConnectionManager.getInstance().getInstanceInfo().version;
|
|
165
|
+
const version = ConnectionManager_1.ConnectionManager.getInstance().getInstanceInfo((0, token_context_1.getGitLabApiUrlFromContext)()).version;
|
|
165
166
|
activeFilterSupported =
|
|
166
167
|
version === 'unknown' || (0, version_1.parseVersion)(version) >= (0, version_1.parseVersion)('18.5');
|
|
167
168
|
}
|
|
@@ -788,7 +789,7 @@ exports.coreToolRegistry = new Map([
|
|
|
788
789
|
const { group_id } = input;
|
|
789
790
|
let version = 'unknown';
|
|
790
791
|
try {
|
|
791
|
-
version = ConnectionManager_1.ConnectionManager.getInstance().getInstanceInfo().version;
|
|
792
|
+
version = ConnectionManager_1.ConnectionManager.getInstance().getInstanceInfo((0, token_context_1.getGitLabApiUrlFromContext)()).version;
|
|
792
793
|
}
|
|
793
794
|
catch {
|
|
794
795
|
}
|