Skip to content

Commit

Permalink
fix: Use rejectUnauthorzed instead of strictSSL (#401)
Browse files Browse the repository at this point in the history 
Even though they should be the same thing, `strictSSL` was not working but `rejectUnauthorized` does.

see https://nodejs.org/docs/latest-v18.x/api/tls.html#tls_tls_connect_options_callback for the proper tls connect options

Co-authored-by: Seth Wheeler <23089578+Megapixel99@users.noreply.github.com>
  • Loading branch information
@lholmquist @Megapixel99
lholmquist and Megapixel99 committed Apr 23, 2024
1 parent 271304a commit d5722b5
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion lib/authorization-server-request.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const getAuthUrlFromOCP = async (url, insecureSkipTlsVerify = true) => {
return new Promise((resolve, reject) => {
const client = new Client(url, {
connect: {
strictSSL: insecureSkipTlsVerify
rejectUnauthorized: insecureSkipTlsVerify
}
});
const requestOptions = {
Expand Down
4 changes: 2 additions & 2 deletions lib/basic-auth-request.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ async function getUserFromAuthToken (settings) {
return new Promise((resolve, reject) => {
const client = new Client(settings.url, {
connect: {
strictSSL: 'insecureSkipTlsVerify' in settings ? !settings.insecureSkipTlsVerify : true
rejectUnauthorized: 'insecureSkipTlsVerify' in settings ? !settings.insecureSkipTlsVerify : true
}
});
const requestOptions = {
Expand Down Expand Up @@ -44,7 +44,7 @@ async function getTokenFromBasicAuth (settings) {

const client = new Client(parsedAuthURL.origin, {
connect: {
strictSSL: 'insecureSkipTlsVerify' in settings ? !settings.insecureSkipTlsVerify : true
rejectUnauthorized: 'insecureSkipTlsVerify' in settings ? !settings.insecureSkipTlsVerify : true
}
});

Expand Down
10 changes: 5 additions & 5 deletions test/authorization-server-request-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ test('authorization server request URL join safety', (t) => {
static '@noCallThru' = true;

constructor (url, options) {
t.equal(options.connect.strictSSL, false, 'strictSSL should be false');
t.equal(options.connect.rejectUnauthorized, false, 'rejectUnauthorized should be false');
t.equal(url, `${BASE_URL}`, 'url should be equal to base url');
this.url = url;
}
Expand Down Expand Up @@ -94,7 +94,7 @@ test('authorization server request without insecureSkipTlsVerify', (t) => {
static '@noCallThru' = true;

constructor (url, options) {
t.equal(options.connect.strictSSL, true, 'strictSSL should be true');
t.equal(options.connect.rejectUnauthorized, true, 'rejectUnauthorized should be true');
}

request (options) {
Expand Down Expand Up @@ -133,7 +133,7 @@ test('authorization server request with empty body', (t) => {
static '@noCallThru' = true;

constructor (url, options) {
t.equal(options.connect.strictSSL, false, 'strictSSL should be false');
t.equal(options.connect.rejectUnauthorized, false, 'rejectUnauthorized should be false');
}

request (options) {
Expand Down Expand Up @@ -170,7 +170,7 @@ test('authorization server request with 404 status code', (t) => {
static '@noCallThru' = true;

constructor (url, options) {
t.equal(options.connect.strictSSL, false, 'strictSSL should be false');
t.equal(options.connect.rejectUnauthorized, false, 'rejectUnauthorized should be false');
}

request (options) {
Expand Down Expand Up @@ -198,7 +198,7 @@ test('authorization server request with error', (t) => {
static '@noCallThru' = true;

constructor (url, options) {
t.equal(options.connect.strictSSL, false, 'strictSSL should be false');
t.equal(options.connect.rejectUnauthorized, false, 'rejectUnauthorized should be false');
}

request (options) {
Expand Down
12 changes: 6 additions & 6 deletions test/basic-auth-request-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ test('basic auth request', (t) => {
static '@noCallThru' = true;

constructor (url, options) {
t.equal(options.connect.strictSSL, false, 'strictSSL should be false');
t.equal(options.connect.rejectUnauthorized, false, 'rejectUnauthorized should be false');
}

request (options) {
Expand Down Expand Up @@ -61,7 +61,7 @@ test('basic auth request with 404 status code', (t) => {
static '@noCallThru' = true;

constructor (url, options) {
t.equal(options.connect.strictSSL, false, 'strictSSL should be false');
t.equal(options.connect.rejectUnauthorized, false, 'rejectUnauthorized should be false');
}

request (options) {
Expand Down Expand Up @@ -119,7 +119,7 @@ test('basic auth request with 401 status code', (t) => {
static '@noCallThru' = true;

constructor (url, options) {
t.equal(options.connect.strictSSL, false, 'strictSSL should be false');
t.equal(options.connect.rejectUnauthorized, false, 'rejectUnauthorized should be false');
}

request (options) {
Expand Down Expand Up @@ -212,7 +212,7 @@ test('get user from token', (t) => {
static '@noCallThru' = true;

constructor (url, options) {
t.equal(options.connect.strictSSL, false, 'strictSSL should be false');
t.equal(options.connect.rejectUnauthorized, false, 'rejectUnauthorized should be false');
}

request (options) {
Expand Down Expand Up @@ -266,7 +266,7 @@ test('get user from token URL join safety', (t) => {
static '@noCallThru' = true;

constructor (url, options) {
t.equal(options.connect.strictSSL, false, 'strictSSL should be false');
t.equal(options.connect.rejectUnauthorized, false, 'rejectUnauthorized should be false');
t.equal(url, `${BASE_URL}`, 'url should be equal to base url');
this.url = url;
}
Expand Down Expand Up @@ -317,7 +317,7 @@ test('get user from token with 401 status code', (t) => {
static '@noCallThru' = true;

constructor (url, options) {
t.equal(options.connect.strictSSL, false, 'strictSSL should be false');
t.equal(options.connect.rejectUnauthorized, false, 'rejectUnauthorized should be false');
}

request (options) {
Expand Down

0 comments on commit d5722b5

Please sign in to comment.