Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tls: use for...of #30961

Closed
wants to merge 5 commits into from
Closed

tls: use for...of #30961

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
af532e7
tls: for...of in _tls_common.js
trivikr Dec 14, 2019
666a4b4
tls: for...of in _tls_wrap.js
trivikr Dec 14, 2019
494f6a4
tls: for...of in tls.js
trivikr Dec 14, 2019
9f05ca5
f remove unused i from _tls_common.js
trivikr Dec 14, 2019
c0cd5b2
f typo for...in to for...of
trivikr Dec 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions lib/_tls_common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,12 @@ exports.createSecureContext = function createSecureContext(options) {

const c = new SecureContext(options.secureProtocol, secureOptions,
options.minVersion, options.maxVersion);
let i;
let val;

// Add CA before the cert to be able to load cert's issuer in C++ code.
const { ca } = options;
if (ca) {
if (ArrayIsArray(ca)) {
for (i = 0; i < ca.length; ++i) {
val = ca[i];
for (const val in ca) {
trivikr marked this conversation as resolved.
Show resolved Hide resolved
validateKeyOrCertOption('ca', val);
c.context.addCACert(val);
}
Expand All @@ -123,8 +120,7 @@ exports.createSecureContext = function createSecureContext(options) {
const { cert } = options;
if (cert) {
if (ArrayIsArray(cert)) {
for (i = 0; i < cert.length; ++i) {
val = cert[i];
for (const val in cert) {
validateKeyOrCertOption('cert', val);
c.context.setCert(val);
}
Expand All @@ -142,8 +138,7 @@ exports.createSecureContext = function createSecureContext(options) {
const passphrase = options.passphrase;
if (key) {
if (ArrayIsArray(key)) {
for (i = 0; i < key.length; ++i) {
val = key[i];
for (const val in key) {
// eslint-disable-next-line eqeqeq
const pem = (val != undefined && val.pem !== undefined ? val.pem : val);
validateKeyOrCertOption('key', pem);
Expand Down Expand Up @@ -242,8 +237,8 @@ exports.createSecureContext = function createSecureContext(options) {

if (options.crl) {
if (ArrayIsArray(options.crl)) {
for (i = 0; i < options.crl.length; i++) {
c.context.addCRL(options.crl[i]);
for (const crl in options.crl) {
c.context.addCRL(crl);
}
} else {
c.context.addCRL(options.crl);
Expand All @@ -259,8 +254,7 @@ exports.createSecureContext = function createSecureContext(options) {
toBuf = require('internal/crypto/util').toBuf;

if (ArrayIsArray(options.pfx)) {
for (i = 0; i < options.pfx.length; i++) {
const pfx = options.pfx[i];
for (const pfx in options.pfx) {
const raw = pfx.buf ? pfx.buf : pfx;
const buf = toBuf(raw);
const passphrase = pfx.passphrase || options.passphrase;
Expand Down
9 changes: 4 additions & 5 deletions lib/_tls_wrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,9 +465,9 @@ function makeMethodProxy(name) {
return this._parent[name].apply(this._parent, args);
};
}
for (let n = 0; n < proxiedMethods.length; n++) {
tls_wrap.TLSWrap.prototype[proxiedMethods[n]] =
makeMethodProxy(proxiedMethods[n]);
for (const proxiedMethod of proxiedMethods) {
tls_wrap.TLSWrap.prototype[proxiedMethod] =
makeMethodProxy(proxiedMethod);
}

tls_wrap.TLSWrap.prototype.close = function close(cb) {
Expand Down Expand Up @@ -1303,8 +1303,7 @@ Server.prototype[EE.captureRejectionSymbol] = function(
function SNICallback(servername, callback) {
const contexts = this.server._contexts;

for (let i = 0; i < contexts.length; i++) {
const elem = contexts[i];
for (const elem of contexts) {
if (elem[0].test(servername)) {
callback(null, elem[1]);
return;
Expand Down
9 changes: 4 additions & 5 deletions lib/internal/tls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ const {
// C=US\nST=CA\nL=SF\nO=Joyent\nOU=Node.js\nCN=ca1\[email protected]
function parseCertString(s) {
const out = ObjectCreate(null);
const parts = s.split('\n');
for (let i = 0, len = parts.length; i < len; i++) {
const sepIndex = parts[i].indexOf('=');
for (const part of s.split('\n')) {
const sepIndex = part.indexOf('=');
if (sepIndex > 0) {
const key = parts[i].slice(0, sepIndex);
const value = parts[i].slice(sepIndex + 1);
const key = part.slice(0, sepIndex);
const value = part.slice(sepIndex + 1);
if (key in out) {
if (!ArrayIsArray(out[key])) {
out[key] = [out[key]];
Expand Down