tbb-commits March 2022

tbb-commits@lists.torproject.org

5 participants
55 discussions

[tor-browser/tor-browser-91.7.0esr-11.5-1] fixup! Bug 30237: Add v3 onion services client authentication prompt
by richard＠torproject.org 08 Mar '22

08 Mar '22

commit 499d1f5b9a6c0247cb723ed478f00629dcd66725 Author: Pier Angelo Vendrame <pierov(a)torproject.org> Date: Mon Mar 7 19:40:10 2022 +0100 fixup! Bug 30237: Add v3 onion services client authentication prompt Fixes a problem with an async function not awaited, that caused #40802. --- browser/components/onionservices/content/authPrompt.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/browser/components/onionservices/content/authPrompt.js b/browser/components/onionservices/content/authPrompt.js index d4a59ac46487..df609df44e49 100644 --- a/browser/components/onionservices/content/authPrompt.js +++ b/browser/components/onionservices/content/authPrompt.js @@ -154,7 +154,7 @@ const OnionAuthPrompt = (function() { this._showWarning(undefined); // Remove the warning. }, - _onDone() { + async _onDone() { let keyElem = this._getKeyElement(); if (!keyElem) return; @@ -173,7 +173,8 @@ const OnionAuthPrompt = (function() { try { let { controller } = Cu.import("resource://torbutton/modules/tor-control-port.js", {}); - let torController = controller(aError => { + let torController = await controller(aError => { + console.error(controllerFailureMsg, aError); this.show(controllerFailureMsg); }); let onionAddr = this._onionName.toLowerCase().replace(/\.onion$/, ""); @@ -189,12 +190,15 @@ const OnionAuthPrompt = (function() { ); }) .catch(aError => { - if (aError.torMessage) + if (aError.torMessage) { this.show(aError.torMessage); - else + } else { + console.error(controllerFailureMsg, aError); this.show(controllerFailureMsg); + } }); } catch (e) { + console.error(controllerFailureMsg, e); this.show(controllerFailureMsg); } },

1 0

[tor-browser/tor-browser-91.7.0esr-11.0-1] fixup! Bug 30237: Add v3 onion services client authentication prompt
by richard＠torproject.org 08 Mar '22

08 Mar '22

commit 77c894e17f9fac22e40834c590be39d2fefd0cc1 Author: Pier Angelo Vendrame <pierov(a)torproject.org> Date: Mon Mar 7 19:40:10 2022 +0100 fixup! Bug 30237: Add v3 onion services client authentication prompt Fixes a problem with an async function not awaited, that caused #40802. --- browser/components/onionservices/content/authPrompt.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/browser/components/onionservices/content/authPrompt.js b/browser/components/onionservices/content/authPrompt.js index d4a59ac46487..df609df44e49 100644 --- a/browser/components/onionservices/content/authPrompt.js +++ b/browser/components/onionservices/content/authPrompt.js @@ -154,7 +154,7 @@ const OnionAuthPrompt = (function() { this._showWarning(undefined); // Remove the warning. }, - _onDone() { + async _onDone() { let keyElem = this._getKeyElement(); if (!keyElem) return; @@ -173,7 +173,8 @@ const OnionAuthPrompt = (function() { try { let { controller } = Cu.import("resource://torbutton/modules/tor-control-port.js", {}); - let torController = controller(aError => { + let torController = await controller(aError => { + console.error(controllerFailureMsg, aError); this.show(controllerFailureMsg); }); let onionAddr = this._onionName.toLowerCase().replace(/\.onion$/, ""); @@ -189,12 +190,15 @@ const OnionAuthPrompt = (function() { ); }) .catch(aError => { - if (aError.torMessage) + if (aError.torMessage) { this.show(aError.torMessage); - else + } else { + console.error(controllerFailureMsg, aError); this.show(controllerFailureMsg); + } }); } catch (e) { + console.error(controllerFailureMsg, e); this.show(controllerFailureMsg); } },

1 0

[tor-browser/geckoview-96.0-11.5-1] Bug 1758062 - Convert parameters upfront. r=smaug, a=tritter
by aguestuser＠torproject.org 08 Mar '22

08 Mar '22

