August 2019 - tor-commits - lists.torproject.org

[meek/master] Make roundtrip async.
by dcf＠torproject.org 28 Aug '19

28 Aug '19

commit 108a89f60bc3b7617c0e8556cbcefefc8926d1da Author: David Fifield <david(a)bamsoftware.com> Date: Fri Feb 15 12:08:01 2019 -0700 Make roundtrip async. roundtrip doesn't need to know the ID; tack that on in the onMessage listener. --- webextension/background.js | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/webextension/background.js b/webextension/background.js index fd39273..8092352 100644 --- a/webextension/background.js +++ b/webextension/background.js @@ -79,7 +79,7 @@ function base64_encode(dec_buf) { return btoa(dec_str); } -function roundtrip(id, request) { +async function roundtrip(request) { // Process the incoming request spec and convert it into parameters to the // fetch API. Also enforce some restrictions on what kinds of requests we // are willing to make. @@ -119,28 +119,26 @@ function roundtrip(id, request) { // TODO: strip Origin header? // TODO: proxy } catch (error) { - port.postMessage({id, response: {error: `request spec failed valiation: ${error.message}`}}); - return; + return {error: `request spec failed valiation: ${error.message}`}; } - // Now actually do the request and send the result back to the native - // process. - fetch(url, init) - .then(resp => resp.arrayBuffer().then(body => ({ - status: resp.status, - body: base64_encode(body), - }))) + // Now actually do the request and build a response object. + try { + let resp = await fetch(url, init); + let body = await resp.arrayBuffer(); + return {status: resp.status, body: base64_encode(body)}; + } catch (error) { // Convert any errors into an error response. - .catch(error => ({error: error.message})) - // Send the response (success or failure) back to the requester, tagged - // with its ID. - .then(response => port.postMessage({id, response})); + return {error: error.message}; + } } port.onMessage.addListener((message) => { switch (message.command) { case "roundtrip": - roundtrip(message.id, message.request); + // Do a roundtrip and send the result back to the native process. + roundtrip(message.request) + .then(response => port.postMessage({id: message.id, response})); break; case "report-address": // Tell meek-client where our subprocess (the one that actually

1 0

[meek/master] Minimal draft of WebExtension port of meek-http-helper.
by dcf＠torproject.org 28 Aug '19

28 Aug '19

