- tor-commits - lists.torproject.org

[webwml/master] Bug #17880: Add ALT text to donation banner.
by sebastian＠torproject.org 21 Dec '15

21 Dec '15

commit ae3e28d207204cd16426542ecf321d3b6892e56d Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Dec 20 14:07:03 2015 -0500 Bug #17880: Add ALT text to donation banner. --- en/index.wml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/en/index.wml b/en/index.wml index 09ed2c8..6fdc5a3 100644 --- a/en/index.wml +++ b/en/index.wml @@ -18,16 +18,25 @@ </a> </div> +#include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8" + + <script>  var alternates = ["cd", "lp", "rd", "rr", "ss"]; + var altTexts = { + "cd" : '"Privacy and anonymity matter to all of us." -- Cory Doctorow, Novelist, Technology Activist, Co-Editor of Boing Boing', + "lp" : '"Edward Snowden would not have been able to contact me without Tor and other free software encryption projects. Tor is an essential tool, and it needs our support." -- Laura Poitras, Oscar-winning Documentary Filmmaker, Citizenfour', + "rd" : '"Please help the strongest privacy tool in the world become more sustainable!" -- Roger Dingledine, Founder, The Tor Project', + "rr" : '"The internet cannot heal itself in the face of tyrants. Tor is the salve that heals that wound; Tor is what allows us to route around Tyranny." -- Rabbi Rob Thomas, Director of The Tor Project', + "ss" : '"Tor is an essential part of the internet freedom infrastructure." -- Shari Steele, Executive Director of the Tor Project', + }; var alternate = alternates[Math.floor(Math.random() * alternates.length)]; var image = document.getElementById("donation-banner-image"); image.src = "images/homepage-banner-" + alternate + ".jpg"; + image.alt = altTexts[alternate]; </script> -#include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8" - <div id="home"> <div id="content" class="clearfix"> <div id="maincol">

1 0

[doctor/master] Check for signatures of all voting authorities
by atagar＠torproject.org 20 Dec '15

20 Dec '15

commit 9146460a6ad6634fca8d0593e5a8b549a5ca6c76 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 20 15:00:59 2015 -0800 Check for signatures of all voting authorities Oops! Dannenberg hasn't been voting in the consensus for the last month due to its v3ident change. It's still up and providing a consensus so we didn't raise an alarm. Tweaking our 'has all signatures' check to check for all voting authorities rather than just the participants. --- consensus_health_checker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index 377fa0a..1962d10 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -511,9 +511,9 @@ def has_all_signatures(latest_consensus, consensuses, votes): "Check that the consensuses have signatures for authorities that voted on it." issues = [] + voting_authorities = set([authority.v3ident for authority in DIRECTORY_AUTHORITIES.values() if authority.v3ident]) for consensus_of, consensus in consensuses.items(): - voting_authorities = set([authority.fingerprint for authority in consensus.directory_authorities]) signing_authorities = set([sig.identity for sig in consensus.signatures]) missing_authorities = set()

1 0

[stem/master] Updating with latest torrc options
by atagar＠torproject.org 20 Dec '15

20 Dec '15

