tor-commits November 2020

tor-commits@lists.torproject.org

16 participants
1820 discussions

[snowflake/master] Make probetest wait for a datachannel to open
by cohosh＠torproject.org 05 Nov '20

05 Nov '20

commit 4663599382e4db8167fcc23a1a890e24ebca517a Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Nov 5 16:48:00 2020 -0500 Make probetest wait for a datachannel to open --- probetest/probetest.go | 7 +- proxy/snowflake.go | 205 +++++++++++++++++++++++++++++++++++++------------ 2 files changed, 162 insertions(+), 50 deletions(-) diff --git a/probetest/probetest.go b/probetest/probetest.go index 1d2d6ef..70032da 100644 --- a/probetest/probetest.go +++ b/… [View More]probetest/probetest.go @@ -51,7 +51,12 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, return nil, fmt.Errorf("accept: NewPeerConnection: %s", err) } pc.OnDataChannel(func(dc *webrtc.DataChannel) { - close(dataChan) + dc.OnOpen(func() { + close(dataChan) + }) + dc.OnClose(func() { + dc.Close() + }) }) err = pc.SetRemoteDescription(*sdp) diff --git a/proxy/snowflake.go b/proxy/snowflake.go index 276ebed..0df0d17 100644 --- a/proxy/snowflake.go +++ b/proxy/snowflake.go @@ -352,7 +352,7 @@ func datachannelHandler(conn *webRTCConn, remoteAddr net.Addr) { // candidates is complete and the answer is available in LocalDescription. // Installs an OnDataChannel callback that creates a webRTCConn and passes it to // datachannelHandler. -func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, +func makePeerConnection(offering bool, sdp *webrtc.SessionDescription, config webrtc.Configuration, dataChan chan struct{}, handler func(conn *webRTCConn, remoteAddr net.Addr)) (*webrtc.PeerConnection, error) { @@ -361,67 +361,99 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, if err != nil { return nil, fmt.Errorf("accept: NewPeerConnection: %s", err) } - pc.OnDataChannel(func(dc *webrtc.DataChannel) { - log.Println("OnDataChannel") - close(dataChan) - pr, pw := io.Pipe() - conn := &webRTCConn{pc: pc, dc: dc, pr: pr} + if offering { + offer, err := pc.CreateOffer(nil) + // TODO: Potentially timeout and retry if ICE isn't working. + if err != nil { + log.Println("Failed to prepare offer", err) + pc.Close() + return nil, err + } + log.Println("WebRTC: Created offer") + err = pc.SetLocalDescription(offer) + if err != nil { + log.Println("Failed to prepare offer", err) + pc.Close() + return nil, err + } + log.Println("WebRTC: Set local description") + dc, err := pc.CreateDataChannel("test", &webrtc.DataChannelInit{}) + if err != nil { + log.Printf("CreateDataChannel ERROR: %s", err) + return nil, err + } dc.OnOpen(func() { - log.Println("OnOpen channel") + log.Println("WebRTC: DataChannel.OnOpen") + close(dataChan) }) dc.OnClose(func() { - conn.lock.Lock() - defer conn.lock.Unlock() - log.Println("OnClose channel") - conn.dc = nil + log.Println("WebRTC: DataChannel.OnClose") dc.Close() - pw.Close() }) - dc.OnMessage(func(msg webrtc.DataChannelMessage) { - var n int - n, err = pw.Write(msg.Data) - if err != nil { - if inerr := pw.CloseWithError(err); inerr != nil { - log.Printf("close with error generated an error: %v", inerr) + } else { + pc.OnDataChannel(func(dc *webrtc.DataChannel) { + log.Println("OnDataChannel") + close(dataChan) + + pr, pw := io.Pipe() + conn := &webRTCConn{pc: pc, dc: dc, pr: pr} + + dc.OnOpen(func() { + log.Println("OnOpen channel") + }) + dc.OnClose(func() { + conn.lock.Lock() + defer conn.lock.Unlock() + log.Println("OnClose channel") + conn.dc = nil + dc.Close() + pw.Close() + }) + dc.OnMessage(func(msg webrtc.DataChannelMessage) { + var n int + n, err = pw.Write(msg.Data) + if err != nil { + if inerr := pw.CloseWithError(err); inerr != nil { + log.Printf("close with error generated an error: %v", inerr) + } } - } - if n != len(msg.Data) { - panic("short write") - } - }) - - go handler(conn, conn.RemoteAddr()) - }) + if n != len(msg.Data) { + panic("short write") + } + }) - err = pc.SetRemoteDescription(*sdp) - if err != nil { - if inerr := pc.Close(); inerr != nil { - log.Printf("unable to call pc.Close after pc.SetRemoteDescription with error: %v", inerr) + go handler(conn, conn.RemoteAddr()) + }) + err = pc.SetRemoteDescription(*sdp) + if err != nil { + if inerr := pc.Close(); inerr != nil { + log.Printf("unable to call pc.Close after pc.SetRemoteDescription with error: %v", inerr) + } + return nil, fmt.Errorf("accept: SetRemoteDescription: %s", err) } - return nil, fmt.Errorf("accept: SetRemoteDescription: %s", err) - } - log.Println("sdp offer successfully received.") + log.Println("sdp offer successfully received.") - log.Println("Generating answer...") - answer, err := pc.CreateAnswer(nil) - // blocks on ICE gathering. we need to add a timeout if needed - // not putting this in a separate go routine, because we need - // SetLocalDescription(answer) to be called before sendAnswer - if err != nil { - if inerr := pc.Close(); inerr != nil { - log.Printf("ICE gathering has generated an error when calling pc.Close: %v", inerr) + log.Println("Generating answer...") + answer, err := pc.CreateAnswer(nil) + // blocks on ICE gathering. we need to add a timeout if needed + // not putting this in a separate go routine, because we need + // SetLocalDescription(answer) to be called before sendAnswer + if err != nil { + if inerr := pc.Close(); inerr != nil { + log.Printf("ICE gathering has generated an error when calling pc.Close: %v", inerr) + } + return nil, err } - return nil, err - } - err = pc.SetLocalDescription(answer) - if err != nil { - if err = pc.Close(); err != nil { - log.Printf("pc.Close after setting local description returned : %v", err) + err = pc.SetLocalDescription(answer) + if err != nil { + if err = pc.Close(); err != nil { + log.Printf("pc.Close after setting local description returned : %v", err) + } + return nil, err } - return nil, err } return pc, nil @@ -435,7 +467,7 @@ func runSession(sid string) { return } dataChan := make(chan struct{}) - pc, err := makePeerConnectionFromOffer(offer, config, dataChan, datachannelHandler) + pc, err := makePeerConnection(false, offer, config, dataChan, datachannelHandler) if err != nil { log.Printf("error making WebRTC connection: %s", err) retToken() @@ -535,6 +567,11 @@ func main() { updateNATType(config.ICEServers) log.Printf("NAT type: %s", currentNATType) + // use probetest to determine NAT compatability + for { + testThroughput(config, "https://snowflake-broker.torproject.net:8443") + } + for { getToken() sessionID := genSessionID() @@ -542,6 +579,76 @@ func main() { } } +func testThroughput(config webrtc.Configuration, probeURL string) { + + var err error + + probe := new(SignalingServer) + probe.transport = http.DefaultTransport.(*http.Transport) + broker.transport.(*http.Transport).ResponseHeaderTimeout = 30 * time.Second + probe.url, err = url.Parse(probeURL) + if err != nil { + log.Printf("Error parsing url: %s", err.Error()) + } + probePath := probe.url.ResolveReference(&url.URL{Path: "probe"}) + + // create offer + dataChan := make(chan struct{}) + pc, err := makePeerConnection(true, nil, config, dataChan, func(conn *webRTCConn, addr net.Addr) { conn.Close() }) + if err != nil { + log.Printf("error making WebRTC connection: %s", err) + return + } + + offer := pc.LocalDescription() + sdp, err := util.SerializeSessionDescription(offer) + if err != nil { + log.Printf("Error encoding probe message: %s", err.Error()) + return + } + + // send offer + body, err := messages.EncodePollResponse(sdp, true, "") + if err != nil { + log.Printf("Error encoding probe message: %s", err.Error()) + return + } + log.Println(string(body)) + resp, err := probe.Post(probePath.String(), bytes.NewBuffer(body)) + if err != nil { + log.Printf("error polling probe: %s", err.Error()) + return + } + + sdp, _, err = messages.DecodeAnswerRequest(resp) + if err != nil { + log.Printf("Error reading probe response: %s", err.Error()) + return + } + answer, err := util.DeserializeSessionDescription(sdp) + if err != nil { + log.Printf("Error setting answer: %s", err.Error()) + return + } + err = pc.SetRemoteDescription(*answer) + if err != nil { + log.Printf("Error setting answer: %s", err.Error()) + return + } + + log.Println("Trying to open datachannel") + select { + case <-dataChan: + log.Println("Connection successful.") + case <-time.After(dataChannelTimeout): + log.Println("Timed out waiting for client to open data channel.") + if err := pc.Close(); err != nil { + log.Printf("error calling pc.Close: %v", err) + } + } + +} + // use provided STUN server(s) to determine NAT type func updateNATType(servers []webrtc.ICEServer) { [View Less]

1 0

[snowflake/master] Fixed a bug that forced datachannel timeout
by cohosh＠torproject.org 05 Nov '20

05 Nov '20

commit b5ce2598586d729b0906d3936706dc48e82e1455 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Nov 5 12:34:24 2020 -0500 Fixed a bug that forced datachannel timeout The probetest answer response was not being sent until the select call received a datachannel timeout causing all attempted connections to fail. --- probetest/probetest.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/probetest/probetest.go b/probetest/… [View More]

1 0

[translation/communitytpo-contentspot_completed] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot_completed
by translation＠torproject.org 05 Nov '20

05 Nov '20

commit 930527ee6ef8348e1998d1175cb20c23a0c1274f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 5 21:46:09 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es-AR.po | 10798 -------------------------- contents.pot | 21990 ++++++++++++++++++++++++++++++++-------------------- 2 files changed, 13419 insertions(+), 19369 deletions(-) diff --git a/contents+es-AR.po b/contents+es-AR.po deleted file … [View More]

1 0

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 05 Nov '20

05 Nov '20

commit 1e50a0b214c8ae00d387ee2b7d298945746d8bea Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 5 19:15:02 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- he/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he/aboutTor.dtd b/he/aboutTor.dtd index 308bea44e0..13a46b9849 100644 --- a/he/aboutTor.dtd +++ b/he/aboutTor.dtd @@ -33,4 +33,4 @@ <!-- End of year 2020 Fundraising … [View More]

1 0

[manual/master] add alt attributes to images for accessibility
by gus＠torproject.org 05 Nov '20

05 Nov '20

commit 2ff958fb51a8f5d30c336d81fd742ff9f7b9338a Author: Kim Le <kle2(a)student.unimelb.edu.au> Date: Fri Oct 23 07:22:55 2020 +1100 add alt attributes to images for accessibility --- content/bridges/contents.lr | 4 ++-- content/managing-identities/contents.lr | 4 ++-- content/running-tor-browser/contents.lr | 10 +++++----- content/security-settings/contents.lr | 4 ++-- content/troubleshooting/contents.lr | 2 +- content/updating/contents.lr | … [View More]4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/content/bridges/contents.lr b/content/bridges/contents.lr index 608fc29..ec6c614 100644 --- a/content/bridges/contents.lr +++ b/content/bridges/contents.lr @@ -27,7 +27,7 @@ Because bridge addresses are not public, you will need to request them yourself. ### USING MOAT -<img class="col-md-6" align="right" hspace="5" src="../../static/images/request-a-bridge.png"> +<img class="col-md-6" align="right" hspace="5" src="../../static/images/request-a-bridge.png" alt="Request a bridge from torproject.org"> If you're starting Tor Browser for the first time, click "Configure" to open the Tor Network Settings window. After checking the checkbox "Tor is censored in my country," choose "Request a bridge from torproject.org" and click "Request a Bridge..." for BridgeDB to provide a bridge. @@ -39,7 +39,7 @@ Complete the CAPTCHA and click "Submit." Your setting will automatically be save ### ENTERING BRIDGE ADDRESSES -<img class="col-md-6" align="right" hspace="5" src="../../static/images/tor-launcher-custom-bridges.png"> +<img class="col-md-6" align="right" hspace="5" src="../../static/images/tor-launcher-custom-bridges.png" alt="Enter custom bridge addresses"> Once you have obtained some bridge addresses, you will need to enter them into Tor Launcher. diff --git a/content/managing-identities/contents.lr b/content/managing-identities/contents.lr index 7fb5bf2..228e972 100644 --- a/content/managing-identities/contents.lr +++ b/content/managing-identities/contents.lr @@ -20,7 +20,7 @@ Tor Browser centers your web experience around your relationship with the websit On the other hand, all connections to a single website address will be made over the same Tor circuit, meaning you can browse different pages of a single website in separate tabs or windows, without any loss of functionality. -<img class="col-md-6" align="right" hspace="5" src="../../static/images/circuit_full.png"> +<img class="col-md-6" align="right" hspace="5" src="../../static/images/circuit_full.png" alt="Display circuit diagram under the site information menu"> You can see a diagram of the circuit that Tor Browser is using for the current tab in the site information menu, in the URL bar. @@ -39,7 +39,7 @@ When you log in to a website over Tor, there are several points you should bear ### CHANGING IDENTITIES AND CIRCUITS -<img class="col-md-6" src="../../static/images/new_identity.png"> +<img class="col-md-6" src="../../static/images/new_identity.png" alt="New Identity and New Tor Circuit options under main menu"> Tor Browser features “New Identity” and “New Tor Circuit for this Site” options. There are also located in the main menu (hamburger menu). diff --git a/content/running-tor-browser/contents.lr b/content/running-tor-browser/contents.lr index 2de889c..708d277 100644 --- a/content/running-tor-browser/contents.lr +++ b/content/running-tor-browser/contents.lr @@ -15,7 +15,7 @@ This offers you the option to connect directly to the Tor network, or to configu ### CONNECT -<img class="col-md-6" src="../../static/images/connect.png"> +<img class="col-md-6" src="../../static/images/connect.png" alt="Click 'connect' to connect to Tor."> In most cases, choosing "Connect" will allow you to connect to the Tor network without any further configuration. Once clicked, a status bar will appear, showing Tor’s connection progress. @@ -23,22 +23,22 @@ If you are on a relatively fast connection, but this bar seems to get stuck at a ### CONFIGURE -<img class="col-md-6" src="../../static/images/configure.png"> +<img class="col-md-6" src="../../static/images/configure.png" alt="Click 'configure' to adjust network settings."> If you know that your connection is censored or uses a proxy, you should select this option. -<img class="col-md-6" src="../../static/images/proxy_question.png"> +<img class="col-md-6" src="../../static/images/proxy_question.png" alt="Select options for censored connection or proxy use."> Tor Browser will take you through a series of configuration options. -<img class="col-md-6" src="../../static/images/pluggable-transport.png"> +<img class="col-md-6" src="../../static/images/pluggable-transport.png" alt="Configure Tor bridge options"> The first checkbox asks if access to the Tor network is blocked or censored on your connection. If you do not believe this is the case, leave this unchecked. If you know your connection is censored, or you have tried and failed to connect to the Tor network and no other solutions have worked, check the checkbox. This will display the [Circumvention](../circumvention) section to configure a pluggable transport. -<img class="col-md-6" src="../../static/images/proxy.png"> +<img class="col-md-6" src="../../static/images/proxy.png" alt="Configure proxy options"> The second checkbox asks if your connection uses a proxy. In most cases, this is not necessary. You will usually know if you need to check this checkbox because the same settings will be used for other browsers on your system. If possible, ask your network administrator for guidance. diff --git a/content/security-settings/contents.lr b/content/security-settings/contents.lr index c799b30..b348822 100644 --- a/content/security-settings/contents.lr +++ b/content/security-settings/contents.lr @@ -19,14 +19,14 @@ Increasing Tor Browser's security level will stop some web pages from functionin The Security Settings can be accessed by clicking the Shield icon next to the Tor Browser URL bar. To view and adjust your Security Settings, click the 'Advanced Security Settings...' button in the shield menu. -<img class="col-lg-6" src="../../static/images/security-settings-anim.gif"> +<img class="col-lg-6" src="../../static/images/security-settings-anim.gif" alt="Click on 'Advanced Security Settings' under the shield menu."> ### SECURITY LEVELS Increasing the Security Level in the Tor Browser Security Settings will disable or partially disable certain browser features to protect against possible attacks. You can enable these settings again at any time by adjusting your Security Level. -<img class="col-lg-6" src="../../static/images/security-settings-safest.png"> +<img class="col-lg-6" src="../../static/images/security-settings-safest.png" alt="Security Level is currently set to Standard."> ###### Standard diff --git a/content/troubleshooting/contents.lr b/content/troubleshooting/contents.lr index a1b2a93..ec70570 100644 --- a/content/troubleshooting/contents.lr +++ b/content/troubleshooting/contents.lr @@ -11,7 +11,7 @@ key: 12 body: You should be able to start browsing the web using Tor Browser shortly after running the program, and clicking the “Connect” button if you are using it for the first time. -<img class="col-md-6" src="../../static/images/connect.png"> +<img class="col-md-6" src="../../static/images/connect.png" alt="Click 'Connect' to connect to Tor."> ### QUICK FIXES diff --git a/content/updating/contents.lr b/content/updating/contents.lr index 1580f56..6c5b14a 100644 --- a/content/updating/contents.lr +++ b/content/updating/contents.lr @@ -15,11 +15,11 @@ Tor Browser will prompt you to update the software once a new version has been r ### UPDATING TOR BROWSER AUTOMATICALLY - <img width="400" src="../../static/images/update1.png" /> + <img width="400" src="../../static/images/update1.png" alt="Select 'Restart to update Tor Browser' under the main menu"/> When you are prompted to update Tor Browser, click on hamburger menu (main menu), then select “Restart to update Tor browser”. - <img width="500" src="../../static/images/update4.png" /> + <img width="500" src="../../static/images/update4.png" alt="Update progress bar"/> Wait for the update to download and install, then Tor Browser will restart itself. You will now be running the latest version. [View Less]

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 05 Nov '20

05 Nov '20

commit 14f0a783ac27c9ad51d46a39cfea24a2c9d57267 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 5 13:18:39 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+et.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/contents+et.po b/contents+et.po index c458030ce0..fed1c1e694 100644 --- a/contents+et.po +++ b/contents+et.po @@ -5,6 +5,7 @@ # Madis Otenurm, 2019 # IDRASSI Mounir <… [View More]

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 05 Nov '20

05 Nov '20

commit dc04e7efd55c5661909e0451ae674eb8a66ea5d6 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 5 13:18:34 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- et/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/et/network-settings.dtd b/et/network-settings.dtd index 06167d2370..4c7ff042bf 100644 --- a/et/network-settings.dtd +++ b/et/network-settings.dtd @@ -28,7 +28,7 @@ &… [View More]

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 05 Nov '20

05 Nov '20

commit df8b233516a023949c0cdb5da26dcdd0a39b2a61 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 5 13:15:21 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/et/LC_MESSAGES/messages.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/locale/et/LC_MESSAGES/messages.po b/locale/et/LC_MESSAGES/messages.po index 5e67b39dd8..67aacb1532 100644 --- a/locale/et/LC_MESSAGES/messages.… [View More]

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 05 Nov '20

05 Nov '20

commit 614a8162d3dd8fbb4c447d7a05ff2009a4b31e04 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 5 13:15:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- et/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/et/LC_MESSAGES/bridgedb.po b/et/LC_MESSAGES/bridgedb.po index 94a0bc1152..0a438e61f4 100644 --- a/et/LC_MESSAGES/bridgedb.po +++ b/et/LC_MESSAGES/bridgedb.po @@ -13,8 +… [View More]

1 0

[tor-browser/tor-browser-83.0b1-10.0-1] Revert "Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware"
by sysrqb＠torproject.org 05 Nov '20

05 Nov '20

commit d5a27eba08000d62b712149ed5809f91f1eb8ab6 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Nov 5 01:52:53 2020 +0000 Revert "Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware" This reverts commit 49685688c006f3050f64c091563eded4466ef9ad. --- .../main/java/org/mozilla/geckoview/WebRequest.java | 18 ------------------ widget/android/WebExecutorSupport.cpp | 10 ---------- 2 files changed, 28 deletions(-) diff --git a/… [View More]mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java index 18f56abeec43..7e3aa285c5be 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java @@ -49,11 +49,6 @@ public class WebRequest extends WebMessage { */ public final @Nullable String referrer; - /** - * The value of the origin of this request. - */ - public final @Nullable String origin; - @Retention(RetentionPolicy.SOURCE) @IntDef({CACHE_MODE_DEFAULT, CACHE_MODE_NO_STORE, CACHE_MODE_RELOAD, CACHE_MODE_NO_CACHE, @@ -115,7 +110,6 @@ public class WebRequest extends WebMessage { method = builder.mMethod; cacheMode = builder.mCacheMode; referrer = builder.mReferrer; - origin = builder.mOrigin; if (builder.mBody != null) { body = builder.mBody.asReadOnlyBuffer(); @@ -132,7 +126,6 @@ public class WebRequest extends WebMessage { /* package */ String mMethod = "GET"; /* package */ int mCacheMode = CACHE_MODE_DEFAULT; /* package */ String mReferrer; - /* package */ String mOrigin; /** * Construct a Builder instance with the specified URI. @@ -212,17 +205,6 @@ public class WebRequest extends WebMessage { return this; } - /** - * Set the origin URI. - * - * @param origin A URI String - * @return This Builder instance. - */ - public @NonNull Builder origin(final @Nullable String origin) { - mOrigin = origin; - return this; - } - /** * @return A {@link WebRequest} constructed with the values from this Builder instance. */ diff --git a/widget/android/WebExecutorSupport.cpp b/widget/android/WebExecutorSupport.cpp index bb639740f013..f9f4262fb50c 100644 --- a/widget/android/WebExecutorSupport.cpp +++ b/widget/android/WebExecutorSupport.cpp @@ -390,16 +390,6 @@ nsresult WebExecutorSupport::CreateStreamLoader( MOZ_ASSERT(cookieJarSettings); nsCOMPtr<nsILoadInfo> loadInfo = channel->LoadInfo(); - - RefPtr<nsIURI> originUri; - const auto origin = req->Origin(); - if (origin) { - rv = NS_NewURI(getter_AddRefs(originUri), origin->ToString()); - NS_ENSURE_SUCCESS(rv, NS_ERROR_MALFORMED_URI); - OriginAttributes attrs = loadInfo->GetOriginAttributes(); - attrs.SetFirstPartyDomain(true, originUri); - loadInfo->SetOriginAttributes(attrs); - } loadInfo->SetCookieJarSettings(cookieJarSettings); // setup http/https specific things [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2020