commit 56176c3834ed416d4bc060745e1d1a2f75beca5d Author: Peter Van der Beken <peterv(a)propagandism.org> Date: Fri Mar 4 14:00:25 2022 +0000 Bug 1758062 - Convert parameters upfront. r=smaug, a=tritter Differential Revision: https://phabricator.services.mozilla.com/D140337 --- dom/xslt/xslt/txMozillaXSLTProcessor.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dom/xslt/xslt/txMozillaXSLTProcessor.cpp b/dom/xslt/xslt/txMozillaXSLTProcessor.cpp index c50a66a40201..a982bd118118 100644 --- a/dom/xslt/xslt/txMozillaXSLTProcessor.cpp +++ b/dom/xslt/xslt/txMozillaXSLTProcessor.cpp @@ -198,19 +198,15 @@ nsresult txToFragmentHandlerFactory::createHandlerWith( class txVariable : public txIGlobalParameter { public: - explicit txVariable(nsIVariant* aValue) : mValue(aValue) { - NS_ASSERTION(aValue, "missing value"); + explicit txVariable(nsIVariant* aValue, txAExprResult* aTxValue) + : mValue(aValue), mTxValue(aTxValue) { + NS_ASSERTION(aValue && aTxValue, "missing value"); } explicit txVariable(txAExprResult* aValue) : mTxValue(aValue) { NS_ASSERTION(aValue, "missing value"); } nsresult getValue(txAExprResult** aValue) override { - NS_ASSERTION(mValue || mTxValue, "variablevalue is null"); - - if (!mTxValue) { - nsresult rv = Convert(mValue, getter_AddRefs(mTxValue)); - NS_ENSURE_SUCCESS(rv, rv); - } + NS_ASSERTION(mTxValue, "variablevalue is null"); *aValue = mTxValue; NS_ADDREF(*aValue); @@ -223,10 +219,10 @@ class txVariable : public txIGlobalParameter { return NS_OK; } nsIVariant* getValue() { return mValue; } - void setValue(nsIVariant* aValue) { - NS_ASSERTION(aValue, "setting variablevalue to null"); + void setValue(nsIVariant* aValue, txAExprResult* aTxValue) { + NS_ASSERTION(aValue && aTxValue, "setting variablevalue to null"); mValue = aValue; - mTxValue = nullptr; + mTxValue = aTxValue; } void setValue(txAExprResult* aValue) { NS_ASSERTION(aValue, "setting variablevalue to null"); @@ -234,14 +230,14 @@ class txVariable : public txIGlobalParameter { mTxValue = aValue; } + static nsresult Convert(nsIVariant* aValue, txAExprResult** aResult); + friend void ImplCycleCollectionUnlink(txVariable& aVariable); friend void ImplCycleCollectionTraverse( nsCycleCollectionTraversalCallback& aCallback, txVariable& aVariable, const char* aName, uint32_t aFlags); private: - static nsresult Convert(nsIVariant* aValue, txAExprResult** aResult); - nsCOMPtr<nsIVariant> mValue; RefPtr<txAExprResult> mTxValue; }; @@ -816,13 +812,17 @@ nsresult txMozillaXSLTProcessor::SetParameter(const nsAString& aNamespaceURI, RefPtr<nsAtom> localName = NS_Atomize(aLocalName); txExpandedName varName(nsId, localName); + RefPtr<txAExprResult> txValue; + rv = txVariable::Convert(value, getter_AddRefs(txValue)); + NS_ENSURE_SUCCESS(rv, rv); + txVariable* var = static_cast<txVariable*>(mVariables.get(varName)); if (var) { - var->setValue(value); + var->setValue(value, txValue); return NS_OK; } - var = new txVariable(value); + var = new txVariable(value, txValue); return mVariables.add(varName, var); }

1 0

[tor-browser-build/master] Bug 40440: Bump version of snowflake to 01ae5b56e839
by boklm＠torproject.org 01 Mar '22

01 Mar '22

commit c93e3de93b408a9adafd23f0401774f3546dcf18 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Feb 28 13:59:16 2022 -0500 Bug 40440: Bump version of snowflake to 01ae5b56e839 This version bump includes a new feature to pass snowflake connection event log messages to the tor log. --- projects/snowflake/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/snowflake/config b/projects/snowflake/config index 0ca299c..089771b 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://git.torproject.org/pluggable-transports/snowflake.git -git_hash: 221f1c41c9618907a022655d1df4eb6eef02ab0a +git_hash: 01ae5b56e8399d29aa18605dc9add913d84dc553 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var:

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gitlab-tpo/merge-requests/417'
by boklm＠torproject.org 01 Mar '22

01 Mar '22

commit 8d2909e1b7dde54382b6204b82b3c0e1707b4d83 Merge: a8d4cac c93e3de Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 1 19:59:05 2022 +0100 Merge remote-tracking branch 'gitlab-tpo/merge-requests/417' projects/snowflake/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits March 2022