commit 4b49f5d1a616acfd7b1e5b9c7c82b3f8bed836d7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 20 14:03:25 2015 -0800 Updating with latest torrc options Recent merges brought in quite a few updates. Getting back in sync. --- stem/cached_tor_manual.cfg | 55 +++++++++++++++++++++++++++++++++++++++----- stem/settings.cfg | 7 ++++++ test/unit/manual.py | 8 +++---- 3 files changed, 60 insertions(+), 10 deletions(-) diff --git a/stem/cached_tor_manual.cfg b/stem/cached_tor_manual.cfg index aa6d7d0..9a6fed0 100644 --- a/stem/cached_tor_manual.cfg +++ b/stem/cached_tor_manual.cfg @@ -6,8 +6,8 @@ description |Basically, Tor provides a distributed network of servers or relays ("onion routers"). Users bounce their TCP streams -- web traffic, ftp, ssh, etc. -- around the network, and recipients, observers, and even the relays themselves have difficulty tracking the source of the stream. | |By default, tor will only act as a client only. To help the network by providing bandwidth as a relay, change the ORPort configuration option -- see below. Please also consult the documentation on the Tor Project's website. -man_commit ec4ef68271ab65b4ec643088153211e861cdc7b3 -stem_commit ef9894dca36e18076815362e44ebf639f0c34fcf +man_commit aa4be914f06baa92857de201a212b9fc9856bdb1 +stem_commit d4fac7f81c180cf8e83ea81d4f3f2e8d0d2ce491 commandline_options -f FILE => Specify a new configuration file to contain further Tor configuration options OR pass - to make Tor read its configuration from standard input. (Default: @CONFDIR@/torrc, or $HOME/.torrc if that file is not found) commandline_options --ignore-missing-torrc => Specifies that Tor should treat a missing torrc file as though it were empty. Ordinarily, Tor does this for missing default torrc files, but not for those specified on the command line. commandline_options --list-fingerprint => Generate your keys and output your nickname and fingerprint. @@ -851,15 +851,20 @@ config_options.DataDirectoryGroupReadable.summary Group read permissions for the config_options.DataDirectoryGroupReadable.description If this option is set to 0, don't allow the filesystem group to read the DataDirectory. If the option is set to 1, make the DataDirectory readable by the default GID. (Default: 0) config_options.FallbackDir.category General config_options.FallbackDir.name FallbackDir -config_options.FallbackDir.usage address:port orport=port id=fingerprint [weight=num] +config_options.FallbackDir.usage address:port orport=port id=fingerprint [weight=num] [ipv6=address:orport] config_options.FallbackDir.summary Fallback when unable to retrieve descriptor information -config_options.FallbackDir.description When we're unable to connect to any directory cache for directory info (usually because we don't know about any yet) we try a FallbackDir. By default, the directory authorities are also FallbackDirs. +config_options.FallbackDir.description When we're unable to connect to any directory cache for directory info (usually because we don't know about any yet) we try a directory authority. Clients also simultaneously try a FallbackDir, to avoid hangs on client startup if a directory authority is down. Clients retry FallbackDirs more often than directory authorities, to reduce the load on the directory authorities. By default, the directory authorities are also FallbackDirs. Specifying a FallbackDir replaces Tor's default hard-coded FallbackDirs (if any). +config_options.UseDefaultFallbackDirs.category General +config_options.UseDefaultFallbackDirs.name UseDefaultFallbackDirs +config_options.UseDefaultFallbackDirs.usage 0|1 +config_options.UseDefaultFallbackDirs.summary Use hard-coded fallback directory authorities when needed +config_options.UseDefaultFallbackDirs.description Use Tor's default hard-coded FallbackDirs (if any). (When a FallbackDir line is present, it replaces the hard-coded FallbackDirs, regardless of the value of UseDefaultFallbackDirs.) (Default: 1) config_options.DirAuthority.category General config_options.DirAuthority.name DirAuthority config_options.DirAuthority.usage [nickname] [flags] address:port fingerprint config_options.DirAuthority.summary Alternative directory authorities config_options.DirAuthority.description -|Use a nonstandard authoritative directory server at the provided address and port, with the specified key fingerprint. This option can be repeated many times, for multiple authoritative directory servers. Flags are separated by spaces, and determine what kind of an authority this directory is. By default, an authority is not authoritative for any directory style or version unless an appropriate flag is given. Tor will use this authority as a bridge authoritative directory if the "bridge" flag is set. If a flag "orport=port" is given, Tor will use the given port when opening encrypted tunnels to the dirserver. If a flag "weight=num" is given, then the directory server is chosen randomly with probability proportional to that weight (default 1.0). Lastly, if a flag "v3ident=fp" is given, the dirserver is a v3 directory authority whose v3 long-term signing key has the fingerprint fp. +|Use a nonstandard authoritative directory server at the provided address and port, with the specified key fingerprint. This option can be repeated many times, for multiple authoritative directory servers. Flags are separated by spaces, and determine what kind of an authority this directory is. By default, an authority is not authoritative for any directory style or version unless an appropriate flag is given. Tor will use this authority as a bridge authoritative directory if the "bridge" flag is set. If a flag "orport=port" is given, Tor will use the given port when opening encrypted tunnels to the dirserver. If a flag "weight=num" is given, then the directory server is chosen randomly with probability proportional to that weight (default 1.0). If a flag "v3ident=fp" is given, the dirserver is a v3 directory authority whose v3 long-term signing key has the fingerprint fp. Lastly, if an "ipv6=address:orport" flag is present, then the directory authority is listening for IPv6 connect ions on the indicated IPv6 address and OR Port. | |If no DirAuthority line is given, Tor will use the default directory authorities. NOTE: this option is intended for setting up a private Tor network with its own directory authorities. If you use it, you will be distinguishable from other users, because you won't believe the same authorities they do. config_options.DirAuthorityFallbackRate.category General @@ -1037,6 +1042,11 @@ config_options.User.name User config_options.User.usage UID config_options.User.summary UID for the process when started config_options.User.description On startup, setuid to this user and setgid to their primary group. +config_options.KeepBindCapabilities.category General +config_options.KeepBindCapabilities.name KeepBindCapabilities +config_options.KeepBindCapabilities.usage 0|1|auto +config_options.KeepBindCapabilities.summary Retain permission for binding to low valued ports +config_options.KeepBindCapabilities.description On Linux, when we are started as root and we switch our identity using the User option, the KeepBindCapabilities option tells us whether to try to retain our ability to bind to low ports. If this value is 1, we try to keep the capability; if it is 0 we do not; and if it is auto, we keep the capability only if we are configured to listen on a low port. (Default: auto.) config_options.HardwareAccel.category General config_options.HardwareAccel.name HardwareAccel config_options.HardwareAccel.usage 0|1 @@ -1470,10 +1480,18 @@ config_options.TestingTorNetwork.description | TestingClientDownloadSchedule 0, 0, 5, 10, 15, 20, 30, 60 | TestingServerConsensusDownloadSchedule 0, 0, 5, 10, 15, 20, 30, 60 | TestingClientConsensusDownloadSchedule 0, 0, 5, 10, 15, 20, 30, 60 +| TestingClientBootstrapConsensusAuthorityDownloadSchedule 0, 2, +| 4 (for 40 seconds), 8, 16, 32, 60 +| TestingClientBootstrapConsensusFallbackDownloadSchedule 0, 1, +| 4 (for 40 seconds), 8, 16, 32, 60 +| TestingClientBootstrapConsensusAuthorityOnlyDownloadSchedule 0, 1, +| 4 (for 40 seconds), 8, 16, 32, 60 | TestingBridgeDownloadSchedule 60, 30, 30, 60 | TestingClientMaxIntervalWithoutRequest 5 seconds | TestingDirConnectionMaxStall 30 seconds | TestingConsensusMaxDownloadTries 80 +| TestingClientBootstrapConsensusMaxDownloadTries 80 +| TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries 80 | TestingDescriptorMaxDownloadTries 80 | TestingMicrodescMaxDownloadTries 80 | TestingCertMaxDownloadTries 80 @@ -1535,6 +1553,21 @@ config_options.TestingClientConsensusDownloadSchedule.name TestingClientConsensu config_options.TestingClientConsensusDownloadSchedule.usage N,N,... config_options.TestingClientConsensusDownloadSchedule.summary Schedule for when we should download the consensus as a client config_options.TestingClientConsensusDownloadSchedule.description Schedule for when clients should download consensuses. Changing this requires that TestingTorNetwork is set. (Default: 0, 0, 60, 300, 600, 1800, 3600, 3600, 3600, 10800, 21600, 43200) +config_options.TestingClientBootstrapConsensusAuthorityDownloadSchedule.category Testing +config_options.TestingClientBootstrapConsensusAuthorityDownloadSchedule.name TestingClientBootstrapConsensusAuthorityDownloadSchedule +config_options.TestingClientBootstrapConsensusAuthorityDownloadSchedule.usage N,N,... +config_options.TestingClientBootstrapConsensusAuthorityDownloadSchedule.summary Schedule when bootstrapping for when to download resources from authorities +config_options.TestingClientBootstrapConsensusAuthorityDownloadSchedule.description Schedule for when clients should download consensuses from authorities if they are bootstrapping (that is, they don't have a usable, reasonably live consensus). Only used by clients fetching from a list of fallback directory mirrors. This schedule is advanced by (potentially concurrent) connection attempts, unlike other schedules, which are advanced by connection failures. Changing this schedule requires that TestingTorNetwork is set. (Default: 10, 11, 3600, 10800, 25200, 54000, 111600, 262800) +config_options.TestingClientBootstrapConsensusFallbackDownloadSchedule.category Testing +config_options.TestingClientBootstrapConsensusFallbackDownloadSchedule.name TestingClientBootstrapConsensusFallbackDownloadSchedule +config_options.TestingClientBootstrapConsensusFallbackDownloadSchedule.usage N,N,... +config_options.TestingClientBootstrapConsensusFallbackDownloadSchedule.summary Schedule when bootstrapping for when to download resources from fallback authorities +config_options.TestingClientBootstrapConsensusFallbackDownloadSchedule.description Schedule for when clients should download consensuses from fallback directory mirrors if they are bootstrapping (that is, they don't have a usable, reasonably live consensus). Only used by clients fetching from a list of fallback directory mirrors. This schedule is advanced by (potentially concurrent) connection attempts, unlike other schedules, which are advanced by connection failures. Changing this schedule requires that TestingTorNetwork is set. (Default: 0, 1, 4, 11, 3600, 10800, 25200, 54000, 111600, 262800) +config_options.TestingClientBootstrapConsensusAuthorityOnlyDownloadSchedule.category Testing +config_options.TestingClientBootstrapConsensusAuthorityOnlyDownloadSchedule.name TestingClientBootstrapConsensusAuthorityOnlyDownloadSchedule +config_options.TestingClientBootstrapConsensusAuthorityOnlyDownloadSchedule.usage N,N,... +config_options.TestingClientBootstrapConsensusAuthorityOnlyDownloadSchedule.summary Schedule when bootstrapping for when to download resources from authorities when fallbacks unavailable +config_options.TestingClientBootstrapConsensusAuthorityOnlyDownloadSchedule.description Schedule for when clients should download consensuses from authorities if they are bootstrapping (that is, they don't have a usable, reasonably live consensus). Only used by clients which don't have or won't fetch from a list of fallback directory mirrors. This schedule is advanced by (potentially concurrent) connection attempts, unlike other schedules, which are advanced by connection failures. Changing this schedule requires that TestingTorNetwork is set. (Default: 0, 3, 7, 3600, 10800, 25200, 54000, 111600, 262800) config_options.TestingBridgeDownloadSchedule.category Testing config_options.TestingBridgeDownloadSchedule.name TestingBridgeDownloadSchedule config_options.TestingBridgeDownloadSchedule.usage N,N,... @@ -1554,7 +1587,17 @@ config_options.TestingConsensusMaxDownloadTries.category Testing config_options.TestingConsensusMaxDownloadTries.name TestingConsensusMaxDownloadTries config_options.TestingConsensusMaxDownloadTries.usage NUM config_options.TestingConsensusMaxDownloadTries.summary Retries for downloading the consensus -config_options.TestingConsensusMaxDownloadTries.description Try this often to download a consensus before giving up. Changing this requires that TestingTorNetwork is set. (Default: 8) +config_options.TestingConsensusMaxDownloadTries.description Try this many times to download a consensus before giving up. Changing this requires that TestingTorNetwork is set. (Default: 8) +config_options.TestingClientBootstrapConsensusMaxDownloadTries.category Testing +config_options.TestingClientBootstrapConsensusMaxDownloadTries.name TestingClientBootstrapConsensusMaxDownloadTries +config_options.TestingClientBootstrapConsensusMaxDownloadTries.usage NUM +config_options.TestingClientBootstrapConsensusMaxDownloadTries.summary Number of times to attempt downloading consensus +config_options.TestingClientBootstrapConsensusMaxDownloadTries.description Try this many times to download a consensus while bootstrapping using fallback directory mirrors before giving up. Changing this requires that TestingTorNetwork is set. (Default: 7) +config_options.TestingClientBootstrapConsensusMaxInProgressTries.category Testing +config_options.TestingClientBootstrapConsensusMaxInProgressTries.name TestingClientBootstrapConsensusMaxInProgressTries +config_options.TestingClientBootstrapConsensusMaxInProgressTries.usage NUM +config_options.TestingClientBootstrapConsensusMaxInProgressTries.summary Number of consensus download requests to allow in-flight at once +config_options.TestingClientBootstrapConsensusMaxInProgressTries.description Try this many simultaneous connections to download a consensus before waiting for one to complete, timeout, or error out. Changing this requires that TestingTorNetwork is set. (Default: 4) config_options.TestingDescriptorMaxDownloadTries.category Testing config_options.TestingDescriptorMaxDownloadTries.name TestingDescriptorMaxDownloadTries config_options.TestingDescriptorMaxDownloadTries.usage NUM diff --git a/stem/settings.cfg b/stem/settings.cfg index dcedc44..b590afe 100644 --- a/stem/settings.cfg +++ b/stem/settings.cfg @@ -74,6 +74,7 @@ manual.summary.ControlPortFileGroupReadable Group read permissions for the contr manual.summary.DataDirectory Location for storing runtime data (state, keys, etc) manual.summary.DataDirectoryGroupReadable Group read permissions for the data directory manual.summary.FallbackDir Fallback when unable to retrieve descriptor information +manual.summary.UseDefaultFallbackDirs Use hard-coded fallback directory authorities when needed manual.summary.DirAuthority Alternative directory authorities manual.summary.DirAuthorityFallbackRate Rate at which to use fallback directory manual.summary.AlternateDirAuthority Alternative directory authorities (consensus only) @@ -108,6 +109,7 @@ manual.summary.TruncateLogFile Overwrites log file rather than appending when re manual.summary.SyslogIdentityTag Tag logs appended to the syslog as being from tor manual.summary.SafeLogging Toggles if logs are scrubbed of sensitive information manual.summary.User UID for the process when started +manual.summary.KeepBindCapabilities Retain permission for binding to low valued ports manual.summary.HardwareAccel Toggles if tor attempts to use hardware acceleration manual.summary.AccelName OpenSSL engine name for crypto acceleration manual.summary.AccelDir Crypto acceleration library path @@ -328,10 +330,15 @@ manual.summary.TestingServerDownloadSchedule Schedule for when we should downloa manual.summary.TestingClientDownloadSchedule Schedule for when we should download resources as a client manual.summary.TestingServerConsensusDownloadSchedule Schedule for when we should download the consensus as a relay manual.summary.TestingClientConsensusDownloadSchedule Schedule for when we should download the consensus as a client +manual.summary.TestingClientBootstrapConsensusAuthorityDownloadSchedule Schedule when bootstrapping for when to download resources from authorities +manual.summary.TestingClientBootstrapConsensusFallbackDownloadSchedule Schedule when bootstrapping for when to download resources from fallback authorities +manual.summary.TestingClientBootstrapConsensusAuthorityOnlyDownloadSchedule Schedule when bootstrapping for when to download resources from authorities when fallbacks unavailable manual.summary.TestingBridgeDownloadSchedule Schedule for when we should download bridge descriptors manual.summary.TestingClientMaxIntervalWithoutRequest Maximum time to wait to batch requests for missing descriptors manual.summary.TestingDirConnectionMaxStall Duration to let directory connections stall before timing out manual.summary.TestingConsensusMaxDownloadTries Retries for downloading the consensus +manual.summary.TestingClientBootstrapConsensusMaxDownloadTries Number of times to attempt downloading consensus +manual.summary.TestingClientBootstrapConsensusMaxInProgressTries Number of consensus download requests to allow in-flight at once manual.summary.TestingDescriptorMaxDownloadTries Retries for downloading server descriptors manual.summary.TestingMicrodescMaxDownloadTries Retries for downloading microdescriptors manual.summary.TestingCertMaxDownloadTries Retries for downloading authority certificates diff --git a/test/unit/manual.py b/test/unit/manual.py index ab8219e..90655d5 100644 --- a/test/unit/manual.py +++ b/test/unit/manual.py @@ -183,10 +183,10 @@ class TestManual(unittest.TestCase): self.assertEqual('tor - The second-generation onion router', manual.name) self.assertEqual('tor [OPTION value]...', manual.synopsis) self.assertTrue(manual.description.startswith(EXPECTED_DESCRIPTION)) - self.assertEqual(14, len(manual.commandline_options)) - self.assertEqual(8, len(manual.signals)) - self.assertEqual(31, len(manual.files)) - self.assertEqual(289, len(manual.config_options)) + self.assertTrue(len(manual.commandline_options) > 10) + self.assertTrue(len(manual.signals) > 5) + self.assertTrue(len(manual.files) > 20) + self.assertTrue(len(manual.config_options) > 200) def test_download_man_page_without_arguments(self): try:

