diff --git a/ACKNOWLEDGMENTS.md b/ACKNOWLEDGMENTS.md index e7a9d7572de8..50beffeabcdf 100644 --- a/ACKNOWLEDGMENTS.md +++ b/ACKNOWLEDGMENTS.md @@ -4300,7 +4300,7 @@ For more information on this, and how to apply and follow the GNU AGPL, see ``` -## attest 0.1.0, libsignal-ffi 0.58.0, libsignal-jni 0.58.0, libsignal-jni-testing 0.58.0, libsignal-node 0.58.0, signal-neon-futures 0.1.0, signal-neon-futures-tests 0.1.0, libsignal-bridge 0.1.0, libsignal-bridge-macros 0.1.0, libsignal-bridge-testing 0.1.0, libsignal-bridge-types 0.1.0, libsignal-core 0.1.0, signal-crypto 0.1.0, device-transfer 0.1.0, libsignal-keytrans 0.0.1, signal-media 0.1.0, libsignal-message-backup 0.1.0, libsignal-message-backup-macros 0.1.0, libsignal-net 0.1.0, signal-pin 0.1.0, poksho 0.7.0, libsignal-protocol 0.1.0, libsignal-svr3 0.1.0, usernames 0.1.0, zkcredential 0.1.0, zkgroup 0.9.0 +## libsignal-account-keys 0.1.0, attest 0.1.0, libsignal-ffi 0.59.0, libsignal-jni 0.59.0, libsignal-jni-testing 0.59.0, libsignal-node 0.59.0, signal-neon-futures 0.1.0, signal-neon-futures-tests 0.1.0, libsignal-bridge 0.1.0, libsignal-bridge-macros 0.1.0, libsignal-bridge-testing 0.1.0, libsignal-bridge-types 0.1.0, libsignal-core 0.1.0, signal-crypto 0.1.0, device-transfer 0.1.0, libsignal-keytrans 0.0.1, signal-media 0.1.0, libsignal-message-backup 0.1.0, libsignal-message-backup-macros 0.1.0, libsignal-net 0.1.0, libsignal-net-infra 0.1.0, poksho 0.7.0, libsignal-protocol 0.1.0, libsignal-svr3 0.1.0, usernames 0.1.0, zkcredential 0.1.0, zkgroup 0.9.0 ``` GNU AFFERO GENERAL PUBLIC LICENSE @@ -6557,7 +6557,7 @@ DEALINGS IN THE SOFTWARE. ``` -## backtrace 0.3.74, cc 1.1.18, cfg-if 1.0.0, cmake 0.1.48, flate2 1.0.33, jobserver 0.1.32, openssl-probe 0.1.5, rustc-demangle 0.1.24, socket2 0.5.7 +## backtrace 0.3.74, cc 1.1.18, cfg-if 1.0.0, cmake 0.1.48, flate2 1.0.33, jobserver 0.1.32, openssl-probe 0.1.5, rustc-demangle 0.1.24, scoped-tls 1.0.1, socket2 0.5.7 ``` Copyright (c) 2014 Alex Crichton @@ -6674,6 +6674,32 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +``` + +## mime 0.3.17 + +``` +Copyright (c) 2014 Sean McArthur + +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. + + ``` ## base64ct 1.6.0 @@ -6769,6 +6795,32 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +``` + +## unicase 2.7.0 + +``` +Copyright (c) 2014-2017 Sean McArthur + +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. + + ``` ## nom 7.1.3 @@ -6795,6 +6847,32 @@ 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. +``` + +## headers-core 0.2.0, headers 0.3.9 + +``` +Copyright (c) 2014-2019 Sean McArthur + +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. + + ``` ## libc 0.2.158 @@ -6828,7 +6906,7 @@ DEALINGS IN THE SOFTWARE. ``` -## hyper 1.4.1 +## hyper 0.14.30, hyper 1.4.1 ``` Copyright (c) 2014-2021 Sean McArthur @@ -7406,6 +7484,37 @@ DEALINGS IN THE SOFTWARE. ``` +## serde_urlencoded 0.7.1 + +``` +Copyright (c) 2016 Anthony Ramine + +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. + +``` + ## utf8parse 0.2.2 ``` @@ -7468,7 +7577,7 @@ DEALINGS IN THE SOFTWARE. ``` -## rustls-native-certs 0.7.3, rustls-pemfile 2.1.3, rustls 0.23.13 +## rustls-native-certs 0.7.3, rustls-pemfile 2.1.3, rustls 0.22.4, rustls 0.23.13 ``` Copyright (c) 2016 Joseph Birr-Pixton @@ -7530,6 +7639,31 @@ DEALINGS IN THE SOFTWARE. ``` +## httpdate 1.0.3 + +``` +Copyright (c) 2016 Pyfisch + +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. + +``` + ## rustc_version 0.4.1 ``` @@ -7836,7 +7970,7 @@ DEALINGS IN THE SOFTWARE. ``` -## tungstenite 0.23.0 +## tungstenite 0.21.0, tungstenite 0.23.0 ``` Copyright (c) 2017 Alexey Galakhov @@ -7955,7 +8089,7 @@ DEALINGS IN THE SOFTWARE. ``` -## tokio-tungstenite 0.23.1 +## tokio-tungstenite 0.21.0, tokio-tungstenite 0.23.1 ``` Copyright (c) 2017 Daniel Abramov @@ -8032,7 +8166,7 @@ SOFTWARE. ``` -## h2 0.4.6 +## h2 0.3.26, h2 0.4.6 ``` Copyright (c) 2017 h2 authors @@ -8063,7 +8197,7 @@ DEALINGS IN THE SOFTWARE. ``` -## http 1.1.0 +## http 0.2.12, http 1.1.0 ``` Copyright (c) 2017 http-rs authors @@ -8094,6 +8228,37 @@ DEALINGS IN THE SOFTWARE. ``` +## tokio-rustls 0.25.0 + +``` +Copyright (c) 2017 quininer kel + +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. + +``` + ## aes 0.8.4 ``` @@ -8336,6 +8501,32 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +``` + +## warp 0.3.7 + +``` +Copyright (c) 2018-2020 Sean McArthur + +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. + + ``` ## cbc 0.1.2, ctr 0.9.2 @@ -8522,7 +8713,7 @@ DEALINGS IN THE SOFTWARE. ``` -## http-body-util 0.1.2 +## http-body-util 0.1.2, http-body 0.4.6 ``` Copyright (c) 2019 Hyper Contributors @@ -8702,7 +8893,7 @@ DEALINGS IN THE SOFTWARE. ``` -## aes-gcm-siv 0.11.1, chacha20poly1305 0.10.1 +## aes-gcm-siv 0.11.1, aes-gcm 0.10.3, chacha20poly1305 0.10.1 ``` Copyright (c) 2019 The RustCrypto Project Developers @@ -8796,6 +8987,37 @@ DEALINGS IN THE SOFTWARE. ``` +## tower-service 0.3.3 + +``` +Copyright (c) 2019 Tower Contributors + +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. + +``` + ## universal-hash 0.5.1 ``` @@ -9998,6 +10220,33 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ``` +## multer 2.1.0 + +``` +MIT License + +Copyright (c) 2020 Rousan Ali + +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. + +``` + ## tinyvec_macros 0.1.1 ``` @@ -10259,7 +10508,7 @@ DEALINGS IN THE SOFTWARE. ``` -## curve25519-dalek-derive 0.1.1, adler2 2.0.0, anyhow 1.0.88, async-trait 0.1.82, atomic-waker 1.1.2, displaydoc 0.2.5, dyn-clone 1.0.17, fastrand 2.1.1, home 0.5.9, itoa 1.0.11, linkme-impl 0.3.28, linkme 0.3.28, linux-raw-sys 0.4.14, minimal-lexical 0.2.1, num_enum 0.7.3, num_enum_derive 0.7.3, once_cell 1.19.0, paste 1.0.15, pin-project-lite 0.2.14, prettyplease 0.2.22, proc-macro-crate 3.2.0, proc-macro2 1.0.86, quote 1.0.37, rustc-hash 1.1.0, rustix 0.38.37, rustversion 1.0.17, semver 1.0.23, send_wrapper 0.6.0, serde 1.0.210, serde_derive 1.0.210, serde_json 1.0.128, syn-mid 0.6.0, syn 1.0.109, syn 2.0.77, thiserror-impl 1.0.63, thiserror 1.0.63, unicode-ident 1.0.13, utf-8 0.7.6 +## curve25519-dalek-derive 0.1.1, adler2 2.0.0, anyhow 1.0.88, async-trait 0.1.82, atomic-waker 1.1.2, displaydoc 0.2.5, dyn-clone 1.0.17, fastrand 2.1.1, home 0.5.9, itoa 1.0.11, linkme-impl 0.3.28, linkme 0.3.28, linux-raw-sys 0.4.14, minimal-lexical 0.2.1, num_enum 0.7.3, num_enum_derive 0.7.3, once_cell 1.19.0, paste 1.0.15, pin-project-internal 1.1.5, pin-project-lite 0.2.14, pin-project 1.1.5, prettyplease 0.2.22, proc-macro-crate 3.2.0, proc-macro2 1.0.86, quote 1.0.37, rustc-hash 1.1.0, rustix 0.38.37, rustversion 1.0.17, semver 1.0.23, send_wrapper 0.6.0, serde 1.0.210, serde_derive 1.0.210, serde_json 1.0.128, syn-mid 0.6.0, syn 1.0.109, syn 2.0.77, thiserror-impl 1.0.63, thiserror 1.0.63, unicode-ident 1.0.13, utf-8 0.7.6 ``` Permission is hereby granted, free of charge, to any @@ -10428,7 +10677,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ``` -## base64 0.22.1 +## base64 0.21.7, base64 0.22.1 ``` The MIT License (MIT) @@ -10953,6 +11202,34 @@ 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. +``` + +## mime_guess 2.0.5 + +``` +The MIT License (MIT) + +Copyright (c) 2015 Austin Bonander + +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. + + ``` ## generic-array 0.14.7 diff --git a/package-lock.json b/package-lock.json index e9387f2ec6f4..8a90100d5685 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "@react-aria/utils": "3.16.0", "@react-spring/web": "9.5.5", "@signalapp/better-sqlite3": "9.0.7", - "@signalapp/libsignal-client": "0.58.0", + "@signalapp/libsignal-client": "0.59.0", "@signalapp/ringrtc": "2.48.3", "@types/fabric": "4.5.3", "backbone": "1.4.0", @@ -7274,9 +7274,9 @@ } }, "node_modules/@signalapp/libsignal-client": { - "version": "0.58.0", - "resolved": "https://registry.npmjs.org/@signalapp/libsignal-client/-/libsignal-client-0.58.0.tgz", - "integrity": "sha512-CXJtNbuODAq6vdF6sJK6yQy9u2qi5NF4r50bvXBYhoKKZngbsgre45rQI6MldpuMVaOuc+LhMprAg5PaoVforQ==", + "version": "0.59.0", + "resolved": "https://registry.npmjs.org/@signalapp/libsignal-client/-/libsignal-client-0.59.0.tgz", + "integrity": "sha512-L1MmlSOmcf0qGnOIXf2J7ux6BSlLwQVi0W8F31A1JUPQ9Iwpbh7q+uCVoplmKXKV52Aw/CeZX109kLMG5vWseQ==", "hasInstallScript": true, "license": "AGPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 76c736a88293..8ed6a7432f6e 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "@react-aria/utils": "3.16.0", "@react-spring/web": "9.5.5", "@signalapp/better-sqlite3": "9.0.7", - "@signalapp/libsignal-client": "0.58.0", + "@signalapp/libsignal-client": "0.59.0", "@signalapp/ringrtc": "2.48.3", "@types/fabric": "4.5.3", "backbone": "1.4.0", diff --git a/ts/services/backups/import.ts b/ts/services/backups/import.ts index 0d3eceee9563..582caf345134 100644 --- a/ts/services/backups/import.ts +++ b/ts/services/backups/import.ts @@ -1766,6 +1766,7 @@ export class BackupImportStream extends Writable { prefix: dropNull(name.prefix), suffix: dropNull(name.suffix), middleName: dropNull(name.middleName), + nickname: dropNull(name.nickname), } : undefined, number: number?.length diff --git a/ts/textsecure/WebAPI.ts b/ts/textsecure/WebAPI.ts index ab65eb2241ef..c74604c9c5ee 100644 --- a/ts/textsecure/WebAPI.ts +++ b/ts/textsecure/WebAPI.ts @@ -78,6 +78,9 @@ import type { ProfileFetchAuthRequestOptions, ProfileFetchUnauthRequestOptions, } from '../services/profiles'; +import { isMockServer } from '../util/isMockServer'; +import { getMockServerPort } from '../util/getMockServerPort'; +import { pemToDer } from '../util/pemToDer'; // Note: this will break some code that expects to be able to use err.response when a // web request fails, because it will force it to text. But it is very useful for @@ -87,11 +90,42 @@ const DEFAULT_TIMEOUT = 30 * SECOND; // Libsignal has internally configured values for domain names // (and other connectivity params) of the services. -function resolveLibsignalNetEnvironment(url: string): Net.Environment { +function resolveLibsignalNet( + url: string, + version: string, + certificateAuthority?: string +): Net.Net { + const userAgent = getUserAgent(version); + log.info(`libsignal net url: ${url}`); if (isStagingServer(url)) { - return Net.Environment.Staging; + log.info('libsignal net environment resolved to staging'); + return new Net.Net({ + env: Net.Environment.Staging, + userAgent, + }); } - return Net.Environment.Production; + + if (isMockServer(url) && certificateAuthority !== undefined) { + const DISCARD_PORT = 9; // Reserved by RFC 863. + log.info('libsignal net environment resolved to mock'); + return new Net.Net({ + localTestServer: true, + userAgent, + TESTING_localServer_chatPort: parseInt(getMockServerPort(url), 10), + TESTING_localServer_cdsiPort: DISCARD_PORT, + TESTING_localServer_svr2Port: DISCARD_PORT, + TESTING_localServer_svr3SgxPort: DISCARD_PORT, + TESTING_localServer_svr3NitroPort: DISCARD_PORT, + TESTING_localServer_svr3Tpm2SnpPort: DISCARD_PORT, + TESTING_localServer_rootCertificateDer: pemToDer(certificateAuthority), + }); + } + + log.info('libsignal net environment resolved to prod'); + return new Net.Net({ + env: Net.Environment.Production, + userAgent, + }); } function _createRedactor( @@ -1640,9 +1674,7 @@ export function initialize({ // for providing network layer API and related functionality. // It's important to have a single instance of this class as it holds // resources that are shared across all other use cases. - const env = resolveLibsignalNetEnvironment(url); - log.info(`libsignal net environment resolved to [${Net.Environment[env]}]`); - const libsignalNet = new Net.Net(env, getUserAgent(version)); + const libsignalNet = resolveLibsignalNet(url, version, certificateAuthority); libsignalNet.setIpv6Enabled(!disableIPv6); // Thanks to function-hoisting, we can put this return statement before all of the diff --git a/ts/util/getMockServerPort.ts b/ts/util/getMockServerPort.ts new file mode 100644 index 000000000000..1ea291cf4b42 --- /dev/null +++ b/ts/util/getMockServerPort.ts @@ -0,0 +1,9 @@ +// Copyright 2024 Signal Messenger, LLC +// SPDX-License-Identifier: AGPL-3.0-only + +export function getMockServerPort( + serverUrl = window.SignalContext.config.serverUrl +): string { + const url = new URL(serverUrl); + return url.port; +} diff --git a/ts/util/isMockServer.ts b/ts/util/isMockServer.ts new file mode 100644 index 000000000000..fbffab4045a8 --- /dev/null +++ b/ts/util/isMockServer.ts @@ -0,0 +1,18 @@ +// Copyright 2024 Signal Messenger, LLC +// SPDX-License-Identifier: AGPL-3.0-only + +export function isMockServer( + serverUrl = window.SignalContext.config.serverUrl +): boolean { + try { + const url = new URL(serverUrl); + + return ( + url.hostname === 'localhost' || + url.hostname === '127.0.0.1' || + url.hostname === '[::1]' // IPv6 loopback address + ); + } catch (e) { + return false; + } +} diff --git a/ts/util/pemToDer.ts b/ts/util/pemToDer.ts new file mode 100644 index 000000000000..12040e565687 --- /dev/null +++ b/ts/util/pemToDer.ts @@ -0,0 +1,11 @@ +// Copyright 2024 Signal Messenger, LLC +// SPDX-License-Identifier: AGPL-3.0-only + +export function pemToDer(pem: string): Buffer { + const pemContent = pem + .replace(/-----BEGIN [^-]+-----/, '') + .replace(/-----END [^-]+-----/, '') + .replace(/\s+/g, ''); + const derBuffer = Buffer.from(pemContent, 'base64'); + return derBuffer; +}