@tsed/oidc-provider-plugin-wildcard-redirect-uri 8.0.0-alpha.9 → 8.0.0-beta.2
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.
|
@@ -1,20 +1,19 @@
|
|
|
1
|
-
import { __decorate
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import { OIDC_PROVIDER_NODE_MODULE } from "@tsed/oidc-provider";
|
|
1
|
+
import { __decorate } from "tslib";
|
|
2
|
+
import { constant, logger, Module } from "@tsed/di";
|
|
3
|
+
import { errors } from "oidc-provider";
|
|
5
4
|
// @ts-ignore
|
|
6
5
|
import psl from "psl";
|
|
7
6
|
import { wildcardRedirectUriAllowed } from "./utils/wildcardRedirectUriAllowed.js";
|
|
8
7
|
let OidcWildcardRedirectUriModule = class OidcWildcardRedirectUriModule {
|
|
9
|
-
constructor(
|
|
10
|
-
this.
|
|
8
|
+
constructor() {
|
|
9
|
+
this.enabled = constant("oidc.plugins.wildcard.enabled", false);
|
|
11
10
|
}
|
|
12
11
|
$onCreateOIDC(provider) {
|
|
13
12
|
if (this.enabled) {
|
|
14
13
|
const { redirectUriAllowed, postLogoutRedirectUriAllowed } = provider.Client.prototype;
|
|
15
14
|
provider.Client.prototype.redirectUriAllowed = wildcardRedirectUriAllowed(redirectUriAllowed, "redirectUris");
|
|
16
15
|
provider.Client.prototype.postLogoutRedirectUriAllowed = wildcardRedirectUriAllowed(postLogoutRedirectUriAllowed, "postLogoutRedirectUris");
|
|
17
|
-
|
|
16
|
+
logger().warn("⚠️⚠️⚠️ OIDC Wildcard Uris plugin is ENABLED ⚠️⚠️⚠️");
|
|
18
17
|
}
|
|
19
18
|
}
|
|
20
19
|
$alterOidcConfiguration(config) {
|
|
@@ -33,13 +32,13 @@ let OidcWildcardRedirectUriModule = class OidcWildcardRedirectUriModule {
|
|
|
33
32
|
if (redirectUri.includes("*")) {
|
|
34
33
|
const { hostname, href } = new URL(redirectUri);
|
|
35
34
|
if (href.split("*").length !== 2) {
|
|
36
|
-
throw new
|
|
35
|
+
throw new errors.InvalidClientMetadata("redirect_uris with a wildcard may only contain a single one");
|
|
37
36
|
}
|
|
38
37
|
if (!hostname.includes("*")) {
|
|
39
|
-
throw new
|
|
38
|
+
throw new errors.InvalidClientMetadata("redirect_uris may only have a wildcard in the hostname");
|
|
40
39
|
}
|
|
41
40
|
if (!psl.get(hostname.split("*.")[1])) {
|
|
42
|
-
throw new
|
|
41
|
+
throw new errors.InvalidClientMetadata("redirect_uris with a wildcard must not match an eTLD+1 of a known public suffix domain");
|
|
43
42
|
}
|
|
44
43
|
}
|
|
45
44
|
}
|
|
@@ -49,31 +48,21 @@ let OidcWildcardRedirectUriModule = class OidcWildcardRedirectUriModule {
|
|
|
49
48
|
if (postLogoutRedirectUri.includes("*")) {
|
|
50
49
|
const { hostname, href } = new URL(postLogoutRedirectUri);
|
|
51
50
|
if (href.split("*").length !== 2) {
|
|
52
|
-
throw new
|
|
51
|
+
throw new errors.InvalidClientMetadata("post_logout_redirect_uris with a wildcard may only contain a single one");
|
|
53
52
|
}
|
|
54
53
|
if (!hostname.includes("*")) {
|
|
55
|
-
throw new
|
|
54
|
+
throw new errors.InvalidClientMetadata("post_logout_redirect_uris may only have a wildcard in the hostname");
|
|
56
55
|
}
|
|
57
56
|
if (!psl.get(hostname.split("*.")[1])) {
|
|
58
|
-
throw new
|
|
57
|
+
throw new errors.InvalidClientMetadata("post_logout_redirect_uris with a wildcard must not match an eTLD+1 of a known public suffix domain");
|
|
59
58
|
}
|
|
60
59
|
}
|
|
61
60
|
}
|
|
62
61
|
}
|
|
63
62
|
}
|
|
64
63
|
};
|
|
65
|
-
__decorate([
|
|
66
|
-
Constant("oidc.plugins.wildcard.enabled", false),
|
|
67
|
-
__metadata("design:type", Boolean)
|
|
68
|
-
], OidcWildcardRedirectUriModule.prototype, "enabled", void 0);
|
|
69
|
-
__decorate([
|
|
70
|
-
Inject(Logger),
|
|
71
|
-
__metadata("design:type", Logger)
|
|
72
|
-
], OidcWildcardRedirectUriModule.prototype, "logger", void 0);
|
|
73
64
|
OidcWildcardRedirectUriModule = __decorate([
|
|
74
|
-
Module()
|
|
75
|
-
__param(0, Inject(OIDC_PROVIDER_NODE_MODULE)),
|
|
76
|
-
__metadata("design:paramtypes", [Object])
|
|
65
|
+
Module()
|
|
77
66
|
], OidcWildcardRedirectUriModule);
|
|
78
67
|
export { OidcWildcardRedirectUriModule };
|
|
79
68
|
//# sourceMappingURL=OidcWildcardRedirectUriModule.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OidcWildcardRedirectUriModule.js","sourceRoot":"","sources":["../../src/OidcWildcardRedirectUriModule.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"OidcWildcardRedirectUriModule.js","sourceRoot":"","sources":["../../src/OidcWildcardRedirectUriModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import type { default as Provider, KoaContextWithOIDC } from "oidc-provider";
|
|
1
|
+
import { OidcSettings } from "@tsed/oidc-provider";
|
|
2
|
+
import Provider, { type KoaContextWithOIDC } from "oidc-provider";
|
|
4
3
|
declare global {
|
|
5
4
|
namespace TsED {
|
|
6
5
|
interface OIDCPluginSettings {
|
|
@@ -11,10 +10,7 @@ declare global {
|
|
|
11
10
|
}
|
|
12
11
|
}
|
|
13
12
|
export declare class OidcWildcardRedirectUriModule {
|
|
14
|
-
protected module: OIDC_PROVIDER_NODE_MODULE;
|
|
15
13
|
readonly enabled: boolean;
|
|
16
|
-
protected logger: Logger;
|
|
17
|
-
constructor(module: OIDC_PROVIDER_NODE_MODULE);
|
|
18
14
|
$onCreateOIDC(provider: Provider): void;
|
|
19
15
|
$alterOidcConfiguration(config: OidcSettings): Promise<OidcSettings>;
|
|
20
16
|
validator(ctx: KoaContextWithOIDC, key: string, value: any): void;
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@tsed/oidc-provider-plugin-wildcard-redirect-uri",
|
|
3
3
|
"description": "A plugin to support wildcard in the redirect uri whitelist",
|
|
4
4
|
"type": "module",
|
|
5
|
-
"version": "8.0.0-
|
|
5
|
+
"version": "8.0.0-beta.2",
|
|
6
6
|
"source": "./src/index.ts",
|
|
7
7
|
"main": "./lib/esm/index.js",
|
|
8
8
|
"module": "./lib/esm/index.js",
|
|
@@ -24,25 +24,25 @@
|
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
26
|
"psl": "1.9.0",
|
|
27
|
-
"wildcard": "2.0.
|
|
27
|
+
"wildcard": "2.0.1"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
|
-
"@tsed/barrels": "8.0.0-
|
|
31
|
-
"@tsed/core": "8.0.0-
|
|
32
|
-
"@tsed/di": "8.0.0-
|
|
33
|
-
"@tsed/oidc-provider": "8.0.0-
|
|
34
|
-
"@tsed/typescript": "8.0.0-
|
|
30
|
+
"@tsed/barrels": "8.0.0-beta.2",
|
|
31
|
+
"@tsed/core": "8.0.0-beta.2",
|
|
32
|
+
"@tsed/di": "8.0.0-beta.2",
|
|
33
|
+
"@tsed/oidc-provider": "8.0.0-beta.2",
|
|
34
|
+
"@tsed/typescript": "8.0.0-beta.2",
|
|
35
35
|
"@types/psl": "^1.1.3",
|
|
36
|
-
"@types/uuid": "
|
|
37
|
-
"eslint": "9.
|
|
36
|
+
"@types/uuid": "10.0.0",
|
|
37
|
+
"eslint": "9.12.0",
|
|
38
38
|
"typescript": "5.4.5",
|
|
39
|
-
"vitest": "2.
|
|
39
|
+
"vitest": "2.1.2"
|
|
40
40
|
},
|
|
41
41
|
"peerDependencies": {
|
|
42
|
-
"@tsed/core": "8.0.0-
|
|
43
|
-
"@tsed/di": "8.0.0-
|
|
42
|
+
"@tsed/core": "8.0.0-beta.2",
|
|
43
|
+
"@tsed/di": "8.0.0-beta.2",
|
|
44
44
|
"@tsed/logger": ">=6.7.5",
|
|
45
|
-
"@tsed/oidc-provider": "8.0.0-
|
|
45
|
+
"@tsed/oidc-provider": "8.0.0-beta.2",
|
|
46
46
|
"oidc-provider": ">=8.0.0"
|
|
47
47
|
},
|
|
48
48
|
"peerDependenciesMeta": {
|
|
@@ -64,6 +64,6 @@
|
|
|
64
64
|
"author": "Romain Lenzotti",
|
|
65
65
|
"license": "MIT",
|
|
66
66
|
"publishConfig": {
|
|
67
|
-
"tag": "
|
|
67
|
+
"tag": "beta"
|
|
68
68
|
}
|
|
69
69
|
}
|
package/vitest.config.mts
CHANGED
|
@@ -10,12 +10,12 @@ export default defineConfig(
|
|
|
10
10
|
coverage: {
|
|
11
11
|
...presets.test.coverage,
|
|
12
12
|
thresholds: {
|
|
13
|
-
statements: 98.
|
|
14
|
-
branches: 86.
|
|
13
|
+
statements: 98.76,
|
|
14
|
+
branches: 86.36,
|
|
15
15
|
functions: 100,
|
|
16
|
-
lines: 98.
|
|
16
|
+
lines: 98.76
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
|
-
);
|
|
21
|
+
);
|