Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

review feedback

Browse source
This commit is contained in:
Max Schmitt 2024-08-16 17:18:05 +02:00
parent 3b116ac1e1
commit cadb3fe514
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/playwright-core/src/server/socksClientCertificatesInterceptor.ts
View file

@ -30,7 +30,6 @@ let dummyServerTlsOptions: tls.TlsOptions | undefined = undefined;
function loadDummyServerCertsIfNeeded() { function loadDummyServerCertsIfNeeded() {
if (dummyServerTlsOptions) if (dummyServerTlsOptions)
return; return;
// TODO: do we want to have it unique per browser context, launch or global?
const { cert, key } = generateSelfSignedCertificate(); const { cert, key } = generateSelfSignedCertificate();
dummyServerTlsOptions = { key, cert }; dummyServerTlsOptions = { key, cert };
} }

21
packages/playwright-core/src/utils/crypto.ts
View file

@ -14,8 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
import assert from 'assert';
import crypto from 'crypto'; import crypto from 'crypto';
import { assert } from './debug';
export function createGuid(): string { export function createGuid(): string {
return crypto.randomBytes(16).toString('hex'); return crypto.randomBytes(16).toString('hex');
@ -45,7 +45,7 @@ class DER {
return this._encode(0x30, Buffer.concat(data)); return this._encode(0x30, Buffer.concat(data));
} }
static encodeInteger(data: number): Buffer { static encodeInteger(data: number): Buffer {
assert(data >= 0 && data <= 0xff); assert(data >= -128 && data <= 127);
return this._encode(0x02, Buffer.from([data])); return this._encode(0x02, Buffer.from([data]));
} }
static encodeObjectIdentifier(oid: string): Buffer { static encodeObjectIdentifier(oid: string): Buffer {
@ -63,10 +63,11 @@ class DER {
return Buffer.from([0x05, 0x00]); return Buffer.from([0x05, 0x00]);
} }
static encodeSet(data: Buffer[]): Buffer { static encodeSet(data: Buffer[]): Buffer {
assert(data.length === 1, 'Only one item in the set is supported. We\'d need to sort the data to support more.');
// We expect the data to be already sorted. // We expect the data to be already sorted.
return this._encode(0x31, Buffer.concat(data)); return this._encode(0x31, Buffer.concat(data));
} }
static encodeImplicitContextDependent(tag: number, data: Buffer): Buffer { static encodeExplicitContextDependent(tag: number, data: Buffer): Buffer {
return this._encode(0xa0 + tag, data); return this._encode(0xa0 + tag, data);
} }
static encodePrintableString(data: string): Buffer { static encodePrintableString(data: string): Buffer {
@ -116,9 +117,13 @@ export function generateSelfSignedCertificate() {
const { privateKey, publicKey } = crypto.generateKeyPairSync('rsa', { modulusLength: 2048 }); const { privateKey, publicKey } = crypto.generateKeyPairSync('rsa', { modulusLength: 2048 });
const publicKeyDer = publicKey.export({ type: 'pkcs1', format: 'der' }); const publicKeyDer = publicKey.export({ type: 'pkcs1', format: 'der' });
const oneYearInMilliseconds = 365 * 24 * 60 * 60 * 1_000;
const notBefore = new Date(new Date().getTime() - oneYearInMilliseconds);
const notAfter = new Date(new Date().getTime() + oneYearInMilliseconds);
// List of fields / structure: https://datatracker.ietf.org/doc/html/rfc2459#section-4.1 // List of fields / structure: https://datatracker.ietf.org/doc/html/rfc2459#section-4.1
const tbsCertificate = DER.encodeSequence([ const tbsCertificate = DER.encodeSequence([
DER.encodeImplicitContextDependent(0, DER.encodeInteger(1)), // version DER.encodeExplicitContextDependent(0, DER.encodeInteger(1)), // version
DER.encodeInteger(1), // serialNumber DER.encodeInteger(1), // serialNumber
DER.encodeSequence([ DER.encodeSequence([
DER.encodeObjectIdentifier('1.2.840.113549.1.1.11'), // sha256WithRSAEncryption PKCS #1 DER.encodeObjectIdentifier('1.2.840.113549.1.1.11'), // sha256WithRSAEncryption PKCS #1
@ -134,13 +139,13 @@ export function generateSelfSignedCertificate() {
DER.encodeSet([ DER.encodeSet([
DER.encodeSequence([ DER.encodeSequence([
DER.encodeObjectIdentifier('2.5.4.10'), // organizationName X.520 DN component DER.encodeObjectIdentifier('2.5.4.10'), // organizationName X.520 DN component
DER.encodePrintableString('Client Certificate Demo') DER.encodePrintableString('Playwright Client Certificate Support')
]) ])
]) ])
]), // issuer ]), // issuer
DER.encodeSequence([ DER.encodeSequence([
DER.encodeDate(new Date()), // notBefore DER.encodeDate(notBefore), // notBefore
DER.encodeDate(new Date()), // notAfter DER.encodeDate(notAfter), // notAfter
]), // validity ]), // validity
DER.encodeSequence([ DER.encodeSequence([
DER.encodeSet([ DER.encodeSet([
@ -152,7 +157,7 @@ export function generateSelfSignedCertificate() {
DER.encodeSet([ DER.encodeSet([
DER.encodeSequence([ DER.encodeSequence([
DER.encodeObjectIdentifier('2.5.4.10'), // organizationName X.520 DN component DER.encodeObjectIdentifier('2.5.4.10'), // organizationName X.520 DN component
DER.encodePrintableString('Client Certificate Demo') DER.encodePrintableString('Playwright Client Certificate Support')
]) ])
]) ])
]), // subject ]), // subject