commit 6ea203b85aa8d98548ff6ef7cff8ce501ee401c3 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Feb 13 19:30:30 2019 -0700 Minimal draft of WebExtension port of meek-http-helper. Doesn't yet: * allow control of the Host header (domain fronting) * support a proxy --- webextension/README | 51 +++++ webextension/background.js | 159 +++++++++++++++ webextension/manifest.json | 22 ++ webextension/meek.http.helper.json | 9 + webextension/native/endian_amd64.go | 8 + webextension/native/main.go | 387 ++++++++++++++++++++++++++++++++++++ 6 files changed, 636 insertions(+) diff --git a/webextension/README b/webextension/README new file mode 100644 index 0000000..a728842 --- /dev/null +++ b/webextension/README @@ -0,0 +1,51 @@ +Installation guide for the meek-http-helper WebExtension. + +The WebExtension is made of two parts: the extension and the native +application. The extension itself is JavaScript, runs in the browser, +and is responsible for making HTTP requests as instructed. The native +application runs as a subprocess of the browser; its job is to open a +localhost socket and act as an intermediary between the extension and +meek-client, because the extension cannot open a socket by itself. + +These instructions require Firefox 65. + +1. Compile the native application. + cd native && go build + +2. Edit meek.http.helper.json and set the "path" field to the path to + the native application. + "path": "/where/you/installed/native", + +3. Copy the edited meek.http.helper.json file to the OS-appropriate + location. + # macOS + mkdir -p ~/"Library/Application Support/Mozilla/NativeMessagingHosts/" + cp meek.http.helper.json ~/"Library/Application Support/Mozilla/NativeMessagingHosts/" + # other Unix + mkdir -p ~/.mozilla/native-messaging-hosts/ + cp meek.http.helper.json ~/.mozilla/native-messaging-hosts/ + The meek.http.helper.json file is called the "host manifest" or "app + manifest" and it tells the browser where to find the native part of + the WebExtension. More information: + https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Nati… + +4. Run Firefox in a terminal so you can see its stdout. In Firefox, go + to about:config and set + browser.dom.window.dump.enabled=true + This enables the extension to write to stdout. + +5. In Firefox, go to about:debugging and click "Load Temporary + Add-on...". Find manifest.json and click Open. + More information: + https://developer.mozilla.org/en-US/docs/Tools/about:debugging#Loading_a_te… + In the terminal, you should see a line like this, with a random port + number in place of XXXX: + meek-http-helper: listen 127.0.0.1:XXXX + +Now the extension is running and ready to start making requests. You can +run "meek-client --helper", passing it the correct port number XXXX: + UseBridges 1 + ClientTransportPlugin meek exec ./meek-client --helper 127.0.0.1:XXXX --log meek-client.log + Bridge meek 0.0.2.0:1 url=https://meek.bamsoftware.com/ + +To debug, open the browser console with Ctrl+Shift+J. diff --git a/webextension/background.js b/webextension/background.js new file mode 100644 index 0000000..ba56e7f --- /dev/null +++ b/webextension/background.js @@ -0,0 +1,159 @@ +// This program is the browser part of the meek-http-helper WebExtension. Its +// purpose is to receive and execute commands from the native part. It +// understands two commands: "report-address" and "roundtrip". +// +// +// { +// "command": "report-address", +// "address": "127.0.0.1:XXXX" +// } +// The "report-address" command causes the extension to print to a line to +// stdout: +// meek-http-helper: listen 127.0.0.1:XXXX +// meek-client looks for this line to find out where the helper is listening. +// For this to work, you must set the pref browser.dom.window.dump.enabled. +// +// +// { +// "command": "roundtrip", +// "id": "...ID..." +// "request": { +// "method": "POST", +// "url": "https://allowed.example/", +// "header": { +// "Host": "forbidden.example", +// "X-Session-Id": ..., +// ... +// }, +// "proxy": { +// "type": "http", +// "host": "proxy.example", +// "port": 8080 +// }, +// "body": "...base64..." +// } +// } +// The "roundtrip" command causes the extension to make an HTTP request +// according to the given specification. It then sends a response back to the +// native part: +// { +// "id": "...ID...", +// "response": { +// "status": 200, +// "body": "...base64..." +// } +// } +// Or, if an error occurred: +// { +// "id": "...ID...", +// "response": { +// "error": "...error message..." +// } +// } +// The "id" field in the response will be the same as the one in the request, +// because that is what enables the native part to match up requests and +// responses. + +let port = browser.runtime.connectNative("meek.http.helper"); + +// Decode a base64-encoded string into an ArrayBuffer. +function base64_decode(enc_str) { + // First step is to decode the base64. atob returns a byte string; i.e., a + // string of 16-bit characters, each of whose character codes is restricted + // to the range 0x00–0xff. + let dec_str = atob(enc_str); + // Next, copy those character codes into an array of 8-bit elements. + let dec_array = new Uint8Array(dec_str.length); + for (let i = 0; i < dec_str.length; i++) { + dec_array[i] = dec_str.charCodeAt(i); + } + return dec_array.buffer; +} + +// Encode an ArrayBuffer into a base64-encoded string. +function base64_encode(dec_buf) { + let dec_array = new Uint8Array(dec_buf); + // Copy the elements of the array into a new byte string. + let dec_str = String.fromCharCode(...dec_array); + // base64-encode the byte string. + return btoa(dec_str); +} + +function roundtrip(id, request) { + // Process the incoming request spec and convert it into parameters to the + // fetch API. Also enforce some restrictions on what kinds of requests we + // are willing to make. + let url; + let init = {}; + try { + if (request.url == null) { + throw new Error("missing \"url\""); + } + if (!(request.url.startsWith("http://") || request.url.startsWith("https://"))) { + throw new Error("only http and https URLs are allowed"); + } + url = request.url; + + if (request.method !== "POST") { + throw new Error("only POST is allowed"); + } + init.method = request.method; + + if (request.header != null) { + init.headers = request.header; + } + + if (request.body != null && request.body !== "") { + init.body = base64_decode(request.body); + } + + // TODO: Host header + // TODO: strip Origin header? + // TODO: proxy + } catch (error) { + port.postMessage({id, response: {error: `request spec failed valiation: ${error.message}`}}); + return; + } + + // Now actually do the request and send the result back to the native + // process. + fetch(url, init) + .then(resp => resp.arrayBuffer().then(body => ({ + status: resp.status, + body: base64_encode(body), + }))) + // Convert any errors into an error response. + .catch(error => ({error: error.message})) + // Send the response (success or failure) back to the requester, tagged + // with its ID. + .then(response => port.postMessage({id, response})); +} + +port.onMessage.addListener((message) => { + switch (message.command) { + case "roundtrip": + roundtrip(message.id, message.request); + break; + case "report-address": + // Tell meek-client where our subprocess (the one that actually + // opens a socket) is listening. For the dump call to have any + // effect, the pref browser.dom.window.dump.enabled must be true. + // This output is supposed to be line-oriented, so ignore it if the + // address from the native part contains a newline. + if (message.address != null && message.address.indexOf("\n") == -1) { + dump(`meek-http-helper: listen ${message.address}\n`); + } + break; + default: + console.log(`${browser.runtime.id}: received unknown command: ${message.command}`); + } +}); + +port.onDisconnect.addListener((p) => { + // https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/… + // "Note that in Google Chrome port.error is not supported: instead, use + // runtime.lastError to get the error message." + if (p.error) { + console.log(`${browser.runtime.id}: disconnected because of error: ${p.error.message}`); + } +}); diff --git a/webextension/manifest.json b/webextension/manifest.json new file mode 100644 index 0000000..2d44d87 --- /dev/null +++ b/webextension/manifest.json @@ -0,0 +1,22 @@ +{ + "manifest_version": 2, + "name": "meek HTTP helper", + "description": "Makes HTTP requests on behalf of meek-client.", + "version": "1.0", + + "browser_specific_settings": { + "gecko": { + "id": "meek-http-helper(a)bamsoftware.com" + } + }, + + "background": { + "scripts": ["background.js"] + }, + + "permissions": [ + "nativeMessaging", + "https://*/*", + "http://*/*" + ] +} diff --git a/webextension/meek.http.helper.json b/webextension/meek.http.helper.json new file mode 100644 index 0000000..269d5f8 --- /dev/null +++ b/webextension/meek.http.helper.json @@ -0,0 +1,9 @@ +{ + "name": "meek.http.helper", + "description": "Native half of meek-http-helper.", + "path": "/path/to/native", + "type": "stdio", + "allowed_extensions": [ + "meek-http-helper(a)bamsoftware.com" + ] +} diff --git a/webextension/native/endian_amd64.go b/webextension/native/endian_amd64.go new file mode 100644 index 0000000..6a1e44e --- /dev/null +++ b/webextension/native/endian_amd64.go @@ -0,0 +1,8 @@ +// The WebExtension browser–app protocol uses native-endian length prefixes :/ +// https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Nati… + +package main + +import "encoding/binary" + +var NativeEndian = binary.LittleEndian diff --git a/webextension/native/main.go b/webextension/native/main.go new file mode 100644 index 0000000..4c66993 --- /dev/null +++ b/webextension/native/main.go @@ -0,0 +1,387 @@ +// This program is the native part of the meek-http-helper WebExtension. Its +// purpose is to open a localhost TCP socket for communication with meek-client +// in its --helper mode (the WebExtension cannot open a socket on its own). This +// program is also in charge of multiplexing the many incoming socket +// connections over the single shared stdio stream to/from the WebExtension. + +package main + +import ( + "crypto/rand" + "encoding/binary" + "encoding/hex" + "encoding/json" + "fmt" + "io" + "math" + "net" + "os" + "os/signal" + "sync" + "syscall" + "time" +) + +const ( + // How long we'll wait for meek-client to send a request spec or receive + // a response spec over the socket. This can be short because it's all + // localhost communication. + localReadTimeout = 2 * time.Second + localWriteTimeout = 2 * time.Second + + // How long we'll wait, after sending a request spec to the browser, for + // the browser to come back with a response. This is meant to be + // generous; its purpose is to allow reclaiming memory in case the + // browser somehow drops a request spec. + roundTripTimeout = 120 * time.Second + + // Self-defense against a malfunctioning meek-client. We'll refuse to + // read encoded responses that are longer than this. + maxRequestSpecLength = 1000000 + + // Self-defense against a malfunctioning browser. We'll refuse to + // receive WebExtension messages that are longer than this. + maxWebExtensionMessageLength = 1000000 +) + +// We receive multiple (possibly concurrent) connections over our listening +// socket, and we must multiplex all their requests/responses to/from the +// browser over the single shared stdio stream. When handleConn sends a +// webExtensionRoundTripRequest to the browser, creates a channel to receive the +// response, and stores the ID–channel mapping in requestResponseMap. When +// inFromBrowserLoop receives a webExtensionRoundTripResponse from the browser, +// it is tagged with the same ID as the corresponding request. inFromBrowserLoop +// looks up the matching channel and sends the response over it. +var requestResponseMap = make(map[string]chan<- *responseSpec) +var requestResponseMapLock sync.Mutex + +// A specification of an HTTP request, as received via the socket from +// "meek-client --helper". +type requestSpec struct { + Method string `json:"method,omitempty"` + URL string `json:"url,omitempty"` + Header map[string]string `json:"header,omitempty"` + Body []byte `json:"body,omitempty"` + Proxy *proxySpec `json:"proxy,omitempty"` +} + +type proxySpec struct { + Type string `json:"type"` + Host string `json:"host"` + Port string `json:"port"` +} + +// A specification of an HTTP request or an error, as sent via the socket to +// "meek-client --helper". +type responseSpec struct { + Error string `json:"error,omitempty"` + Status int `json:"status,omitempty"` + Body []byte `json:"body,omitempty"` +} + +// A "roundtrip" command sent out to the browser over the stdout stream. It +// encapsulates a requestSpec as received from the socket, plus +// command:"roundtrip" and an ID, which used to match up the eventual reply with +// this request. +// +// command:"roundtrip" is to disambiguate with the other command we may send, +// "report-address". +type webExtensionRoundTripRequest struct { + Command string `json:"command"` // "roundtrip" + ID string `json:"id"` + Request *requestSpec `json:"request"` +} + +// A message received from the the browser over the stdin stream. It +// encapsulates a responseSpec along with the ID of the webExtensionResponse +// that resulted in this response. +type webExtensionRoundTripResponse struct { + ID string `json:"id"` + Response *responseSpec `json:"response"` +} + +// Read a requestSpec (receive from "meek-client --helper"). +// +// The meek-client protocol is coincidentally similar to the WebExtension stdio +// protocol: a 4-byte length, followed by a JSON object of that length. The only +// difference is the byte order of the length: meek-client's is big-endian, +// while WebExtension's is native-endian. +func readRequestSpec(r io.Reader) (*requestSpec, error) { + var length uint32 + err := binary.Read(r, binary.BigEndian, &length) + if err != nil { + return nil, err + } + if length > maxRequestSpecLength { + return nil, fmt.Errorf("request spec is too long: %d (max %d)", length, maxRequestSpecLength) + } + + encodedSpec := make([]byte, length) + _, err = io.ReadFull(r, encodedSpec) + if err != nil { + return nil, err + } + + spec := new(requestSpec) + err = json.Unmarshal(encodedSpec, spec) + if err != nil { + return nil, err + } + + return spec, nil +} + +// Write a responseSpec (send to "meek-client --helper"). +func writeResponseSpec(w io.Writer, spec *responseSpec) error { + encodedSpec, err := json.Marshal(spec) + if err != nil { + panic(err) + } + + length := len(encodedSpec) + if length > math.MaxUint32 { + return fmt.Errorf("response spec is too long to represent: %d", length) + } + err = binary.Write(w, binary.BigEndian, uint32(length)) + if err != nil { + return err + } + + _, err = w.Write(encodedSpec) + if err != nil { + return err + } + + return nil +} + +// Receive a WebExtension message. +// https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Nati… +func recvWebExtensionMessage(r io.Reader) ([]byte, error) { + var length uint32 + err := binary.Read(r, NativeEndian, &length) + if err != nil { + return nil, err + } + if length > maxWebExtensionMessageLength { + return nil, fmt.Errorf("WebExtension message is too long: %d (max %d)", length, maxWebExtensionMessageLength) + } + message := make([]byte, length) + _, err = io.ReadFull(r, message) + if err != nil { + return nil, err + } + return message, nil +} + +// Send a WebExtension message. +// https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Nati… +func sendWebExtensionMessage(w io.Writer, message []byte) error { + length := len(message) + if length > math.MaxUint32 { + return fmt.Errorf("WebExtension message is too long to represent: %d", length) + } + err := binary.Write(w, NativeEndian, uint32(length)) + if err != nil { + return err + } + _, err = w.Write(message) + return err +} + +// Handle a socket connection, which is used for one request–response roundtrip +// through the browser. We read a responseSpec from the socket and wrap it in a +// webExtensionRoundTripRequest, tagging it with a random ID. We register the ID +// in requestResponseMap and forward the webExtensionRoundTripRequest to the +// browser. Then we wait for the browser to send back a +// webExtensionRoundTripResponse, which actually happens in inFromBrowserLoop. +// inFromBrowserLoop uses the ID to find this goroutine again. +func handleConn(conn net.Conn, outToBrowserChan chan<- []byte) error { + defer conn.Close() + + err := conn.SetReadDeadline(time.Now().Add(localReadTimeout)) + if err != nil { + return err + } + req, err := readRequestSpec(conn) + if err != nil { + return err + } + + // Generate an ID that will allow us to match a response to this request. + idRaw := make([]byte, 8) + _, err = rand.Read(idRaw) + if err != nil { + return err + } + id := hex.EncodeToString(idRaw) + + // This is the channel over which inFromBrowserLoop will send the + // response. Register it in requestResponseMap to enable + // inFromBrowserLoop to match the corresponding response to it. + responseSpecChan := make(chan *responseSpec) + requestResponseMapLock.Lock() + requestResponseMap[id] = responseSpecChan + requestResponseMapLock.Unlock() + + // Encode and send the message to the browser. + message, err := json.Marshal(&webExtensionRoundTripRequest{ + Command: "roundtrip", + ID: id, + Request: req, + }) + if err != nil { + panic(err) + } + outToBrowserChan <- message + + // Now wait for the browser to send the response back to us. + // inFromBrowserLoop will find the proper channel by looking up the ID + // in requestResponseMap. + timeout := time.NewTimer(roundTripTimeout) + select { + case resp := <-responseSpecChan: + timeout.Stop() + // Encode the response send it back out over the socket. + err = conn.SetWriteDeadline(time.Now().Add(localWriteTimeout)) + if err != nil { + return err + } + err = writeResponseSpec(conn, resp) + if err != nil { + return err + } + case <-timeout.C: + // But don't wait forever, so as to allow reclaiming memory in + // case of a malfunction elsewhere. + requestResponseMapLock.Lock() + delete(requestResponseMap, id) + requestResponseMapLock.Unlock() + } + + return nil +} + +// Receive socket connections and dispatch them to handleConn. +func acceptLoop(ln net.Listener, outToBrowserChan chan<- []byte) error { + for { + conn, err := ln.Accept() + if err != nil { + if err, ok := err.(net.Error); ok && err.Temporary() { + continue + } + return err + } + go func() { + err := handleConn(conn, outToBrowserChan) + if err != nil { + fmt.Fprintln(os.Stderr, "handling socket request:", err) + } + }() + } +} + +// Read messages from the browser over stdin, and send them (matching using the +// ID field) over the channel that corresponds to the original request. This is +// the only function allowed to read from stdin. +func inFromBrowserLoop() error { + for { + message, err := recvWebExtensionMessage(os.Stdin) + if err != nil { + return err + } + var resp webExtensionRoundTripResponse + err = json.Unmarshal(message, &resp) + if err != nil { + return err + } + + // Look up what channel (previously registered in + // requestResponseMap by handleConn) should receive the + // response. + requestResponseMapLock.Lock() + responseSpecChan, ok := requestResponseMap[resp.ID] + delete(requestResponseMap, resp.ID) + requestResponseMapLock.Unlock() + + if !ok { + // Either the browser made up an ID that we never sent + // it, or (more likely) it took too long and handleConn + // stopped waiting. Just drop the response on the floor. + continue + } + responseSpecChan <- resp.Response + // Each socket Conn is good for one request–response exchange only. + close(responseSpecChan) + } +} + +// Read messages from outToBrowserChan and send them to the browser over the +// stdout channel. This is the only function allowed to write to stdout. +func outToBrowserLoop(outToBrowserChan <-chan []byte) error { + for message := range outToBrowserChan { + err := sendWebExtensionMessage(os.Stdout, message) + if err != nil { + return err + } + } + return nil +} + +func main() { + ln, err := net.Listen("tcp", "127.0.0.1:0") + if err != nil { + fmt.Fprintln(os.Stderr, err) + os.Exit(1) + } + defer ln.Close() + + outToBrowserChan := make(chan []byte) + signalChan := make(chan os.Signal) + errChan := make(chan error) + + // Goroutine that handles new socket connections. + go func() { + errChan <- acceptLoop(ln, outToBrowserChan) + }() + + // Goroutine that writes WebExtension messages to stdout. + go func() { + errChan <- outToBrowserLoop(outToBrowserChan) + }() + + // Goroutine that reads WebExtension messages from stdin. + go func() { + err := inFromBrowserLoop() + if err == io.EOF { + // EOF is not an error. + err = nil + } + errChan <- err + }() + + // Tell the browser our listening socket address. + message, err := json.Marshal(struct { + Command string `json:"command"` + Address string `json:"address"` + }{ + Command: "report-address", + Address: ln.Addr().String(), + }) + if err != nil { + panic(err) + } + outToBrowserChan <- message + + // We quit when we receive a SIGTERM, or when our stdin is closed, or + // some irrecoverable error happens. + // https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Nati… + signal.Notify(signalChan, syscall.SIGTERM) + select { + case <-signalChan: + case err := <-errChan: + if err != nil { + fmt.Fprintln(os.Stderr, err) + } + } +}

