@noodleseed/one 0.62.0 → 0.63.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/bin.js +8 -2
- package/dist/bin.js.map +1 -1
- package/dist/browser.d.ts +10 -0
- package/dist/browser.d.ts.map +1 -0
- package/dist/browser.js +18 -0
- package/dist/browser.js.map +1 -0
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +4 -0
- package/dist/cli.js.map +1 -1
- package/dist/commands/apps-ops.js +1 -1
- package/dist/commands/apps-ops.js.map +1 -1
- package/dist/commands/deploy-ops.d.ts +2 -3
- package/dist/commands/deploy-ops.d.ts.map +1 -1
- package/dist/commands/deploy-ops.js +5 -17
- package/dist/commands/deploy-ops.js.map +1 -1
- package/dist/commands/github-ops.d.ts +3 -2
- package/dist/commands/github-ops.d.ts.map +1 -1
- package/dist/commands/github-ops.js +7 -4
- package/dist/commands/github-ops.js.map +1 -1
- package/dist/control-plane.d.ts +2 -1
- package/dist/control-plane.d.ts.map +1 -1
- package/dist/control-plane.js +31 -10
- package/dist/control-plane.js.map +1 -1
- package/dist/device-login.d.ts +30 -0
- package/dist/device-login.d.ts.map +1 -0
- package/dist/device-login.js +162 -0
- package/dist/device-login.js.map +1 -0
- package/dist/doctor.d.ts.map +1 -1
- package/dist/doctor.js +11 -0
- package/dist/doctor.js.map +1 -1
- package/dist/platform-support.d.ts +22 -0
- package/dist/platform-support.d.ts.map +1 -0
- package/dist/platform-support.js +118 -0
- package/dist/platform-support.js.map +1 -0
- package/node_modules/@noodle-borg/service/dist/oauth/app.d.ts.map +1 -1
- package/node_modules/@noodle-borg/service/dist/oauth/app.js +65 -0
- package/node_modules/@noodle-borg/service/dist/oauth/app.js.map +1 -1
- package/node_modules/@noodle-borg/service/dist/oauth/device-flow.d.ts +20 -0
- package/node_modules/@noodle-borg/service/dist/oauth/device-flow.d.ts.map +1 -0
- package/node_modules/@noodle-borg/service/dist/oauth/device-flow.js +239 -0
- package/node_modules/@noodle-borg/service/dist/oauth/device-flow.js.map +1 -0
- package/node_modules/@noodle-borg/service/dist/oauth/device-provider.d.ts +15 -0
- package/node_modules/@noodle-borg/service/dist/oauth/device-provider.d.ts.map +1 -0
- package/node_modules/@noodle-borg/service/dist/oauth/device-provider.js +45 -0
- package/node_modules/@noodle-borg/service/dist/oauth/device-provider.js.map +1 -0
- package/node_modules/@noodle-borg/service/dist/oauth/device-store-postgres-schema.d.ts +3 -0
- package/node_modules/@noodle-borg/service/dist/oauth/device-store-postgres-schema.d.ts.map +1 -0
- package/node_modules/@noodle-borg/service/dist/oauth/device-store-postgres-schema.js +33 -0
- package/node_modules/@noodle-borg/service/dist/oauth/device-store-postgres-schema.js.map +1 -0
- package/node_modules/@noodle-borg/service/dist/oauth/device-store-postgres-types.d.ts +30 -0
- package/node_modules/@noodle-borg/service/dist/oauth/device-store-postgres-types.d.ts.map +1 -0
- package/node_modules/@noodle-borg/service/dist/oauth/device-store-postgres-types.js +31 -0
- package/node_modules/@noodle-borg/service/dist/oauth/device-store-postgres-types.js.map +1 -0
- package/node_modules/@noodle-borg/service/dist/oauth/device-store.d.ts +66 -0
- package/node_modules/@noodle-borg/service/dist/oauth/device-store.d.ts.map +1 -0
- package/node_modules/@noodle-borg/service/dist/oauth/device-store.js +2 -0
- package/node_modules/@noodle-borg/service/dist/oauth/device-store.js.map +1 -0
- package/node_modules/@noodle-borg/service/dist/oauth/paths.d.ts.map +1 -1
- package/node_modules/@noodle-borg/service/dist/oauth/paths.js +3 -0
- package/node_modules/@noodle-borg/service/dist/oauth/paths.js.map +1 -1
- package/node_modules/@noodle-borg/service/dist/oauth/provider.d.ts +7 -0
- package/node_modules/@noodle-borg/service/dist/oauth/provider.d.ts.map +1 -1
- package/node_modules/@noodle-borg/service/dist/oauth/provider.js +36 -1
- package/node_modules/@noodle-borg/service/dist/oauth/provider.js.map +1 -1
- package/node_modules/@noodle-borg/service/dist/oauth/store-postgres.d.ts +14 -0
- package/node_modules/@noodle-borg/service/dist/oauth/store-postgres.d.ts.map +1 -1
- package/node_modules/@noodle-borg/service/dist/oauth/store-postgres.js +122 -0
- package/node_modules/@noodle-borg/service/dist/oauth/store-postgres.js.map +1 -1
- package/node_modules/@noodle-borg/service/dist/oauth/store.d.ts +15 -1
- package/node_modules/@noodle-borg/service/dist/oauth/store.d.ts.map +1 -1
- package/node_modules/@noodle-borg/service/dist/oauth/store.js +83 -0
- package/node_modules/@noodle-borg/service/dist/oauth/store.js.map +1 -1
- package/node_modules/bundle-name/index.js +5 -0
- package/node_modules/bundle-name/license +9 -0
- package/node_modules/bundle-name/package.json +45 -0
- package/node_modules/bundle-name/readme.md +23 -0
- package/node_modules/default-browser/index.d.ts +29 -0
- package/node_modules/default-browser/index.js +34 -0
- package/node_modules/default-browser/license +9 -0
- package/node_modules/default-browser/package.json +54 -0
- package/node_modules/default-browser/readme.md +24 -0
- package/node_modules/default-browser/windows.js +57 -0
- package/node_modules/default-browser-id/index.js +25 -0
- package/node_modules/default-browser-id/license +9 -0
- package/node_modules/default-browser-id/package.json +41 -0
- package/node_modules/default-browser-id/readme.md +19 -0
- package/node_modules/define-lazy-prop/index.d.ts +31 -0
- package/node_modules/define-lazy-prop/index.js +18 -0
- package/node_modules/define-lazy-prop/license +9 -0
- package/node_modules/define-lazy-prop/package.json +51 -0
- package/node_modules/define-lazy-prop/readme.md +55 -0
- package/node_modules/is-docker/cli.js +5 -0
- package/node_modules/is-docker/index.d.ts +13 -0
- package/node_modules/is-docker/index.js +29 -0
- package/node_modules/is-docker/license +9 -0
- package/node_modules/is-docker/package.json +44 -0
- package/node_modules/is-docker/readme.md +27 -0
- package/node_modules/is-in-ssh/index.d.ts +15 -0
- package/node_modules/is-in-ssh/index.js +7 -0
- package/node_modules/is-in-ssh/license +9 -0
- package/node_modules/is-in-ssh/package.json +43 -0
- package/node_modules/is-in-ssh/readme.md +43 -0
- package/node_modules/is-inside-container/cli.js +5 -0
- package/node_modules/is-inside-container/index.d.ts +13 -0
- package/node_modules/is-inside-container/index.js +23 -0
- package/node_modules/is-inside-container/license +9 -0
- package/node_modules/is-inside-container/package.json +51 -0
- package/node_modules/is-inside-container/readme.md +36 -0
- package/node_modules/is-wsl/index.d.ts +15 -0
- package/node_modules/is-wsl/index.js +36 -0
- package/node_modules/is-wsl/license +9 -0
- package/node_modules/is-wsl/package.json +58 -0
- package/node_modules/is-wsl/readme.md +21 -0
- package/node_modules/open/index.d.ts +158 -0
- package/node_modules/open/index.js +417 -0
- package/node_modules/open/license +9 -0
- package/node_modules/open/package.json +70 -0
- package/node_modules/open/readme.md +197 -0
- package/node_modules/open/xdg-open +1267 -0
- package/node_modules/powershell-utils/index.d.ts +122 -0
- package/node_modules/powershell-utils/index.js +58 -0
- package/node_modules/powershell-utils/license +9 -0
- package/node_modules/powershell-utils/package.json +47 -0
- package/node_modules/powershell-utils/readme.md +153 -0
- package/node_modules/run-applescript/index.d.ts +66 -0
- package/node_modules/run-applescript/index.js +37 -0
- package/node_modules/run-applescript/license +9 -0
- package/node_modules/run-applescript/package.json +42 -0
- package/node_modules/run-applescript/readme.md +78 -0
- package/node_modules/wsl-utils/index.d.ts +81 -0
- package/node_modules/wsl-utils/index.js +98 -0
- package/node_modules/wsl-utils/license +9 -0
- package/node_modules/wsl-utils/package.json +48 -0
- package/node_modules/wsl-utils/readme.md +111 -0
- package/node_modules/wsl-utils/utilities.js +19 -0
- package/package.json +14 -1
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
import { existsSync } from 'node:fs';
|
|
2
|
+
import { delimiter, join } from 'node:path';
|
|
3
|
+
import { EXIT, printJsonFailure } from './commands/output.js';
|
|
4
|
+
const DISCOVERY_COMMANDS = new Set(['--help', '-h', 'help', '--version', '-v', 'version']);
|
|
5
|
+
const MOUNTED_WINDOWS_PATH = /^\/mnt\/[a-z](?:\/|$)/i;
|
|
6
|
+
export function platformSupportFailure(argv, platform) {
|
|
7
|
+
if (platform !== 'win32' || DISCOVERY_COMMANDS.has(argv[0] ?? ''))
|
|
8
|
+
return undefined;
|
|
9
|
+
return {
|
|
10
|
+
code: 'unsupported_platform',
|
|
11
|
+
message: 'Noodle CLI commands run on macOS or Windows through WSL2.',
|
|
12
|
+
cause: 'Native Windows shells are not supported in this first slice.',
|
|
13
|
+
fix: 'Install WSL2 with Ubuntu and run Noodle from its Linux terminal.',
|
|
14
|
+
next: 'wsl --install -d Ubuntu',
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
export function enforcePlatformSupport(argv, platform) {
|
|
18
|
+
const failure = platformSupportFailure(argv, platform);
|
|
19
|
+
if (failure === undefined)
|
|
20
|
+
return undefined;
|
|
21
|
+
if (argv.includes('--json'))
|
|
22
|
+
return printJsonFailure(failure, EXIT.USAGE);
|
|
23
|
+
console.error([
|
|
24
|
+
`${failure.code}: ${failure.message}`,
|
|
25
|
+
`Cause: ${failure.cause}`,
|
|
26
|
+
`Fix: ${failure.fix}`,
|
|
27
|
+
`Next: ${failure.next}`,
|
|
28
|
+
].join('\n'));
|
|
29
|
+
return EXIT.USAGE;
|
|
30
|
+
}
|
|
31
|
+
export function wslPlatformChecks(input) {
|
|
32
|
+
if (!isWsl(input.platform, input.env, input.kernelRelease))
|
|
33
|
+
return [];
|
|
34
|
+
const distro = input.env.WSL_DISTRO_NAME;
|
|
35
|
+
const isWsl2 = /wsl2/i.test(input.kernelRelease);
|
|
36
|
+
const isUbuntu = distro !== undefined && /^ubuntu(?:-|$)/i.test(distro);
|
|
37
|
+
const checks = [
|
|
38
|
+
!isWsl2
|
|
39
|
+
? {
|
|
40
|
+
level: 'WARN',
|
|
41
|
+
name: 'Platform',
|
|
42
|
+
message: `WSL version 2 not detected${distro ? ` (${distro})` : ''}`,
|
|
43
|
+
cause: 'The supported Windows environment is WSL2 with Ubuntu.',
|
|
44
|
+
fix: 'Upgrade this distro to WSL2 from PowerShell.',
|
|
45
|
+
next: distro !== undefined
|
|
46
|
+
? `wsl.exe --set-version ${distro} 2`
|
|
47
|
+
: 'wsl.exe --set-default-version 2',
|
|
48
|
+
}
|
|
49
|
+
: distro === undefined
|
|
50
|
+
? {
|
|
51
|
+
level: 'WARN',
|
|
52
|
+
name: 'Platform',
|
|
53
|
+
message: 'WSL2 distro could not be identified',
|
|
54
|
+
cause: 'The supported Windows environment is WSL2 with Ubuntu.',
|
|
55
|
+
fix: 'Run Noodle from an Ubuntu WSL2 terminal.',
|
|
56
|
+
next: 'wsl.exe --list --verbose',
|
|
57
|
+
}
|
|
58
|
+
: !isUbuntu
|
|
59
|
+
? {
|
|
60
|
+
level: 'WARN',
|
|
61
|
+
name: 'Platform',
|
|
62
|
+
message: `WSL2 distro is not Ubuntu (${distro})`,
|
|
63
|
+
cause: 'The supported Windows environment is WSL2 with Ubuntu.',
|
|
64
|
+
fix: 'Install the supported Ubuntu distro for Noodle CLI work.',
|
|
65
|
+
next: 'wsl.exe --install -d Ubuntu',
|
|
66
|
+
}
|
|
67
|
+
: {
|
|
68
|
+
level: 'PASS',
|
|
69
|
+
name: 'Platform',
|
|
70
|
+
message: `WSL2 (${distro})`,
|
|
71
|
+
},
|
|
72
|
+
];
|
|
73
|
+
if (isMountedWindowsPath(input.cwd)) {
|
|
74
|
+
checks.push({
|
|
75
|
+
level: 'WARN',
|
|
76
|
+
name: 'WSL workspace',
|
|
77
|
+
message: input.cwd,
|
|
78
|
+
cause: 'The project is on a mounted Windows drive, which makes Node file watching and installs slower and less reliable.',
|
|
79
|
+
fix: 'Move the repository into the WSL Linux filesystem, such as ~/src.',
|
|
80
|
+
next: 'mkdir -p ~/src',
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
if (isMountedWindowsPath(input.nodePath) || isMountedWindowsPath(input.npmPath)) {
|
|
84
|
+
checks.push({
|
|
85
|
+
level: 'WARN',
|
|
86
|
+
name: 'WSL runtime',
|
|
87
|
+
message: 'mounted Windows Node/npm detected',
|
|
88
|
+
cause: 'Node or npm resolves from /mnt, so the CLI is mixing Windows tools with the WSL environment.',
|
|
89
|
+
fix: 'Install Node 24 and npm inside WSL, then ensure the Linux binaries appear first on PATH.',
|
|
90
|
+
next: 'command -v node && command -v npm',
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
return checks;
|
|
94
|
+
}
|
|
95
|
+
export function findExecutableOnPath(name, pathValue) {
|
|
96
|
+
if (!pathValue)
|
|
97
|
+
return undefined;
|
|
98
|
+
for (const directory of pathValue.split(delimiter)) {
|
|
99
|
+
if (!directory)
|
|
100
|
+
continue;
|
|
101
|
+
for (const candidateName of [name, `${name}.cmd`, `${name}.exe`]) {
|
|
102
|
+
const candidate = join(directory, candidateName);
|
|
103
|
+
if (existsSync(candidate))
|
|
104
|
+
return candidate;
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
return undefined;
|
|
108
|
+
}
|
|
109
|
+
function isWsl(platform, env, kernelRelease) {
|
|
110
|
+
return (platform === 'linux' &&
|
|
111
|
+
(env.WSL_DISTRO_NAME !== undefined ||
|
|
112
|
+
env.WSL_INTEROP !== undefined ||
|
|
113
|
+
/microsoft|wsl/i.test(kernelRelease)));
|
|
114
|
+
}
|
|
115
|
+
function isMountedWindowsPath(path) {
|
|
116
|
+
return path !== undefined && MOUNTED_WINDOWS_PATH.test(path);
|
|
117
|
+
}
|
|
118
|
+
//# sourceMappingURL=platform-support.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"platform-support.js","sourceRoot":"","sources":["../src/platform-support.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../src/oauth/app.ts"],"names":[],"mappings":"AAIA,OAAgB,EAAE,KAAK,OAAO,EAA+B,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../src/oauth/app.ts"],"names":[],"mappings":"AAIA,OAAgB,EAAE,KAAK,OAAO,EAA+B,MAAM,SAAS,CAAC;AAG7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEzD;;;;;;;;GAQG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,mBAAmB,EAC7B,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAuIT;AA0CD,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC"}
|
|
@@ -3,6 +3,7 @@ import { clientRegistrationHandler } from '@modelcontextprotocol/sdk/server/auth
|
|
|
3
3
|
import { revocationHandler } from '@modelcontextprotocol/sdk/server/auth/handlers/revoke.js';
|
|
4
4
|
import { tokenHandler } from '@modelcontextprotocol/sdk/server/auth/handlers/token.js';
|
|
5
5
|
import express, {} from 'express';
|
|
6
|
+
import { rateLimit as createRateLimit } from 'express-rate-limit';
|
|
6
7
|
import { renderOAuthErrorPage } from './branding.js';
|
|
7
8
|
export function createOAuthApp(provider, options = {}) {
|
|
8
9
|
const app = express();
|
|
@@ -17,7 +18,64 @@ export function createOAuthApp(provider, options = {}) {
|
|
|
17
18
|
xForwardedForHeader: false,
|
|
18
19
|
},
|
|
19
20
|
};
|
|
21
|
+
app.use(['/device_authorization', '/device', '/oauth/device/callback'], createRateLimit({
|
|
22
|
+
windowMs: 60_000,
|
|
23
|
+
limit: 30,
|
|
24
|
+
standardHeaders: true,
|
|
25
|
+
legacyHeaders: false,
|
|
26
|
+
...rateLimit,
|
|
27
|
+
}), createRateLimit({
|
|
28
|
+
windowMs: 60_000,
|
|
29
|
+
limit: 600,
|
|
30
|
+
standardHeaders: false,
|
|
31
|
+
legacyHeaders: false,
|
|
32
|
+
keyGenerator: transportRateLimitKey,
|
|
33
|
+
validate: rateLimit.validate,
|
|
34
|
+
}));
|
|
35
|
+
const deviceTokenRateLimit = createRateLimit({
|
|
36
|
+
windowMs: 60_000,
|
|
37
|
+
limit: 30,
|
|
38
|
+
standardHeaders: true,
|
|
39
|
+
legacyHeaders: false,
|
|
40
|
+
...rateLimit,
|
|
41
|
+
});
|
|
42
|
+
const deviceTokenTransportRateLimit = createRateLimit({
|
|
43
|
+
windowMs: 60_000,
|
|
44
|
+
limit: 600,
|
|
45
|
+
standardHeaders: false,
|
|
46
|
+
legacyHeaders: false,
|
|
47
|
+
keyGenerator: transportRateLimitKey,
|
|
48
|
+
validate: rateLimit.validate,
|
|
49
|
+
});
|
|
20
50
|
app.use('/authorize', authorizationHandler({ provider, rateLimit }));
|
|
51
|
+
app.post('/device_authorization', express.urlencoded({ extended: false }), (req, res) => {
|
|
52
|
+
void provider.deviceAuthorizationFlow
|
|
53
|
+
.handleAuthorization(req, res)
|
|
54
|
+
.catch(() => failJson(res));
|
|
55
|
+
});
|
|
56
|
+
app.get('/device', (req, res) => {
|
|
57
|
+
provider.deviceAuthorizationFlow.handleVerificationPage(req, res);
|
|
58
|
+
});
|
|
59
|
+
app.post('/device', express.urlencoded({ extended: false }), (req, res) => {
|
|
60
|
+
void provider.deviceAuthorizationFlow.handleVerification(req, res).catch(() => failPlain(res));
|
|
61
|
+
});
|
|
62
|
+
app.get('/oauth/device/callback', (req, res) => {
|
|
63
|
+
void provider.deviceAuthorizationFlow.handleCallback(req, res).catch(() => failPlain(res));
|
|
64
|
+
});
|
|
65
|
+
app.use(express.urlencoded({ extended: false }));
|
|
66
|
+
app.use('/token', allowCors);
|
|
67
|
+
app.use('/token', (req, res, next) => {
|
|
68
|
+
const body = (req.body ?? {});
|
|
69
|
+
if (body.grant_type !== 'urn:ietf:params:oauth:grant-type:device_code') {
|
|
70
|
+
next();
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
deviceTokenTransportRateLimit(req, res, () => {
|
|
74
|
+
deviceTokenRateLimit(req, res, () => {
|
|
75
|
+
void provider.deviceAuthorizationFlow.handleToken(req, res).catch(() => failJson(res));
|
|
76
|
+
});
|
|
77
|
+
});
|
|
78
|
+
});
|
|
21
79
|
app.use('/token', tokenHandler({ provider, rateLimit }));
|
|
22
80
|
app.use('/revoke', revocationHandler({ provider, rateLimit }));
|
|
23
81
|
app.use('/register', clientRegistrationHandler({ clientsStore: provider.clientsStore, rateLimit }));
|
|
@@ -63,6 +121,10 @@ function failPlain(res) {
|
|
|
63
121
|
if (!res.headersSent)
|
|
64
122
|
res.status(500).type('text/html').send(renderOAuthErrorPage());
|
|
65
123
|
}
|
|
124
|
+
function failJson(res) {
|
|
125
|
+
if (!res.headersSent)
|
|
126
|
+
res.status(500).json({ error: 'server_error' });
|
|
127
|
+
}
|
|
66
128
|
function rateLimitKey(req, trustProxy) {
|
|
67
129
|
if (trustProxy) {
|
|
68
130
|
const forwarded = firstForwardedFor(req.headers.forwarded);
|
|
@@ -74,6 +136,9 @@ function rateLimitKey(req, trustProxy) {
|
|
|
74
136
|
}
|
|
75
137
|
return req.ip ?? req.socket.remoteAddress ?? 'unknown';
|
|
76
138
|
}
|
|
139
|
+
function transportRateLimitKey(req) {
|
|
140
|
+
return req.socket.remoteAddress ?? 'unknown';
|
|
141
|
+
}
|
|
77
142
|
function firstForwardedFor(value) {
|
|
78
143
|
const raw = firstHeaderValue(value);
|
|
79
144
|
if (!raw)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/oauth/app.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/oauth/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import type { Request, Response } from 'express';
|
|
2
|
+
import type { NoodleOAuthProvider } from './provider.js';
|
|
3
|
+
import type { OAuthStore } from './store.js';
|
|
4
|
+
export declare const DEVICE_GRANT = "urn:ietf:params:oauth:grant-type:device_code";
|
|
5
|
+
/** RFC 8628 endpoints, backed by the existing authorization-code consent path in the browser. */
|
|
6
|
+
export declare class DeviceAuthorizationFlow {
|
|
7
|
+
#private;
|
|
8
|
+
constructor(input: {
|
|
9
|
+
readonly issuer: string;
|
|
10
|
+
readonly store: OAuthStore;
|
|
11
|
+
readonly provider: NoodleOAuthProvider;
|
|
12
|
+
readonly now?: () => number;
|
|
13
|
+
});
|
|
14
|
+
handleAuthorization(req: Request, res: Response): Promise<void>;
|
|
15
|
+
handleVerificationPage(req: Request, res: Response): void;
|
|
16
|
+
handleVerification(req: Request, res: Response): Promise<void>;
|
|
17
|
+
handleCallback(req: Request, res: Response): Promise<void>;
|
|
18
|
+
handleToken(req: Request, res: Response): Promise<void>;
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=device-flow.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"device-flow.d.ts","sourceRoot":"","sources":["../../src/oauth/device-flow.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG7C,eAAO,MAAM,YAAY,iDAAiD,CAAC;AAI3E,iGAAiG;AACjG,qBAAa,uBAAuB;;gBAMtB,KAAK,EAAE;QACjB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QACxB,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;QAC3B,QAAQ,CAAC,QAAQ,EAAE,mBAAmB,CAAC;QACvC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;KAC7B;IAOK,mBAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAiDrE,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,IAAI;IAKnD,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAqC9D,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB1D,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAwD9D"}
|
|
@@ -0,0 +1,239 @@
|
|
|
1
|
+
import { randomBytes } from 'node:crypto';
|
|
2
|
+
import { renderOAuthPage } from './branding.js';
|
|
3
|
+
import { hashToken, randomToken } from './tokens.js';
|
|
4
|
+
export const DEVICE_GRANT = 'urn:ietf:params:oauth:grant-type:device_code';
|
|
5
|
+
const DEVICE_TTL_SECONDS = 600;
|
|
6
|
+
const DEVICE_POLL_INTERVAL_SECONDS = 5;
|
|
7
|
+
/** RFC 8628 endpoints, backed by the existing authorization-code consent path in the browser. */
|
|
8
|
+
export class DeviceAuthorizationFlow {
|
|
9
|
+
#issuer;
|
|
10
|
+
#store;
|
|
11
|
+
#provider;
|
|
12
|
+
#nowSeconds;
|
|
13
|
+
constructor(input) {
|
|
14
|
+
this.#issuer = input.issuer.replace(/\/+$/, '');
|
|
15
|
+
this.#store = input.store;
|
|
16
|
+
this.#provider = input.provider;
|
|
17
|
+
this.#nowSeconds = input.now ?? (() => Math.floor(Date.now() / 1000));
|
|
18
|
+
}
|
|
19
|
+
async handleAuthorization(req, res) {
|
|
20
|
+
const body = formBody(req);
|
|
21
|
+
const clientId = stringField(body, 'client_id');
|
|
22
|
+
const resource = stringField(body, 'resource');
|
|
23
|
+
const scope = optionalStringField(body, 'scope');
|
|
24
|
+
if (clientId === undefined || resource === undefined || !this.#validResource(resource)) {
|
|
25
|
+
sendOAuthError(res, 'invalid_request');
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
const client = await this.#store.getClient(clientId);
|
|
29
|
+
const callback = this.#callbackUrl();
|
|
30
|
+
if (client === undefined ||
|
|
31
|
+
client.token_endpoint_auth_method !== 'none' ||
|
|
32
|
+
!client.grant_types?.includes(DEVICE_GRANT) ||
|
|
33
|
+
!client.redirect_uris.includes(callback)) {
|
|
34
|
+
sendOAuthError(res, 'invalid_client', 401);
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
const rawDeviceCode = randomToken();
|
|
38
|
+
const rawUserCode = userCode();
|
|
39
|
+
const now = this.#nowSeconds();
|
|
40
|
+
await this.#store.createDeviceAuthorization({
|
|
41
|
+
deviceCode: hashToken(rawDeviceCode),
|
|
42
|
+
userCode: hashToken(normalizeUserCode(rawUserCode)),
|
|
43
|
+
clientId,
|
|
44
|
+
resource: normalizeUrl(resource),
|
|
45
|
+
...(scope !== undefined ? { scope } : {}),
|
|
46
|
+
status: 'pending',
|
|
47
|
+
expiresAt: now + DEVICE_TTL_SECONDS,
|
|
48
|
+
nextPollAt: now,
|
|
49
|
+
intervalSeconds: DEVICE_POLL_INTERVAL_SECONDS,
|
|
50
|
+
});
|
|
51
|
+
const verificationUri = `${this.#issuer}/device`;
|
|
52
|
+
const complete = new URL(verificationUri);
|
|
53
|
+
complete.searchParams.set('user_code', rawUserCode);
|
|
54
|
+
res.setHeader('cache-control', 'no-store');
|
|
55
|
+
res.json({
|
|
56
|
+
device_code: rawDeviceCode,
|
|
57
|
+
user_code: rawUserCode,
|
|
58
|
+
verification_uri: verificationUri,
|
|
59
|
+
verification_uri_complete: complete.href,
|
|
60
|
+
expires_in: DEVICE_TTL_SECONDS,
|
|
61
|
+
interval: DEVICE_POLL_INTERVAL_SECONDS,
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
handleVerificationPage(req, res) {
|
|
65
|
+
const code = typeof req.query.user_code === 'string' ? req.query.user_code : '';
|
|
66
|
+
res.status(200).type('html').send(renderDeviceCodePage(code));
|
|
67
|
+
}
|
|
68
|
+
async handleVerification(req, res) {
|
|
69
|
+
const rawUserCode = stringField(formBody(req), 'user_code');
|
|
70
|
+
const normalized = rawUserCode === undefined ? undefined : normalizeUserCode(rawUserCode);
|
|
71
|
+
const device = normalized === undefined
|
|
72
|
+
? undefined
|
|
73
|
+
: await this.#store.getDeviceAuthorizationByUserCode(hashToken(normalized));
|
|
74
|
+
if (device === undefined) {
|
|
75
|
+
res
|
|
76
|
+
.status(400)
|
|
77
|
+
.type('html')
|
|
78
|
+
.send(renderDeviceCodePage(rawUserCode ?? '', true));
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
const rawState = randomToken();
|
|
82
|
+
const challenge = randomToken();
|
|
83
|
+
await this.#store.createDeviceBrowserSession({
|
|
84
|
+
state: hashToken(rawState),
|
|
85
|
+
deviceCode: device.deviceCode,
|
|
86
|
+
clientId: device.clientId,
|
|
87
|
+
resource: device.resource,
|
|
88
|
+
codeChallenge: challenge,
|
|
89
|
+
expiresAt: device.expiresAt,
|
|
90
|
+
});
|
|
91
|
+
const authorize = new URL(`${this.#issuer}/authorize`);
|
|
92
|
+
authorize.searchParams.set('client_id', device.clientId);
|
|
93
|
+
authorize.searchParams.set('redirect_uri', this.#callbackUrl());
|
|
94
|
+
authorize.searchParams.set('response_type', 'code');
|
|
95
|
+
authorize.searchParams.set('code_challenge', challenge);
|
|
96
|
+
authorize.searchParams.set('code_challenge_method', 'S256');
|
|
97
|
+
authorize.searchParams.set('state', rawState);
|
|
98
|
+
authorize.searchParams.set('resource', device.resource);
|
|
99
|
+
if (device.scope !== undefined)
|
|
100
|
+
authorize.searchParams.set('scope', device.scope);
|
|
101
|
+
res.redirect(302, authorize.href);
|
|
102
|
+
}
|
|
103
|
+
async handleCallback(req, res) {
|
|
104
|
+
const rawState = typeof req.query.state === 'string' ? req.query.state : undefined;
|
|
105
|
+
const session = rawState === undefined
|
|
106
|
+
? undefined
|
|
107
|
+
: await this.#store.consumeDeviceBrowserSession(hashToken(rawState));
|
|
108
|
+
if (session === undefined) {
|
|
109
|
+
res.status(400).type('html').send(renderCompletionPage(false));
|
|
110
|
+
return;
|
|
111
|
+
}
|
|
112
|
+
if (typeof req.query.error === 'string') {
|
|
113
|
+
await this.#store.denyDeviceAuthorization(session.deviceCode);
|
|
114
|
+
res.status(200).type('html').send(renderCompletionPage(false));
|
|
115
|
+
return;
|
|
116
|
+
}
|
|
117
|
+
const code = typeof req.query.code === 'string' ? req.query.code : undefined;
|
|
118
|
+
const approved = code !== undefined && (await this.#provider.completeDeviceAuthorization(session, code));
|
|
119
|
+
res
|
|
120
|
+
.status(approved ? 200 : 400)
|
|
121
|
+
.type('html')
|
|
122
|
+
.send(renderCompletionPage(approved));
|
|
123
|
+
}
|
|
124
|
+
async handleToken(req, res) {
|
|
125
|
+
const body = formBody(req);
|
|
126
|
+
const clientId = stringField(body, 'client_id');
|
|
127
|
+
const rawDeviceCode = stringField(body, 'device_code');
|
|
128
|
+
const resource = optionalStringField(body, 'resource');
|
|
129
|
+
if (clientId === undefined || rawDeviceCode === undefined) {
|
|
130
|
+
sendOAuthError(res, 'invalid_request');
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
const client = await this.#store.getClient(clientId);
|
|
134
|
+
if (client === undefined ||
|
|
135
|
+
client.token_endpoint_auth_method !== 'none' ||
|
|
136
|
+
!client.grant_types?.includes(DEVICE_GRANT)) {
|
|
137
|
+
sendOAuthError(res, 'invalid_client', 401);
|
|
138
|
+
return;
|
|
139
|
+
}
|
|
140
|
+
const result = await this.#store.pollDeviceAuthorization({
|
|
141
|
+
deviceCode: hashToken(rawDeviceCode),
|
|
142
|
+
clientId,
|
|
143
|
+
...(resource !== undefined ? { resource: normalizeUrl(resource) } : {}),
|
|
144
|
+
nowSeconds: this.#nowSeconds(),
|
|
145
|
+
});
|
|
146
|
+
if (result.status !== 'approved') {
|
|
147
|
+
sendOAuthError(res, result.status);
|
|
148
|
+
return;
|
|
149
|
+
}
|
|
150
|
+
const tokens = await this.#provider.issueDeviceTokens(result.record);
|
|
151
|
+
if (!(await this.#store.completeDeviceTokenIssuance(result.record.deviceCode, result.record.clientId))) {
|
|
152
|
+
sendOAuthError(res, 'expired_token');
|
|
153
|
+
return;
|
|
154
|
+
}
|
|
155
|
+
res.setHeader('cache-control', 'no-store');
|
|
156
|
+
res.json(tokens);
|
|
157
|
+
}
|
|
158
|
+
#callbackUrl() {
|
|
159
|
+
return `${this.#issuer}/oauth/device/callback`;
|
|
160
|
+
}
|
|
161
|
+
#validResource(resource) {
|
|
162
|
+
try {
|
|
163
|
+
const normalized = normalizeUrl(resource);
|
|
164
|
+
return (normalized === normalizeUrl(this.#issuer) || normalized === `${this.#issuer}/developer/cli`);
|
|
165
|
+
}
|
|
166
|
+
catch {
|
|
167
|
+
return false;
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
function formBody(req) {
|
|
172
|
+
return (req.body ?? {});
|
|
173
|
+
}
|
|
174
|
+
function stringField(body, name) {
|
|
175
|
+
const value = body[name];
|
|
176
|
+
return typeof value === 'string' && value.length > 0 ? value : undefined;
|
|
177
|
+
}
|
|
178
|
+
function optionalStringField(body, name) {
|
|
179
|
+
return stringField(body, name);
|
|
180
|
+
}
|
|
181
|
+
function normalizeUrl(value) {
|
|
182
|
+
const url = new URL(value);
|
|
183
|
+
url.hash = '';
|
|
184
|
+
url.search = '';
|
|
185
|
+
return url.href;
|
|
186
|
+
}
|
|
187
|
+
function normalizeUserCode(value) {
|
|
188
|
+
return value.toUpperCase().replace(/[^A-Z2-9]/g, '');
|
|
189
|
+
}
|
|
190
|
+
function userCode() {
|
|
191
|
+
const alphabet = 'ABCDEFGHJKLMNPQRSTUVWXYZ23456789';
|
|
192
|
+
const bytes = randomBytes(8);
|
|
193
|
+
let value = '';
|
|
194
|
+
for (let index = 0; index < 8; index += 1) {
|
|
195
|
+
value += alphabet[(bytes[index] ?? 0) % alphabet.length];
|
|
196
|
+
}
|
|
197
|
+
return `${value.slice(0, 4)}-${value.slice(4)}`;
|
|
198
|
+
}
|
|
199
|
+
function sendOAuthError(res, error, status = 400) {
|
|
200
|
+
res.setHeader('cache-control', 'no-store');
|
|
201
|
+
res.status(status).json({ error });
|
|
202
|
+
}
|
|
203
|
+
function renderDeviceCodePage(code, invalid = false) {
|
|
204
|
+
return renderOAuthPage({
|
|
205
|
+
title: 'Sign in — Noodle Seed',
|
|
206
|
+
kicker: 'CLI sign in',
|
|
207
|
+
heading: 'Enter your device code',
|
|
208
|
+
contentHtml: `${invalid ? '<p class="ns-lede">That code is invalid or expired. Try the code again.</p>' : ''}${code === ''
|
|
209
|
+
? ''
|
|
210
|
+
: `<p class="ns-lede">Confirm <strong>${escapeHtml(code)}</strong> matches the code shown in your terminal.</p>`}<form method="post" action="/device">
|
|
211
|
+
<label for="user_code">Device code</label>
|
|
212
|
+
<input id="user_code" name="user_code" value="${escapeHtml(code)}" autocomplete="one-time-code" required />
|
|
213
|
+
<div class="btn-glow"><button class="btn btn-primary" type="submit">Continue</button></div>
|
|
214
|
+
</form>`,
|
|
215
|
+
});
|
|
216
|
+
}
|
|
217
|
+
function renderCompletionPage(approved) {
|
|
218
|
+
return renderOAuthPage({
|
|
219
|
+
title: `${approved ? 'Signed in' : 'Sign-in denied'} — Noodle Seed`,
|
|
220
|
+
kicker: approved ? 'Complete' : 'Not completed',
|
|
221
|
+
heading: approved ? 'You are signed in' : 'Sign-in was not completed',
|
|
222
|
+
contentHtml: approved
|
|
223
|
+
? '<p class="ns-lede">You can return to your terminal. This window can now be closed.</p>'
|
|
224
|
+
: '<p class="ns-lede">Return to your terminal and start sign-in again if you still want to continue.</p>',
|
|
225
|
+
});
|
|
226
|
+
}
|
|
227
|
+
function escapeHtml(value) {
|
|
228
|
+
return value.replace(/[&<>"']/g, (character) => {
|
|
229
|
+
const entities = {
|
|
230
|
+
'&': '&',
|
|
231
|
+
'<': '<',
|
|
232
|
+
'>': '>',
|
|
233
|
+
'"': '"',
|
|
234
|
+
"'": ''',
|
|
235
|
+
};
|
|
236
|
+
return entities[character] ?? character;
|
|
237
|
+
});
|
|
238
|
+
}
|
|
239
|
+
//# sourceMappingURL=device-flow.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"device-flow.js","sourceRoot":"","sources":["../../src/oauth/device-flow.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { OAuthTokens } from '@modelcontextprotocol/sdk/shared/auth.js';
|
|
2
|
+
import type { DeviceAuthorizationRecord, DeviceBrowserSessionRecord } from './device-store.js';
|
|
3
|
+
import type { OAuthStore } from './store.js';
|
|
4
|
+
import type { OAuthTokenIssuer } from './token-issuer.js';
|
|
5
|
+
export declare function completeDeviceAuthorization(input: {
|
|
6
|
+
readonly store: OAuthStore;
|
|
7
|
+
readonly issuer: string;
|
|
8
|
+
readonly session: DeviceBrowserSessionRecord;
|
|
9
|
+
readonly authorizationCode: string;
|
|
10
|
+
}): Promise<boolean>;
|
|
11
|
+
export declare function issueDeviceTokens(input: {
|
|
12
|
+
readonly tokenIssuer: OAuthTokenIssuer;
|
|
13
|
+
readonly record: DeviceAuthorizationRecord;
|
|
14
|
+
}): Promise<OAuthTokens>;
|
|
15
|
+
//# sourceMappingURL=device-provider.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"device-provider.d.ts","sourceRoot":"","sources":["../../src/oauth/device-provider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,KAAK,EAAE,yBAAyB,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAE/F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAG1D,wBAAsB,2BAA2B,CAAC,KAAK,EAAE;IACvD,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,0BAA0B,CAAC;IAC7C,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;CACpC,GAAG,OAAO,CAAC,OAAO,CAAC,CAsBnB;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE;IACvC,QAAQ,CAAC,WAAW,EAAE,gBAAgB,CAAC;IACvC,QAAQ,CAAC,MAAM,EAAE,yBAAyB,CAAC;CAC5C,GAAG,OAAO,CAAC,WAAW,CAAC,CAmBvB"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import { InvalidGrantError } from '@modelcontextprotocol/sdk/server/auth/errors.js';
|
|
2
|
+
import { storedOAuthOwnerPreferences } from './identity-preferences.js';
|
|
3
|
+
import { hashToken } from './tokens.js';
|
|
4
|
+
export async function completeDeviceAuthorization(input) {
|
|
5
|
+
const record = await input.store.redeemAuthorizationCode(hashToken(input.authorizationCode));
|
|
6
|
+
if (record === undefined ||
|
|
7
|
+
record.clientId !== input.session.clientId ||
|
|
8
|
+
record.redirectUri !== `${input.issuer.replace(/\/+$/, '')}/oauth/device/callback` ||
|
|
9
|
+
record.resource !== input.session.resource ||
|
|
10
|
+
record.codeChallenge !== input.session.codeChallenge) {
|
|
11
|
+
return false;
|
|
12
|
+
}
|
|
13
|
+
return input.store.approveDeviceAuthorization(input.session.deviceCode, {
|
|
14
|
+
ownerSubject: record.ownerSubject,
|
|
15
|
+
...(record.ownerEmail !== undefined ? { ownerEmail: record.ownerEmail } : {}),
|
|
16
|
+
...storedOAuthOwnerPreferences({
|
|
17
|
+
locale: record.ownerLocale,
|
|
18
|
+
timeZone: record.ownerTimeZone,
|
|
19
|
+
}),
|
|
20
|
+
...(record.identityKind !== undefined ? { identityKind: record.identityKind } : {}),
|
|
21
|
+
...(record.identityProvider !== undefined ? { identityProvider: record.identityProvider } : {}),
|
|
22
|
+
...(record.developerGrantId !== undefined ? { developerGrantId: record.developerGrantId } : {}),
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
export function issueDeviceTokens(input) {
|
|
26
|
+
const record = input.record;
|
|
27
|
+
if (record.ownerSubject === undefined) {
|
|
28
|
+
throw new InvalidGrantError('device authorization is missing an approved identity');
|
|
29
|
+
}
|
|
30
|
+
return input.tokenIssuer.issueTokens({
|
|
31
|
+
clientId: record.clientId,
|
|
32
|
+
ownerSubject: record.ownerSubject,
|
|
33
|
+
resource: record.resource,
|
|
34
|
+
...(record.ownerEmail !== undefined ? { ownerEmail: record.ownerEmail } : {}),
|
|
35
|
+
...storedOAuthOwnerPreferences({
|
|
36
|
+
locale: record.ownerLocale,
|
|
37
|
+
timeZone: record.ownerTimeZone,
|
|
38
|
+
}),
|
|
39
|
+
...(record.scope !== undefined ? { scope: record.scope } : {}),
|
|
40
|
+
...(record.identityKind !== undefined ? { identityKind: record.identityKind } : {}),
|
|
41
|
+
...(record.identityProvider !== undefined ? { identityProvider: record.identityProvider } : {}),
|
|
42
|
+
...(record.developerGrantId !== undefined ? { developerGrantId: record.developerGrantId } : {}),
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
//# sourceMappingURL=device-provider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"device-provider.js","sourceRoot":"","sources":["../../src/oauth/device-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"device-store-postgres-schema.d.ts","sourceRoot":"","sources":["../../src/oauth/device-store-postgres-schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAE/B,wBAAsB,+BAA+B,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CA+B/E"}
|