diff -Nru thunderbird-102.9.0+build1/accessible/base/ARIAMap.cpp thunderbird-102.10.0+build2/accessible/base/ARIAMap.cpp --- thunderbird-102.9.0+build1/accessible/base/ARIAMap.cpp 2023-03-11 11:24:06.000000000 +0000 +++ thunderbird-102.10.0+build2/accessible/base/ARIAMap.cpp 2023-04-11 06:10:53.000000000 +0000 @@ -1446,10 +1446,22 @@ } else if (aRoleMapEntry == &sLandmarkRoleMap) { return LANDMARK_ROLE_MAP_ENTRY_INDEX; } else { - return aRoleMapEntry - sWAIRoleMaps; + uint8_t index = aRoleMapEntry - sWAIRoleMaps; + MOZ_ASSERT(aria::IsRoleMapIndexValid(index)); + return index; } } +bool aria::IsRoleMapIndexValid(uint8_t aRoleMapIndex) { + switch (aRoleMapIndex) { + case NO_ROLE_MAP_ENTRY_INDEX: + case EMPTY_ROLE_MAP_ENTRY_INDEX: + case LANDMARK_ROLE_MAP_ENTRY_INDEX: + return true; + } + return aRoleMapIndex < ArrayLength(sWAIRoleMaps); +} + uint64_t aria::UniversalStatesFor(mozilla::dom::Element* aElement) { uint64_t state = 0; uint32_t index = 0; diff -Nru thunderbird-102.9.0+build1/accessible/base/ARIAMap.h thunderbird-102.10.0+build2/accessible/base/ARIAMap.h --- thunderbird-102.9.0+build1/accessible/base/ARIAMap.h 2023-03-11 11:24:06.000000000 +0000 +++ thunderbird-102.10.0+build2/accessible/base/ARIAMap.h 2023-04-11 06:10:53.000000000 +0000 @@ -259,6 +259,11 @@ uint8_t GetIndexFromRoleMap(const nsRoleMapEntry* aRoleMap); /** + * Determine whether a role map entry index is valid. + */ +bool IsRoleMapIndexValid(uint8_t aRoleMapIndex); + +/** * Return accessible state from ARIA universal states applied to the given * element. */ diff -Nru thunderbird-102.9.0+build1/accessible/ipc/DocAccessibleParent.cpp thunderbird-102.10.0+build2/accessible/ipc/DocAccessibleParent.cpp --- thunderbird-102.9.0+build1/accessible/ipc/DocAccessibleParent.cpp 2023-03-11 11:24:06.000000000 +0000 +++ thunderbird-102.10.0+build2/accessible/ipc/DocAccessibleParent.cpp 2023-04-11 06:10:53.000000000 +0000 @@ -4,6 +4,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "ARIAMap.h" #include "CachedTableAccessible.h" #include "DocAccessibleParent.h" #include "mozilla/a11y/Platform.h" @@ -145,6 +146,10 @@ aParent->AddChildAt(aIdxInParent, newProxy); newProxy->SetParent(aParent); } else { + if (!aria::IsRoleMapIndexValid(newChild.RoleMapEntryIndex())) { + MOZ_ASSERT_UNREACHABLE("Invalid role map entry index"); + return 0; + } newProxy = new RemoteAccessible( newChild.ID(), aParent, this, newChild.Role(), newChild.Type(), newChild.GenericTypes(), newChild.RoleMapEntryIndex()); @@ -246,8 +251,18 @@ return IPC_OK(); } +#ifdef XP_WIN + WeakPtr parent = root->RemoteParent(); +#else RemoteAccessible* parent = root->RemoteParent(); +#endif ProxyShowHideEvent(root, parent, false, aFromUser); +#ifdef XP_WIN + if (!parent) { + MOZ_ASSERT(!StaticPrefs::accessibility_cache_enabled_AtStartup()); + return IPC_FAIL(this, "Parent removed while removing child"); + } +#endif RefPtr event = nullptr; if (nsCoreUtils::AccEventObserversExist()) { @@ -726,7 +741,12 @@ return IPC_FAIL(this, "binding to nonexistant proxy!"); } +#ifdef XP_WIN + WeakPtr outerDoc = e->mProxy; +#else RemoteAccessible* outerDoc = e->mProxy; +#endif + MOZ_ASSERT(outerDoc); // OuterDocAccessibles are expected to only have a document as a child. @@ -781,6 +801,9 @@ # endif // defined(MOZ_SANDBOX) } } + if (!outerDoc) { + return IPC_FAIL(this, "OuterDoc removed while adding child doc"); + } // Send a COM proxy for the embedder OuterDocAccessible to the embedded // document process. This will be returned as the parent of the // embedded document. @@ -818,6 +841,9 @@ # endif // defined(MOZ_SANDBOX) } } + if (!outerDoc) { + return IPC_FAIL(this, "OuterDoc removed while adding child doc"); + } } if (nsWinUtils::IsWindowEmulationStarted()) { aChildDoc->SetEmulatedWindowHandle(mEmulatedWindowHandle); diff -Nru thunderbird-102.9.0+build1/accessible/ipc/RemoteAccessibleBase.h thunderbird-102.10.0+build2/accessible/ipc/RemoteAccessibleBase.h --- thunderbird-102.9.0+build1/accessible/ipc/RemoteAccessibleBase.h 2023-03-11 11:24:06.000000000 +0000 +++ thunderbird-102.10.0+build2/accessible/ipc/RemoteAccessibleBase.h 2023-04-11 06:10:53.000000000 +0000 @@ -11,6 +11,7 @@ #include "mozilla/a11y/CacheConstants.h" #include "mozilla/a11y/HyperTextAccessibleBase.h" #include "mozilla/a11y/Role.h" +#include "mozilla/WeakPtr.h" #include "AccAttributes.h" #include "nsIAccessibleText.h" #include "nsIAccessibleTypes.h" @@ -27,7 +28,13 @@ enum class RelationType; template +#ifdef XP_WIN +class RemoteAccessibleBase : public Accessible, + public HyperTextAccessibleBase, + public SupportsWeakPtr { +#else class RemoteAccessibleBase : public Accessible, public HyperTextAccessibleBase { +#endif public: virtual ~RemoteAccessibleBase() { MOZ_ASSERT(!mWrapper); } diff -Nru thunderbird-102.9.0+build1/accessible/ipc/win/RemoteAccessible.cpp thunderbird-102.10.0+build2/accessible/ipc/win/RemoteAccessible.cpp --- thunderbird-102.9.0+build1/accessible/ipc/win/RemoteAccessible.cpp 2023-03-11 11:24:06.000000000 +0000 +++ thunderbird-102.10.0+build2/accessible/ipc/win/RemoteAccessible.cpp 2023-04-11 06:10:53.000000000 +0000 @@ -38,7 +38,7 @@ // methods here in RemoteAccessible, causing infinite recursion. MOZ_ASSERT(!StaticPrefs::accessibility_cache_enabled_AtStartup()); if (!mCOMProxy && mSafeToRecurse) { - RemoteAccessible* thisPtr = const_cast(this); + WeakPtr thisPtr = const_cast(this); // See if we can lazily obtain a COM proxy MsaaAccessible* msaa = MsaaAccessible::GetFrom(thisPtr); bool isDefunct = false; @@ -48,7 +48,12 @@ VARIANT realId = {{{VT_I4}}}; realId.ulVal = msaa->GetExistingID(); MOZ_DIAGNOSTIC_ASSERT(realId.ulVal != CHILDID_SELF); - thisPtr->mCOMProxy = msaa->GetIAccessibleFor(realId, &isDefunct); + RefPtr proxy = msaa->GetIAccessibleFor(realId, &isDefunct); + if (!thisPtr) { + *aOutAccessible = nullptr; + return false; + } + thisPtr->mCOMProxy = proxy; } RefPtr addRefed = mCOMProxy; diff -Nru thunderbird-102.9.0+build1/accessible/windows/msaa/MsaaAccessible.cpp thunderbird-102.10.0+build2/accessible/windows/msaa/MsaaAccessible.cpp --- thunderbird-102.9.0+build1/accessible/windows/msaa/MsaaAccessible.cpp 2023-03-11 11:24:06.000000000 +0000 +++ thunderbird-102.10.0+build2/accessible/windows/msaa/MsaaAccessible.cpp 2023-04-11 06:10:53.000000000 +0000 @@ -665,10 +665,16 @@ dom::BrowserParent* aBrowser, Callback aCallback) { // We can't use BrowserBridgeParent::VisitAllDescendants because it doesn't // provide a way to stop the search. - const auto& bridges = aBrowser->ManagedPBrowserBridgeParent(); - return std::all_of(bridges.cbegin(), bridges.cend(), [&](const auto& key) { - auto* bridge = static_cast(key); - dom::BrowserParent* childBrowser = bridge->GetBrowserParent(); + const auto& rawBridges = aBrowser->ManagedPBrowserBridgeParent(); + nsTArray> bridges(rawBridges.Count()); + for (const auto bridge : rawBridges) { + bridges.AppendElement(static_cast(bridge)); + } + return std::all_of(bridges.cbegin(), bridges.cend(), [&](const auto& bridge) { + RefPtr childBrowser = bridge->GetBrowserParent(); + if (!childBrowser) { + return true; + } DocAccessibleParent* childDocAcc = childBrowser->GetTopLevelDocAccessible(); if (!childDocAcc || childDocAcc->IsShutdown()) { return true; diff -Nru thunderbird-102.9.0+build1/browser/components/attribution/AttributionCode.jsm thunderbird-102.10.0+build2/browser/components/attribution/AttributionCode.jsm --- thunderbird-102.9.0+build1/browser/components/attribution/AttributionCode.jsm 2023-03-11 11:24:07.000000000 +0000 +++ thunderbird-102.10.0+build2/browser/components/attribution/AttributionCode.jsm 2023-04-11 06:10:53.000000000 +0000 @@ -66,6 +66,7 @@ "ua", "dltoken", "msstoresignedin", + "dlsource", ]; let gCachedAttrData = null; diff -Nru thunderbird-102.9.0+build1/browser/components/attribution/test/xpcshell/head.js thunderbird-102.10.0+build2/browser/components/attribution/test/xpcshell/head.js --- thunderbird-102.9.0+build1/browser/components/attribution/test/xpcshell/head.js 2023-03-11 11:24:06.000000000 +0000 +++ thunderbird-102.10.0+build2/browser/components/attribution/test/xpcshell/head.js 2023-04-11 06:10:53.000000000 +0000 @@ -64,6 +64,12 @@ code: "dltoken%3Dc18f86a3-f228-4d98-91bb-f90135c0aa9c", parsed: { dltoken: "c18f86a3-f228-4d98-91bb-f90135c0aa9c" }, }, + { + code: "dlsource%3Dsome-dl-source", + parsed: { + dlsource: "some-dl-source", + }, + }, ]; let invalidAttrCodes = [ diff -Nru thunderbird-102.9.0+build1/browser/components/enterprisepolicies/Policies.jsm thunderbird-102.10.0+build2/browser/components/enterprisepolicies/Policies.jsm --- thunderbird-102.9.0+build1/browser/components/enterprisepolicies/Policies.jsm 2023-03-11 11:24:07.000000000 +0000 +++ thunderbird-102.10.0+build2/browser/components/enterprisepolicies/Policies.jsm 2023-04-11 06:10:54.000000000 +0000 @@ -31,6 +31,7 @@ BookmarksPolicies: "resource:///modules/policies/BookmarksPolicies.jsm", CustomizableUI: "resource:///modules/CustomizableUI.jsm", FileUtils: "resource://gre/modules/FileUtils.jsm", + PdfJsDefaultPreferences: "resource://pdf.js/PdfJsDefaultPreferences.jsm", ProxyPolicies: "resource:///modules/policies/ProxyPolicies.jsm", WebsiteFilter: "resource:///modules/policies/WebsiteFilter.jsm", }); @@ -1669,7 +1670,7 @@ Preferences: { onBeforeAddons(manager, param) { - const allowedPrefixes = [ + let allowedPrefixes = [ "accessibility.", "app.update.", "browser.", @@ -1695,6 +1696,9 @@ "ui.", "widget.", ]; + if (!AppConstants.MOZ_REQUIRE_SIGNING) { + allowedPrefixes.push("xpinstall.signatures.required"); + } const allowedSecurityPrefs = [ "security.block_fileuri_script_with_wrong_mime", "security.default_personal_cert", @@ -1770,7 +1774,22 @@ // automatically converting these values to booleans. // Since we allow arbitrary prefs now, we have to do // something different. See bug 1666836. - if ( + // Even uglier, because pdfjs prefs are set async, we need + // to get their type from PdfJsDefaultPreferences. + if (preference.startsWith("pdfjs.")) { + let preferenceTail = preference.replace("pdfjs.", ""); + if ( + preferenceTail in PdfJsDefaultPreferences && + typeof PdfJsDefaultPreferences[preferenceTail] == "number" + ) { + prefBranch.setIntPref(preference, param[preference].Value); + } else { + prefBranch.setBoolPref( + preference, + !!param[preference].Value + ); + } + } else if ( prefBranch.getPrefType(preference) == prefBranch.PREF_INT || ![0, 1].includes(param[preference].Value) ) { diff -Nru thunderbird-102.9.0+build1/browser/components/enterprisepolicies/tests/xpcshell/head.js thunderbird-102.10.0+build2/browser/components/enterprisepolicies/tests/xpcshell/head.js --- thunderbird-102.9.0+build1/browser/components/enterprisepolicies/tests/xpcshell/head.js 2023-03-11 11:24:07.000000000 +0000 +++ thunderbird-102.10.0+build2/browser/components/enterprisepolicies/tests/xpcshell/head.js 2023-04-11 06:10:53.000000000 +0000 @@ -51,7 +51,7 @@ true, `Pref ${prefName} is correctly locked` ); - equal( + strictEqual( Preferences.get(prefName), prefValue, `Pref ${prefName} has the correct value` @@ -64,7 +64,7 @@ false, `Pref ${prefName} is correctly unlocked` ); - equal( + strictEqual( Preferences.get(prefName), prefValue, `Pref ${prefName} has the correct value` @@ -72,7 +72,7 @@ } function checkUserPref(prefName, prefValue) { - equal( + strictEqual( Preferences.get(prefName), prefValue, `Pref ${prefName} has the correct value` diff -Nru thunderbird-102.9.0+build1/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js thunderbird-102.10.0+build2/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js --- thunderbird-102.9.0+build1/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js 2023-03-11 11:24:06.000000000 +0000 +++ thunderbird-102.10.0+build2/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js 2023-04-11 06:10:53.000000000 +0000 @@ -967,6 +967,26 @@ "print.prefer_system_dialog": true, }, }, + + // Bug 1820195 + { + policies: { + Preferences: { + "pdfjs.annotationMode": { + Value: 1, + Status: "default", + }, + "pdfjs.sidebarViewOnLoad": { + Value: 0, + Status: "default", + }, + }, + }, + unlockedPrefs: { + "pdfjs.annotationMode": 1, + "pdfjs.sidebarViewOnLoad": 0, + }, + }, ]; add_task(async function test_policy_simple_prefs() { diff -Nru thunderbird-102.9.0+build1/browser/config/version_display.txt thunderbird-102.10.0+build2/browser/config/version_display.txt --- thunderbird-102.9.0+build1/browser/config/version_display.txt 2023-03-11 11:24:07.000000000 +0000 +++ thunderbird-102.10.0+build2/browser/config/version_display.txt 2023-04-11 06:11:36.000000000 +0000 @@ -1 +1 @@ -102.9.0esr +102.10.0esr diff -Nru thunderbird-102.9.0+build1/browser/config/version.txt thunderbird-102.10.0+build2/browser/config/version.txt --- thunderbird-102.9.0+build1/browser/config/version.txt 2023-03-11 11:24:07.000000000 +0000 +++ thunderbird-102.10.0+build2/browser/config/version.txt 2023-04-11 06:11:36.000000000 +0000 @@ -1 +1 @@ -102.9.0 +102.10.0 diff -Nru thunderbird-102.9.0+build1/build/debian-packages/mercurial-timeout.diff thunderbird-102.10.0+build2/build/debian-packages/mercurial-timeout.diff --- thunderbird-102.9.0+build1/build/debian-packages/mercurial-timeout.diff 1970-01-01 00:00:00.000000000 +0000 +++ thunderbird-102.10.0+build2/build/debian-packages/mercurial-timeout.diff 2023-04-11 06:10:54.000000000 +0000 @@ -0,0 +1,38 @@ +# HG changeset patch +# User Julien Cristau +# Date 1679408823 -3600 +# Tue Mar 21 15:27:03 2023 +0100 +# Branch stable +# Node ID 3a889388b8f5e4fc884fd7eb6c5daf82056627e2 +# Parent 411dc27fd9fd076d6a031a08fcaace659afe2fe3 +url: don't ignore timeout for https connections + +For http, we use the stdlib's HTTPConnection.connect which passes the +timeout down to socket.create_connection; for https, we override the +connect method but weren't handling the timeout, so connections could +hang for hours even with http.timeout set to low values. + +diff --git a/mercurial/url.py b/mercurial/url.py +--- a/mercurial/url.py ++++ b/mercurial/url.py +@@ -404,17 +404,19 @@ if has_https: + *args, + **kwargs + ): + keepalive.HTTPConnection.__init__(self, host, port, *args, **kwargs) + self.key_file = key_file + self.cert_file = cert_file + + def connect(self): +- self.sock = socket.create_connection((self.host, self.port)) ++ self.sock = socket.create_connection( ++ (self.host, self.port), self.timeout ++ ) + + host = self.host + if self.realhostport: # use CONNECT proxy + _generic_proxytunnel(self) + host = self.realhostport.rsplit(b':', 1)[0] + self.sock = sslutil.wrapsocket( + self.sock, + self.key_file, diff -Nru thunderbird-102.9.0+build1/BUILDID thunderbird-102.10.0+build2/BUILDID --- thunderbird-102.9.0+build1/BUILDID 2023-03-11 11:33:26.000000000 +0000 +++ thunderbird-102.10.0+build2/BUILDID 2023-04-11 06:18:48.000000000 +0000 @@ -1 +1 @@ -20230310165821 \ No newline at end of file +20230407145224 \ No newline at end of file diff -Nru thunderbird-102.9.0+build1/CLOBBER thunderbird-102.10.0+build2/CLOBBER --- thunderbird-102.9.0+build1/CLOBBER 2023-03-11 11:24:06.000000000 +0000 +++ thunderbird-102.10.0+build2/CLOBBER 2023-04-11 06:11:36.000000000 +0000 @@ -22,4 +22,4 @@ # changes to stick? As of bug 928195, this shouldn't be necessary! Please # don't change CLOBBER for WebIDL changes any more. -Merge day clobber 2023-02-14 \ No newline at end of file +Merge day clobber 2023-03-13 \ No newline at end of file diff -Nru thunderbird-102.9.0+build1/comm/calendar/timezones/zones.json thunderbird-102.10.0+build2/comm/calendar/timezones/zones.json --- thunderbird-102.9.0+build1/comm/calendar/timezones/zones.json 2023-03-11 11:25:08.000000000 +0000 +++ thunderbird-102.10.0+build2/comm/calendar/timezones/zones.json 2023-04-11 06:11:52.000000000 +0000 @@ -1596,8 +1596,7 @@ }, "America/Mexico_City": { "ics": [ - "BEGIN:DAYLIGHT\r\nTZOFFSETFROM:-0600\r\nTZOFFSETTO:-0500\r\nTZNAME:CDT\r\nDTSTART:19700405T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU\r\nEND:DAYLIGHT", - "BEGIN:STANDARD\r\nTZOFFSETFROM:-0500\r\nTZOFFSETTO:-0600\r\nTZNAME:CST\r\nDTSTART:19701025T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD" + "BEGIN:STANDARD\r\nTZOFFSETFROM:-0600\r\nTZOFFSETTO:-0600\r\nTZNAME:CST\r\nDTSTART:19700101T000000\r\nEND:STANDARD" ], "latitude": "+0192400", "longitude": "-0990900" diff -Nru thunderbird-102.9.0+build1/comm/chat/protocols/matrix/lib/browser-request/index.js thunderbird-102.10.0+build2/comm/chat/protocols/matrix/lib/browser-request/index.js --- thunderbird-102.9.0+build1/comm/chat/protocols/matrix/lib/browser-request/index.js 2023-03-11 11:25:08.000000000 +0000 +++ thunderbird-102.10.0+build2/comm/chat/protocols/matrix/lib/browser-request/index.js 1970-01-01 00:00:00.000000000 +0000 @@ -1,496 +0,0 @@ -// Browser Request -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// UMD HEADER START -(function (root, factory) { - if (typeof define === 'function' && define.amd) { - // AMD. Register as an anonymous module. - define([], factory); - } else if (typeof exports === 'object') { - // Node. Does not work with strict CommonJS, but - // only CommonJS-like enviroments that support module.exports, - // like Node. - module.exports = factory(); - } else { - // Browser globals (root is window) - root.returnExports = factory(); - } -}(this, function () { -// UMD HEADER END - -var XHR = XMLHttpRequest -if (!XHR) throw new Error('missing XMLHttpRequest') -request.log = { - 'trace': noop, 'debug': noop, 'info': noop, 'warn': noop, 'error': noop -} - -var DEFAULT_TIMEOUT = 3 * 60 * 1000 // 3 minutes - -// -// request -// - -function request(options, callback) { - // The entry-point to the API: prep the options object and pass the real work to run_xhr. - if(typeof callback !== 'function') - throw new Error('Bad callback given: ' + callback) - - if(!options) - throw new Error('No options given') - - var options_onResponse = options.onResponse; // Save this for later. - - if(typeof options === 'string') - options = {'uri':options}; - else - options = JSON.parse(JSON.stringify(options)); // Use a duplicate for mutating. - - options.onResponse = options_onResponse // And put it back. - - if (options.verbose) request.log = getLogger(); - - if(options.url) { - options.uri = options.url; - delete options.url; - } - - if(!options.uri && options.uri !== "") - throw new Error("options.uri is a required argument"); - - if(typeof options.uri != "string") - throw new Error("options.uri must be a string"); - - var unsupported_options = ['proxy', '_redirectsFollowed', 'maxRedirects', 'followRedirect'] - for (var i = 0; i < unsupported_options.length; i++) - if(options[ unsupported_options[i] ]) - throw new Error("options." + unsupported_options[i] + " is not supported") - - options.callback = callback - options.method = options.method || 'GET'; - options.headers = options.headers || {}; - options.body = options.body || null - options.timeout = options.timeout || request.DEFAULT_TIMEOUT - - if(options.headers.host) - throw new Error("Options.headers.host is not supported"); - - if(options.json) { - options.headers.accept = options.headers.accept || 'application/json' - if(options.method !== 'GET') - options.headers['content-type'] = 'application/json' - - if(typeof options.json !== 'boolean') - options.body = JSON.stringify(options.json) - else if(typeof options.body !== 'string') - options.body = JSON.stringify(options.body) - } - - //BEGIN QS Hack - var serialize = function(obj) { - var str = []; - for(var p in obj) - if (obj.hasOwnProperty(p)) { - str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p])); - } - return str.join("&"); - } - - if(options.qs){ - var qs = (typeof options.qs == 'string')? options.qs : serialize(options.qs); - if(options.uri.indexOf('?') !== -1){ //no get params - options.uri = options.uri+'&'+qs; - }else{ //existing get params - options.uri = options.uri+'?'+qs; - } - } - //END QS Hack - - //BEGIN FORM Hack - var multipart = function(obj) { - //todo: support file type (useful?) - var result = {}; - result.boundry = '-------------------------------'+Math.floor(Math.random()*1000000000); - var lines = []; - for(var p in obj){ - if (obj.hasOwnProperty(p)) { - lines.push( - '--'+result.boundry+"\n"+ - 'Content-Disposition: form-data; name="'+p+'"'+"\n"+ - "\n"+ - obj[p]+"\n" - ); - } - } - lines.push( '--'+result.boundry+'--' ); - result.body = lines.join(''); - result.length = result.body.length; - result.type = 'multipart/form-data; boundary='+result.boundry; - return result; - } - - if(options.form){ - if(typeof options.form == 'string') throw('form name unsupported'); - if(options.method === 'POST'){ - var encoding = (options.encoding || 'application/x-www-form-urlencoded').toLowerCase(); - options.headers['content-type'] = encoding; - switch(encoding){ - case 'application/x-www-form-urlencoded': - options.body = serialize(options.form).replace(/%20/g, "+"); - break; - case 'multipart/form-data': - var multi = multipart(options.form); - //options.headers['content-length'] = multi.length; - options.body = multi.body; - options.headers['content-type'] = multi.type; - break; - default : throw new Error('unsupported encoding:'+encoding); - } - } - } - //END FORM Hack - - // If onResponse is boolean true, call back immediately when the response is known, - // not when the full request is complete. - options.onResponse = options.onResponse || noop - if(options.onResponse === true) { - options.onResponse = callback - options.callback = noop - } - - // XXX Browsers do not like this. - //if(options.body) - // options.headers['content-length'] = options.body.length; - - // HTTP basic authentication - if(!options.headers.authorization && options.auth) - options.headers.authorization = 'Basic ' + b64_enc(options.auth.username + ':' + options.auth.password); - - return run_xhr(options) -} - -var req_seq = 0 -function run_xhr(options) { - var xhr = new XHR - , timed_out = false - , is_cors = is_crossDomain(options.uri) - , supports_cors = ('withCredentials' in xhr) - - req_seq += 1 - xhr.seq_id = req_seq - xhr.id = req_seq + ': ' + options.method + ' ' + options.uri - xhr._id = xhr.id // I know I will type "_id" from habit all the time. - - if(is_cors && !supports_cors) { - var cors_err = new Error('Browser does not support cross-origin request: ' + options.uri) - cors_err.cors = 'unsupported' - return options.callback(cors_err, xhr) - } - - xhr.timeoutTimer = setTimeout(too_late, options.timeout) - function too_late() { - timed_out = true - var er = new Error('ETIMEDOUT') - er.code = 'ETIMEDOUT' - er.duration = options.timeout - - request.log.error('Timeout', { 'id':xhr._id, 'milliseconds':options.timeout }) - return options.callback(er, xhr) - } - - // Some states can be skipped over, so remember what is still incomplete. - var did = {'response':false, 'loading':false, 'end':false} - - xhr.onreadystatechange = on_state_change - xhr.open(options.method, options.uri, true) // asynchronous - if(is_cors) - xhr.withCredentials = !! options.withCredentials - xhr.send(options.body) - return xhr - - function on_state_change(event) { - if(timed_out) - return request.log.debug('Ignoring timed out state change', {'state':xhr.readyState, 'id':xhr.id}) - - request.log.debug('State change', {'state':xhr.readyState, 'id':xhr.id, 'timed_out':timed_out}) - - if(xhr.readyState === XHR.OPENED) { - request.log.debug('Request started', {'id':xhr.id}) - for (var key in options.headers) - xhr.setRequestHeader(key, options.headers[key]) - } - - else if(xhr.readyState === XHR.HEADERS_RECEIVED) - on_response() - - else if(xhr.readyState === XHR.LOADING) { - on_response() - on_loading() - } - - else if(xhr.readyState === XHR.DONE) { - on_response() - on_loading() - on_end() - } - } - - function on_response() { - if(did.response) - return - - did.response = true - request.log.debug('Got response', {'id':xhr.id, 'status':xhr.status}) - clearTimeout(xhr.timeoutTimer) - xhr.statusCode = xhr.status // Node request compatibility - - // Detect failed CORS requests. - if(is_cors && xhr.statusCode == 0) { - var cors_err = new Error('CORS request rejected: ' + options.uri) - cors_err.cors = 'rejected' - - // Do not process this request further. - did.loading = true - did.end = true - - return options.callback(cors_err, xhr) - } - - options.onResponse(null, xhr) - } - - function on_loading() { - if(did.loading) - return - - did.loading = true - request.log.debug('Response body loading', {'id':xhr.id}) - // TODO: Maybe simulate "data" events by watching xhr.responseText - } - - function on_end() { - if(did.end) - return - - did.end = true - request.log.debug('Request done', {'id':xhr.id}) - - xhr.body = xhr.responseText - if(options.json) { - try { xhr.body = JSON.parse(xhr.responseText) } - catch (er) { return options.callback(er, xhr) } - } - - options.callback(null, xhr, xhr.body) - } - -} // request - -request.withCredentials = false; -request.DEFAULT_TIMEOUT = DEFAULT_TIMEOUT; - -// -// defaults -// - -request.defaults = function(options, requester) { - var def = function (method) { - var d = function (params, callback) { - if(typeof params === 'string') - params = {'uri': params}; - else { - params = JSON.parse(JSON.stringify(params)); - } - for (var i in options) { - if (params[i] === undefined) params[i] = options[i] - } - return method(params, callback) - } - return d - } - var de = def(request) - de.get = def(request.get) - de.post = def(request.post) - de.put = def(request.put) - de.head = def(request.head) - return de -} - -// -// HTTP method shortcuts -// - -var shortcuts = [ 'get', 'put', 'post', 'head' ]; -shortcuts.forEach(function(shortcut) { - var method = shortcut.toUpperCase(); - var func = shortcut.toLowerCase(); - - request[func] = function(opts) { - if(typeof opts === 'string') - opts = {'method':method, 'uri':opts}; - else { - opts = JSON.parse(JSON.stringify(opts)); - opts.method = method; - } - - var args = [opts].concat(Array.prototype.slice.apply(arguments, [1])); - return request.apply(this, args); - } -}) - -// -// CouchDB shortcut -// - -request.couch = function(options, callback) { - if(typeof options === 'string') - options = {'uri':options} - - // Just use the request API to do JSON. - options.json = true - if(options.body) - options.json = options.body - delete options.body - - callback = callback || noop - - var xhr = request(options, couch_handler) - return xhr - - function couch_handler(er, resp, body) { - if(er) - return callback(er, resp, body) - - if((resp.statusCode < 200 || resp.statusCode > 299) && body.error) { - // The body is a Couch JSON object indicating the error. - er = new Error('CouchDB error: ' + (body.error.reason || body.error.error)) - for (var key in body) - er[key] = body[key] - return callback(er, resp, body); - } - - return callback(er, resp, body); - } -} - -// -// Utility -// - -function noop() {} - -function getLogger() { - var logger = {} - , levels = ['trace', 'debug', 'info', 'warn', 'error'] - , level, i - - for(i = 0; i < levels.length; i++) { - level = levels[i] - - logger[level] = noop - if(typeof console !== 'undefined' && console && console[level]) - logger[level] = formatted(console, level) - } - - return logger -} - -function formatted(obj, method) { - return formatted_logger - - function formatted_logger(str, context) { - if(typeof context === 'object') - str += ' ' + JSON.stringify(context) - - return obj[method].call(obj, str) - } -} - -// Return whether a URL is a cross-domain request. -function is_crossDomain(url) { - // Always return false, we never issue a cross-domain request. - return false; - var rurl = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/ - - // jQuery #8138, IE may throw an exception when accessing - // a field from window.location if document.domain has been set - var ajaxLocation - try { ajaxLocation = location.href } - catch (e) { - // Use the href attribute of an A element since IE will modify it given document.location - ajaxLocation = document.createElement( "a" ); - ajaxLocation.href = ""; - ajaxLocation = ajaxLocation.href; - } - - var ajaxLocParts = rurl.exec(ajaxLocation.toLowerCase()) || [] - , parts = rurl.exec(url.toLowerCase() ) - - var result = !!( - parts && - ( parts[1] != ajaxLocParts[1] - || parts[2] != ajaxLocParts[2] - || (parts[3] || (parts[1] === "http:" ? 80 : 443)) != (ajaxLocParts[3] || (ajaxLocParts[1] === "http:" ? 80 : 443)) - ) - ) - - //console.debug('is_crossDomain('+url+') -> ' + result) - return result -} - -// MIT License from http://phpjs.org/functions/base64_encode:358 -function b64_enc (data) { - // Encodes string using MIME base64 algorithm - var b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; - var o1, o2, o3, h1, h2, h3, h4, bits, i = 0, ac = 0, enc="", tmp_arr = []; - - if (!data) { - return data; - } - - // assume utf8 data - // data = this.utf8_encode(data+''); - - do { // pack three octets into four hexets - o1 = data.charCodeAt(i++); - o2 = data.charCodeAt(i++); - o3 = data.charCodeAt(i++); - - bits = o1<<16 | o2<<8 | o3; - - h1 = bits>>18 & 0x3f; - h2 = bits>>12 & 0x3f; - h3 = bits>>6 & 0x3f; - h4 = bits & 0x3f; - - // use hexets to index into b64, and append result to encoded string - tmp_arr[ac++] = b64.charAt(h1) + b64.charAt(h2) + b64.charAt(h3) + b64.charAt(h4); - } while (i < data.length); - - enc = tmp_arr.join(''); - - switch (data.length % 3) { - case 1: - enc = enc.slice(0, -2) + '=='; - break; - case 2: - enc = enc.slice(0, -1) + '='; - break; - } - - return enc; -} - return request; -//UMD FOOTER START -})); -//UMD FOOTER END diff -Nru thunderbird-102.9.0+build1/comm/chat/protocols/matrix/lib/browser-request/LICENSE thunderbird-102.10.0+build2/comm/chat/protocols/matrix/lib/browser-request/LICENSE --- thunderbird-102.9.0+build1/comm/chat/protocols/matrix/lib/browser-request/LICENSE 2023-03-11 11:25:08.000000000 +0000 +++ thunderbird-102.10.0+build2/comm/chat/protocols/matrix/lib/browser-request/LICENSE 1970-01-01 00:00:00.000000000 +0000 @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff -Nru thunderbird-102.9.0+build1/comm/chat/protocols/matrix/lib/content-type/index.js thunderbird-102.10.0+build2/comm/chat/protocols/matrix/lib/content-type/index.js --- thunderbird-102.9.0+build1/comm/chat/protocols/matrix/lib/content-type/index.js 2023-03-11 11:25:08.000000000 +0000 +++ thunderbird-102.10.0+build2/comm/chat/protocols/matrix/lib/content-type/index.js 2023-04-11 06:11:52.000000000 +0000 @@ -20,8 +20,8 @@ * obs-text = %x80-FF * quoted-pair = "\" ( HTAB / SP / VCHAR / obs-text ) */ -var PARAM_REGEXP = /; *([!#$%&'*+.^_`|~0-9A-Za-z-]+) *= *("(?:[\u000b\u0020\u0021\u0023-\u005b\u005d-\u007e\u0080-\u00ff]|\\[\u000b\u0020-\u00ff])*"|[!#$%&'*+.^_`|~0-9A-Za-z-]+) */g -var TEXT_REGEXP = /^[\u000b\u0020-\u007e\u0080-\u00ff]+$/ +var PARAM_REGEXP = /; *([!#$%&'*+.^_`|~0-9A-Za-z-]+) *= *("(?:[\u000b\u0020\u0021\u0023-\u005b\u005d-\u007e\u0080-\u00ff]|\\[\u000b\u0020-\u00ff])*"|[!#$%&'*+.^_`|~0-9A-Za-z-]+) */g // eslint-disable-line no-control-regex +var TEXT_REGEXP = /^[\u000b\u0020-\u007e\u0080-\u00ff]+$/ // eslint-disable-line no-control-regex var TOKEN_REGEXP = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/ /** @@ -30,7 +30,7 @@ * quoted-pair = "\" ( HTAB / SP / VCHAR / obs-text ) * obs-text = %x80-FF */ -var QESC_REGEXP = /\\([\u000b\u0020-\u00ff])/g +var QESC_REGEXP = /\\([\u000b\u0020-\u00ff])/g // eslint-disable-line no-control-regex /** * RegExp to match chars that must be quoted-pair in RFC 7230 sec 3.2.6 @@ -119,7 +119,7 @@ var index = header.indexOf(';') var type = index !== -1 - ? header.substr(0, index).trim() + ? header.slice(0, index).trim() : header.trim() if (!TYPE_REGEXP.test(type)) { @@ -145,11 +145,14 @@ key = match[1].toLowerCase() value = match[2] - if (value[0] === '"') { - // remove quotes and escapes - value = value - .substr(1, value.length - 2) - .replace(QESC_REGEXP, '$1') + if (value.charCodeAt(0) === 0x22 /* " */) { + // remove quotes + value = value.slice(1, -1) + + // remove escapes + if (value.indexOf('\\') !== -1) { + value = value.replace(QESC_REGEXP, '$1') + } } obj.parameters[key] = value diff -Nru thunderbird-102.9.0+build1/comm/chat/protocols/matrix/lib/@matrix-org/olm/olm.js thunderbird-102.10.0+build2/comm/chat/protocols/matrix/lib/@matrix-org/olm/olm.js --- thunderbird-102.9.0+build1/comm/chat/protocols/matrix/lib/@matrix-org/olm/olm.js 2023-03-11 11:25:08.000000000 +0000 +++ thunderbird-102.10.0+build2/comm/chat/protocols/matrix/lib/@matrix-org/olm/olm.js 2023-04-11 06:11:52.000000000 +0000 @@ -1,12 +1,12 @@ // @license magnet:?xt=urn:btih:8e4f440f4c65981c5bf93c76d35135ba5064d8b7&dn=apache-2.0.txt Apache-2.0 -// @source: https://gitlab.matrix.org/matrix-org/olm/-/tree/3.2.12 +// @source: https://gitlab.matrix.org/matrix-org/olm/-/tree/3.2.14 var Olm = (function() { var olm_exports = {}; var onInitSuccess; var onInitFail; -var Module = (function() { +var Module = (() => { var _scriptDir = typeof document !== 'undefined' && document.currentScript ? document.currentScript.src : undefined; if (typeof __filename !== 'undefined') _scriptDir = _scriptDir || __filename; return ( @@ -14,24 +14,24 @@ Module = Module || {}; -var a;a||(a=typeof Module !== 'undefined' ? Module : {});var aa,ba;a.ready=new Promise(function(b,c){aa=b;ba=c});var g;if("undefined"!==typeof window)g=function(b){window.crypto.getRandomValues(b)};else if(module.exports){var ca=require("crypto");g=function(b){var c=ca.randomBytes(b.length);b.set(c)};process=global.process}else throw Error("Cannot find global to attach library to"); -if("undefined"!==typeof OLM_OPTIONS)for(var da in OLM_OPTIONS)OLM_OPTIONS.hasOwnProperty(da)&&(a[da]=OLM_OPTIONS[da]);a.onRuntimeInitialized=function(){h=a._olm_error();olm_exports.PRIVATE_KEY_LENGTH=a._olm_pk_private_key_length();onInitSuccess&&onInitSuccess()};a.onAbort=function(b){onInitFail&&onInitFail(b)};var ea={},l;for(l in a)a.hasOwnProperty(l)&&(ea[l]=a[l]);var ha="object"===typeof window,ia="function"===typeof importScripts,m="",ja,ka,la,n,q; -if("object"===typeof process&&"object"===typeof process.versions&&"string"===typeof process.versions.node)m=ia?require("path").dirname(m)+"/":__dirname+"/",ja=function(b,c){n||(n=require("fs"));q||(q=require("path"));b=q.normalize(b);return n.readFileSync(b,c?null:"utf8")},la=function(b){b=ja(b,!0);b.buffer||(b=new Uint8Array(b));b.buffer||r("Assertion failed: undefined");return b},ka=function(b,c,d){n||(n=require("fs"));q||(q=require("path"));b=q.normalize(b);n.readFile(b,function(e,f){e?d(e):c(f.buffer)})}, -1>0]=0;break;case "i8":u[b>>0]=0;break;case "i16":oa[b>>1]=0;break;case "i32":v[b>>2]=0;break;case "i64":pa=[0,(x=0,1<=+Math.abs(x)?0>>0:~~+Math.ceil((x-+(~~x>>>0))/4294967296)>>>0:0)];v[b>>2]=pa[0];v[b+4>>2]=pa[1];break;case "float":qa[b>>2]=0;break;case "double":ra[b>>3]=0;break;default:r("invalid type for setValue: "+c)}} -function sa(b,c){c=c||"i8";"*"===c.charAt(c.length-1)&&(c="i32");switch(c){case "i1":return u[b>>0];case "i8":return u[b>>0];case "i16":return oa[b>>1];case "i32":return v[b>>2];case "i64":return v[b>>2];case "float":return qa[b>>2];case "double":return Number(ra[b>>3]);default:r("invalid type for getValue: "+c)}return null}var ta,ua=!1,va="undefined"!==typeof TextDecoder?new TextDecoder("utf8"):void 0; -function y(b,c){if(b){var d=z,e=b+c;for(c=b;d[c]&&!(c>=e);)++c;if(16f?e+=String.fromCharCode(f):(f-=65536,e+=String.fromCharCode(55296|f>>10,56320|f&1023))}}else e+=String.fromCharCode(f)}b=e}}else b="";return b} -function A(b,c,d,e){if(!(0=p){var w=b.charCodeAt(++k);p=65536+((p&1023)<<10)|w&1023}if(127>=p){if(d>=e)break;c[d++]=p}else{if(2047>=p){if(d+1>=e)break;c[d++]=192|p>>6}else{if(65535>=p){if(d+2>=e)break;c[d++]=224|p>>12}else{if(d+3>=e)break;c[d++]=240|p>>18;c[d++]=128|p>>12&63}c[d++]=128|p>>6&63}c[d++]=128|p&63}}c[d]=0;return d-f} -function B(b){for(var c=0,d=0;d=e&&(e=65536+((e&1023)<<10)|b.charCodeAt(++d)&1023);127>=e?++c:c=2047>=e?c+2:65535>=e?c+3:c+4}return c}function wa(b,c){for(var d=0;d>0]=b.charCodeAt(d)}var xa,u,z,oa,v,qa,ra; -function ya(){var b=ta.buffer;xa=b;a.HEAP8=u=new Int8Array(b);a.HEAP16=oa=new Int16Array(b);a.HEAP32=v=new Int32Array(b);a.HEAPU8=z=new Uint8Array(b);a.HEAPU16=new Uint16Array(b);a.HEAPU32=new Uint32Array(b);a.HEAPF32=qa=new Float32Array(b);a.HEAPF64=ra=new Float64Array(b)}var za,Aa=[],Ba=[],Da=[];function Ea(){var b=a.preRun.shift();Aa.unshift(b)}var C=0,Fa=null,Ga=null;a.preloadedImages={};a.preloadedAudios={}; -function r(b){if(a.onAbort)a.onAbort(b);b="Aborted("+b+")";ma(b);ua=!0;b=new WebAssembly.RuntimeError(b+". Build with -s ASSERTIONS=1 for more info.");ba(b);throw b;}function Ha(){return D.startsWith("data:application/octet-stream;base64,")}var D;D="olm.wasm";if(!Ha()){var Ia=D;D=a.locateFile?a.locateFile(Ia,m):m+Ia}function Ja(){var b=D;try{if(b==D&&na)return new Uint8Array(na);if(la)return la(b);throw"both async and sync fetching of the wasm failed";}catch(c){r(c)}} -function Ka(){if(!na&&(ha||ia)){if("function"===typeof fetch&&!D.startsWith("file://"))return fetch(D,{credentials:"same-origin"}).then(function(b){if(!b.ok)throw"failed to load wasm binary file at '"+D+"'";return b.arrayBuffer()}).catch(function(){return Ja()});if(ka)return new Promise(function(b,c){ka(D,function(d){b(new Uint8Array(d))},c)})}return Promise.resolve().then(function(){return Ja()})}var x,pa; -function La(b){for(;0=Na.length&&(Na.length=b+1),Na[b]=c=za.get(b));return c} -var Oa={a:function(b,c,d){z.copyWithin(b,c,c+d)},b:function(b){var c=z.length;b>>>=0;if(2147483648=d;d*=2){var e=c*(1+.2/d);e=Math.min(e,b+100663296);e=Math.max(b,e);0>>16);ya();var f=1;break a}catch(k){}f=void 0}if(f)return!0}return!1}}; -(function(){function b(f){a.asm=f.exports;ta=a.asm.c;ya();za=a.asm.e;Ba.unshift(a.asm.d);C--;a.monitorRunDependencies&&a.monitorRunDependencies(C);0==C&&(null!==Fa&&(clearInterval(Fa),Fa=null),Ga&&(f=Ga,Ga=null,f()))}function c(f){b(f.instance)}function d(f){return Ka().then(function(k){return WebAssembly.instantiate(k,e)}).then(function(k){return k}).then(f,function(k){ma("failed to asynchronously prepare wasm: "+k);r(k)})}var e={a:Oa};C++;a.monitorRunDependencies&&a.monitorRunDependencies(C);if(a.instantiateWasm)try{return a.instantiateWasm(e, -b)}catch(f){return ma("Module.instantiateWasm callback failed with error: "+f),!1}(function(){return na||"function"!==typeof WebAssembly.instantiateStreaming||Ha()||D.startsWith("file://")||"function"!==typeof fetch?d(c):fetch(D,{credentials:"same-origin"}).then(function(f){return WebAssembly.instantiateStreaming(f,e).then(c,function(k){ma("wasm streaming compile failed: "+k);ma("falling back to ArrayBuffer instantiation");return d(c)})})})().catch(ba);return{}})(); +var a;a||(a=typeof Module !== 'undefined' ? Module : {});var aa,ca;a.ready=new Promise(function(b,c){aa=b;ca=c});var g;if("undefined"!==typeof window)g=function(b){window.crypto.getRandomValues(b)};else if(module.exports){var da=require("crypto");g=function(b){var c=da.randomBytes(b.length);b.set(c)};process=global.process}else throw Error("Cannot find global to attach library to"); +if("undefined"!==typeof OLM_OPTIONS)for(var ea in OLM_OPTIONS)OLM_OPTIONS.hasOwnProperty(ea)&&(a[ea]=OLM_OPTIONS[ea]);a.onRuntimeInitialized=function(){h=a._olm_error();olm_exports.PRIVATE_KEY_LENGTH=a._olm_pk_private_key_length();onInitSuccess&&onInitSuccess()};a.onAbort=function(b){onInitFail&&onInitFail(b)}; +var fa=Object.assign({},a),ha="object"==typeof window,l="function"==typeof importScripts,ia="object"==typeof process&&"object"==typeof process.versions&&"string"==typeof process.versions.node,m="",ja,ka,la,fs,ma,na; +if(ia)m=l?require("path").dirname(m)+"/":__dirname+"/",na=()=>{ma||(fs=require("fs"),ma=require("path"))},ja=function(b,c){na();b=ma.normalize(b);return fs.readFileSync(b,c?void 0:"utf8")},la=b=>{b=ja(b,!0);b.buffer||(b=new Uint8Array(b));return b},ka=(b,c,d)=>{na();b=ma.normalize(b);fs.readFile(b,function(e,f){e?d(e):c(f.buffer)})},1{var c=new XMLHttpRequest;c.open("GET",b,!1);c.send(null);return c.responseText},l&&(la=b=>{var c=new XMLHttpRequest;c.open("GET",b,!1);c.responseType="arraybuffer";c.send(null);return new Uint8Array(c.response)}), +ka=(b,c,d)=>{var e=new XMLHttpRequest;e.open("GET",b,!0);e.responseType="arraybuffer";e.onload=()=>{200==e.status||0==e.status&&e.response?c(e.response):d()};e.onerror=d;e.send(null)};a.print||console.log.bind(console);var n=a.printErr||console.warn.bind(console);Object.assign(a,fa);fa=null;var q;a.wasmBinary&&(q=a.wasmBinary);var noExitRuntime=a.noExitRuntime||!0;"object"!=typeof WebAssembly&&r("no native wasm support detected"); +var oa,pa=!1,qa="undefined"!=typeof TextDecoder?new TextDecoder("utf8"):void 0; +function t(b,c){if(b){var d=u,e=b+c;for(c=b;d[c]&&!(c>=e);)++c;if(16f?e+=String.fromCharCode(f):(f-=65536,e+=String.fromCharCode(55296|f>>10,56320|f&1023))}}else e+=String.fromCharCode(f)}b=e}}else b="";return b} +function v(b,c,d,e){if(!(0=p){var w=b.charCodeAt(++k);p=65536+((p&1023)<<10)|w&1023}if(127>=p){if(d>=e)break;c[d++]=p}else{if(2047>=p){if(d+1>=e)break;c[d++]=192|p>>6}else{if(65535>=p){if(d+2>=e)break;c[d++]=224|p>>12}else{if(d+3>=e)break;c[d++]=240|p>>18;c[d++]=128|p>>12&63}c[d++]=128|p>>6&63}c[d++]=128|p&63}}c[d]=0;return d-f} +function x(b){for(var c=0,d=0;d=e?c++:2047>=e?c+=2:55296<=e&&57343>=e?(c+=4,++d):c+=3}return c}var ra,y,u,sa,z,ta,ua,va;function wa(){var b=oa.buffer;ra=b;a.HEAP8=y=new Int8Array(b);a.HEAP16=sa=new Int16Array(b);a.HEAP32=z=new Int32Array(b);a.HEAPU8=u=new Uint8Array(b);a.HEAPU16=new Uint16Array(b);a.HEAPU32=ta=new Uint32Array(b);a.HEAPF32=ua=new Float32Array(b);a.HEAPF64=va=new Float64Array(b)}var xa=[],za=[],Aa=[]; +function Ba(){var b=a.preRun.shift();xa.unshift(b)}var A=0,Ca=null,B=null;function r(b){if(a.onAbort)a.onAbort(b);b="Aborted("+b+")";n(b);pa=!0;b=new WebAssembly.RuntimeError(b+". Build with -sASSERTIONS for more info.");ca(b);throw b;}function Da(){return C.startsWith("data:application/octet-stream;base64,")}var C;C="olm.wasm";if(!Da()){var Ea=C;C=a.locateFile?a.locateFile(Ea,m):m+Ea} +function Fa(){var b=C;try{if(b==C&&q)return new Uint8Array(q);if(la)return la(b);throw"both async and sync fetching of the wasm failed";}catch(c){r(c)}} +function Ga(){if(!q&&(ha||l)){if("function"==typeof fetch&&!C.startsWith("file://"))return fetch(C,{credentials:"same-origin"}).then(function(b){if(!b.ok)throw"failed to load wasm binary file at '"+C+"'";return b.arrayBuffer()}).catch(function(){return Fa()});if(ka)return new Promise(function(b,c){ka(C,function(d){b(new Uint8Array(d))},c)})}return Promise.resolve().then(function(){return Fa()})}var Ha;function Ia(b){for(;0>0];case "i8":return y[b>>0];case "i16":return sa[b>>1];case "i32":return z[b>>2];case "i64":return z[b>>2];case "float":return ua[b>>2];case "double":return va[b>>3];case "*":return ta[b>>2];default:r("invalid type for getValue: "+c)}return null} +function D(b){var c="i8";c.endsWith("*")&&(c="*");switch(c){case "i1":y[b>>0]=0;break;case "i8":y[b>>0]=0;break;case "i16":sa[b>>1]=0;break;case "i32":z[b>>2]=0;break;case "i64":Ha=[0,0];z[b>>2]=Ha[0];z[b+4>>2]=Ha[1];break;case "float":ua[b>>2]=0;break;case "double":va[b>>3]=0;break;case "*":ta[b>>2]=0;break;default:r("invalid type for setValue: "+c)}}function Ka(b,c,d){for(var e=0;e>0]=b.charCodeAt(e);d||(y[c>>0]=0)} +function La(b,c,d){d=Array(0>>=0;if(2147483648=d;d*=2){var e=c*(1+.2/d);e=Math.min(e,b+100663296);var f=Math;e=Math.max(b,e);f=f.min.call(f,2147483648,e+(65536-e%65536)%65536);a:{try{oa.grow(f-ra.byteLength+65535>>>16);wa();var k=1;break a}catch(p){}k=void 0}if(k)return!0}return!1}}; +(function(){function b(f){a.asm=f.exports;oa=a.asm.c;wa();za.unshift(a.asm.d);A--;a.monitorRunDependencies&&a.monitorRunDependencies(A);0==A&&(null!==Ca&&(clearInterval(Ca),Ca=null),B&&(f=B,B=null,f()))}function c(f){b(f.instance)}function d(f){return Ga().then(function(k){return WebAssembly.instantiate(k,e)}).then(function(k){return k}).then(f,function(k){n("failed to asynchronously prepare wasm: "+k);r(k)})}var e={a:Ma};A++;a.monitorRunDependencies&&a.monitorRunDependencies(A);if(a.instantiateWasm)try{return a.instantiateWasm(e, +b)}catch(f){return n("Module.instantiateWasm callback failed with error: "+f),!1}(function(){return q||"function"!=typeof WebAssembly.instantiateStreaming||Da()||C.startsWith("file://")||ia||"function"!=typeof fetch?d(c):fetch(C,{credentials:"same-origin"}).then(function(f){return WebAssembly.instantiateStreaming(f,e).then(c,function(k){n("wasm streaming compile failed: "+k);n("falling back to ArrayBuffer instantiation");return d(c)})})})().catch(ca);return{}})(); a.___wasm_call_ctors=function(){return(a.___wasm_call_ctors=a.asm.d).apply(null,arguments)};a._olm_get_library_version=function(){return(a._olm_get_library_version=a.asm.f).apply(null,arguments)};a._olm_error=function(){return(a._olm_error=a.asm.g).apply(null,arguments)};a._olm_account_last_error=function(){return(a._olm_account_last_error=a.asm.h).apply(null,arguments)};a.__olm_error_to_string=function(){return(a.__olm_error_to_string=a.asm.i).apply(null,arguments)}; a._olm_account_last_error_code=function(){return(a._olm_account_last_error_code=a.asm.j).apply(null,arguments)};a._olm_session_last_error=function(){return(a._olm_session_last_error=a.asm.k).apply(null,arguments)};a._olm_session_last_error_code=function(){return(a._olm_session_last_error_code=a.asm.l).apply(null,arguments)};a._olm_utility_last_error=function(){return(a._olm_utility_last_error=a.asm.m).apply(null,arguments)}; a._olm_utility_last_error_code=function(){return(a._olm_utility_last_error_code=a.asm.n).apply(null,arguments)};a._olm_account_size=function(){return(a._olm_account_size=a.asm.o).apply(null,arguments)};a._olm_session_size=function(){return(a._olm_session_size=a.asm.p).apply(null,arguments)};a._olm_utility_size=function(){return(a._olm_utility_size=a.asm.q).apply(null,arguments)};a._olm_account=function(){return(a._olm_account=a.asm.r).apply(null,arguments)}; @@ -70,47 +70,47 @@ a._olm_create_sas_random_length=function(){return(a._olm_create_sas_random_length=a.asm.Kb).apply(null,arguments)};a._olm_create_sas=function(){return(a._olm_create_sas=a.asm.Lb).apply(null,arguments)};a._olm_sas_pubkey_length=function(){return(a._olm_sas_pubkey_length=a.asm.Mb).apply(null,arguments)};a._olm_sas_get_pubkey=function(){return(a._olm_sas_get_pubkey=a.asm.Nb).apply(null,arguments)};a._olm_sas_set_their_key=function(){return(a._olm_sas_set_their_key=a.asm.Ob).apply(null,arguments)}; a._olm_sas_is_their_key_set=function(){return(a._olm_sas_is_their_key_set=a.asm.Pb).apply(null,arguments)};a._olm_sas_generate_bytes=function(){return(a._olm_sas_generate_bytes=a.asm.Qb).apply(null,arguments)};a._olm_sas_mac_length=function(){return(a._olm_sas_mac_length=a.asm.Rb).apply(null,arguments)};a._olm_sas_calculate_mac_fixed_base64=function(){return(a._olm_sas_calculate_mac_fixed_base64=a.asm.Sb).apply(null,arguments)}; a._olm_sas_calculate_mac=function(){return(a._olm_sas_calculate_mac=a.asm.Tb).apply(null,arguments)};a._olm_sas_calculate_mac_long_kdf=function(){return(a._olm_sas_calculate_mac_long_kdf=a.asm.Ub).apply(null,arguments)};a._malloc=function(){return(a._malloc=a.asm.Vb).apply(null,arguments)};a._free=function(){return(a._free=a.asm.Wb).apply(null,arguments)}; -var Pa=a.stackSave=function(){return(Pa=a.stackSave=a.asm.Xb).apply(null,arguments)},Qa=a.stackRestore=function(){return(Qa=a.stackRestore=a.asm.Yb).apply(null,arguments)},Ra=a.stackAlloc=function(){return(Ra=a.stackAlloc=a.asm.Zb).apply(null,arguments)};a.ALLOC_STACK=1;var Sa;Ga=function Ta(){Sa||Ua();Sa||(Ga=Ta)}; -function Ua(){function b(){if(!Sa&&(Sa=!0,a.calledRun=!0,!ua)){La(Ba);aa(a);if(a.onRuntimeInitialized)a.onRuntimeInitialized();if(a.postRun)for("function"==typeof a.postRun&&(a.postRun=[a.postRun]);a.postRun.length;){var c=a.postRun.shift();Da.unshift(c)}La(Da)}}if(!(0} Resolves to the verified + * @returns Promise which resolves to the verified * configuration, which may include error states. Rejects on unexpected * failure, not when verification fails. */ static async fromDiscoveryConfig(wellknown) { // Step 1 is to get the config, which is provided to us here. + // We default to an error state to make the first few checks easier to // write. We'll update the properties of this object over the duration // of this function. @@ -100,56 +97,49 @@ base_url: null } }; - if (!wellknown || !wellknown["m.homeserver"]) { _logger.logger.error("No m.homeserver key in config"); - clientConfig["m.homeserver"].state = AutoDiscovery.FAIL_PROMPT; clientConfig["m.homeserver"].error = AutoDiscovery.ERROR_INVALID; return Promise.resolve(clientConfig); } - if (!wellknown["m.homeserver"]["base_url"]) { _logger.logger.error("No m.homeserver base_url in config"); - clientConfig["m.homeserver"].state = AutoDiscovery.FAIL_PROMPT; clientConfig["m.homeserver"].error = AutoDiscovery.ERROR_INVALID_HS_BASE_URL; return Promise.resolve(clientConfig); - } // Step 2: Make sure the homeserver URL is valid *looking*. We'll make - // sure it points to a homeserver in Step 3. - + } + // Step 2: Make sure the homeserver URL is valid *looking*. We'll make + // sure it points to a homeserver in Step 3. const hsUrl = this.sanitizeWellKnownUrl(wellknown["m.homeserver"]["base_url"]); - if (!hsUrl) { _logger.logger.error("Invalid base_url for m.homeserver"); - clientConfig["m.homeserver"].error = AutoDiscovery.ERROR_INVALID_HS_BASE_URL; return Promise.resolve(clientConfig); - } // Step 3: Make sure the homeserver URL points to a homeserver. - + } + // Step 3: Make sure the homeserver URL points to a homeserver. const hsVersions = await this.fetchWellKnownObject(`${hsUrl}/_matrix/client/versions`); - - if (!hsVersions || !hsVersions.raw["versions"]) { + if (!hsVersions || !hsVersions.raw?.["versions"]) { _logger.logger.error("Invalid /versions response"); + clientConfig["m.homeserver"].error = AutoDiscovery.ERROR_INVALID_HOMESERVER; - clientConfig["m.homeserver"].error = AutoDiscovery.ERROR_INVALID_HOMESERVER; // Supply the base_url to the caller because they may be ignoring liveliness + // Supply the base_url to the caller because they may be ignoring liveliness // errors, like this one. - clientConfig["m.homeserver"].base_url = hsUrl; return Promise.resolve(clientConfig); - } // Step 4: Now that the homeserver looks valid, update our client config. - + } + // Step 4: Now that the homeserver looks valid, update our client config. clientConfig["m.homeserver"] = { state: AutoDiscovery.SUCCESS, error: null, base_url: hsUrl - }; // Step 5: Try to pull out the identity server configuration + }; + // Step 5: Try to pull out the identity server configuration let isUrl = ""; - if (wellknown["m.identity_server"]) { // We prepare a failing identity server response to save lines later // in this branch. @@ -160,81 +150,81 @@ error: AutoDiscovery.ERROR_INVALID_IS, base_url: null } - }; // Step 5a: Make sure the URL is valid *looking*. We'll make sure it - // points to an identity server in Step 5b. + }; + // Step 5a: Make sure the URL is valid *looking*. We'll make sure it + // points to an identity server in Step 5b. isUrl = this.sanitizeWellKnownUrl(wellknown["m.identity_server"]["base_url"]); - if (!isUrl) { _logger.logger.error("Invalid base_url for m.identity_server"); - failingClientConfig["m.identity_server"].error = AutoDiscovery.ERROR_INVALID_IS_BASE_URL; return Promise.resolve(failingClientConfig); - } // Step 5b: Verify there is an identity server listening on the provided - // URL. - - - const isResponse = await this.fetchWellKnownObject(`${isUrl}/_matrix/identity/api/v1`); + } - if (!isResponse || !isResponse.raw || isResponse.action !== AutoDiscoveryAction.SUCCESS) { - _logger.logger.error("Invalid /api/v1 response"); + // Step 5b: Verify there is an identity server listening on the provided + // URL. + const isResponse = await this.fetchWellKnownObject(`${isUrl}/_matrix/identity/v2`); + if (!isResponse?.raw || isResponse.action !== AutoDiscoveryAction.SUCCESS) { + _logger.logger.error("Invalid /v2 response"); + failingClientConfig["m.identity_server"].error = AutoDiscovery.ERROR_INVALID_IDENTITY_SERVER; - failingClientConfig["m.identity_server"].error = AutoDiscovery.ERROR_INVALID_IDENTITY_SERVER; // Supply the base_url to the caller because they may be ignoring + // Supply the base_url to the caller because they may be ignoring // liveliness errors, like this one. - failingClientConfig["m.identity_server"].base_url = isUrl; return Promise.resolve(failingClientConfig); } - } // Step 6: Now that the identity server is valid, or never existed, - // populate the IS section. - + } + // Step 6: Now that the identity server is valid, or never existed, + // populate the IS section. if (isUrl && isUrl.toString().length > 0) { clientConfig["m.identity_server"] = { state: AutoDiscovery.SUCCESS, error: null, base_url: isUrl }; - } // Step 7: Copy any other keys directly into the clientConfig. This is for - // things like custom configuration of services. - + } + // Step 7: Copy any other keys directly into the clientConfig. This is for + // things like custom configuration of services. Object.keys(wellknown).forEach(k => { if (k === "m.homeserver" || k === "m.identity_server") { // Only copy selected parts of the config to avoid overwriting // properties computed by the validation logic above. const notProps = ["error", "state", "base_url"]; - for (const prop of Object.keys(wellknown[k])) { if (notProps.includes(prop)) continue; + // @ts-ignore - ts gets unhappy as we're mixing types here clientConfig[k][prop] = wellknown[k][prop]; } } else { // Just copy the whole thing over otherwise clientConfig[k] = wellknown[k]; } - }); // Step 8: Give the config to the caller (finally) + }); + // Step 8: Give the config to the caller (finally) return Promise.resolve(clientConfig); } + /** * Attempts to automatically discover client configuration information * prior to logging in. Such information includes the homeserver URL * and identity server URL the client would want. Additional details * may also be discovered, and will be transparently included in the * response object unaltered. - * @param {string} domain The homeserver domain to perform discovery + * @param domain - The homeserver domain to perform discovery * on. For example, "matrix.org". - * @return {Promise} Resolves to the discovered + * @returns Promise which resolves to the discovered * configuration, which may include error states. Rejects on unexpected * failure, not when discovery fails. */ - - static async findClientConfig(domain) { if (!domain || typeof domain !== "string" || domain.length === 0) { throw new Error("'domain' must be a string of non-zero length"); - } // We use a .well-known lookup for all cases. According to the spec, we + } + + // We use a .well-known lookup for all cases. According to the spec, we // can do other discovery mechanisms if we want such as custom lookups // however we won't bother with that here (mostly because the spec only // supports .well-known right now). @@ -244,11 +234,10 @@ // but will return one anyways (with state PROMPT) to make development // easier for clients. If we can't get a homeserver URL, all bets are // off on the rest of the config and we'll assume it is invalid too. + // We default to an error state to make the first few checks easier to // write. We'll update the properties of this object over the duration // of this function. - - const clientConfig = { "m.homeserver": { state: AutoDiscovery.FAIL_ERROR, @@ -262,16 +251,14 @@ error: null, base_url: null } - }; // Step 1: Actually request the .well-known JSON file and make sure it - // at least has a homeserver definition. + }; + // Step 1: Actually request the .well-known JSON file and make sure it + // at least has a homeserver definition. const wellknown = await this.fetchWellKnownObject(`https://${domain}/.well-known/matrix/client`); - if (!wellknown || wellknown.action !== AutoDiscoveryAction.SUCCESS) { _logger.logger.error("No response or error when parsing .well-known"); - if (wellknown.reason) _logger.logger.error(wellknown.reason); - if (wellknown.action === AutoDiscoveryAction.IGNORE) { clientConfig["m.homeserver"] = { state: AutoDiscovery.PROMPT, @@ -283,71 +270,71 @@ clientConfig["m.homeserver"].state = AutoDiscovery.FAIL_PROMPT; clientConfig["m.homeserver"].error = AutoDiscovery.ERROR_INVALID; } - return Promise.resolve(clientConfig); - } // Step 2: Validate and parse the config - + } + // Step 2: Validate and parse the config return AutoDiscovery.fromDiscoveryConfig(wellknown.raw); } + /** * Gets the raw discovery client configuration for the given domain name. * Should only be used if there's no validation to be done on the resulting * object, otherwise use findClientConfig(). - * @param {string} domain The domain to get the client config for. - * @returns {Promise

Apache License 2.0

BSD-3-Clause License

getopt.c License

getopt.c License

base-x License

bs58 License

content-type License

events License

p-retry License

retry License

unhomoglyph License

sax License

GNU Lesser General Public License 2.1

sdp-transform License