March 2017 - tor-commits - lists.torproject.org

[tor/master] Create function to log service introduction point creation limits
by nickm＠torproject.org 14 Mar '17

14 Mar '17

commit d0927b664602a68844b4a91e10af6d6350048397 Author: teor <teor2345(a)gmail.com> Date: Sat Mar 4 22:42:59 2017 +1100 Create function to log service introduction point creation limits Depends on 21594, part of 21622. (Resolved merge conflict in static function declarations. --- src/or/rendservice.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index eeccd43..8f978d0 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -83,6 +83,7 @@ static const smartlist_t* rend_get_service_list( const smartlist_t* substitute_service_list); static smartlist_t* rend_get_service_list_mutable( smartlist_t* substitute_service_list); +static int rend_max_intro_circs_per_period(unsigned int n_intro_points_wanted); /** Represents the mapping from a virtual port of a rendezvous service to * a real port on some IP. @@ -1025,6 +1026,45 @@ rend_service_del_ephemeral(const char *service_id) return 0; } +/* There can be 1 second's delay due to second_elapsed_callback, and perhaps + * another few seconds due to blocking calls. */ +#define INTRO_CIRC_RETRY_PERIOD_SLOP 10 + +/** Log information about the intro point creation rate and current intro + * points for service, upgrading the log level from min_severity to warn if + * we have stopped launching new intro point circuits. */ +static void +rend_log_intro_limit(const rend_service_t *service, int min_severity) +{ + int exceeded_limit = (service->n_intro_circuits_launched >= + rend_max_intro_circs_per_period( + service->n_intro_points_wanted)); + int severity = min_severity; + /* We stopped creating circuits */ + if (exceeded_limit) { + severity = LOG_WARN; + } + time_t intro_period_elapsed = time(NULL) - service->intro_period_started; + tor_assert_nonfatal(intro_period_elapsed >= 0); + /* We delayed resuming circuits longer than expected */ + int exceeded_elapsed = (intro_period_elapsed > INTRO_CIRC_RETRY_PERIOD + + INTRO_CIRC_RETRY_PERIOD_SLOP); + if (exceeded_elapsed) { + severity = LOG_WARN; + } + log_fn(severity, LD_REND, "Hidden service %s %s %d intro points in the last " + "%d seconds%s. Intro circuit launches are limited to %d per %d " + "seconds.", + service->service_id, + exceeded_limit ? "exceeded launch limit with" : "launched", + service->n_intro_circuits_launched, + (int)intro_period_elapsed, + exceeded_elapsed ? " (delayed)" : "", + rend_max_intro_circs_per_period(service->n_intro_points_wanted), + INTRO_CIRC_RETRY_PERIOD); + rend_service_dump_stats(severity); +} + /** Replace the old value of <b>service</b>-\>desc with one that reflects * the other fields in service. */

1 0

[tor/master] Merge branch 'feature21622_only'
by nickm＠torproject.org 14 Mar '17

14 Mar '17

commit f38f9b33d0bf52583491cdea6f41eb51819c627b Merge: c000c7d f1dd64b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 14 12:07:30 2017 -0400 Merge branch 'feature21622_only' changes/feature21622 | 8 ++++++++ src/or/rendservice.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 56 insertions(+), 2 deletions(-)

1 0

[tor/master] Create logfiles in mode 0640
by nickm＠torproject.org 14 Mar '17

14 Mar '17

commit c000c7d118728abea6e03ddde1862e2dcf784166 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 14 11:36:53 2017 -0400 Create logfiles in mode 0640 Patch from toralf; closes 21729. --- changes/ticket21729 | 7 +++++++ src/common/log.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/ticket21729 b/changes/ticket21729 new file mode 100644 index 0000000..51d1173 --- /dev/null +++ b/changes/ticket21729 @@ -0,0 +1,7 @@ + o Minor features (logging): + - Log files are no longer created world-readable by default. + (Previously, most distributors would store the logs in a + non-world-readable location to prevent inappropriate access. This + change is an extra precaution.) Closes ticket 21729; patch from + toralf. + diff --git a/src/common/log.c b/src/common/log.c index 5f7151b..f679336 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -1086,7 +1086,7 @@ add_file_log(const log_severity_list_t *severity, const char *filename, int open_flags = O_WRONLY|O_CREAT; open_flags |= truncate_log ? O_TRUNC : O_APPEND; - fd = tor_open_cloexec(filename, open_flags, 0644); + fd = tor_open_cloexec(filename, open_flags, 0640); if (fd<0) return -1; if (tor_fd_seekend(fd)<0) {

1 0

[tor/master] Adds standard to run code changes against test suite
by nickm＠torproject.org 14 Mar '17

14 Mar '17

commit 064b1b6d1c2beca282dd878e7fa869d1dff1eea3 Author: Chelsea H. Komlo <chelsea.komlo(a)gmail.com> Date: Fri Oct 28 20:20:40 2016 -0500 Adds standard to run code changes against test suite --- doc/HACKING/CodingStandards.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/HACKING/CodingStandards.md b/doc/HACKING/CodingStandards.md index 01212a9..009047d 100644 --- a/doc/HACKING/CodingStandards.md +++ b/doc/HACKING/CodingStandards.md @@ -7,6 +7,7 @@ tl;dr: - Run `make check-spaces` to catch whitespace errors - Document your functions - Write unit tests + - Run `make test-full` to test against all unit and integration tests. - Add a file in `changes` for your branch. Patch checklist @@ -26,6 +27,8 @@ Did you remember... - To run `make check-docs` to see whether all new options are on the manpage? - To write unit tests, as possible? + - To run `make test-full` to test against all unit and integration tests (or + `make test-full-online` if you have a working connection to the internet)? - To base your code on the appropriate branch? - To include a file in the `changes` directory as appropriate?

1 0

[tor/master] make distcheck should be a part of the local development process
by nickm＠torproject.org 14 Mar '17

14 Mar '17

commit d95678ca8f97ac6e648598af01b4394840999e72 Author: Chelsea H. Komlo <chelsea.komlo(a)gmail.com> Date: Wed Dec 21 11:42:05 2016 -0500 make distcheck should be a part of the local development process --- doc/HACKING/CodingStandards.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/HACKING/CodingStandards.md b/doc/HACKING/CodingStandards.md index 009047d..9932c77 100644 --- a/doc/HACKING/CodingStandards.md +++ b/doc/HACKING/CodingStandards.md @@ -8,6 +8,7 @@ tl;dr: - Document your functions - Write unit tests - Run `make test-full` to test against all unit and integration tests. + - Run `make distcheck` to ensure the distribution works - Add a file in `changes` for your branch. Patch checklist @@ -29,6 +30,7 @@ Did you remember... - To write unit tests, as possible? - To run `make test-full` to test against all unit and integration tests (or `make test-full-online` if you have a working connection to the internet)? + - To test that the distribution will actually work via `make distcheck`? - To base your code on the appropriate branch? - To include a file in the `changes` directory as appropriate?

1 0

[tor/master] Merge remote-tracking branch 'chelseakomlo/documentation_integ_tests'
by nickm＠torproject.org 14 Mar '17

14 Mar '17

commit 99ec44de45e6fb38af0a99b82728f7d359ca5bf5 Merge: 5b5ec52 dfde58d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 14 11:32:53 2017 -0400 Merge remote-tracking branch 'chelseakomlo/documentation_integ_tests' doc/HACKING/CodingStandards.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/master] check-spaces is run as part of make check
by nickm＠torproject.org 14 Mar '17

14 Mar '17

commit dfde58db6b4ca0b406b872d7b049efbe07d7a0fe Author: Chelsea H. Komlo <chelsea.komlo(a)gmail.com> Date: Wed Dec 21 17:07:57 2016 -0500 check-spaces is run as part of make check --- doc/HACKING/CodingStandards.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/HACKING/CodingStandards.md b/doc/HACKING/CodingStandards.md index 9932c77..c7787a7 100644 --- a/doc/HACKING/CodingStandards.md +++ b/doc/HACKING/CodingStandards.md @@ -4,7 +4,6 @@ Coding conventions for Tor tl;dr: - Run configure with `--enable-fatal-warnings` - - Run `make check-spaces` to catch whitespace errors - Document your functions - Write unit tests - Run `make test-full` to test against all unit and integration tests. @@ -24,7 +23,6 @@ preference) Did you remember... - To build your code while configured with `--enable-fatal-warnings`? - - To run `make check-spaces` on your code? - To run `make check-docs` to see whether all new options are on the manpage? - To write unit tests, as possible?

1 0

[tor/maint-0.3.0] #21720: Update "directory server options" preamble in manpage
by nickm＠torproject.org 14 Mar '17

14 Mar '17

commit 92813941b5f467b878485eb3c141c59f48736847 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 14 11:25:54 2017 -0400 #21720: Update "directory server options" preamble in manpage --- changes/bug21720 | 5 +++++ doc/tor.1.txt | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug21720 b/changes/bug21720 new file mode 100644 index 0000000..6d2fbcf --- /dev/null +++ b/changes/bug21720 @@ -0,0 +1,5 @@ + o Documentation: + - Update the description of the directory server options in the manual + page, to clarify that DirPort is no longer necessary to be a directory + cache. Closes ticket 21720. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index de2e2b4..1665cfe 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2121,8 +2121,9 @@ is non-zero): DIRECTORY SERVER OPTIONS ------------------------ -The following options are useful only for directory servers (that is, -if DirPort is non-zero): +The following options are useful only for directory servers. (Relays with +enough bandwidth automatically become directory servers; see DirCache for +details.) [[DirPortFrontPage]] **DirPortFrontPage** __FILENAME__:: When this option is set, it takes an HTML file and publishes it as "/" on

1 0

[tor/release-0.3.0] #21720: Update "directory server options" preamble in manpage
by nickm＠torproject.org 14 Mar '17

14 Mar '17

commit 92813941b5f467b878485eb3c141c59f48736847 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 14 11:25:54 2017 -0400 #21720: Update "directory server options" preamble in manpage --- changes/bug21720 | 5 +++++ doc/tor.1.txt | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug21720 b/changes/bug21720 new file mode 100644 index 0000000..6d2fbcf --- /dev/null +++ b/changes/bug21720 @@ -0,0 +1,5 @@ + o Documentation: + - Update the description of the directory server options in the manual + page, to clarify that DirPort is no longer necessary to be a directory + cache. Closes ticket 21720. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index de2e2b4..1665cfe 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2121,8 +2121,9 @@ is non-zero): DIRECTORY SERVER OPTIONS ------------------------ -The following options are useful only for directory servers (that is, -if DirPort is non-zero): +The following options are useful only for directory servers. (Relays with +enough bandwidth automatically become directory servers; see DirCache for +details.) [[DirPortFrontPage]] **DirPortFrontPage** __FILENAME__:: When this option is set, it takes an HTML file and publishes it as "/" on

1 0

[tor/master] #21720: Update "directory server options" preamble in manpage
by nickm＠torproject.org 14 Mar '17

14 Mar '17

commit 92813941b5f467b878485eb3c141c59f48736847 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 14 11:25:54 2017 -0400 #21720: Update "directory server options" preamble in manpage --- changes/bug21720 | 5 +++++ doc/tor.1.txt | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug21720 b/changes/bug21720 new file mode 100644 index 0000000..6d2fbcf --- /dev/null +++ b/changes/bug21720 @@ -0,0 +1,5 @@ + o Documentation: + - Update the description of the directory server options in the manual + page, to clarify that DirPort is no longer necessary to be a directory + cache. Closes ticket 21720. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index de2e2b4..1665cfe 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2121,8 +2121,9 @@ is non-zero): DIRECTORY SERVER OPTIONS ------------------------ -The following options are useful only for directory servers (that is, -if DirPort is non-zero): +The following options are useful only for directory servers. (Relays with +enough bandwidth automatically become directory servers; see DirCache for +details.) [[DirPortFrontPage]] **DirPortFrontPage** __FILENAME__:: When this option is set, it takes an HTML file and publishes it as "/" on

1 0