1 0

[doctor/master] Don't retry downloading votes
by atagar＠torproject.org 20 Dec '15

20 Dec '15

commit dc77970da41850c7ea51d56b975c13f35ce80d54 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 20 14:15:53 2015 -0800 Don't retry downloading votes Honestly I don't recall why we added retries here... https://gitweb.torproject.org/doctor.git/commit/?id=5e200e9 Seems this mostly just masked when an authority was unavailable. --- .gitignore | 2 +- consensus_health_checker.py | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index c320e41..e33b50c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ logs/ data/contact_information.cfg data/fingerprints data/fingerprint_changes +data/fingerprint_change_last_notified.cfg data/last_notified.cfg stem -gmail_pw diff --git a/consensus_health_checker.py b/consensus_health_checker.py index 1224dfc..377fa0a 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -776,23 +776,6 @@ def _get_documents(label, resource): documents[authority.nickname] = query.run()[0] times_taken[authority.nickname] = time.time() - start_time except Exception as exc: - if label == 'vote': - # try to download the vote via the other authorities - - v3ident = DIRECTORY_AUTHORITIES[authority.nickname].v3ident - - query = downloader.query( - '/tor/status-vote/current/%s.z' % v3ident, - default_params = False, - validate = True, - ) - - query.run(True) - - if not query.error: - documents[authority.nickname] = list(query)[0] - continue - issues.append(Issue(Runlevel.ERROR, 'AUTHORITY_UNAVAILABLE', fetch_type = label, authority = authority.nickname, url = query.download_url, error = exc, to = [authority.nickname])) if label == 'consensus':

