From cc7a7ee9aa85bb02bc4edf93db8de7fdfddf93e4 Mon Sep 17 00:00:00 2001 From: "Evgeny @ SimpleX Chat" <259188159+evgeny-simplex@users.noreply.github.com> Date: Tue, 10 Feb 2026 23:21:31 +0000 Subject: [PATCH] fixed https in the test page --- tests/fixtures/ca.srl | 1 + tests/fixtures/web.crt | 18 +++++++------- tests/fixtures/web_ca.crt | 30 ++++++++++++++++++++++ tests/fixtures/web_ca.key | 52 +++++++++++++++++++++++++++++++++++++++ tests/fixtures/web_ca.srl | 1 + xftp-web/vite.config.ts | 6 ++--- 6 files changed, 96 insertions(+), 12 deletions(-) create mode 100644 tests/fixtures/ca.srl create mode 100644 tests/fixtures/web_ca.crt create mode 100644 tests/fixtures/web_ca.key create mode 100644 tests/fixtures/web_ca.srl diff --git a/tests/fixtures/ca.srl b/tests/fixtures/ca.srl new file mode 100644 index 000000000..1b461e9f3 --- /dev/null +++ b/tests/fixtures/ca.srl @@ -0,0 +1 @@ +6395D75F2A7A37CA274B8BE766187EA9ECC64665 diff --git a/tests/fixtures/web.crt b/tests/fixtures/web.crt index 4de287b1e..161bd23e0 100644 --- a/tests/fixtures/web.crt +++ b/tests/fixtures/web.crt @@ -1,7 +1,7 @@ -----BEGIN CERTIFICATE----- -MIIDnTCCAx2gAwIBAgIUFhZZsKj9uBgGnUrr+Cf3XFf7t6IwBQYDK2VxMCoxFjAU -BgNVBAMMDVNNUCBzZXJ2ZXIgQ0ExEDAOBgNVBAoMB1NpbXBsZVgwIBcNMjQwOTI2 -MTIyNTEyWhgPNDc2MjA4MjMxMjI1MTJaMBQxEjAQBgNVBAMMCWxvY2FsaG9zdDCC +MIIDtTCCAzWgAwIBAgIUY5XXXyp6N8onS4vnZhh+qezGRmUwBQYDK2VxMCoxFjAU +BgNVBAMMDVNNUCBzZXJ2ZXIgQ0ExEDAOBgNVBAoMB1NpbXBsZVgwIBcNMjYwMjEw +MjMxMTEzWhgPNDc2NDAxMDcyMzExMTNaMBQxEjAQBgNVBAMMCWxvY2FsaG9zdDCC AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALB59b8oyxP5YtXI1kemBzJU Pt0xLN/Tmzdul283DhbNCJV+eUn4fNz+PjiRS/F2vZLb3WXInPi3bc57hw2Yu94o 7MXH5DTWkaubNq0bV0Koi17zZBSCOOq+MbPN7bUT1sOwOHadLh3IWTfkz9EufowD @@ -13,12 +13,12 @@ AMzu4O+pEodIOJDXTARBE6VX1qoEZQuft5+ljVy4i9ySpmHnkxLocF40rKV1G0c5 LnVNTtr5GokC9sfIXZPZw0EEpk3eAseNWccwuyRfHQfL6yjcDig2IdLvLVcm9JyA 2P5QpP15EoA3Ow9uX8HmBbSFe1F35rqcNwY0lhDXEboSA/X4xDLnu4aVhNPiUnRq NXqVlgz5ybRAUHd8fDBwK8fT5VhvuEnCja7+8hVc33gK56vu+28ZMkN2Y4z0GNQd -iamPUZJlUcCJzNI2cz27AgMBAAGjbzBtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgPI -MBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBSWiPT6Nl13/CTjaHCkHp17 -GWoyvzAfBgNVHSMEGDAWgBQcUJvR7mm26yxMQfCsWgbnwMmJVDAFBgMrZXEDcwDC -DTbvSA61ydoRA8mTHFW1EYL+xfQjo0aH56N1Aqn47DzLGQZjP/fxoW929+Jwoiz0 -UgUtUAeFjgA9wfvDv7mMm/K4wqyiZzFuWVZdQV6AUwBJK0hN5qlXpvJzMKLrj3Ap -dRELAgLJvC2e/xVc3dXSFwA= +iamPUZJlUcCJzNI2cz27AgMBAAGjgYYwgYMwFAYDVR0RBA0wC4IJbG9jYWxob3N0 +MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgPIMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0G +A1UdDgQWBBSWiPT6Nl13/CTjaHCkHp17GWoyvzAfBgNVHSMEGDAWgBQcUJvR7mm2 +6yxMQfCsWgbnwMmJVDAFBgMrZXEDcwCAU0Ly+IBQkjuefPKUvdE121uJou8EwE/r +ccVywOsL61CjkMlzDbxBKKgq2ey8g9Gt76uQcG5AdIAPiWkdsgaKKrevwhV7/TBD +D7UHgVyUBZWd362QJs4x/am59Wi6AbFQ98wvAudZzUfhx9h1te6BMAA= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIBtjCCATagAwIBAgIUe2PryrWo0xXX9vcA3WfbCzcdmgAwBQYDK2VxMCoxFjAU diff --git a/tests/fixtures/web_ca.crt b/tests/fixtures/web_ca.crt new file mode 100644 index 000000000..6e4f36063 --- /dev/null +++ b/tests/fixtures/web_ca.crt @@ -0,0 +1,30 @@ +-----BEGIN CERTIFICATE----- +MIIFDzCCAvegAwIBAgIUH4iIx8J7mtrJP1BTx9rg0u7NSxgwDQYJKoZIhvcNAQEL +BQAwFjEUMBIGA1UEAwwLWEZUUCBXZWIgQ0EwIBcNMjYwMjEwMjE0MzQyWhgPMjEy +NjAxMTcyMTQzNDJaMBYxFDASBgNVBAMMC1hGVFAgV2ViIENBMIICIjANBgkqhkiG +9w0BAQEFAAOCAg8AMIICCgKCAgEA0R+kKVip2bAIBqnRS05GYJ3uBPidYrVEOyiC +nB2asfcFIRlMBCWGchYeRrFxE70FCkbmHpIniiTrHwsYfG7uS6dW5myRbGX9g2X0 +L/zs9X4o7pYj+gWk/8X6FXr+urKT72kcNRgn/3fE+rYOaOPrYkQrHsUVsr0jWxt9 +9Qfjrh+PC8BT25BEDzoCqByHt6sVYMulpP8koUWIzcHTHdk5RNqzqIFZUnELsq0C +dCohWw/87khT/ZNtWEG6gmipSj5/6IfabcF3C6dHIV69kff6f/Gv4W3z9yiusxw9 +hD5vwH1RaDQ7wPw+8w1wRu4ChOo9MWqjnprrahrEqURAQrKDEgzj9+ctULl7bd28 +f85ffJJlBF9P738u+0z5asJ7LNmy5hjNq4n0htKiuRiW8Yp2MSWqNZaF7rXRIFE9 +I9JhWQhaRwQ9Imq1WcOctj1+Ppk5o63cKsNssSkqNF0xK+VYFYLyebMJt0y3UqtW +nLAXE2+xQTpzt2ixN0gHVX+lFGxNN0BKTrouuYLImPx5nBEdgjkeA9nFgRSAiG23 +5IvgvxYA777dcU4fdUI5WFbjhBIn0oo0qTmYM+b06a2B4B0b9RD0Vo3Zm4K0gGF5 +uRFx5SSS3SO16EWkEaXukq6vuSO3EiP4xQWPtn7OwuKN8AJxQOUxkrkaeLQPoHgp +pgFmSfMCAwEAAaNTMFEwHQYDVR0OBBYEFBdmE/cMcZHm50hTCykKG0/IYAjgMB8G +A1UdIwQYMBaAFBdmE/cMcZHm50hTCykKG0/IYAjgMA8GA1UdEwEB/wQFMAMBAf8w +DQYJKoZIhvcNAQELBQADggIBABLntwY5YIdcFr+TI1a9c7v+4/OYg1xxn252Dqab +u7UIE3esKuXSMa8j9KDiskklmzKV70Z4cEE7NWTwe6x5T/W1I38CWOhWSX9JmFBK +V0WdT8nu+YfSz+Len8Q5PpJeiBhSItYRtQAkAkpvhpCcBzu50KBvZnGLnT+Lzwuc +vC5eh7hT8srfLF342kS0sMZb0cGrtdihm2PnCpUJewaClLhUTU+MAgqf49yzY8Zr +c4HWrpAb2VHsy9uzw5qKJCJQUUmIguetXbr+ZOp22Y5APCNfOBNwe+ndZAN4wk8f +lZdIlOFIHZnHUF8rRufgM2bcn0QcqbuwHcaeiFb4TfTeEhF0Ck4LZlSjEDODNZ16 +yg3VkiCWlqwOZZ7gESwB672tzTHevZLQfyB0dC/6RVPFzoff+ZXpchOEsI9mAzhI +3S1S/wOs2Tt7KOboMROg0vfYFO32a/nFHbr7EsVbdYdm/cCFH6vqX4AlSqMsBQ9Q +g8HYShYmuW0w28mBSslIwA7/Wmh8uQ8oW/tr1mEVh1ZRCMjkLw+M2hKKZPJiveK5 +EtBxtD1xygGC/CvaWiiUMJjqxuKkOyZyEDl30+6QcgyTDjq8enFVoH/PfsancvFF +nGYJhFbtwwKLjhf1XKjj8hT043s4pPzIIFLKrTCwaFALqRDadBT3st6VltWxgOcr +sxdf +-----END CERTIFICATE----- diff --git a/tests/fixtures/web_ca.key b/tests/fixtures/web_ca.key new file mode 100644 index 000000000..f616c86fd --- /dev/null +++ b/tests/fixtures/web_ca.key @@ -0,0 +1,52 @@ +-----BEGIN PRIVATE KEY----- +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 +jKWCUpUTNdIlYN3HcBgNnci7b2wXDHQ= +-----END PRIVATE KEY----- diff --git a/tests/fixtures/web_ca.srl b/tests/fixtures/web_ca.srl new file mode 100644 index 000000000..dfdcaaf21 --- /dev/null +++ b/tests/fixtures/web_ca.srl @@ -0,0 +1 @@ +67BBC92C019B6E4F701BC7CB4930A533A367792D diff --git a/xftp-web/vite.config.ts b/xftp-web/vite.config.ts index e2d37418d..fd2cdd651 100644 --- a/xftp-web/vite.config.ts +++ b/xftp-web/vite.config.ts @@ -79,15 +79,15 @@ export default defineConfig(({mode}) => { plugins.push(cspPlugin(servers, mode === 'development')) const httpsConfig = mode === 'development' ? { - key: readFileSync(join(FIXTURES, 'server.key')), - cert: readFileSync(join(FIXTURES, 'server.crt')), + key: readFileSync(join(FIXTURES, 'web.key')), + cert: readFileSync(join(FIXTURES, 'web.crt')), } : undefined return { root: 'web', build: {outDir: resolve(__dirname, 'dist-web'), target: 'esnext'}, server: httpsConfig ? {https: httpsConfig} : {}, - preview: {host: true, https: httpsConfig}, + preview: {host: true, https: false}, define, worker: {format: 'es' as const}, plugins,