1 0

[meek/master] Allow overriding the request headers.
by dcf＠torproject.org 28 Aug '19

28 Aug '19

commit 0a0ab758b0442ba5561d0a0fff343604e794ef72 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Feb 15 13:14:43 2019 -0700 Allow overriding the request headers. The fetch API itself doesn't let you change certain headers, notably including Host which we need for domain fronting. So instead, we set an onBeforeSendHeaders listener, with a lock to cause this shared global setting to be used by only one request at a time. --- webextension/background.js | 78 +++++++++++++++++++++++++++++++++++++++++++--- webextension/manifest.json | 2 ++ 2 files changed, 75 insertions(+), 5 deletions(-) diff --git a/webextension/background.js b/webextension/background.js index 8092352..1ffb828 100644 --- a/webextension/background.js +++ b/webextension/background.js @@ -79,6 +79,27 @@ function base64_encode(dec_buf) { return btoa(dec_str); } +// A Mutex's lock function returns a promise that resolves to a function which, +// when called, allows the next call to lock to proceed. +// https://stackoverflow.com/a/51086893 +function Mutex() { + // Initially unlocked. + let p = Promise.resolve(); + this.lock = function() { + let old_p = p; + let unlock; + // Make a new promise for the *next* caller to wait on. Copy the new + // promise's resolve function into the outer scope as "unlock". + p = new Promise(resolve => unlock = resolve); + // The caller gets a promise that allows them to unlock the *next* + // caller. + return old_p.then(() => unlock); + } +} + +// Enforces exclusive access for onBeforeSendHeaders listeners. +const headersMutex = new Mutex(); + async function roundtrip(request) { // Process the incoming request spec and convert it into parameters to the // fetch API. Also enforce some restrictions on what kinds of requests we @@ -100,9 +121,8 @@ async function roundtrip(request) { } init.method = request.method; - if (request.header != null) { - init.headers = request.header; - } + // Don't set init.headers; that handled in the onBeforeSendHeaders + // listener. if (request.body != null && request.body !== "") { init.body = base64_decode(request.body); @@ -115,21 +135,69 @@ async function roundtrip(request) { // Don't follow redirects (we'll get resp.status:0 if there is one). init.redirect = "manual"; - // TODO: Host header // TODO: strip Origin header? // TODO: proxy } catch (error) { return {error: `request spec failed valiation: ${error.message}`}; } - // Now actually do the request and build a response object. + // We need to use an onBeforeSendHeaders to override certain header fields, + // including Host (passing them to fetch in init.headers does not work). But + // onBeforeSendHeaders is a global setting (applies to all requests) and we + // need to be able to set different headers per request. We make it so that + // any onBeforeSendHeaders listener is only used for a single request, by + // acquiring a lock here and releasing it within the listener itself. The + // lock is acquired and released before any network communication happens; + // i.e., it's fast. + let headersUnlock = await headersMutex.lock(); + let headersCalled = false; + function headersFn(details) { + try { + // Sanity assertion: any given listener is called at most once. + if (headersCalled) { + throw new Error("headersFn called more than once"); + } + headersCalled = true; + + // Convert request.header from object to array form. + // https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/… + let headers = Object.entries(request.header != null ? request.header : {}) + .map(x => ({name: x[0], value: x[1]})); + // Remove all browser headers that conflict with requested headers. + let overrides = Object.fromEntries(headers.map(x => [x.name.toLowerCase(), true])); + let browserHeaders = details.requestHeaders.filter(x => !(x.name.toLowerCase() in overrides)); + return {requestHeaders: browserHeaders.concat(headers)}; + } finally { + // Now that the listener has been called, remove it and release the + // lock to allow the next request to set different listener. + browser.webRequest.onBeforeSendHeaders.removeListener(headersFn); + headersUnlock(); + } + }; + try { + // Set our listener that overrides the headers for this request. + // https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/… + browser.webRequest.onBeforeSendHeaders.addListener( + headersFn, + {"urls": ["http://*/*", "https://*/*"]}, + ["blocking", "requestHeaders"] + ); + + // Now actually do the request and build a response object. let resp = await fetch(url, init); let body = await resp.arrayBuffer(); return {status: resp.status, body: base64_encode(body)}; } catch (error) { // Convert any errors into an error response. return {error: error.message}; + } finally { + // With certain errors (e.g. an invalid URL), the onBeforeSendHeaders + // listener may never get called, and therefore never release its lock. + // Ensure that locks are released and listeners removed in any case. + // It's safe to release a lock or remove a listener more than once. + browser.webRequest.onBeforeSendHeaders.removeListener(headersFn); + headersUnlock(); } } diff --git a/webextension/manifest.json b/webextension/manifest.json index 2d44d87..a079833 100644 --- a/webextension/manifest.json +++ b/webextension/manifest.json @@ -16,6 +16,8 @@ "permissions": [ "nativeMessaging", + "webRequest", + "webRequestBlocking", "https://*/*", "http://*/*" ]

