diff --git a/.gitignore b/.gitignore index 8f17b4b67..a6b7c116e 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ cypress/videos *.zip *.crx *.pem +!x-dev-certs/**/*.pem update.xml .idea package-lock.json diff --git a/packages/firecamp-desktop/src-tauri/rustc-ice-2023-09-01T10:38:16.464703Z-21654.txt b/packages/firecamp-desktop/src-tauri/rustc-ice-2023-09-01T10:38:16.464703Z-21654.txt new file mode 100644 index 000000000..e69de29bb diff --git a/packages/firecamp-desktop/src-tauri/tauri.conf.json b/packages/firecamp-desktop/src-tauri/tauri.conf.json index ba26736dc..ce0128f03 100644 --- a/packages/firecamp-desktop/src-tauri/tauri.conf.json +++ b/packages/firecamp-desktop/src-tauri/tauri.conf.json @@ -2,7 +2,7 @@ "build": { "beforeDevCommand": "pnpm dev", "beforeBuildCommand": "pnpm build", - "devPath": "https://firecamp.dev", + "devPath": "https://localhost:3000", "distDir": "../dist", "withGlobalTauri": false }, diff --git a/webpack.dev.js b/webpack.dev.js index 4328dffb7..e7893a142 100644 --- a/webpack.dev.js +++ b/webpack.dev.js @@ -1,3 +1,4 @@ +const { readFileSync } = require('fs'); const path = require('path'); const webpack = require('webpack'); const { merge } = require('webpack-merge'); @@ -32,7 +33,12 @@ module.exports = merge(base, { ], }, devServer: { - //server: 'https', + server: 'https', + https: { + key: readFileSync('x-dev-certs/localhost.key.pem'), + cert: readFileSync('x-dev-certs/localhost.cert.pem'), + ca: readFileSync('x-dev-certs/ca/rootCA.pem'), + }, static: path.join(__dirname, './build/development'), compress: true, port: 3000, diff --git a/x-dev-certs/README.md b/x-dev-certs/README.md new file mode 100644 index 000000000..58a5b0c96 --- /dev/null +++ b/x-dev-certs/README.md @@ -0,0 +1,3 @@ +These certificates are generated with MKCert + +https://github.com/FiloSottile/mkcert \ No newline at end of file diff --git a/x-dev-certs/ca/rootCA-key.pem b/x-dev-certs/ca/rootCA-key.pem new file mode 100644 index 000000000..efb8e4ae2 --- /dev/null +++ b/x-dev-certs/ca/rootCA-key.pem @@ -0,0 +1,40 @@ +-----BEGIN PRIVATE KEY----- +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 +r4p3y0S7i+sVblm5gWeN0X+Y +-----END PRIVATE KEY----- diff --git a/x-dev-certs/ca/rootCA.pem b/x-dev-certs/ca/rootCA.pem new file mode 100644 index 000000000..d7d8c46f3 --- /dev/null +++ b/x-dev-certs/ca/rootCA.pem @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE3DCCA0SgAwIBAgIRAPE8SCLbUrbV5v2Uh9CZTKkwDQYJKoZIhvcNAQELBQAw +gYUxHjAcBgNVBAoTFW1rY2VydCBkZXZlbG9wbWVudCBDQTEtMCsGA1UECwwkbmlz +aGNoaXRAbmQubG9jYWwgKE5pc2hjaGl0IERoYW5hbmkpMTQwMgYDVQQDDCtta2Nl +cnQgbmlzaGNoaXRAbmQubG9jYWwgKE5pc2hjaGl0IERoYW5hbmkpMB4XDTIzMDkw +MTEyNDg0OVoXDTMzMDkwMTEyNDg0OVowgYUxHjAcBgNVBAoTFW1rY2VydCBkZXZl +bG9wbWVudCBDQTEtMCsGA1UECwwkbmlzaGNoaXRAbmQubG9jYWwgKE5pc2hjaGl0 +IERoYW5hbmkpMTQwMgYDVQQDDCtta2NlcnQgbmlzaGNoaXRAbmQubG9jYWwgKE5p +c2hjaGl0IERoYW5hbmkpMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA +w0cTNpayvNZK367h2h514pVB2cFpHMwRj/GOc8baXvcgiosnjGbg6SzroTBJNQYu +jN3C8HEtlWQkr13tNtXYA60V0p3hVkBnBkOiL4Vy0uOquMxkrrV9ry3PeqGlBHPi +6i+PUQdlu1LqXpOqL+2K1Z/pwdoJYGiGDxolBKvtRijxU8VgEr5qhVsfzCrO/MpC +hHd/UcCcGFTOe6i3EXJmRQuhE2FmLZ24cILBabmO4GAOIJii3JgpIl52xTCHA4qi +JSmeSFtVAi+i9Q68HOwxwhqkspMStNAqndOK8WxxCEJReO3uRSO0W9VSwLswLj5M +GlMeF0m0ZcI00VRZT274sdLr8AQFdxnYuj/KpPKMecQuoJQ0ojX5FuWfp/JQOj5w +t5XMPzx3arfMY4n/K9zIv42CKotE3gHw7nGZVdW8YUua+A3WYCn2GqZ5GYs2uJQf +IxI3uMepPFNR0manBFZ4sM8cL3wIgS0MjeisYUMvdz2r3v1mMPzAK8ZjAeEgKnV9 +AgMBAAGjRTBDMA4GA1UdDwEB/wQEAwICBDASBgNVHRMBAf8ECDAGAQH/AgEAMB0G +A1UdDgQWBBSowwoctxqlqvby2V2TAsG8zeMZ8DANBgkqhkiG9w0BAQsFAAOCAYEA +OA/20GLyp2B/gBAXfs4WhAMIXYjM5jXVhN3NA+ZYeiLstzLJ9lVBiorVX3rO4zYs +/CS95ullWiwNgUTBT6P0rjR6soLNb3lJWGp8Kef1A7XFrMemSQerhsnrNFlBEajA +y+x0D+aSHcwahfDaecvhxvviN0ic3XnWzhhC8nl43U+es+U0zH9wHJtrKW6AX8E7 +xjTXstWwKFKkGvPryhcKd6Wq2kp6XKsOTU+mhofgkLsV2eC5aiA61baF12gd03wa +m7ugTkuvouBmxlejipoRlo0klkxmI+wpcGK++K//t8WeUe1zqv3HuLepihPGrfDM +38m/mhNLUog3JQ4D/TMZy2vDYBRESX68Eu5orBiL2em3p9s/Hot4Np9yixcT4MMv +gDFzQklYQeG2YPbp6vJQ5W+/gXILgnDNiY63rYjIqUyYU8pZi3YSzqyALRLaG9u7 +M9OZjLtHlCJyBzP2hmkNIgW6b1GFevycdXSP2lokTA01oehFTdM/Ctsya+ytLVmn +-----END CERTIFICATE----- diff --git a/x-dev-certs/localhost.cert.pem b/x-dev-certs/localhost.cert.pem new file mode 100644 index 000000000..855f2674b --- /dev/null +++ b/x-dev-certs/localhost.cert.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIERzCCAq+gAwIBAgIRAIdbZ96puQfGmuJw9cn7/LQwDQYJKoZIhvcNAQELBQAw +gYUxHjAcBgNVBAoTFW1rY2VydCBkZXZlbG9wbWVudCBDQTEtMCsGA1UECwwkbmlz +aGNoaXRAbmQubG9jYWwgKE5pc2hjaGl0IERoYW5hbmkpMTQwMgYDVQQDDCtta2Nl +cnQgbmlzaGNoaXRAbmQubG9jYWwgKE5pc2hjaGl0IERoYW5hbmkpMB4XDTIzMDkw +MTEyNDg1M1oXDTI1MTIwMTEyNDg1M1owWDEnMCUGA1UEChMebWtjZXJ0IGRldmVs +b3BtZW50IGNlcnRpZmljYXRlMS0wKwYDVQQLDCRuaXNoY2hpdEBuZC5sb2NhbCAo +TmlzaGNoaXQgRGhhbmFuaSkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQDRziQGa8XIR3qu0/gLBosfsslrWkfJ+ng9RCHhnKx+C95iSQEnH76J0cTrbRxw +7FNmyja4IVcsrbWcKS7BDm0X/Q4huy4HXZ4Aicr2UTr/kKqYLKxmaDpJc4kqpDGm ++j8iR6DKylOKcbduFmMyHuRXYEo0CJtL5mwPwS7rGJfY6SMbrJqULw3+hJVNZNhO +1GM6oQ9QRfLERW5IGEo88/jj4RF+M/VkbhH+eVPlavCykyHNUQ7IRgE1dgy1uq2f +nlZDrsgpsqqYJ7WTzkufcam/5v7kxknw8Y6L1UbRc3FXRm5ivDkYh+PX/Aho8Od3 +jiVrQQ9oo6mDUXRzksS/dnxJAgMBAAGjXjBcMA4GA1UdDwEB/wQEAwIFoDATBgNV +HSUEDDAKBggrBgEFBQcDATAfBgNVHSMEGDAWgBSowwoctxqlqvby2V2TAsG8zeMZ +8DAUBgNVHREEDTALgglsb2NhbGhvc3QwDQYJKoZIhvcNAQELBQADggGBALezggEa +L06uST/PMZME+NFWHbGKkoNlFP1ACat6AzDDUuGLipX5svBuSaFyf4lqVrvhRZI4 +o5Idg0IlAMLEUPlryU5LY+LWq13+MXd/oOn1cImns9Pn5mOglvzFSoRd1t9GZol+ +v066AHNmHdzKVA9Qhfu5qS20I1FB35jGc1gqLwFeQuX9mrS7EdsAD8BzKcBFJnfc +HiEYkTKpYwQO2MmBf394PGF7dq83eh16nCrptsa/76s0iys6mwQQDBRsjaA+sEvw +8cmqeBCRUd1fHSD5/yCgXE9KYRRgaCHbnjxyy5IsJcH/gjVX160U3Qbq3S/94Iya +epBrqupIOJI6bWGWwngb2N7z+GBBhE4h5iVz9lmXiKFGw92V1UIGGXjgFHsxxFU9 ++TOUFrXhJ2Fr7eNxUSLOHsUVfD5BzCGdNC4pgGkbUyXn8VGr41yOAWOMR04zoqYg +n5DQ7/aUHkJJ40Jmzj1Iag70h5iH/8T4+ea2j/lmmwe26m6tDceVgM8Y9Q== +-----END CERTIFICATE----- diff --git a/x-dev-certs/localhost.key.pem b/x-dev-certs/localhost.key.pem new file mode 100644 index 000000000..5503740cb --- /dev/null +++ b/x-dev-certs/localhost.key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDRziQGa8XIR3qu +0/gLBosfsslrWkfJ+ng9RCHhnKx+C95iSQEnH76J0cTrbRxw7FNmyja4IVcsrbWc +KS7BDm0X/Q4huy4HXZ4Aicr2UTr/kKqYLKxmaDpJc4kqpDGm+j8iR6DKylOKcbdu +FmMyHuRXYEo0CJtL5mwPwS7rGJfY6SMbrJqULw3+hJVNZNhO1GM6oQ9QRfLERW5I +GEo88/jj4RF+M/VkbhH+eVPlavCykyHNUQ7IRgE1dgy1uq2fnlZDrsgpsqqYJ7WT +zkufcam/5v7kxknw8Y6L1UbRc3FXRm5ivDkYh+PX/Aho8Od3jiVrQQ9oo6mDUXRz +ksS/dnxJAgMBAAECggEBAMhn+T9s6MLTjFu9PB0EBhakSAPUe+hx6TLUhuykJJxO +KAGILKK7jtzE1C3xzo4LH+t60uP1bPjPgT+GkxNz/T9ByKLt0hzVDt0Cwi2hEBMY +k+vCGHfFrY+F3gsuRgNy3KWY9/1dYIlI8Gcm2WAB5CmWX6ruYbERjD1MUc3dcwaM +iOj6jLmaKvoByiNlXdErO0OBaZiHJVnSrkolsCbUMnpKyExV4tteJkn+l1Yqae7q +UP5CxlVX/vmpRKTxN4fRjHZhNBAHbQsOFHLFp64XzN45Ea+QHYbLX1uzNJp0DGKf +QXWWYoWHfJDEa4dFleS4Zjw9JfTifi+jtmJFgmu9YwECgYEA5bfZ7F7gp6jGZWmg +vup4R/Dq1Cv7ifKZ6eoDG5zVYvAAMg8LYmQaWqH2yMbbF+YwTZ3KUFcOhPy1s1L+ +H/he6vJydPm3YnVoAwpaU57PSoKVBLYaA1L5toiKWC5U5/cH4nkipdc1oI3F21G5 +Sj7gC/vodwVWphuH+TsCYHU7puECgYEA6c8QvPyWOkAl1hDCcCJOyBYUnBOybHJJ +9LuAOpnm9N2MnNA+dblqvKHK+0e123vYLrfkY3gbI+7hLXPWxLuxwegJk/AacEVq +AZkFWU+CLB0mNG3UkG1Gsuv6DhcQKb8zkwlvu2vogbeuPEFi9xF0FEmyk9Lxh3vq +Wg1Ng94CSmkCgYEAq21fEFjhV9zIaWfBEJgTOMSdycYkyZYkq/35YcLRLyshSjoV +6dAAJsCVVNGpMJWUWGe3UesVp8Kaqf72K8+CrdxN8+NiqfQpsZMpQxvRX65BHKn0 +kaR7O297pkC1FgIwfR6e75nBqFYEYB4Fo1V2hxrvKNrwBben6iLSLD9wS6ECgYB8 +HcW+7T86cO8k8gSlzjCQGtiZ+gLPeuQznI13jleCSVHptMpTaDh3JlRAjFLHzrh2 +JHyDKTEPJDI5FLNAAHteejULaXw/eTnK21ZxkLmDfX3Yey1J9hh/xrEZZbjY0H0q +YuoDTkdBBSbjKbrFeWhrlKvNuT8qMue3IjSx+dqxcQKBgG3R57lnIBDPOt5m6Rgf +Kj1S8HKJJS23gtkCW5eO3F4Z4XVsDlr4Lbpxl9jSfSb1x4Knfszg17LJCSJR/Kpr +H9hoZ9zWPVnCGiQw/FLAKm+N6L5NF2j3QObsqRdCUsRPh09wZ+leeuu4j2Q5XHVb +/74ghk8H5/xq7yXOH43LMw4m +-----END PRIVATE KEY-----