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

skip generating cert each time #67122

Merged
merged 3 commits into from
Sep 13, 2024
Merged

skip generating cert each time #67122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8758302
skip generating cert each time
r34son Jun 22, 2024
b38c52f
added test
r34son Jun 29, 2024
eaa93f5
Merge branch 'canary' into cert-improve
ijjk Sep 13, 2024
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
26 changes: 23 additions & 3 deletions packages/next/src/lib/mkcert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import fs from 'fs'
import path from 'path'
import fs from 'node:fs'
import path from 'node:path'
import { X509Certificate, createPrivateKey } from 'node:crypto'
import { getCacheDirectory } from './helpers/get-cache-directory'
import * as Log from '../build/output/log'
import { execSync } from 'child_process'
import { execSync } from 'node:child_process'
const { WritableStream } = require('node:stream/web') as {
WritableStream: typeof global.WritableStream
}
Expand Down Expand Up @@ -112,6 +113,25 @@ export async function createSelfSignedCertificate(
const keyPath = path.resolve(resolvedCertDir, 'localhost-key.pem')
const certPath = path.resolve(resolvedCertDir, 'localhost.pem')

if (fs.existsSync(keyPath) && fs.existsSync(certPath)) {
const cert = new X509Certificate(fs.readFileSync(certPath))
const key = fs.readFileSync(keyPath)

if (
cert.checkHost(host ?? 'localhost') &&
cert.checkPrivateKey(createPrivateKey(key))
) {
Log.info('Using already generated self signed certificate')
const caLocation = execSync(`"${binaryPath}" -CAROOT`).toString().trim()

return {
key: keyPath,
cert: certPath,
rootCA: `${caLocation}/rootCA.pem`,
}
}
}

Log.info(
'Attempting to generate self signed certificate. This may prompt for your password'
)
Expand Down
9 changes: 9 additions & 0 deletions test/development/experimental-https-server/https-server.generated-key.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,13 @@ describe('experimental-https-server (generated certificate)', () => {
const html = await renderViaHTTP(next.url, '/2', undefined, { agent })
expect(html).toContain('Hello from Pages')
})

it('should successfully reuse generated certificates', async () => {
Copy link
Contributor Author

@r34son r34son Jun 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would also add test case for next dev restart with another hostname. In this case we should regenerate cert.
But i`m not sure how to restart next with another cli options during test

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe you can point me to a similar test

await next.stop()
await next.start()
expect(next.url).toInclude('https://')
expect(next.cliOutput).toContain(
'Using already generated self signed certificate'
)
})
})
2 changes: 0 additions & 2 deletions test/lib/next-modes/base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ export class NextInstance {
this.env = {}
Object.assign(this, opts)

require('console').log('packageJson??', this.packageJson)

if (!isNextDeploy) {
this.env = {
...this.env,
Expand Down
Loading