1. fix issues #365 #366

Author: xpf0000

build/helper.js

@@ -114,12 +114,16 @@ class Manager extends Base {
         await execPromise(command)
 
         process.chdir(param.savePath)
-        command = `echo basicConstraints=CA:true > "${caFileName}.cnf"`
-        await execPromise(command)
 
         const caCRT = join(param.savePath, `${caFileName}.crt`)
         const caCnf = join(param.savePath, `${caFileName}.cnf`)
 
+        const cnf = `basicConstraints = critical,CA:TRUE
+keyUsage = critical,keyCertSign,cRLSign
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always,issuer`
+        await writeFile(caCnf, cnf)
+
         process.chdir(dirname(openssl))
         command = `${basename(openssl)} x509 -req -in "${caCSR}" -signkey "${caKey}" -out "${caCRT}" -extfile "${caCnf}" -sha256 -days 3650`
         await execPromise(command)

src/fork/module/Tool.win.ts

@@ -121,7 +121,7 @@ subjectAltName=@alt_names
             resolve(false)
             return
           }
-          await Helper.send('host', 'sslAddTrustedCert', CADir)
+          await Helper.send('host', 'sslAddTrustedCert', CADir, 'FlyEnv-Root-CA.crt')
           const res: any = await Helper.send('host', 'sslFindCertificate', CADir)
           if (!res.stdout.includes('FlyEnv-Root-CA') && !res.stderr.includes('FlyEnv-Root-CA')) {
             resolve(false)

src/fork/module/host/SSL.ts

@@ -2,11 +2,11 @@ import { BaseManager } from './Base'
 import { execPromise } from '../util'
 
 class Manager extends BaseManager {
-  sslAddTrustedCert(cwd: string): Promise<boolean> {
+  sslAddTrustedCert(cwd: string, caName: string): Promise<boolean> {
     return new Promise(async (resolve, reject) => {
       try {
         await execPromise(
-          `security add-trusted-cert -d -r trustRoot -k "/Library/Keychains/System.keychain" "FlyEnv-Root-CA.crt"`,
+          `security add-trusted-cert -d -r trustRoot -k "/Library/Keychains/System.keychain" "${caName}"`,
           {
             cwd
           }

src/helper/module/Host.ts

@@ -10,7 +10,7 @@ const SOCKET_PATH = '/tmp/flyenv-helper.sock'
 
 class AppHelper {
   state: 'normal' | 'installing' | 'installed' = 'normal'
-  version = 5
+  version = 6
   check() {
     console.time('AppHelper check')
     return new Promise((resolve, reject) => {

src/main/core/AppHelper.ts

@@ -173,7 +173,7 @@
       if (!exists) {
         let command = `openssl genrsa -out "${caFileName}.key" 2048;`
         command += `openssl req -new -key "${caFileName}.key" -out "${caFileName}.csr" -sha256 -subj "/CN=Dev Root CA ${caFileName}";`
-        command += `echo "basicConstraints=CA:true" > "${caFileName}.cnf";`
+        command += `echo "basicConstraints = critical,CA:TRUE\nkeyUsage = critical,keyCertSign,cRLSign\nsubjectKeyIdentifier = hash\nauthorityKeyIdentifier = keyid:always,issuer" > "${caFileName}.cnf";`
         command += `openssl x509 -req -in "${caFileName}.csr" -signkey "${caFileName}.key" -out "${caFileName}.crt" -extfile "${caFileName}.cnf" -sha256 -days 3650;`
         await exec.exec(command, opt)
       }