1 0

[meek/master] Set some safety defaults for fetch.
by dcf＠torproject.org 28 Aug '19

28 Aug '19

commit c9839e85b66793b6209abf820c2cda8c07ee2157 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Feb 15 14:29:54 2019 -0700 Set some safety defaults for fetch. cache: "no-store" credentials: "omit" redirect: "manual" cache: "no-store" adds these headers, which seem fine: Cache-Control: no-cache Pragma: no-cache --- webextension/background.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/webextension/background.js b/webextension/background.js index ba56e7f..fd39273 100644 --- a/webextension/background.js +++ b/webextension/background.js @@ -83,6 +83,7 @@ function roundtrip(id, request) { // Process the incoming request spec and convert it into parameters to the // fetch API. Also enforce some restrictions on what kinds of requests we // are willing to make. + // https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/… let url; let init = {}; try { @@ -107,6 +108,13 @@ function roundtrip(id, request) { init.body = base64_decode(request.body); } + // Do not read nor write from the browser's HTTP cache. + init.cache = "no-store"; + // Don't send cookies. + init.credentials = "omit"; + // Don't follow redirects (we'll get resp.status:0 if there is one). + init.redirect = "manual"; + // TODO: Host header // TODO: strip Origin header? // TODO: proxy

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 28 Aug '19

28 Aug '19

commit fef47548d816bff6b7774e3dbf3f33d2867e4d61 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 28 05:54:12 2019 +0000 Update translations for tails-onioncircuits_completed --- ar/onioncircuits.pot | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/ar/onioncircuits.pot b/ar/onioncircuits.pot index fa1552371..222baedc2 100644 --- a/ar/onioncircuits.pot +++ b/ar/onioncircuits.pot @@ -3,18 +3,19 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Ahmed Alhammadi <6622227a(a)gmail.com>, 2016 +# Ahmed A. <6622227a(a)gmail.com>, 2016 # ButterflyOfFire, 2018 # crash x <xmr.crashx(a)gmail.com>, 2016 -# Khaled Hosny <khaledhosny(a)eglug.org>, 2018 +# Khaled Hosny, 2018 # Singapore Goldindor, 2016 +# yahia zakaria <yahiazak(a)hotmail.com>, 2019 msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-03 13:00+0000\n" -"PO-Revision-Date: 2018-07-03 13:30+0000\n" -"Last-Translator: Khaled Hosny <khaledhosny(a)eglug.org>\n" +"PO-Revision-Date: 2019-08-28 05:37+0000\n" +"Last-Translator: yahia zakaria <yahiazak(a)hotmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,67 +25,67 @@ msgstr "" #: ../onioncircuits:81 msgid "You are not connected to Tor yet..." -msgstr "لست متصلا بعدُ بشبكة تور…" +msgstr "" #: ../onioncircuits:95 msgid "Onion Circuits" -msgstr "دوائر البصلة" +msgstr "" #: ../onioncircuits:125 msgid "Circuit" -msgstr "دائرة" +msgstr "" #: ../onioncircuits:126 msgid "Status" -msgstr "الحالة" +msgstr "" #: ../onioncircuits:142 msgid "Click on a circuit for more detail about its Tor relays." -msgstr "انقر على دائرة لمزيد من التفاصيل حول تحويلات تور الخاصة بها." +msgstr "" #: ../onioncircuits:221 msgid "The connection to Tor was lost..." -msgstr "فقد الاتصال بتور…" +msgstr "" #: ../onioncircuits:317 msgid "..." -msgstr "..." +msgstr "" #: ../onioncircuits:343 #, c-format msgid "%s: %s" -msgstr "%s: %s" +msgstr "" #: ../onioncircuits:554 msgid "GeoIP database unavailable. No country information will be displayed." -msgstr "قاعدة بيانات GeoIP غير متوفرة. لن تعرض أي معلومة عن البلدان." +msgstr "" #: ../onioncircuits:585 #, c-format msgid "%s (%s)" -msgstr "%s (%s)" +msgstr "" #: ../onioncircuits:590 #, c-format msgid "%.2f Mb/s" -msgstr "%.2f ميجابايت/ثانية" +msgstr "" #: ../onioncircuits:592 ../onioncircuits:593 ../onioncircuits:594 msgid "Unknown" -msgstr "غير معروف" +msgstr "" #: ../onioncircuits:607 msgid "Fingerprint:" -msgstr "البصمة:" +msgstr "" #: ../onioncircuits:608 msgid "Published:" -msgstr "نُشِر في:" +msgstr "" #: ../onioncircuits:609 msgid "IP:" -msgstr "عنوان الإنترنت (IP):" +msgstr "" #: ../onioncircuits:610 msgid "Bandwidth:" -msgstr "سرعة الإنترنت:" +msgstr ""

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 28 Aug '19

28 Aug '19

commit 50370a5caa127f4b2a086cc959dfa164abbf4c23 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 28 05:54:06 2019 +0000 Update translations for tails-onioncircuits --- ar/onioncircuits.pot | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/ar/onioncircuits.pot b/ar/onioncircuits.pot index fa1552371..222baedc2 100644 --- a/ar/onioncircuits.pot +++ b/ar/onioncircuits.pot @@ -3,18 +3,19 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Ahmed Alhammadi <6622227a(a)gmail.com>, 2016 +# Ahmed A. <6622227a(a)gmail.com>, 2016 # ButterflyOfFire, 2018 # crash x <xmr.crashx(a)gmail.com>, 2016 -# Khaled Hosny <khaledhosny(a)eglug.org>, 2018 +# Khaled Hosny, 2018 # Singapore Goldindor, 2016 +# yahia zakaria <yahiazak(a)hotmail.com>, 2019 msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-03 13:00+0000\n" -"PO-Revision-Date: 2018-07-03 13:30+0000\n" -"Last-Translator: Khaled Hosny <khaledhosny(a)eglug.org>\n" +"PO-Revision-Date: 2019-08-28 05:37+0000\n" +"Last-Translator: yahia zakaria <yahiazak(a)hotmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,67 +25,67 @@ msgstr "" #: ../onioncircuits:81 msgid "You are not connected to Tor yet..." -msgstr "لست متصلا بعدُ بشبكة تور…" +msgstr "" #: ../onioncircuits:95 msgid "Onion Circuits" -msgstr "دوائر البصلة" +msgstr "" #: ../onioncircuits:125 msgid "Circuit" -msgstr "دائرة" +msgstr "" #: ../onioncircuits:126 msgid "Status" -msgstr "الحالة" +msgstr "" #: ../onioncircuits:142 msgid "Click on a circuit for more detail about its Tor relays." -msgstr "انقر على دائرة لمزيد من التفاصيل حول تحويلات تور الخاصة بها." +msgstr "" #: ../onioncircuits:221 msgid "The connection to Tor was lost..." -msgstr "فقد الاتصال بتور…" +msgstr "" #: ../onioncircuits:317 msgid "..." -msgstr "..." +msgstr "" #: ../onioncircuits:343 #, c-format msgid "%s: %s" -msgstr "%s: %s" +msgstr "" #: ../onioncircuits:554 msgid "GeoIP database unavailable. No country information will be displayed." -msgstr "قاعدة بيانات GeoIP غير متوفرة. لن تعرض أي معلومة عن البلدان." +msgstr "" #: ../onioncircuits:585 #, c-format msgid "%s (%s)" -msgstr "%s (%s)" +msgstr "" #: ../onioncircuits:590 #, c-format msgid "%.2f Mb/s" -msgstr "%.2f ميجابايت/ثانية" +msgstr "" #: ../onioncircuits:592 ../onioncircuits:593 ../onioncircuits:594 msgid "Unknown" -msgstr "غير معروف" +msgstr "" #: ../onioncircuits:607 msgid "Fingerprint:" -msgstr "البصمة:" +msgstr "" #: ../onioncircuits:608 msgid "Published:" -msgstr "نُشِر في:" +msgstr "" #: ../onioncircuits:609 msgid "IP:" -msgstr "عنوان الإنترنت (IP):" +msgstr "" #: ../onioncircuits:610 msgid "Bandwidth:" -msgstr "سرعة الإنترنت:" +msgstr ""

1 0

[translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
by translation＠torproject.org 28 Aug '19

28 Aug '19

commit 1f909b61be081f727b2dd46d57870386876076fa Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 28 04:58:07 2019 +0000 Update translations for torbutton-browseronboardingproperties --- hi-IN/browserOnboarding.properties | 46 +++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/hi-IN/browserOnboarding.properties b/hi-IN/browserOnboarding.properties index 4239f9684..89e55ff00 100644 --- a/hi-IN/browserOnboarding.properties +++ b/hi-IN/browserOnboarding.properties @@ -8,7 +8,7 @@ onboarding.tour-tor-welcome.description=टोर ब्राउज़र व onboarding.tour-tor-welcome.next-button=गोपनीयता पर जाएं onboarding.tour-tor-privacy=एकांत -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. +onboarding.tour-tor-privacy.title=स्नब ट्रैकर और स्नूपर्स। onboarding.tour-tor-privacy.description=टोर ब्राउज़र कुकीज़ को अलग करता है और आपके सत्र के बाद आपके ब्राउज़र के इतिहास को हटा देता है। ये संशोधन सुनिश्चित करते हैं कि आपकी गोपनीयता और सुरक्षा ब्राउज़र में सुरक्षित है। यह जानने के लिए कि हम नेटवर्क स्तर पर आपकी सुरक्षा कैसे करते हैं, 'टोर नेटवर्क' पर क्लिक करें| onboarding.tour-tor-privacy.button=टोर नेटवर्क पर जाएं @@ -25,34 +25,34 @@ onboarding.tour-tor-circuit-display.next-button=सुरक्षा के ल onboarding.tour-tor-security=सुरक्षा onboarding.tour-tor-security.title=अपना अनुभव चुनें। -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them. -onboarding.tour-tor-security-level.button=See Your Security Level -onboarding.tour-tor-security-level.next-button=Go to Experience Tips +onboarding.tour-tor-security.description=हम आपको आपकी ब्राउज़र सुरक्षा को टक्कर देने के लिए अतिरिक्त सेटिंग्स भी प्रदान करते हैं। हमारी सुरक्षा सेटिंग्स आपको उन तत्वों को ब्लॉक करने की अनुमति देती हैं जिनका उपयोग आपके कंप्यूटर पर हमला करने के लिए किया जा सकता है। विभिन्न विकल्प क्या करते हैं, यह देखने के लिए नीचे क्लिक करें। +onboarding.tour-tor-security.description-suffix=नोट: डिफ़ॉल्ट रूप से, NoScript और HTTPS हर जगह टूलबार में शामिल नहीं हैं, लेकिन आप उन्हें जोड़ने के लिए अपने टूलबार को कस्टमाइज़ कर सकते हैं। +onboarding.tour-tor-security-level.button=अपना सुरक्षा स्तर देखें +onboarding.tour-tor-security-level.next-button=सुझावों का अनुभव करने के लिए जाओ -onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs -onboarding.tour-tor-expect-differences.next-button=Go to Onion Services +onboarding.tour-tor-expect-differences=सुझावों का अनुभव करें +onboarding.tour-tor-expect-differences.title=कुछ अंतरों की अपेक्षा करें। +onboarding.tour-tor-expect-differences.description=टोर द्वारा प्रदान की गई सभी सुरक्षा और गोपनीयता सुविधाओं के साथ, इंटरनेट ब्राउज़ करते समय आपका अनुभव थोड़ा अलग हो सकता है। चीजें थोड़ी धीमी हो सकती हैं, और आपके सुरक्षा स्तर के आधार पर, कुछ तत्व काम या लोड नहीं कर सकते हैं। आपको यह साबित करने के लिए भी कहा जा सकता है कि आप एक इंसान हैं और रोबोट नहीं हैं। +onboarding.tour-tor-expect-differences.button=अक्सर पूछे जाने वाले प्रश्न देखें +onboarding.tour-tor-expect-differences.next-button=ऑनलाइन सेवाओं पर जाएं onboarding.tour-tor-onion-services=Onion Services -onboarding.tour-tor-onion-services.title=Be extra protected. +onboarding.tour-tor-onion-services.title=अतिरिक्त सुरक्षित रहें। onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. onboarding.tour-tor-onion-services.button=Visit an Onion onboarding.tour-tor-onion-services.next-button=सम्पन्न -onboarding.overlay-icon-tooltip-updated2=See what's new\nin %S +onboarding.overlay-icon-tooltip-updated2=देखें, क्या नया है\n%S में onboarding.tour-tor-update.prefix-new=नया -onboarding.tour-tor-update.prefix-updated=Updated +onboarding.tour-tor-update.prefix-updated=अद्यतन -onboarding.tour-tor-toolbar=Toolbar -onboarding.tour-tor-toolbar-update-8.5.title=Toolbar layout -onboarding.tour-tor-toolbar-update-8.5.description=We improved the browser toolbar layout. We moved the Torbutton icon after the URL bar, and we added a security level icon next to it. +onboarding.tour-tor-toolbar=उपकरण पट्टी +onboarding.tour-tor-toolbar-update-8.5.title=उपकरण पट्टी ख़ाका +onboarding.tour-tor-toolbar-update-8.5.description=हमने ब्राउज़र टूलबार लेआउट में सुधार किया। हमने URL बार के बाद टोरबटन आइकन को स्थानांतरित किया, और हमने इसके बगल में एक सुरक्षा स्तर आइकन जोड़ा। onboarding.tour-tor-toolbar-update-8.5.next-button=सुरक्षा के लिए जाओ -onboarding.tour-tor-security-update-8.5.title=Security level experience -onboarding.tour-tor-security-update-8.5.description=We improved how you see and set your security level. We replaced the security slider with a toolbar icon that makes your current level visible at all times. Click it to view details about your current level or to change your security settings. +onboarding.tour-tor-security-update-8.5.title=सुरक्षा स्तर का अनुभव +onboarding.tour-tor-security-update-8.5.description=हमने सुधार किया कि आप अपने सुरक्षा स्तर को कैसे देखते हैं और सेट करते हैं। हमने सुरक्षा स्लाइडर को एक टूलबार आइकन से बदल दिया है जो आपके वर्तमान स्तर को हर समय दिखाई देता है। अपने वर्तमान स्तर के बारे में विवरण देखने के लिए या अपनी सुरक्षा सेटिंग बदलने के लिए इसे क्लिक करें। # Circuit Display onboarding. onboarding.tor-circuit-display.next=अगला @@ -61,11 +61,11 @@ onboarding.tor-circuit-display.one-of-three=1 of 3 onboarding.tor-circuit-display.two-of-three=2 of 3 onboarding.tor-circuit-display.three-of-three=3 of 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.title=सर्किट कैसे काम करते हैं? +onboarding.tor-circuit-display.intro.msg=सर्किट बेतरतीब ढंग से असाइन किए गए रिले से बने होते हैं, जो दुनिया भर के कंप्यूटर हैं जो टोर ट्रैफिक को फॉरवर्ड करते हैं। सर्किट आपको निजी तौर पर ब्राउज़ करने और प्याज सेवाओं से जुड़ने की अनुमति देते हैं। onboarding.tor-circuit-display.diagram.title=सर्किट प्रदर्शन -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.msg=यह आरेख उन रिले को दिखाता है जो इस वेबसाइट के लिए सर्किट बनाते हैं। विभिन्न साइटों पर गतिविधि को जोड़ने से रोकने के लिए, प्रत्येक वेबसाइट को एक अलग सर्किट मिलता है। -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=क्या आपको एक नया सर्किट चाहिए? +onboarding.tor-circuit-display.new-circuit.msg=यदि आप उस वेबसाइट से कनेक्ट नहीं कर पा रहे हैं जिस पर आप जाने की कोशिश कर रहे हैं या यह ठीक से लोड नहीं हो रहा है, तो आप इस बटन का उपयोग करके नए सर्किट के साथ साइट को पुनः लोड कर सकते हैं।

1 0

[translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd
by translation＠torproject.org 28 Aug '19

28 Aug '19

commit 0bd07b100f24afac745881b19cfe3bcac54240b2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 28 04:55:57 2019 +0000 Update translations for tba-torbrowserstringsdtd --- hi-IN/torbrowser_strings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hi-IN/torbrowser_strings.dtd b/hi-IN/torbrowser_strings.dtd index ad97274bf..613937406 100644 --- a/hi-IN/torbrowser_strings.dtd +++ b/hi-IN/torbrowser_strings.dtd @@ -4,7 +4,7 @@ <!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how."> <!ENTITY firstrun_welcome_next "Start now"> <!ENTITY firstrun_privacy_tab_title "एकांत"> -<!ENTITY firstrun_privacy_title "Snub trackers and snoopers."> +<!ENTITY firstrun_privacy_title "स्नब ट्रैकर और स्नूपर्स।"> <!ENTITY firstrun_privacy_message "टोर ब्राउज़र कुकीज़ को अलग करता है और आपके सत्र के बाद आपके ब्राउज़र के इतिहास को हटा देता है। ये संशोधन सुनिश्चित करते हैं कि आपकी गोपनीयता और सुरक्षा ब्राउज़र में सुरक्षित है। यह जानने के लिए कि हम नेटवर्क स्तर पर आपकी सुरक्षा कैसे करते हैं, 'टोर नेटवर्क' पर क्लिक करें|"> <!ENTITY firstrun_privacy_next "टोर नेटवर्क पर जाएं"> <!ENTITY firstrun_tornetwork_tab_title "टोर नेटवर्क">

1 0

[translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
by translation＠torproject.org 28 Aug '19

28 Aug '19

commit 3bfb298d09eeb84b526968ed979201b74c27728e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 28 04:27:25 2019 +0000 Update translations for torbutton-browseronboardingproperties --- hi-IN/browserOnboarding.properties | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/hi-IN/browserOnboarding.properties b/hi-IN/browserOnboarding.properties index ce5d3de4b..4239f9684 100644 --- a/hi-IN/browserOnboarding.properties +++ b/hi-IN/browserOnboarding.properties @@ -9,22 +9,22 @@ onboarding.tour-tor-welcome.next-button=गोपनीयता पर जा onboarding.tour-tor-privacy=एकांत onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network +onboarding.tour-tor-privacy.description=टोर ब्राउज़र कुकीज़ को अलग करता है और आपके सत्र के बाद आपके ब्राउज़र के इतिहास को हटा देता है। ये संशोधन सुनिश्चित करते हैं कि आपकी गोपनीयता और सुरक्षा ब्राउज़र में सुरक्षित है। यह जानने के लिए कि हम नेटवर्क स्तर पर आपकी सुरक्षा कैसे करते हैं, 'टोर नेटवर्क' पर क्लिक करें| +onboarding.tour-tor-privacy.button=टोर नेटवर्क पर जाएं -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. -onboarding.tour-tor-network.button=Go to Circuit Display +onboarding.tour-tor-network=टोर नेटवर्क +onboarding.tour-tor-network.title=एक विकेंद्रीकृत नेटवर्क की यात्रा करें +onboarding.tour-tor-network.description=टोर ब्राउज़र आपको दुनिया भर के हजारों स्वयंसेवकों द्वारा चलाए जा रहे टोर नेटवर्क से जोड़ता है। एक वीपीएन के विपरीत, निजी तौर पर इंटरनेट का आनंद लेने के लिए विफलता या केंद्रीकृत इकाई का कोई एक बिंदु नहीं है। +onboarding.tour-tor-network.button=वर्तमान प्रदर्शन पर जाएं -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. -onboarding.tour-tor-circuit-display.button=See My Path -onboarding.tour-tor-circuit-display.next-button=Go to Security +onboarding.tour-tor-circuit-display=सर्किट प्रदर्शन +onboarding.tour-tor-circuit-display.title=अपना रास्ता देखो | +onboarding.tour-tor-circuit-display.description=आपके द्वारा देखे जाने वाले प्रत्येक डोमेन के लिए, आपके ट्रैफ़िक को दुनिया भर के तीन टोर रिले में एक सर्किट में रिले और एन्क्रिप्ट किया गया है। कोई भी वेबसाइट यह नहीं जानती कि आप कहां से जुड़ रहे हैं। आप हमारे सर्किट प्रदर्शन पर 'इस साइट के लिए नए सर्किट' पर क्लिक करके एक नए सर्किट का अनुरोध कर सकते हैं। +onboarding.tour-tor-circuit-display.button=मेरी राह देखो +onboarding.tour-tor-circuit-display.next-button=सुरक्षा के लिए जाओ onboarding.tour-tor-security=सुरक्षा -onboarding.tour-tor-security.title=Choose your experience. +onboarding.tour-tor-security.title=अपना अनुभव चुनें। onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them. onboarding.tour-tor-security-level.button=See Your Security Level @@ -49,7 +49,7 @@ onboarding.tour-tor-update.prefix-updated=Updated onboarding.tour-tor-toolbar=Toolbar onboarding.tour-tor-toolbar-update-8.5.title=Toolbar layout onboarding.tour-tor-toolbar-update-8.5.description=We improved the browser toolbar layout. We moved the Torbutton icon after the URL bar, and we added a security level icon next to it. -onboarding.tour-tor-toolbar-update-8.5.next-button=Go to Security +onboarding.tour-tor-toolbar-update-8.5.next-button=सुरक्षा के लिए जाओ onboarding.tour-tor-security-update-8.5.title=Security level experience onboarding.tour-tor-security-update-8.5.description=We improved how you see and set your security level. We replaced the security slider with a toolbar icon that makes your current level visible at all times. Click it to view details about your current level or to change your security settings. @@ -64,7 +64,7 @@ onboarding.tor-circuit-display.three-of-three=3 of 3 onboarding.tor-circuit-display.intro.title=How do circuits work? onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. -onboarding.tor-circuit-display.diagram.title=Circuit Display +onboarding.tor-circuit-display.diagram.title=सर्किट प्रदर्शन onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?

1 0

[translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd
by translation＠torproject.org 28 Aug '19

28 Aug '19

commit 6dcd2131a2bfdf7bfcb3879ce2661881dda94b68 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 28 04:25:23 2019 +0000 Update translations for tba-torbrowserstringsdtd --- hi-IN/torbrowser_strings.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hi-IN/torbrowser_strings.dtd b/hi-IN/torbrowser_strings.dtd index 41e39478a..ad97274bf 100644 --- a/hi-IN/torbrowser_strings.dtd +++ b/hi-IN/torbrowser_strings.dtd @@ -5,14 +5,14 @@ <!ENTITY firstrun_welcome_next "Start now"> <!ENTITY firstrun_privacy_tab_title "एकांत"> <!ENTITY firstrun_privacy_title "Snub trackers and snoopers."> -<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level."> -<!ENTITY firstrun_privacy_next "Go to Tor Network"> -<!ENTITY firstrun_tornetwork_tab_title "Tor Network"> -<!ENTITY firstrun_tornetwork_title "Travel a decentralized network."> +<!ENTITY firstrun_privacy_message "टोर ब्राउज़र कुकीज़ को अलग करता है और आपके सत्र के बाद आपके ब्राउज़र के इतिहास को हटा देता है। ये संशोधन सुनिश्चित करते हैं कि आपकी गोपनीयता और सुरक्षा ब्राउज़र में सुरक्षित है। यह जानने के लिए कि हम नेटवर्क स्तर पर आपकी सुरक्षा कैसे करते हैं, 'टोर नेटवर्क' पर क्लिक करें|"> +<!ENTITY firstrun_privacy_next "टोर नेटवर्क पर जाएं"> +<!ENTITY firstrun_tornetwork_tab_title "टोर नेटवर्क"> +<!ENTITY firstrun_tornetwork_title "एक विकेंद्रीकृत नेटवर्क की यात्रा करें"> <!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately."> <!ENTITY firstrun_tornetwork_next "अगला"> <!ENTITY firstrun_secsettings_tab_title "सुरक्षा "> -<!ENTITY firstrun_secsettings_title "Choose your experience."> +<!ENTITY firstrun_secsettings_title "अपना अनुभव चुनें।"> <!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer."> <!ENTITY firstrun_secsettings_next "अगला"> <!ENTITY firstrun_tips_tab_title "Tips">

1 0