aboutsummaryrefslogtreecommitdiff
path: root/src/or
AgeCommit message (Collapse)Author
2015-10-06fix check-spaces once moreNick Mathewson
2015-10-06Merge remote-tracking branch 'twstrike/rendcache_tests'Nick Mathewson
Conflicts: src/test/include.am src/test/rend_test_helpers.c src/test/rend_test_helpers.h
2015-10-05Fix spaces and other smaller issuesOla Bini
2015-10-04fix easy typoRoger Dingledine
2015-10-02Merge remote-tracking branch 'twstrike/dir-handle-cmd-get'Nick Mathewson
2015-10-02Merge remote-tracking branch 'teor/warn-when-time-goes-backwards'Nick Mathewson
2015-10-02Merge remote-tracking branch 'teor/routerset-parse-IPv6-literals'Nick Mathewson
(Minor conflicts)
2015-10-02Merge remote-tracking branch 'donncha/feature14846_4'Nick Mathewson
2015-10-01fixup #17188: Add most likely reasons for clock going backwardsteor (Tim Wilson-Brown)
Add "You might have an empty clock battery or bad NTP server."
2015-09-30Disallow transitions on SyslogIdentityTag, since they do not work rightNick Mathewson
2015-09-30Add SyslogIdentityTagPeter Palfrader
When logging to syslog, allow a tag to be added to the syslog identity ("Tor"), i.e. the string prepended to every log message. The tag can be configured by setting SyslogIdentityTag and defaults to none. Setting it to "foo" will cause logs to be tagged as "Tor-foo". Closes: #17194.
2015-09-30Warn when the system clock is set back in timeteor (Tim Wilson-Brown)
Warn when the state file was last written in the future. Tor doesn't know that consensuses have expired if the clock is in the past. Patch by "teor". Implements ticket #17188.
2015-09-29No spaces around = in variable assignmentMarcin Cieślak
BSD make takes spaces around = literally and produces a "TESTING_TOR_BINARY " variable with a trailing space, which leads to test_keygen.sh failure. Fixes 17154
2015-09-24Make our digest-mismatch warnings a touch betterNick Mathewson
2015-09-24Put braces around reject-lines for IPv6 addrsNick Mathewson
Fixes bug 17149; bug not in any released Tor.
2015-09-23New AuthDirPinKeys option to enable/disable keypinning enforcementNick Mathewson
Implements ticket #17135. We're going to need this one to avoid chaos as everybody figures out how ed25519 keys work.
2015-09-23Extract the add-or-replace-keypin logic into a new functionNick Mathewson
We're about to need to call it in another place too.
2015-09-23Allow conflicts to occur in keypinning journalNick Mathewson
When we find a conflict in the keypinning journal, treat the new entry as superseding all old entries that overlap either of its keys. Also add a (not-yet-used) configuration option to disable keypinning enforcement.
2015-09-22Fix a memory leak in router_parse_addr_policy_item_from_string. CID 1324770Nick Mathewson
2015-09-22Merge branch 'feature16769_squashed'Nick Mathewson
2015-09-22Disable --master-key as not-yet-working for 0.2.7Nick Mathewson
2015-09-22Add a --master-key optionNick Mathewson
This lets the user override the default location for the master key when used with --keygen Part of 16769.
2015-09-22Add a new --newpass option to add or remove secret key passphrases.Nick Mathewson
2015-09-22Merge branch 'feature16944_v2'Nick Mathewson
2015-09-16Merge branch 'bug17027-reject-private-all-interfaces-v2' into bug16069-bug17027teor (Tim Wilson-Brown)
src/test/test_policy.c: Merged calls to policies_parse_exit_policy by adding additional arguments. fixup to remaining instance of ~EXIT_POLICY_IPV6_ENABLED. Compacting logic test now produces previous list length of 4, corrected this. src/config/torrc.sample.in: src/config/torrc.minimal.in-staging: Merged torrc modification dates in favour of latest.
2015-09-16fixup Clarify ambiguous log message in router_add_exit_policyteor (Tim Wilson-Brown)
2015-09-16fixup Only set TAPMP_STAR_IPV6_ONLY if TAPMP_EXTENDED_STAR is setteor (Tim Wilson-Brown)
Also fix a comment.
2015-09-16Log an info-level message for each IP blocked by ExitPolicyRejectPrivateteor (Tim Wilson-Brown)
Log an info-level message containing the reject line added to the exit policy for each local IP address blocked by ExitPolicyRejectPrivate: - Published IPv4 and IPv6 addresses - Publicly routable IPv4 and IPv6 interface addresses
2015-09-16ExitPolicyRejectPrivate rejects local IPv6 address and interface addressesteor (Tim Wilson-Brown)
ExitPolicyRejectPrivate now rejects more local addresses by default: * the relay's published IPv6 address (if any), and * any publicly routable IPv4 or IPv6 addresses on any local interfaces. This resolves a security issue for IPv6 Exits and multihomed Exits that trust connections originating from localhost. Resolves ticket 17027. Patch by "teor". Patch on 42b8fb5a1523 (11 Nov 2007), released in 0.2.0.11-alpha.
2015-09-15Add tests for directory_handle_command_getReinaldo de Souza Jr
2015-09-15Add tests for the rend cacheOla Bini
2015-09-16ExitPolicy accept6/reject6 produces IPv6 wildcard addresses onlyteor (Tim Wilson-Brown)
In previous versions of Tor, ExitPolicy accept6/reject6 * produced policy entries for IPv4 and IPv6 wildcard addresses. To reduce operator confusion, change accept6/reject6 * to only produce an IPv6 wildcard address. Resolves bug #16069. Patch on 2eb7eafc9d78 and a96c0affcb4c (25 Oct 2012), released in 0.2.4.7-alpha.
2015-09-16Warn about redundant torrc ExitPolicy lines due to accept/reject *:*teor (Tim Wilson-Brown)
Tor now warns when ExitPolicy lines occur after accept/reject *:* or variants. These lines are redundant, and were always ignored. Partial fix for ticket 16069. Patch by "teor". Patch on 2eb7eafc9d78 and a96c0affcb4c (25 Oct 2012), released in 0.2.4.7-alpha.
2015-09-16Ignore accept6/reject6 IPv4, warn about unexpected rule outcomesteor (Tim Wilson-Brown)
When parsing torrc ExitPolicies, we now warn if: * an IPv4 address is used on an accept6 or reject6 line. The line is ignored, but the rest of the policy items in the list are used. (accept/reject continue to allow both IPv4 and IPv6 addresses in torrcs.) * a "private" address alias is used on an accept6 or reject6 line. The line filters both IPv4 and IPv6 private addresses, disregarding the 6 in accept6/reject6. When parsing torrc ExitPolicies, we now issue an info-level message: * when expanding an accept/reject * line to include both IPv4 and IPv6 wildcard addresses. In each instance, usage advice is provided to avoid the message. Partial fix for ticket 16069. Patch by "teor". Patch on 2eb7eafc9d78 and a96c0affcb4c (25 Oct 2012), released in 0.2.4.7-alpha.
2015-09-14Allow IPv6 literal addresses in routersetsteor (Tim Wilson-Brown)
routerset_parse now accepts IPv6 literal addresses. Fix for ticket 17060. Patch by "teor". Patch on 3ce6e2fba290 (24 Jul 2008), and related commits, released in 0.2.1.3-alpha.
2015-09-14Update comments about ExitPolicy parsingteor (Tim Wilson-Brown)
Fix incomplete and incorrect comments. Comment changes only.
2015-09-13Convince coverity that we do not have a particular memory leakNick Mathewson
2015-09-11Add a rend cache failure info dup functionDavid Goulet
When validating a new descriptor against our rend cache failure, we were added the failure entry to the new cache entry without duplicating. It was then freed just after the validation ending up in a very bad memory state that was making tor abort(). To fix this, a dup function has been added and used just before adding the failure entry. Fixes #17041 Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-09-10Merge remote-tracking branch 'public/ed25519_hup_v2'Nick Mathewson
2015-09-09Check NoKeepAliveIsolateSOCKSAuth in a better place.Yawning Angel
No functional changes, but since NoKeepAliveIsolateSOCKSAuth isn't part of isoflag, it should be checked where all other similar options are, and bypass the (no-op) masking at the end.
2015-09-08Make NoKeepAliveIsolateSOCKSAuth work as expectedNick Mathewson
2015-09-08Merge branch 'feature15482_squashed'Nick Mathewson
2015-09-08Add `KeepAliveIsolateSOCKSAuth` as a SOCKSPort option.Yawning Angel
This controls the circuit dirtyness reset behavior added for Tor Browser's user experience fix (#15482). Unlike previous iterations of this patch, the tunable actually works, and is documented.
2015-09-08Separate lookup function for service rend cacheDonncha O'Cearbhaill
Performing lookups in both the client and service side descriptor caches from the same rend_cache_lookup_entry() function increases the risk of accidental API misuse. I'm separating the lookup functions to keep the caches distinct.
2015-09-08Rename rend_cache_service to rend_cache_local_service for clarityDonncha O'Cearbhaill
2015-09-08Clean old descriptors from the service-side rend cacheDonncha O'Cearbhaill
Parameterize the rend_cache_clean() function to allow it clean old rendezvous descriptors from the service-side cache as well as the client descriptor cache.
2015-09-08Require explict specification of cache typeDonncha O'Cearbhaill
2015-09-08Add replica number to HS_DESC CREATED eventDonncha O'Cearbhaill
Including the replica number in the HS_DESC CREATED event provides more context to a control port client. The replica allows clients to more easily identify each replicated descriptor from the independantly output control events.
2015-09-08Clean up service-side descriptor cache and fix potential double-free.Donncha O'Cearbhaill
Entries in the service-side descriptor cache are now cleaned when rend_cache_free_all() is called. The call to tor_free(intro_content) in rend_cache_store_v2_desc_as_service() is moved to prevent a potential double-free when a service has a descriptor with a newer timestamp already in it's service-side descriptor cache.
2015-09-08Specify descriptor cache type in rend_cache_lookup_entry()Donncha O'Cearbhaill
Adds an Enum which represents the different types of rendezvous descriptor caches. This argument is passed in each call to rend_cache_lookup_entry() to specify lookup in the client-side or service-side descriptor caches.