@lightdash/common 1.252.0 → 1.252.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/dist/cjs/.tsbuildinfo +1 -1
- package/dist/cjs/utils/oauth.d.ts +2 -1
- package/dist/cjs/utils/oauth.d.ts.map +1 -1
- package/dist/cjs/utils/oauth.js +57 -33
- package/dist/cjs/utils/oauth.js.map +1 -1
- package/dist/cjs/utils/oauth.test.js +40 -1
- package/dist/cjs/utils/oauth.test.js.map +1 -1
- package/dist/esm/.tsbuildinfo +1 -1
- package/dist/esm/utils/oauth.d.ts +2 -1
- package/dist/esm/utils/oauth.d.ts.map +1 -1
- package/dist/esm/utils/oauth.js +55 -32
- package/dist/esm/utils/oauth.js.map +1 -1
- package/dist/esm/utils/oauth.test.js +41 -2
- package/dist/esm/utils/oauth.test.js.map +1 -1
- package/dist/types/.tsbuildinfo +1 -1
- package/dist/types/utils/oauth.d.ts +2 -1
- package/dist/types/utils/oauth.d.ts.map +1 -1
- package/dist/types/utils/oauth.js +55 -32
- package/dist/types/utils/oauth.js.map +1 -1
- package/dist/types/utils/oauth.test.js +41 -2
- package/dist/types/utils/oauth.test.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export declare const oauthPageStyles = "\n body {\n font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans', 'Open Sans', 'Helvetica Neue', sans-serif;\n background-color: #f8fafc;\n margin: 0;\n padding: 20px;\n box-sizing: border-box;\n min-height: 100vh;\n display: flex;\n align-items: center;\n justify-content: center;\n font-size: 14px;\n line-height: 1.4;\n }\n .container {\n background: white;\n border-radius: 8px;\n border: 1px solid #e9ecef;\n box-shadow: 0px 1px 2px 0px rgba(10, 13, 18, 0.05);\n padding: 24px;\n margin: 0;\n box-sizing: border-box;\n max-width: 450px;\n width: 100%;\n text-align: center;\n }\n .logo {\n width: 130px;\n height: auto;\n margin: 0 auto 24px auto;\n display: block;\n }\n h1 {\n color: #111418;\n margin: 0 0 16px 0;\n font-size: 18px;\n font-weight: 600;\n text-align: center;\n }\n p {\n color: #6c757d;\n margin: 0 0 12px 0;\n line-height: 1.4;\n font-size: 14px;\n }\n .icon {\n width: 32px;\n height: 32px;\n margin: 0 auto 16px auto;\n display: block;\n }\n .success .icon {\n color: #111418;\n }\n .error .icon {\n color: #6c757d;\n }\n .stack {\n display: flex;\n flex-direction: column;\n gap: 16px;\n }\n";
|
|
1
|
+
export declare const oauthPageStyles = "\n body {\n font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans', 'Open Sans', 'Helvetica Neue', sans-serif;\n background-color: #f8fafc;\n margin: 0;\n padding: 20px;\n box-sizing: border-box;\n min-height: 100vh;\n display: flex;\n align-items: center;\n justify-content: center;\n font-size: 14px;\n line-height: 1.4;\n }\n .container {\n background: white;\n border-radius: 8px;\n border: 1px solid #e9ecef;\n box-shadow: 0px 1px 2px 0px rgba(10, 13, 18, 0.05);\n padding: 24px;\n margin: 0;\n box-sizing: border-box;\n max-width: 450px;\n width: 100%;\n text-align: center;\n }\n .logo {\n width: 130px;\n height: auto;\n margin: 0 auto 24px auto;\n display: block;\n }\n h1 {\n color: #111418;\n margin: 0 0 16px 0;\n font-size: 18px;\n font-weight: 600;\n text-align: center;\n }\n p {\n color: #6c757d;\n margin: 0 0 12px 0;\n line-height: 1.4;\n font-size: 14px;\n }\n .icon {\n width: 32px;\n height: 32px;\n margin: 0 auto 16px auto;\n display: block;\n }\n .success .icon {\n color: #111418;\n }\n .error .icon {\n color: #6c757d;\n }\n .stack {\n display: flex;\n flex-direction: column;\n gap: 16px;\n }\n .oauth-btn,\n .button {\n display: inline-block;\n padding: 8px 24px;\n border: 1px solid #e9ecef;\n border-radius: 8px;\n font-weight: 500;\n font-size: 14px;\n cursor: pointer;\n text-decoration: none;\n transition: background 0.15s, border-color 0.15s;\n }\n .oauth-btn.approve,\n .button {\n background: #111418;\n color: #fff;\n border-color: #111418;\n }\n .oauth-btn.approve:hover,\n .button:hover {\n background: #2c2e33;\n border-color: #2c2e33;\n }\n .oauth-btn.deny {\n background: transparent;\n color: #111418;\n border-color: #e9ecef;\n }\n .oauth-btn.deny:hover {\n background: #f8fafc;\n border-color: #dee2e6;\n }\n";
|
|
2
2
|
declare const OAUTH_ICONS: {
|
|
3
3
|
readonly success: '<circle cx="12" cy="12" r="10" stroke="currentColor" stroke-width="2"/><path d="M9 12l2 2 4-4" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>';
|
|
4
4
|
readonly error: '<circle cx="12" cy="12" r="10" stroke="currentColor" stroke-width="2"/><path d="M15 9l-6 6M9 9l6 6" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>';
|
|
@@ -35,6 +35,7 @@ export interface OAuthRedirectParams {
|
|
|
35
35
|
redirectUrl: string;
|
|
36
36
|
message: string;
|
|
37
37
|
}
|
|
38
|
+
export declare const isSafeRedirectScheme: (uri: string) => boolean;
|
|
38
39
|
/**
|
|
39
40
|
* Parses a scope string (e.g. "read write") and returns an array of scope objects with descriptions
|
|
40
41
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../../../src/utils/oauth.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,eAAe,
|
|
1
|
+
{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../../../src/utils/oauth.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,eAAe,gzEA8F3B,CAAC;AAoTF,QAAA,MAAM,WAAW;aACb,OAAO,EACH,wLAAwL;aAC5L,KAAK,EAAE,6LAA6L;aACpM,cAAc,EACV,sLAAsL;CACpL,CAAC;AAOX,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG,OAAO,CAAC;AACtD,MAAM,MAAM,aAAa,GAAG,MAAM,OAAO,WAAW,CAAC;AAGrD,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,qBAAqB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,oBAAoB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,qBAAqB,EAAE,CAAC;IAChC,IAAI,EAAE,SAAS,CAAC;IAChB,8DAA8D;IAC9D,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,gBAAgB,EAAE,CAAC;CACpC;AAED,MAAM,WAAW,mBAAmB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACnB;AAQD,eAAO,MAAM,oBAAoB,QAAS,MAAM,KAAG,OAOlD,CAAC;AAwBF;;GAEG;AACH,eAAO,MAAM,gBAAgB,gBACZ,MAAM,KACpB,qBAAqB,EASvB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,aAAc,MAAM,KAAG,MAKhD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,yBAAyB,WAC1B,mBAAmB,SACpB,MAAM,YACH,MAAM,EAAE,aACR,aAAa,KACxB,MAQG,CAAC;AAEP;;GAEG;AACH,eAAO,MAAM,4BAA4B,WAC9B,MAAM,aACH,MAAM,EAAE,KAInB,MAA0E,CAAC;AAE9E;;GAEG;AACH,eAAO,MAAM,0BAA0B,UAC5B,MAAM,YACH,MAAM,EAAE,aACR,aAAa,KACxB,MAME,CAAC;AAEN;;GAEG;AACH,eAAO,MAAM,yBAAyB,WAC1B,mBAAmB,KAC5B,MAYF,CAAC;AAQF;;;GAGG;AACH,eAAO,MAAM,0BAA0B,WAC3B,oBAAoB,KAC7B,MASG,CAAC"}
|
package/dist/cjs/utils/oauth.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.generateOAuthAuthorizePage = exports.generateOAuthRedirectPage = exports.generateOAuthErrorResponse = exports.generateOAuthSuccessResponse = exports.generateOAuthResponseHtml = exports.getClientName = exports.parseScopeString = exports.oauthPageStyles = void 0;
|
|
3
|
+
exports.generateOAuthAuthorizePage = exports.generateOAuthRedirectPage = exports.generateOAuthErrorResponse = exports.generateOAuthSuccessResponse = exports.generateOAuthResponseHtml = exports.getClientName = exports.parseScopeString = exports.isSafeRedirectScheme = exports.oauthPageStyles = void 0;
|
|
4
4
|
const handlebars_1 = require("handlebars");
|
|
5
5
|
exports.oauthPageStyles = `
|
|
6
6
|
body {
|
|
@@ -64,6 +64,38 @@ exports.oauthPageStyles = `
|
|
|
64
64
|
flex-direction: column;
|
|
65
65
|
gap: 16px;
|
|
66
66
|
}
|
|
67
|
+
.oauth-btn,
|
|
68
|
+
.button {
|
|
69
|
+
display: inline-block;
|
|
70
|
+
padding: 8px 24px;
|
|
71
|
+
border: 1px solid #e9ecef;
|
|
72
|
+
border-radius: 8px;
|
|
73
|
+
font-weight: 500;
|
|
74
|
+
font-size: 14px;
|
|
75
|
+
cursor: pointer;
|
|
76
|
+
text-decoration: none;
|
|
77
|
+
transition: background 0.15s, border-color 0.15s;
|
|
78
|
+
}
|
|
79
|
+
.oauth-btn.approve,
|
|
80
|
+
.button {
|
|
81
|
+
background: #111418;
|
|
82
|
+
color: #fff;
|
|
83
|
+
border-color: #111418;
|
|
84
|
+
}
|
|
85
|
+
.oauth-btn.approve:hover,
|
|
86
|
+
.button:hover {
|
|
87
|
+
background: #2c2e33;
|
|
88
|
+
border-color: #2c2e33;
|
|
89
|
+
}
|
|
90
|
+
.oauth-btn.deny {
|
|
91
|
+
background: transparent;
|
|
92
|
+
color: #111418;
|
|
93
|
+
border-color: #e9ecef;
|
|
94
|
+
}
|
|
95
|
+
.oauth-btn.deny:hover {
|
|
96
|
+
background: #f8fafc;
|
|
97
|
+
border-color: #dee2e6;
|
|
98
|
+
}
|
|
67
99
|
`;
|
|
68
100
|
// Lightdash logo SVG
|
|
69
101
|
const LIGHTDASH_LOGO_SVG = `
|
|
@@ -122,6 +154,7 @@ const OAUTH_REDIRECT_TEMPLATE = `
|
|
|
122
154
|
{{{logo}}}
|
|
123
155
|
<h1>Redirecting...</h1>
|
|
124
156
|
<p>{{message}}</p>
|
|
157
|
+
<a class="button" href="{{redirectUrl}}">Continue</a>
|
|
125
158
|
</div>
|
|
126
159
|
</div>
|
|
127
160
|
</body>
|
|
@@ -281,33 +314,6 @@ const OAUTH_AUTHORIZE_TEMPLATE = `
|
|
|
281
314
|
padding-top: 16px;
|
|
282
315
|
border-top: 1px solid #e9ecef;
|
|
283
316
|
}
|
|
284
|
-
.oauth-btn {
|
|
285
|
-
padding: 8px 24px;
|
|
286
|
-
border: 1px solid #e9ecef;
|
|
287
|
-
border-radius: 8px;
|
|
288
|
-
font-weight: 500;
|
|
289
|
-
font-size: 14px;
|
|
290
|
-
cursor: pointer;
|
|
291
|
-
transition: background 0.15s, border-color 0.15s;
|
|
292
|
-
}
|
|
293
|
-
.oauth-btn.approve {
|
|
294
|
-
background: #111418;
|
|
295
|
-
color: #fff;
|
|
296
|
-
border-color: #111418;
|
|
297
|
-
}
|
|
298
|
-
.oauth-btn.approve:hover {
|
|
299
|
-
background: #2c2e33;
|
|
300
|
-
border-color: #2c2e33;
|
|
301
|
-
}
|
|
302
|
-
.oauth-btn.deny {
|
|
303
|
-
background: transparent;
|
|
304
|
-
color: #111418;
|
|
305
|
-
border-color: #e9ecef;
|
|
306
|
-
}
|
|
307
|
-
.oauth-btn.deny:hover {
|
|
308
|
-
background: #f8fafc;
|
|
309
|
-
border-color: #dee2e6;
|
|
310
|
-
}
|
|
311
317
|
</style>
|
|
312
318
|
</head>
|
|
313
319
|
<body>
|
|
@@ -402,6 +408,17 @@ const OAUTH_ICONS = {
|
|
|
402
408
|
const compiledResponseTemplate = (0, handlebars_1.compile)(OAUTH_RESPONSE_TEMPLATE);
|
|
403
409
|
const compiledRedirectTemplate = (0, handlebars_1.compile)(OAUTH_REDIRECT_TEMPLATE);
|
|
404
410
|
const compiledAuthorizeTemplate = (0, handlebars_1.compile)(OAUTH_AUTHORIZE_TEMPLATE);
|
|
411
|
+
const UNSAFE_REDIRECT_PROTOCOLS = new Set(['javascript', 'data', 'vbscript', 'file', 'blob'].map((scheme) => `${scheme}:`));
|
|
412
|
+
const isSafeRedirectScheme = (uri) => {
|
|
413
|
+
try {
|
|
414
|
+
const { protocol } = new URL(uri);
|
|
415
|
+
return !UNSAFE_REDIRECT_PROTOCOLS.has(protocol.toLowerCase());
|
|
416
|
+
}
|
|
417
|
+
catch {
|
|
418
|
+
return false;
|
|
419
|
+
}
|
|
420
|
+
};
|
|
421
|
+
exports.isSafeRedirectScheme = isSafeRedirectScheme;
|
|
405
422
|
// Scope descriptions mapping
|
|
406
423
|
const SCOPE_DESCRIPTIONS = {
|
|
407
424
|
read: {
|
|
@@ -473,11 +490,18 @@ exports.generateOAuthErrorResponse = generateOAuthErrorResponse;
|
|
|
473
490
|
/**
|
|
474
491
|
* Generates a script-free redirect page for a previously validated OAuth URI.
|
|
475
492
|
*/
|
|
476
|
-
const generateOAuthRedirectPage = (params) =>
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
493
|
+
const generateOAuthRedirectPage = (params) => {
|
|
494
|
+
if (!(0, exports.isSafeRedirectScheme)(params.redirectUrl)) {
|
|
495
|
+
return (0, exports.generateOAuthErrorResponse)('Unsupported redirect', [
|
|
496
|
+
'This application uses an unsupported redirect and cannot continue.',
|
|
497
|
+
]);
|
|
498
|
+
}
|
|
499
|
+
return compiledRedirectTemplate({
|
|
500
|
+
styles: exports.oauthPageStyles,
|
|
501
|
+
logo: LIGHTDASH_LOGO_SVG,
|
|
502
|
+
...params,
|
|
503
|
+
});
|
|
504
|
+
};
|
|
481
505
|
exports.generateOAuthRedirectPage = generateOAuthRedirectPage;
|
|
482
506
|
const getUserInitials = (user) => {
|
|
483
507
|
const initials = `${user.firstName.charAt(0)}${user.lastName.charAt(0)}`.trim();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../src/utils/oauth.ts"],"names":[],"mappings":";;;AAAA,2CAAqC;AAExB,QAAA,eAAe,GAAG
|
|
1
|
+
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../src/utils/oauth.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const oauth_1 = require("./oauth");
|
|
4
4
|
const VIEWPORT_META = '<meta name="viewport" content="width=device-width, initial-scale=1" />';
|
|
5
|
+
const JAVASCRIPT_SCHEME = ['javascript', ''].join(':');
|
|
6
|
+
const JAVASCRIPT_REDIRECT_URI = `${JAVASCRIPT_SCHEME}alert(1)`;
|
|
5
7
|
const authorizePage = () => (0, oauth_1.generateOAuthAuthorizePage)({
|
|
6
8
|
action: '/api/v1/oauth/authorize',
|
|
7
9
|
client_id: 'test-client',
|
|
@@ -17,6 +19,27 @@ const authorizePage = () => (0, oauth_1.generateOAuthAuthorizePage)({
|
|
|
17
19
|
loginUrl: '/login',
|
|
18
20
|
hiddenInputs: [],
|
|
19
21
|
});
|
|
22
|
+
describe('isSafeRedirectScheme', () => {
|
|
23
|
+
it.each([
|
|
24
|
+
'https://example.com/callback',
|
|
25
|
+
'http://localhost:9000/callback',
|
|
26
|
+
'com.lightdash.mobile://oauth/callback',
|
|
27
|
+
])('accepts supported redirect URI %s', (redirectUri) => {
|
|
28
|
+
expect((0, oauth_1.isSafeRedirectScheme)(redirectUri)).toBe(true);
|
|
29
|
+
});
|
|
30
|
+
it.each([
|
|
31
|
+
JAVASCRIPT_REDIRECT_URI,
|
|
32
|
+
'data:text/html,x',
|
|
33
|
+
'vbscript:x',
|
|
34
|
+
'file:///etc/passwd',
|
|
35
|
+
'blob:https://x',
|
|
36
|
+
[' JAVASCRIPT', 'alert(1)'].join(':'),
|
|
37
|
+
'\tDaTa:text/html,x ',
|
|
38
|
+
'not a URL',
|
|
39
|
+
])('rejects unsafe redirect URI %s', (redirectUri) => {
|
|
40
|
+
expect((0, oauth_1.isSafeRedirectScheme)(redirectUri)).toBe(false);
|
|
41
|
+
});
|
|
42
|
+
});
|
|
20
43
|
describe('OAuth page templates', () => {
|
|
21
44
|
it('declares the viewport on the authorize page so it renders at 1:1 on mobile', () => {
|
|
22
45
|
expect(authorizePage()).toContain(VIEWPORT_META);
|
|
@@ -40,8 +63,24 @@ describe('OAuth page templates', () => {
|
|
|
40
63
|
expect(redirectPage).not.toContain('</script>');
|
|
41
64
|
expect(redirectPage).not.toContain('<img src=x');
|
|
42
65
|
expect(redirectPage).not.toContain('onerror=');
|
|
43
|
-
expect(redirectPage).
|
|
66
|
+
expect(redirectPage).toContain('<a class="button" href="https://example.com/callback?</script><img src=x onerror=alert(document.domain)>">Continue</a>');
|
|
44
67
|
expect(redirectPage).toContain('</script>');
|
|
45
68
|
});
|
|
69
|
+
it('escapes quotes in OAuth redirect link URLs', () => {
|
|
70
|
+
const redirectPage = (0, oauth_1.generateOAuthRedirectPage)({
|
|
71
|
+
redirectUrl: 'com.lightdash.mobile://oauth/callback?state="value"',
|
|
72
|
+
message: 'Redirecting',
|
|
73
|
+
});
|
|
74
|
+
expect(redirectPage).toContain('<a class="button" href="com.lightdash.mobile://oauth/callback?state="value"">Continue</a>');
|
|
75
|
+
expect(redirectPage).not.toContain('href="value"');
|
|
76
|
+
});
|
|
77
|
+
it('does not navigate to an unsafe OAuth redirect URL', () => {
|
|
78
|
+
const redirectPage = (0, oauth_1.generateOAuthRedirectPage)({
|
|
79
|
+
redirectUrl: JAVASCRIPT_REDIRECT_URI,
|
|
80
|
+
message: 'Redirecting',
|
|
81
|
+
});
|
|
82
|
+
expect(redirectPage).not.toContain(JAVASCRIPT_SCHEME);
|
|
83
|
+
expect(redirectPage).not.toContain('http-equiv="refresh"');
|
|
84
|
+
});
|
|
46
85
|
});
|
|
47
86
|
//# sourceMappingURL=oauth.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.test.js","sourceRoot":"","sources":["../../../src/utils/oauth.test.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"oauth.test.js","sourceRoot":"","sources":["../../../src/utils/oauth.test.ts"],"names":[],"mappings":"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"}
|