Skip to content

Commit 7b30d2b

Browse files
paula-stachoaddaleax
paula-stacho
and
addaleax
authored
* chore(oidc-http-server-pages): import from https://github.com/mongodb-js/devtools-connect/tree/main/src/oidc/static * chore(devtools-connect): import from https://github.com/mongodb-js/devtools-connect * chore: setup fixes * ignore .ems-wrapper.mjs * align dependencies * update dependencies and reduce exports * fix * try * Revert "try" This reverts commit f2c0792. * temp: add explain * add mongodb to deps * add @mongodb-js/saslprep directly * set python version * address suggestions * Add EINVAL to fast failures Co-authored-by: Anna Henningsen <[email protected]> * reformat --------- Co-authored-by: Anna Henningsen <[email protected]>
1 parent 0c70ce8 commit 7b30d2b

40 files changed

+28103
-14055
lines changed

‎.github/workflows/check-test.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,13 @@ jobs:
5757
- name: Install npm
5858
run: npm install -g npm@8
5959

60+
- name: Use [email protected]
61+
# Default Python (3.12) doesn't have support for distutils
62+
# https://github.com/nodejs/node-gyp/issues/2869
63+
uses: actions/setup-python@v4
64+
with:
65+
python-version: '3.11'
66+
6067
- name: Install Dependencies
6168
run: |
6269
# Dependencies are included when installing as npm workspaces will

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ coverage
2828
env-vars.sh
2929
mongocryptd.pid
3030
mongodb-csfle
31+
.esm-wrapper.mjs

‎package-lock.json

Lines changed: 24928 additions & 14055 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/devtools-connect/.depcheckrc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
ignores:
2+
- '@mongodb-js/prettier-config-devtools'
3+
- '@mongodb-js/mocha-config-devtools'
4+
- '@mongodb-js/tsconfig-devtools'
5+
- '@types/chai'
6+
- '@types/sinon-chai'
7+
- 'sinon'
8+
# this is explicitly called as a dependency to make sure that is bootstrapped
9+
# before mongodb-runner, since it is required via mongodb
10+
- '@mongodb-js/saslprep'
11+
ignore-patterns:
12+
- 'dist'

‎packages/devtools-connect/.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.nyc-output
2+
dist

‎packages/devtools-connect/.eslintrc.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
module.exports = {
2+
root: true,
3+
extends: [
4+
'semistandard',
5+
'plugin:promise/recommended',
6+
'plugin:@typescript-eslint/recommended',
7+
],
8+
rules: {
9+
'@typescript-eslint/no-explicit-any': 0,
10+
'@typescript-eslint/no-empty-function': 0,
11+
'no-return-assign': 0,
12+
'no-use-before-define': 0,
13+
'comma-dangle': 0,
14+
'space-before-function-paren': 0,
15+
'@typescript-eslint/no-var-requires': 0,
16+
indent: 0,
17+
},
18+
};

‎packages/devtools-connect/.mocharc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require('@mongodb-js/mocha-config-devtools');

‎packages/devtools-connect/.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.nyc_output
2+
dist
3+
coverage
4+
.esm-wrapper.mjs

‎packages/devtools-connect/.prettierrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"@mongodb-js/prettier-config-devtools"

‎packages/devtools-connect/LICENSE

Lines changed: 192 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,192 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
Copyright 2020 MongoDB Inc.
180+
181+
Licensed under the Apache License, Version 2.0 (the "License");
182+
you may not use this file except in compliance with the License.
183+
You may obtain a copy of the License at
184+
185+
http://www.apache.org/licenses/LICENSE-2.0
186+
187+
Unless required by applicable law or agreed to in writing, software
188+
distributed under the License is distributed on an "AS IS" BASIS,
189+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
190+
See the License for the specific language governing permissions and
191+
limitations under the License.
192+