1 0

[tor/master] add libkeccak-tiny to .gitignore
by nickm＠torproject.org 20 Dec '15

20 Dec '15

commit 079644b7918f9098b063547997a158fb80003713 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 20 16:23:42 2015 -0500 add libkeccak-tiny to .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index c71dc02..b141e80 100644 --- a/.gitignore +++ b/.gitignore @@ -154,6 +154,8 @@ uptime-*.json /src/ext/ed25519/ref10/libed25519_ref10.lib /src/ext/ed25519/donna/libed25519_donna.a /src/ext/ed25519/donna/libed25519_donna.lib +/src/ext/keccak-tiny/libkeccak-tiny.a +/src/ext/keccak-tiny/libkeccak-tiny.lib # /src/or/ /src/or/Makefile

1 0

[meek/master] Factor out code to get the original client IP address.
by dcf＠torproject.org 20 Dec '15

20 Dec '15

commit 1377d0e6ee7a21b441e718729f8b08180df1ceee Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 13 22:07:06 2015 -0800 Factor out code to get the original client IP address. This is working towards #13171. Currently it's just getting req.RemoteAddr as before, except that it's now setting the port number to ":0" in all cases. --- meek-server/meek-server.go | 14 +++++++++++++- meek-server/useraddr.go | 20 ++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index 5b28e79..482fa3c 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -122,6 +122,18 @@ func (state *State) Get(w http.ResponseWriter, req *http.Request) { w.Write([]byte("I’m just a happy little web server.\n")) } +// Get a string representing the original client address, if available, as a +// "host:port" string suitable to pass as the addr parameter to pt.DialOr. Never +// fails: if the original client address is not available, returns "". If the +// original client address is available, the returned port number is always 1. +func getUseraddr(req *http.Request) string { + ip, err := originalClientIP(req) + if err != nil { + return "" + } + return net.JoinHostPort(ip.String(), "1") +} + // Look up a session by id, or create a new one (with its OR port connection) if // it doesn't already exist. func (state *State) GetSession(sessionID string, req *http.Request) (*Session, error) { @@ -132,7 +144,7 @@ func (state *State) GetSession(sessionID string, req *http.Request) (*Session, e if session == nil { // log.Printf("unknown session id %q; creating new session", sessionID) - or, err := pt.DialOr(&ptInfo, req.RemoteAddr, ptMethodName) + or, err := pt.DialOr(&ptInfo, getUseraddr(req), ptMethodName) if err != nil { return nil, err } diff --git a/meek-server/useraddr.go b/meek-server/useraddr.go new file mode 100644 index 0000000..6695d6d --- /dev/null +++ b/meek-server/useraddr.go @@ -0,0 +1,20 @@ +package main + +import ( + "fmt" + "net" + "net/http" +) + +// Return the original client IP address as best as it can be determined. +func originalClientIP(req *http.Request) (net.IP, error) { + host, _, err := net.SplitHostPort(req.RemoteAddr) + if err != nil { + return nil, err + } + ip := net.ParseIP(host) + if ip == nil { + return nil, fmt.Errorf("cannot parse %q as IP address") + } + return ip, nil +}

