From 5c6cf5a2a6577fb8e8ecc66a0411143af3fed042 Mon Sep 17 00:00:00 2001 From: patak Date: Thu, 7 Jul 2022 14:51:52 +0200 Subject: [PATCH] refactor!: move basic ssl setup to external plugin, fix #8532 (#8961) --- docs/config/server-options.md | 2 + docs/guide/migration.md | 13 + packages/vite/LICENSE.md | 340 +------------------------- packages/vite/package.json | 1 - packages/vite/src/node/certificate.ts | 169 ------------- packages/vite/src/node/http.ts | 29 +-- pnpm-lock.yaml | 7 - 7 files changed, 17 insertions(+), 544 deletions(-) delete mode 100644 packages/vite/src/node/certificate.ts diff --git a/docs/config/server-options.md b/docs/config/server-options.md index 6a5ae5ebab3aa4..d5ed802ef716a6 100644 --- a/docs/config/server-options.md +++ b/docs/config/server-options.md @@ -55,6 +55,8 @@ Enable TLS + HTTP/2. Note this downgrades to TLS only when the [`server.proxy` o The value can also be an [options object](https://nodejs.org/api/https.html#https_https_createserver_options_requestlistener) passed to `https.createServer()`. +A valid certificate is needed. For a basic setup, you can add [@vitejs/plugin-basic-ssl](https://github.com/vitejs/vite-plugin-basic-ssl) to the project plugins, which will automatically create and cache a self-signed certificate. But we recommend creating your own certificates. + ## server.open - **Type:** `boolean | string` diff --git a/docs/guide/migration.md b/docs/guide/migration.md index acf6460f93cf9a..3153c856ce2e61 100644 --- a/docs/guide/migration.md +++ b/docs/guide/migration.md @@ -101,6 +101,19 @@ You can use `?init` which is similar to the previous behavior. }) ``` +### Automatic https certificate generation + +A valid certificate is needed when using `https`. In Vite v2, if no certificate was configured, a self-signed certificate was automatically created and cached. +Since Vite v3, we recommend manually creating your certificates. If you still want to use the automatic generation from v2, this feature can be enabled back by adding [@vitejs/plugin-basic-ssl](https://github.com/vitejs/vite-plugin-basic-ssl) to the project plugins. + +```js +import basicSsl from '@vitejs/plugin-basic-ssl' + +export default { + plugins: [basicSsl()] +} +``` + ## Advanced There are some changes which only affects plugin/tool creators. diff --git a/packages/vite/LICENSE.md b/packages/vite/LICENSE.md index b6ea3555b32d39..41da37ad32dd33 100644 --- a/packages/vite/LICENSE.md +++ b/packages/vite/LICENSE.md @@ -25,7 +25,7 @@ SOFTWARE. # Licenses of bundled dependencies The published Vite artifact additionally contains code with the following licenses: -Apache-2.0, BSD-2-Clause, CC0-1.0, ISC, MIT, (BSD-3-Clause OR GPL-2.0) +Apache-2.0, BSD-2-Clause, CC0-1.0, ISC, MIT # Bundled dependencies: ## @ampproject/remapping @@ -2276,344 +2276,6 @@ Repository: zeit/ms --------------------------------------- -## node-forge -License: (BSD-3-Clause OR GPL-2.0) -By: Digital Bazaar, Inc., Dave Longley, David I. Lehn, Stefan Siegl, Christoph Dorn -Repository: https://github.com/digitalbazaar/forge - -> You may use the Forge project under the terms of either the BSD License or the -> GNU General Public License (GPL) Version 2. -> -> The BSD License is recommended for most projects. It is simple and easy to -> understand and it places almost no restrictions on what you can do with the -> Forge project. -> -> If the GPL suits your project better you are also free to use Forge under -> that license. -> -> You don't have to do anything special to choose one license or the other and -> you don't have to notify anyone which license you are using. You are free to -> use this project in commercial projects as long as the copyright header is -> left intact. -> -> If you are a commercial entity and use this set of libraries in your -> commercial software then reasonable payment to Digital Bazaar, if you can -> afford it, is not required but is expected and would be appreciated. If this -> library saves you time, then it's saving you money. The cost of developing -> the Forge software was on the order of several hundred hours and tens of -> thousands of dollars. We are attempting to strike a balance between helping -> the development community while not being taken advantage of by lucrative -> commercial entities for our efforts. -> -> ------------------------------------------------------------------------------- -> New BSD License (3-clause) -> Copyright (c) 2010, Digital Bazaar, Inc. -> All rights reserved. -> -> Redistribution and use in source and binary forms, with or without -> modification, are permitted provided that the following conditions are met: -> * Redistributions of source code must retain the above copyright -> notice, this list of conditions and the following disclaimer. -> * Redistributions in binary form must reproduce the above copyright -> notice, this list of conditions and the following disclaimer in the -> documentation and/or other materials provided with the distribution. -> * Neither the name of Digital Bazaar, Inc. nor the -> names of its contributors may be used to endorse or promote products -> derived from this software without specific prior written permission. -> -> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -> ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -> WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -> DISCLAIMED. IN NO EVENT SHALL DIGITAL BAZAAR BE LIABLE FOR ANY -> DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -> (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -> ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -> (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -> SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -> -> ------------------------------------------------------------------------------- -> GNU GENERAL PUBLIC LICENSE -> Version 2, June 1991 -> -> Copyright (C) 1989, 1991 Free Software Foundation, Inc. -> 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -> Everyone is permitted to copy and distribute verbatim copies -> of this license document, but changing it is not allowed. -> -> Preamble -> -> The licenses for most software are designed to take away your -> freedom to share and change it. By contrast, the GNU General Public -> License is intended to guarantee your freedom to share and change free -> software--to make sure the software is free for all its users. This -> General Public License applies to most of the Free Software -> Foundation's software and to any other program whose authors commit to -> using it. (Some other Free Software Foundation software is covered by -> the GNU Lesser General Public License instead.) You can apply it to -> your programs, too. -> -> When we speak of free software, we are referring to freedom, not -> price. Our General Public Licenses are designed to make sure that you -> have the freedom to distribute copies of free software (and charge for -> this service if you wish), that you receive source code or can get it -> if you want it, that you can change the software or use pieces of it -> in new free programs; and that you know you can do these things. -> -> To protect your rights, we need to make restrictions that forbid -> anyone to deny you these rights or to ask you to surrender the rights. -> These restrictions translate to certain responsibilities for you if you -> distribute copies of the software, or if you modify it. -> -> For example, if you distribute copies of such a program, whether -> gratis or for a fee, you must give the recipients all the rights that -> you have. You must make sure that they, too, receive or can get the -> source code. And you must show them these terms so they know their -> rights. -> -> We protect your rights with two steps: (1) copyright the software, and -> (2) offer you this license which gives you legal permission to copy, -> distribute and/or modify the software. -> -> Also, for each author's protection and ours, we want to make certain -> that everyone understands that there is no warranty for this free -> software. If the software is modified by someone else and passed on, we -> want its recipients to know that what they have is not the original, so -> that any problems introduced by others will not reflect on the original -> authors' reputations. -> -> Finally, any free program is threatened constantly by software -> patents. We wish to avoid the danger that redistributors of a free -> program will individually obtain patent licenses, in effect making the -> program proprietary. To prevent this, we have made it clear that any -> patent must be licensed for everyone's free use or not licensed at all. -> -> The precise terms and conditions for copying, distribution and -> modification follow. -> -> GNU GENERAL PUBLIC LICENSE -> TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -> -> 0. This License applies to any program or other work which contains -> a notice placed by the copyright holder saying it may be distributed -> under the terms of this General Public License. The "Program", below, -> refers to any such program or work, and a "work based on the Program" -> means either the Program or any derivative work under copyright law: -> that is to say, a work containing the Program or a portion of it, -> either verbatim or with modifications and/or translated into another -> language. (Hereinafter, translation is included without limitation in -> the term "modification".) Each licensee is addressed as "you". -> -> Activities other than copying, distribution and modification are not -> covered by this License; they are outside its scope. The act of -> running the Program is not restricted, and the output from the Program -> is covered only if its contents constitute a work based on the -> Program (independent of having been made by running the Program). -> Whether that is true depends on what the Program does. -> -> 1. You may copy and distribute verbatim copies of the Program's -> source code as you receive it, in any medium, provided that you -> conspicuously and appropriately publish on each copy an appropriate -> copyright notice and disclaimer of warranty; keep intact all the -> notices that refer to this License and to the absence of any warranty; -> and give any other recipients of the Program a copy of this License -> along with the Program. -> -> You may charge a fee for the physical act of transferring a copy, and -> you may at your option offer warranty protection in exchange for a fee. -> -> 2. You may modify your copy or copies of the Program or any portion -> of it, thus forming a work based on the Program, and copy and -> distribute such modifications or work under the terms of Section 1 -> above, provided that you also meet all of these conditions: -> -> a) You must cause the modified files to carry prominent notices -> stating that you changed the files and the date of any change. -> -> b) You must cause any work that you distribute or publish, that in -> whole or in part contains or is derived from the Program or any -> part thereof, to be licensed as a whole at no charge to all third -> parties under the terms of this License. -> -> c) If the modified program normally reads commands interactively -> when run, you must cause it, when started running for such -> interactive use in the most ordinary way, to print or display an -> announcement including an appropriate copyright notice and a -> notice that there is no warranty (or else, saying that you provide -> a warranty) and that users may redistribute the program under -> these conditions, and telling the user how to view a copy of this -> License. (Exception: if the Program itself is interactive but -> does not normally print such an announcement, your work based on -> the Program is not required to print an announcement.) -> -> These requirements apply to the modified work as a whole. If -> identifiable sections of that work are not derived from the Program, -> and can be reasonably considered independent and separate works in -> themselves, then this License, and its terms, do not apply to those -> sections when you distribute them as separate works. But when you -> distribute the same sections as part of a whole which is a work based -> on the Program, the distribution of the whole must be on the terms of -> this License, whose permissions for other licensees extend to the -> entire whole, and thus to each and every part regardless of who wrote it. -> -> Thus, it is not the intent of this section to claim rights or contest -> your rights to work written entirely by you; rather, the intent is to -> exercise the right to control the distribution of derivative or -> collective works based on the Program. -> -> In addition, mere aggregation of another work not based on the Program -> with the Program (or with a work based on the Program) on a volume of -> a storage or distribution medium does not bring the other work under -> the scope of this License. -> -> 3. You may copy and distribute the Program (or a work based on it, -> under Section 2) in object code or executable form under the terms of -> Sections 1 and 2 above provided that you also do one of the following: -> -> a) Accompany it with the complete corresponding machine-readable -> source code, which must be distributed under the terms of Sections -> 1 and 2 above on a medium customarily used for software interchange; or, -> -> b) Accompany it with a written offer, valid for at least three -> years, to give any third party, for a charge no more than your -> cost of physically performing source distribution, a complete -> machine-readable copy of the corresponding source code, to be -> distributed under the terms of Sections 1 and 2 above on a medium -> customarily used for software interchange; or, -> -> c) Accompany it with the information you received as to the offer -> to distribute corresponding source code. (This alternative is -> allowed only for noncommercial distribution and only if you -> received the program in object code or executable form with such -> an offer, in accord with Subsection b above.) -> -> The source code for a work means the preferred form of the work for -> making modifications to it. For an executable work, complete source -> code means all the source code for all modules it contains, plus any -> associated interface definition files, plus the scripts used to -> control compilation and installation of the executable. However, as a -> special exception, the source code distributed need not include -> anything that is normally distributed (in either source or binary -> form) with the major components (compiler, kernel, and so on) of the -> operating system on which the executable runs, unless that component -> itself accompanies the executable. -> -> If distribution of executable or object code is made by offering -> access to copy from a designated place, then offering equivalent -> access to copy the source code from the same place counts as -> distribution of the source code, even though third parties are not -> compelled to copy the source along with the object code. -> -> 4. You may not copy, modify, sublicense, or distribute the Program -> except as expressly provided under this License. Any attempt -> otherwise to copy, modify, sublicense or distribute the Program is -> void, and will automatically terminate your rights under this License. -> However, parties who have received copies, or rights, from you under -> this License will not have their licenses terminated so long as such -> parties remain in full compliance. -> -> 5. You are not required to accept this License, since you have not -> signed it. However, nothing else grants you permission to modify or -> distribute the Program or its derivative works. These actions are -> prohibited by law if you do not accept this License. Therefore, by -> modifying or distributing the Program (or any work based on the -> Program), you indicate your acceptance of this License to do so, and -> all its terms and conditions for copying, distributing or modifying -> the Program or works based on it. -> -> 6. Each time you redistribute the Program (or any work based on the -> Program), the recipient automatically receives a license from the -> original licensor to copy, distribute or modify the Program subject to -> these terms and conditions. You may not impose any further -> restrictions on the recipients' exercise of the rights granted herein. -> You are not responsible for enforcing compliance by third parties to -> this License. -> -> 7. If, as a consequence of a court judgment or allegation of patent -> infringement or for any other reason (not limited to patent issues), -> conditions are imposed on you (whether by court order, agreement or -> otherwise) that contradict the conditions of this License, they do not -> excuse you from the conditions of this License. If you cannot -> distribute so as to satisfy simultaneously your obligations under this -> License and any other pertinent obligations, then as a consequence you -> may not distribute the Program at all. For example, if a patent -> license would not permit royalty-free redistribution of the Program by -> all those who receive copies directly or indirectly through you, then -> the only way you could satisfy both it and this License would be to -> refrain entirely from distribution of the Program. -> -> If any portion of this section is held invalid or unenforceable under -> any particular circumstance, the balance of the section is intended to -> apply and the section as a whole is intended to apply in other -> circumstances. -> -> It is not the purpose of this section to induce you to infringe any -> patents or other property right claims or to contest validity of any -> such claims; this section has the sole purpose of protecting the -> integrity of the free software distribution system, which is -> implemented by public license practices. Many people have made -> generous contributions to the wide range of software distributed -> through that system in reliance on consistent application of that -> system; it is up to the author/donor to decide if he or she is willing -> to distribute software through any other system and a licensee cannot -> impose that choice. -> -> This section is intended to make thoroughly clear what is believed to -> be a consequence of the rest of this License. -> -> 8. If the distribution and/or use of the Program is restricted in -> certain countries either by patents or by copyrighted interfaces, the -> original copyright holder who places the Program under this License -> may add an explicit geographical distribution limitation excluding -> those countries, so that distribution is permitted only in or among -> countries not thus excluded. In such case, this License incorporates -> the limitation as if written in the body of this License. -> -> 9. The Free Software Foundation may publish revised and/or new versions -> of the General Public License from time to time. Such new versions will -> be similar in spirit to the present version, but may differ in detail to -> address new problems or concerns. -> -> Each version is given a distinguishing version number. If the Program -> specifies a version number of this License which applies to it and "any -> later version", you have the option of following the terms and conditions -> either of that version or of any later version published by the Free -> Software Foundation. If the Program does not specify a version number of -> this License, you may choose any version ever published by the Free Software -> Foundation. -> -> 10. If you wish to incorporate parts of the Program into other free -> programs whose distribution conditions are different, write to the author -> to ask for permission. For software which is copyrighted by the Free -> Software Foundation, write to the Free Software Foundation; we sometimes -> make exceptions for this. Our decision will be guided by the two goals -> of preserving the free status of all derivatives of our free software and -> of promoting the sharing and reuse of software generally. -> -> NO WARRANTY -> -> 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -> FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -> OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -> PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -> OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -> MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -> TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -> PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -> REPAIR OR CORRECTION. -> -> 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -> WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -> REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -> INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -> OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -> TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -> YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -> PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -> POSSIBILITY OF SUCH DAMAGES. - ---------------------------------------- - ## normalize-path License: MIT By: Jon Schlinkert, Blaine Bublitz diff --git a/packages/vite/package.json b/packages/vite/package.json index 8d35c763cb9990..8bb80653bd9ea5 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -101,7 +101,6 @@ "micromatch": "^4.0.5", "mlly": "^0.5.4", "mrmime": "^1.0.1", - "node-forge": "^1.3.1", "okie": "^1.0.1", "open": "^8.4.0", "periscopic": "^3.0.4", diff --git a/packages/vite/src/node/certificate.ts b/packages/vite/src/node/certificate.ts deleted file mode 100644 index d8ce82d6b5365d..00000000000000 --- a/packages/vite/src/node/certificate.ts +++ /dev/null @@ -1,169 +0,0 @@ -// Simplified fork of selfsigned with inlined options and partial -// node-forge usage to achieve smaller bundle. See: -// https://github.com/jfromaniello/selfsigned/blob/da38146f8d02183c35f49f91659a744a243e8707/index.js -// -// this utility create untrusted certificate which still -// allows to access page after proceeding a wall with warning -// -// should be deprecated eventually and replaced with recipes -// about generating secure trusted certificates -// -// ## selfsigned -// License: MIT -// By: José F. Romaniello, Paolo Fragomeni, Charles Bushong -// Repository: git://github.com/jfromaniello/selfsigned.git -// MIT License -// Copyright (c) 2013 José F. Romaniello -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -// @ts-ignore -import forge from 'node-forge/lib/forge' -// @ts-ignore -import 'node-forge/lib/pki' - -// a hexString is considered negative if it's most significant bit is 1 -// because serial numbers use ones' complement notation -// this RFC in section 4.1.2.2 requires serial numbers to be positive -// http://www.ietf.org/rfc/rfc5280.txt -function toPositiveHex(hexString: string) { - let mostSignificativeHexAsInt = parseInt(hexString[0], 16) - if (mostSignificativeHexAsInt < 8) { - return hexString - } - - mostSignificativeHexAsInt -= 8 - return mostSignificativeHexAsInt.toString() + hexString.substring(1) -} - -export function createCertificate(): string { - const days = 30 - const keySize = 2048 - - const extensions = [ - // { - // name: 'basicConstraints', - // cA: true, - // }, - { - name: 'keyUsage', - keyCertSign: true, - digitalSignature: true, - nonRepudiation: true, - keyEncipherment: true, - dataEncipherment: true - }, - { - name: 'extKeyUsage', - serverAuth: true, - clientAuth: true, - codeSigning: true, - timeStamping: true - }, - { - name: 'subjectAltName', - altNames: [ - { - // type 2 is DNS - type: 2, - value: 'localhost' - }, - { - type: 2, - value: 'localhost.localdomain' - }, - { - type: 2, - value: 'lvh.me' - }, - { - type: 2, - value: '*.lvh.me' - }, - { - type: 2, - value: '[::1]' - }, - { - // type 7 is IP - type: 7, - ip: '127.0.0.1' - }, - { - type: 7, - ip: 'fe80::1' - } - ] - } - ] - - const attrs = [ - { - name: 'commonName', - value: 'example.org' - }, - { - name: 'countryName', - value: 'US' - }, - { - shortName: 'ST', - value: 'Virginia' - }, - { - name: 'localityName', - value: 'Blacksburg' - }, - { - name: 'organizationName', - value: 'Test' - }, - { - shortName: 'OU', - value: 'Test' - } - ] - - const keyPair = forge.pki.rsa.generateKeyPair(keySize) - - const cert = forge.pki.createCertificate() - - cert.serialNumber = toPositiveHex( - forge.util.bytesToHex(forge.random.getBytesSync(9)) - ) // the serial number can be decimal or hex (if preceded by 0x) - - cert.validity.notBefore = new Date() - cert.validity.notAfter = new Date() - cert.validity.notAfter.setDate(cert.validity.notBefore.getDate() + days) - - cert.setSubject(attrs) - cert.setIssuer(attrs) - - cert.publicKey = keyPair.publicKey - - cert.setExtensions(extensions) - - const algorithm = forge.md.sha256.create() - cert.sign(keyPair.privateKey, algorithm) - - const privateKeyPem = forge.pki.privateKeyToPem(keyPair.privateKey) - const certPem = forge.pki.certificateToPem(cert) - - return privateKeyPem + certPem -} diff --git a/packages/vite/src/node/http.ts b/packages/vite/src/node/http.ts index d34e67d62aeb36..18ce37f6a327e1 100644 --- a/packages/vite/src/node/http.ts +++ b/packages/vite/src/node/http.ts @@ -1,4 +1,4 @@ -import fs, { promises as fsp } from 'node:fs' +import fs from 'node:fs' import path from 'node:path' import type { Server as HttpServer, @@ -134,9 +134,6 @@ export async function resolveHttpsConfig( key: readFileIfExists(key), pfx: readFileIfExists(pfx) }) - if (!httpsOption.key || !httpsOption.cert) { - httpsOption.cert = httpsOption.key = await getCertificate(cacheDir) - } return httpsOption } @@ -151,30 +148,6 @@ function readFileIfExists(value?: string | Buffer | any[]) { return value } -async function getCertificate(cacheDir: string) { - const cachePath = path.join(cacheDir, '_cert.pem') - - try { - const [stat, content] = await Promise.all([ - fsp.stat(cachePath), - fsp.readFile(cachePath, 'utf8') - ]) - - if (Date.now() - stat.ctime.valueOf() > 30 * 24 * 60 * 60 * 1000) { - throw new Error('cache is outdated.') - } - - return content - } catch { - const content = (await import('./certificate')).createCertificate() - fsp - .mkdir(cacheDir, { recursive: true }) - .then(() => fsp.writeFile(cachePath, content)) - .catch(() => {}) - return content - } -} - export async function httpServerStart( httpServer: HttpServer, serverOptions: { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2135de17c45851..a9b329c87ac56d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -247,7 +247,6 @@ importers: micromatch: ^4.0.5 mlly: ^0.5.4 mrmime: ^1.0.1 - node-forge: ^1.3.1 okie: ^1.0.1 open: ^8.4.0 periscopic: ^3.0.4 @@ -312,7 +311,6 @@ importers: micromatch: 4.0.5 mlly: 0.5.4 mrmime: 1.0.1 - node-forge: 1.3.1 okie: 1.0.1 open: 8.4.0 periscopic: 3.0.4 @@ -6405,11 +6403,6 @@ packages: engines: {node: '>= 6.0.0'} dev: true - /node-forge/1.3.1: - resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==} - engines: {node: '>= 6.13.0'} - dev: true - /node-releases/2.0.4: resolution: {integrity: sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==}