‎packages/devtools-connect/package.json

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
{
2+
"name": "@mongodb-js/devtools-connect",
3+
"version": "2.4.3",
4+
"description": "A connection establishment utility for MongoDB developer tools",
5+
"homepage": "https://github.com/mongodb-js/devtools-connect",
6+
"repository": {
7+
"type": "git",
8+
"url": "https://github.com/mongodb-js/devtools-connect.git"
9+
},
10+
"publishConfig": {
11+
"access": "public"
12+
},
13+
"bugs": {
14+
"url": "https://github.com/mongodb-js/devtools-connect/issues"
15+
},
16+
"main": "dist/index.js",
17+
"exports": {
18+
"require": "./dist/index.js",
19+
"import": "./.esm-wrapper.mjs"
20+
},
21+
"files": [
22+
"LICENSE",
23+
"dist",
24+
"package.json",
25+
"README.md",
26+
".esm-wrapper.mjs"
27+
],
28+
"scripts": {
29+
"bootstrap": "npm run compile",
30+
"prepublishOnly": "npm run compile",
31+
"compile": "npm run compile-ts && gen-esm-wrapper . ./.esm-wrapper.mjs",
32+
"typecheck": "tsc --noEmit",
33+
"eslint": "eslint src/**/*.ts",
34+
"prettier": "prettier",
35+
"lint": "npm run eslint . && npm run prettier -- --check .",
36+
"depcheck": "depcheck",
37+
"check": "npm run typecheck && npm run lint && npm run depcheck",
38+
"check-ci": "npm run check",
39+
"testonly": "nyc mocha --colors -r ts-node/register src/**/*.spec.ts",
40+
"test": "npm run lint && npm run compile && npm run testonly",
41+
"test-cov": "nyc -x \"**/*.spec.*\" --reporter=lcov --reporter=text --reporter=html npm run test",
42+
"test-watch": "npm run test -- --watch",
43+
"test-ci": "npm run test-cov",
44+
"reformat": "npm run prettier -- --write .",
45+
"prepack": "npm run compile",
46+
"compile-ts": "tsc -p tsconfig.json"
47+
},
48+
"license": "Apache-2.0",
49+
"dependencies": {
50+
"@mongodb-js/oidc-http-server-pages": "0.1.0",
51+
"lodash.merge": "^4.6.2",
52+
"mongodb-connection-string-url": "^3.0.0",
53+
"socks": "^2.7.3",
54+
"system-ca": "^1.0.2"
55+
},
56+
"peerDependencies": {
57+
"@mongodb-js/oidc-plugin": "^0.3.1",
58+
"mongodb": "^5.8.1 || ^6.0.0",
59+
"mongodb-log-writer": "^1.2.0"
60+
},
61+
"devDependencies": {
62+
"@mongodb-js/oidc-plugin": "^0.3.1",
63+
"@mongodb-js/saslprep": "^1.1.4",
64+
"@types/lodash.merge": "^4.6.7",
65+
"@types/mocha": "^9.0.0",
66+
"@types/node": "^17.0.35",
67+
"@typescript-eslint/eslint-plugin": "^5.59.0",
68+
"@typescript-eslint/parser": "^5.59.0",
69+
"chai": "^4.3.4",
70+
"eslint": "^7.25.0",
71+
"eslint-config-semistandard": "^17.0.0",
72+
"eslint-config-standard": "^17.1.0",
73+
"eslint-plugin-import": "^2.22.0",
74+
"eslint-plugin-n": "^16.6.2",
75+
"eslint-plugin-promise": "^6.1.1",
76+
"gen-esm-wrapper": "^1.1.0",
77+
"mocha": "^8.4.0",
78+
"mongodb": "^5.8.1 || ^6.0.0",
79+
"mongodb-log-writer": "^1.2.0",
80+
"nyc": "^15.1.0",
81+
"os-dns-native": "^1.2.0",
82+
"resolve-mongodb-srv": "^1.1.1",
83+
"sinon-chai": "^3.7.0",
84+
"ts-node": "^10.2.1",
85+
"ts-sinon": "^2.0.1",
86+
"typescript": "^5.0.4"
87+
},
88+
"optionalDependencies": {
89+
"kerberos": "^2.1.0",
90+
"mongodb-client-encryption": "^6.0.0",
91+
"os-dns-native": "^1.2.0",
92+
"resolve-mongodb-srv": "^1.1.1"
93+
}
94+
}

‎packages/devtools-connect/scripts/test-oidc-pages.js

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/* eslint-disable @typescript-eslint/no-var-requires */
2+
'use strict';
3+
const { oidcServerRequestHandler } = require('../dist/oidc/handler');
4+
const { createServer } = require('http');
5+
6+
createServer((req, res) => {
7+
const params = new URL(req.url ?? '/', 'http://localhost/').searchParams;
8+
9+
oidcServerRequestHandler(
10+
{
11+
productDocsLink: 'https://example.com',
12+
productName: 'MongoDB <Product>',
13+
},
14+
{ req, res, status: 200, ...Object.fromEntries(params) }
15+
);
16+
}).listen(0, function () {
17+
const { port } = this.address();
18+
const base = `http://localhost:${port}`;
19+
console.log('See rendered pages at these locations:');
20+
console.log(`${base}/?result=accepted`);
21+
console.log(`${base}/notfound`);
22+
console.log(`${base}/?result=rejected`);
23+
console.log(`${base}/?result=rejected&error=access_denied`);
24+
console.log(
25+
`${base}/?result=rejected&error=access_denied&errorDescription=The%20resource%20owner%20or%20authorization%20server%20denied%20the%20request`
26+
);
27+
console.log(
28+
`${base}/?result=rejected&error=access_denied&errorURI=https://example.com`
29+
);
30+
console.log(
31+
`${base}/?result=rejected&error=access_denied&errorDescription=The%20resource%20owner%20or%20authorization%20server%20denied%20the%20request&errorURI=https://example.com`
32+
);
33+
});

0 commit comments

Comments
 (0)