1 0

[meek/master] Add tests for originalClientIP.
by dcf＠torproject.org 20 Dec '15

20 Dec '15

commit 2e585a73bc6718e80069e6f05a0574e65c547cc2 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 13 23:57:53 2015 -0800 Add tests for originalClientIP. Includes failing tests for X-Forwarded-For. --- meek-server/useraddr_test.go | 131 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/meek-server/useraddr_test.go b/meek-server/useraddr_test.go new file mode 100644 index 0000000..d603031 --- /dev/null +++ b/meek-server/useraddr_test.go @@ -0,0 +1,131 @@ +package main + +import ( + "net" + "net/http" + "testing" +) + +func checkExpected(t *testing.T, req *http.Request, expected net.IP) { + ip, err := originalClientIP(req) + // If ip is nil, then err must not be nil; and if ip is not nil, then + // err must be nil. + if (ip == nil && err == nil) || (ip != nil && err != nil) { + t.Errorf("%v returned ip=%v and err=%v", req, ip, expected) + return + } + // Either both are nil or ip is equal to expected. + if (ip == nil && expected != nil) || + (ip != nil && !ip.Equal(expected)) { + t.Errorf("%v got %v, expected %v", req, ip, expected) + } +} + +// Test that in the absence of headers indicating the original client IP +// address, originalClientIP returns an answer based on RemoteAddr. +func TestOriginalClientIPRemoteAddr(t *testing.T) { + tests := []struct { + RemoteAddr string + Expected net.IP + }{ + {"", nil}, + {"1.2.3.4:1234", net.IPv4(1, 2, 3, 4)}, + {"[1:2::3:4]:1234", net.IP{0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 4}}, + // Bad syntax. + {"1.2.3.4", nil}, + {"1:2::3:4:1234", nil}, + {"xyz", nil}, + } + + for _, test := range tests { + req := &http.Request{ + RemoteAddr: test.RemoteAddr, + } + checkExpected(t, req, test.Expected) + } +} + +// Test that originalClientIP reads the X-Forwarded-For header if present. +func TestOriginalClientXForwardedFor(t *testing.T) { + tests := []struct { + XForwardedFor string + Expected net.IP + }{ + {"", nil}, + {"1.2.3.4", net.IPv4(1, 2, 3, 4)}, + {"1:2::3:4", net.IP{0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 4}}, + {"1.2.3.4,1:2::3:4", net.IPv4(1, 2, 3, 4)}, + {"1.2.3.4, 1:2::3:4", net.IPv4(1, 2, 3, 4)}, + {"1:2::3:4, 1.2.3.4", net.IP{0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 4}}, + // Bad syntax. + {"xyz", nil}, + {"1.2.3.4:1234", nil}, + // Only try to parse the first element + {"1.2.3.4, xyz", net.IPv4(1, 2, 3, 4)}, + {"1.2.3.4,,,", net.IPv4(1, 2, 3, 4)}, + {"xyz, 1.2.3.4", nil}, + // X-Forwarded-For doesn't use square brackets on IPv6. + {"[1:2::3:4]", nil}, + {"[1:2::3:4]:1234", nil}, + } + + for _, test := range tests { + req := &http.Request{ + Header: make(http.Header), + } + req.Header.Set("X-Forwarded-For", test.XForwardedFor) + checkExpected(t, req, test.Expected) + } +} + +// Test that headers prevent reading RemoteAddr, even if the headers cannot be +// parsed. +func TestOriginalClientPrecedence(t *testing.T) { + tests := []struct { + Req http.Request + Expected net.IP + }{ + { + http.Request{}, + nil, + }, + { + http.Request{ + RemoteAddr: "5.6.7.8:5678", + }, + net.IPv4(5, 6, 7, 8), + }, + { + http.Request{ + RemoteAddr: "5.6.7.8:5678", + Header: http.Header{ + http.CanonicalHeaderKey("X-Forwarded-For"): []string{"1.2.3.4"}, + }, + }, + net.IPv4(1, 2, 3, 4), + }, + { + http.Request{ + RemoteAddr: "5.6.7.8:5678", + Header: http.Header{ + http.CanonicalHeaderKey("X-Forwarded-For"): []string{"1:2::3:4"}, + }, + }, + net.IP{0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 4}, + }, + // X-Forwarded-For shadows RemoteAddr, even if bad syntax. + { + http.Request{ + RemoteAddr: "5.6.7.8:5678", + Header: http.Header{ + http.CanonicalHeaderKey("X-Forwarded-For"): []string{"xyz"}, + }, + }, + nil, + }, + } + + for _, test := range tests { + checkExpected(t, &test.Req, test.Expected) + } +}

1 0

[meek/master] Understand X-Forwarded-For in originalClientIP.
by dcf＠torproject.org 20 Dec '15

20 Dec '15

commit 3e4fffbbd1410b07209e6980e7f3516944acdf09 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Dec 14 01:24:50 2015 -0800 Understand X-Forwarded-For in originalClientIP. --- meek-server/useraddr.go | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/meek-server/useraddr.go b/meek-server/useraddr.go index 6695d6d..680a6d8 100644 --- a/meek-server/useraddr.go +++ b/meek-server/useraddr.go @@ -4,14 +4,41 @@ import ( "fmt" "net" "net/http" + "strings" ) +// Get the first hostname in an X-Forwarded-For header field value. +// +// The X-Forwarded-For header is set automatically by CDNs (and other proxies). +// There doesn't seem to be any formal specification of it. +// https://en.wikipedia.org/wiki/X-Forwarded-For says it was originally +// implemented in Squid. The format appears to be: one or more IPv4 or IPv6 +// addresses, without port numbers, separated by commas and optional whitespace. +// Because the format is unspecified, we only look at whatever is before the +// first comma (or end of string). +func getXForwardedFor(xForwardedFor string) (string, error) { + parts := strings.SplitN(xForwardedFor, ",", 2) + if len(parts) < 1 { + return "", fmt.Errorf("bad X-Forwarded-For value %q", xForwardedFor) + } + return strings.TrimSpace(parts[0]), nil +} + // Return the original client IP address as best as it can be determined. func originalClientIP(req *http.Request) (net.IP, error) { - host, _, err := net.SplitHostPort(req.RemoteAddr) + var host string + var err error + + xForwardedFor := req.Header.Get("X-Forwarded-For") + if xForwardedFor != "" { + host, err = getXForwardedFor(xForwardedFor) + } else { + host, _, err = net.SplitHostPort(req.RemoteAddr) + } if err != nil { return nil, err } + ip := net.ParseIP(host) if ip == nil { return nil, fmt.Errorf("cannot parse %q as IP address")

1 0

[meek/master] Set a Meek-IP header with the client IP in the App Engine reflector.
by dcf＠torproject.org 20 Dec '15

20 Dec '15

commit 90307dba62d6dba25c19d199de8df28d9144d9b8 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Dec 14 01:44:06 2015 -0800 Set a Meek-IP header with the client IP in the App Engine reflector. This is a replacement for X-Forwarded-For because App Engine doesn't allow to set X-Forwarded-For, and doesn't set any equivalent header by default. https://trac.torproject.org/projects/tor/ticket/13171#comment:7 --- appengine/reflect.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/appengine/reflect.go b/appengine/reflect.go index 44596b9..93ac5d1 100644 --- a/appengine/reflect.go +++ b/appengine/reflect.go @@ -5,6 +5,7 @@ package reflect import ( "io" "net/http" + "net" "net/url" "time" @@ -40,6 +41,17 @@ var reflectedHeaderFields = []string{ "X-Session-Id", } +// Get the original client IP address as a string. When using the standard +// net/http server, Request.RemoteAddr is a "host:port" string; however App +// Engine seems to use just "host". We check for both to be safe. +func getClientAddr(r *http.Request) string { + host, _, err := net.SplitHostPort(r.RemoteAddr) + if err == nil { + return host + } + return r.RemoteAddr +} + // Make a copy of r, with the URL being changed to be relative to forwardURL, // and including only the headers in reflectedHeaderFields. func copyRequest(r *http.Request) (*http.Request, error) { @@ -60,6 +72,12 @@ func copyRequest(r *http.Request) (*http.Request, error) { c.Header.Add(key, value) } } + // Set the original client IP address in a Meek-IP header. We would use + // X-Forwarded-For, but App Engine prohibits setting that header: + // https://cloud.google.com/appengine/docs/go/urlfetch/#Go_Request_headers + // We could use Forwarded from RFC 7239, but other CDNs already use + // X-Forwarded-For and this way we only need one parser. + c.Header.Add("Meek-IP", getClientAddr(r)) return c, nil }

1 0

[meek/master] Recognize Meek-IP as a synonym of X-Forwarded-For.
by dcf＠torproject.org 20 Dec '15

20 Dec '15

commit edcca4e9f53a2858325dedf901bef54d4d9a8b71 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Dec 14 01:55:10 2015 -0800 Recognize Meek-IP as a synonym of X-Forwarded-For. With higher precedence. --- meek-server/useraddr.go | 5 ++++- meek-server/useraddr_test.go | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/meek-server/useraddr.go b/meek-server/useraddr.go index 680a6d8..a01944b 100644 --- a/meek-server/useraddr.go +++ b/meek-server/useraddr.go @@ -29,7 +29,10 @@ func originalClientIP(req *http.Request) (net.IP, error) { var host string var err error - xForwardedFor := req.Header.Get("X-Forwarded-For") + xForwardedFor := req.Header.Get("Meek-IP") + if xForwardedFor == "" { + xForwardedFor = req.Header.Get("X-Forwarded-For") + } if xForwardedFor != "" { host, err = getXForwardedFor(xForwardedFor) } else { diff --git a/meek-server/useraddr_test.go b/meek-server/useraddr_test.go index d603031..3f975fa 100644 --- a/meek-server/useraddr_test.go +++ b/meek-server/useraddr_test.go @@ -45,7 +45,8 @@ func TestOriginalClientIPRemoteAddr(t *testing.T) { } } -// Test that originalClientIP reads the X-Forwarded-For header if present. +// Test that originalClientIP reads the Meek-IP and X-Forwarded-For headers if +// present. func TestOriginalClientXForwardedFor(t *testing.T) { tests := []struct { XForwardedFor string @@ -73,6 +74,8 @@ func TestOriginalClientXForwardedFor(t *testing.T) { req := &http.Request{ Header: make(http.Header), } + req.Header.Set("Meek-IP", test.XForwardedFor) + checkExpected(t, req, test.Expected) req.Header.Set("X-Forwarded-For", test.XForwardedFor) checkExpected(t, req, test.Expected) } @@ -99,6 +102,24 @@ func TestOriginalClientPrecedence(t *testing.T) { http.Request{ RemoteAddr: "5.6.7.8:5678", Header: http.Header{ + http.CanonicalHeaderKey("Meek-IP"): []string{"1.2.3.4"}, + }, + }, + net.IPv4(1, 2, 3, 4), + }, + { + http.Request{ + RemoteAddr: "5.6.7.8:5678", + Header: http.Header{ + http.CanonicalHeaderKey("Meek-IP"): []string{"1:2::3:4"}, + }, + }, + net.IP{0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 4}, + }, + { + http.Request{ + RemoteAddr: "5.6.7.8:5678", + Header: http.Header{ http.CanonicalHeaderKey("X-Forwarded-For"): []string{"1.2.3.4"}, }, }, @@ -113,6 +134,17 @@ func TestOriginalClientPrecedence(t *testing.T) { }, net.IP{0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 4}, }, + // Meek-IP has precedence over X-Forwarded-For if both are set. + { + http.Request{ + RemoteAddr: "5.6.7.8:5678", + Header: http.Header{ + http.CanonicalHeaderKey("Meek-IP"): []string{"1.2.3.4"}, + http.CanonicalHeaderKey("X-Forwarded-For"): []string{"2.2.2.2"}, + }, + }, + net.IPv4(1, 2, 3, 4), + }, // X-Forwarded-For shadows RemoteAddr, even if bad syntax. { http.Request{

1 0