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

[tor/master] practracker: a violation of a .may_include rule is now a problem.
by dgoulet＠torproject.org 21 Aug '19

21 Aug '19

commit 6b26281b50f25f0175f3ba801951324a30ba7a32 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 5 17:17:50 2019 -0400 practracker: a violation of a .may_include rule is now a problem. We treat "0" as the expected number, and warn about everything else. The problem type is "dependency-violation". --- scripts/maint/practracker/practracker.py | 17 ++++++++++++++++- scripts/maint/practracker/problem.py | 17 +++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py index 7e51edb48..66ebb1277 100755 --- a/scripts/maint/practracker/practracker.py +++ b/scripts/maint/practracker/practracker.py @@ -25,6 +25,7 @@ import os, sys import metrics import util import problem +import includes # The filename of the exceptions file (it should be placed in the practracker directory) EXCEPTIONS_FNAME = "./exceptions.txt" @@ -35,12 +36,15 @@ MAX_FILE_SIZE = 3000 # lines MAX_FUNCTION_SIZE = 100 # lines # Recommended number of #includes MAX_INCLUDE_COUNT = 50 +# Recommended number of dependency violations +MAX_DEP_VIOLATIONS = 0 # Map from problem type to functions that adjust for tolerance TOLERANCE_FNS = { 'include-count': lambda n: int(n*1.1), 'function-size': lambda n: int(n*1.1), - 'file-size': lambda n: int(n*1.02) + 'file-size': lambda n: int(n*1.02), + 'dependency-violation': lambda n: (n+2) } ####################################################### @@ -94,6 +98,7 @@ def consider_metrics_for_file(fname, f): Yield a sequence of problem.Item objects for all of the metrics in 'f'. """ + real_fname = fname # Strip the useless part of the path if fname.startswith(TOR_TOPDIR): fname = fname[len(TOR_TOPDIR):] @@ -112,6 +117,13 @@ def consider_metrics_for_file(fname, f): for item in consider_function_size(fname, f): yield item + n = 0 + for item in includes.consider_include_rules(real_fname): + n += 1 + if n: + yield problem.DependencyViolationItem(fname, n) + + HEADER="""\ # Welcome to the exceptions file for Tor's best-practices tracker! # @@ -167,6 +179,8 @@ def main(argv): help="Maximum includes per C file") parser.add_argument("--max-function-size", default=MAX_FUNCTION_SIZE, help="Maximum lines per function") + parser.add_argument("--max-dependency-violations", default=MAX_DEP_VIOLATIONS, + help="Maximum number of dependency violations to allow") parser.add_argument("topdir", default=".", nargs="?", help="Top-level directory for the tor source") args = parser.parse_args(argv[1:]) @@ -183,6 +197,7 @@ def main(argv): filt.addThreshold(problem.FileSizeItem("*", int(args.max_file_size))) filt.addThreshold(problem.IncludeCountItem("*", int(args.max_include_count))) filt.addThreshold(problem.FunctionSizeItem("*", int(args.max_function_size))) + filt.addThreshold(problem.DependencyViolationItem("*", int(args.max_dependency_violations))) # 1) Get all the .c files we care about files_list = util.get_tor_c_files(TOR_TOPDIR) diff --git a/scripts/maint/practracker/problem.py b/scripts/maint/practracker/problem.py index 73519d446..dafcda86f 100644 --- a/scripts/maint/practracker/problem.py +++ b/scripts/maint/practracker/problem.py @@ -191,6 +191,21 @@ class FunctionSizeItem(Item): def __init__(self, problem_location, metric_value): super(FunctionSizeItem, self).__init__("function-size", problem_location, metric_value) +class DependencyViolationItem(Item): + """ + Denotes a dependency violation in a .c or .h file. A dependency violation + occurs when a file includes a file from some module that is not listed + in its .may_include file. + + The 'problem_location' is the file that contains the problem. + + The 'metric_value' is the number of forbidden includes. + """ + def __init__(self, problem_location, metric_value): + super(DependencyViolationItem, self).__init__("dependency-violation", + problem_location, + metric_value) + comment_re = re.compile(r'#.*$') def get_old_problem_from_exception_str(exception_str): @@ -212,5 +227,7 @@ def get_old_problem_from_exception_str(exception_str): return IncludeCountItem(problem_location, metric_value) elif problem_type == "function-size": return FunctionSizeItem(problem_location, metric_value) + elif problem_type == "dependency-violation": + return DependencyViolationItem(problem_location, metric_value) else: raise ValueError("Unknown exception type {!r}".format(orig_str))

1 0

[tor/master] changes file for ticket 31176
by dgoulet＠torproject.org 21 Aug '19

21 Aug '19

commit d515b0f4ba5797ab763c43b5ded0a7a5712eae20 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 5 17:43:53 2019 -0400 changes file for ticket 31176 --- changes/ticket31176 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/ticket31176 b/changes/ticket31176 new file mode 100644 index 000000000..5fcdeab3a --- /dev/null +++ b/changes/ticket31176 @@ -0,0 +1,5 @@ + o Major features (developer tools): + - Our best-practices tracker now integrates with our include-checker tool + to keep track of the layering violations that we have not yet fixed. + We hope to reduce this number over time to improve Tor's modularity. + Closes ticket 31176.

1 0

[tor/master] update exceptions file for depencency violations
by dgoulet＠torproject.org 21 Aug '19

21 Aug '19

commit 0f4b245b20e4fc16d4382a48121801c300b686a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 5 17:44:15 2019 -0400 update exceptions file for depencency violations --- scripts/maint/practracker/exceptions.txt | 42 ++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index d437726fe..39eb7a437 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -51,6 +51,11 @@ problem function-size /src/app/main/main.c:tor_init() 133 problem function-size /src/app/main/main.c:sandbox_init_filter() 291 problem function-size /src/app/main/main.c:run_tor_main_loop() 105 problem function-size /src/app/main/ntmain.c:nt_service_install() 126 +problem dependency-violation /src/core/crypto/hs_ntor.c 1 +problem dependency-violation /src/core/crypto/onion_crypto.c 5 +problem dependency-violation /src/core/crypto/onion_fast.c 1 +problem dependency-violation /src/core/crypto/onion_tap.c 3 +problem dependency-violation /src/core/crypto/relay_crypto.c 9 problem file-size /src/core/mainloop/connection.c 5569 problem include-count /src/core/mainloop/connection.c 62 problem function-size /src/core/mainloop/connection.c:connection_free_minimal() 185 @@ -63,32 +68,49 @@ problem function-size /src/core/mainloop/connection.c:connection_handle_read_imp problem function-size /src/core/mainloop/connection.c:connection_buf_read_from_socket() 180 problem function-size /src/core/mainloop/connection.c:connection_handle_write_impl() 241 problem function-size /src/core/mainloop/connection.c:assert_connection_ok() 143 +problem dependency-violation /src/core/mainloop/connection.c 44 +problem dependency-violation /src/core/mainloop/cpuworker.c 12 problem include-count /src/core/mainloop/mainloop.c 63 problem function-size /src/core/mainloop/mainloop.c:conn_close_if_marked() 108 problem function-size /src/core/mainloop/mainloop.c:run_connection_housekeeping() 123 +problem dependency-violation /src/core/mainloop/mainloop.c 49 +problem dependency-violation /src/core/mainloop/mainloop_pubsub.c 1 +problem dependency-violation /src/core/mainloop/mainloop_sys.c 1 +problem dependency-violation /src/core/mainloop/netstatus.c 4 +problem dependency-violation /src/core/mainloop/periodic.c 2 +problem dependency-violation /src/core/or/address_set.c 1 problem file-size /src/core/or/channel.c 3487 +problem dependency-violation /src/core/or/channel.c 9 +problem dependency-violation /src/core/or/channelpadding.c 6 problem function-size /src/core/or/channeltls.c:channel_tls_handle_var_cell() 160 problem function-size /src/core/or/channeltls.c:channel_tls_process_versions_cell() 170 problem function-size /src/core/or/channeltls.c:channel_tls_process_netinfo_cell() 214 problem function-size /src/core/or/channeltls.c:channel_tls_process_certs_cell() 246 problem function-size /src/core/or/channeltls.c:channel_tls_process_authenticate_cell() 202 +problem dependency-violation /src/core/or/channeltls.c 10 problem include-count /src/core/or/circuitbuild.c 54 problem function-size /src/core/or/circuitbuild.c:get_unique_circ_id_by_chan() 128 problem function-size /src/core/or/circuitbuild.c:circuit_extend() 147 problem function-size /src/core/or/circuitbuild.c:choose_good_exit_server_general() 206 +problem dependency-violation /src/core/or/circuitbuild.c 25 problem include-count /src/core/or/circuitlist.c 55 problem function-size /src/core/or/circuitlist.c:HT_PROTOTYPE() 109 problem function-size /src/core/or/circuitlist.c:circuit_free_() 143 problem function-size /src/core/or/circuitlist.c:circuit_find_to_cannibalize() 101 problem function-size /src/core/or/circuitlist.c:circuit_about_to_free() 120 problem function-size /src/core/or/circuitlist.c:circuits_handle_oom() 117 +problem dependency-violation /src/core/or/circuitlist.c 19 problem function-size /src/core/or/circuitmux.c:circuitmux_set_policy() 109 problem function-size /src/core/or/circuitmux.c:circuitmux_attach_circuit() 113 +problem dependency-violation /src/core/or/circuitmux_ewma.c 2 problem file-size /src/core/or/circuitpadding.c 3043 problem function-size /src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 107 +problem dependency-violation /src/core/or/circuitpadding.c 6 problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_relay_hide_intro_circuits() 103 problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_client_hide_rend_circuits() 112 +problem dependency-violation /src/core/or/circuitpadding_machines.c 1 problem function-size /src/core/or/circuitstats.c:circuit_build_times_parse_state() 123 +problem dependency-violation /src/core/or/circuitstats.c 11 problem file-size /src/core/or/circuituse.c 3162 problem function-size /src/core/or/circuituse.c:circuit_is_acceptable() 128 problem function-size /src/core/or/circuituse.c:circuit_expire_building() 394 @@ -97,8 +119,10 @@ problem function-size /src/core/or/circuituse.c:circuit_build_failed() 149 problem function-size /src/core/or/circuituse.c:circuit_launch_by_extend_info() 108 problem function-size /src/core/or/circuituse.c:circuit_get_open_circ_or_launch() 352 problem function-size /src/core/or/circuituse.c:connection_ap_handshake_attach_circuit() 244 +problem dependency-violation /src/core/or/circuituse.c 23 problem function-size /src/core/or/command.c:command_process_create_cell() 156 problem function-size /src/core/or/command.c:command_process_relay_cell() 132 +problem dependency-violation /src/core/or/command.c 8 problem file-size /src/core/or/connection_edge.c 4596 problem include-count /src/core/or/connection_edge.c 65 problem function-size /src/core/or/connection_edge.c:connection_ap_expire_beginning() 117 @@ -109,14 +133,21 @@ problem function-size /src/core/or/connection_edge.c:connection_ap_handshake_sen problem function-size /src/core/or/connection_edge.c:connection_ap_handshake_socks_resolved() 101 problem function-size /src/core/or/connection_edge.c:connection_exit_begin_conn() 185 problem function-size /src/core/or/connection_edge.c:connection_exit_connect() 102 +problem dependency-violation /src/core/or/connection_edge.c 27 problem file-size /src/core/or/connection_or.c 3122 problem include-count /src/core/or/connection_or.c 51 problem function-size /src/core/or/connection_or.c:connection_or_group_set_badness_() 105 problem function-size /src/core/or/connection_or.c:connection_or_client_learned_peer_id() 142 problem function-size /src/core/or/connection_or.c:connection_or_compute_authenticate_cell_body() 231 +problem dependency-violation /src/core/or/connection_or.c 20 +problem dependency-violation /src/core/or/dos.c 5 +problem dependency-violation /src/core/or/onion.c 2 +problem dependency-violation /src/core/or/or_periodic.c 1 problem file-size /src/core/or/policies.c 3249 problem function-size /src/core/or/policies.c:policy_summarize() 107 +problem dependency-violation /src/core/or/policies.c 14 problem function-size /src/core/or/protover.c:protover_all_supported() 117 +problem dependency-violation /src/core/or/reasons.c 2 problem file-size /src/core/or/relay.c 3263 problem function-size /src/core/or/relay.c:circuit_receive_relay_cell() 126 problem function-size /src/core/or/relay.c:relay_send_command_from_edge_() 109 @@ -125,10 +156,21 @@ problem function-size /src/core/or/relay.c:connection_edge_process_relay_cell_no problem function-size /src/core/or/relay.c:handle_relay_cell_command() 369 problem function-size /src/core/or/relay.c:connection_edge_package_raw_inbuf() 128 problem function-size /src/core/or/relay.c:circuit_resume_edge_reading_helper() 146 +problem dependency-violation /src/core/or/relay.c 16 +problem dependency-violation /src/core/or/scheduler.c 1 problem function-size /src/core/or/scheduler_kist.c:kist_scheduler_run() 171 +problem dependency-violation /src/core/or/scheduler_kist.c 2 problem function-size /src/core/or/scheduler_vanilla.c:vanilla_scheduler_run() 109 +problem dependency-violation /src/core/or/scheduler_vanilla.c 1 +problem dependency-violation /src/core/or/sendme.c 2 +problem dependency-violation /src/core/or/status.c 12 problem function-size /src/core/or/versions.c:tor_version_parse() 104 +problem dependency-violation /src/core/proto/proto_cell.c 3 +problem dependency-violation /src/core/proto/proto_control0.c 1 +problem dependency-violation /src/core/proto/proto_ext_or.c 2 +problem dependency-violation /src/core/proto/proto_http.c 1 problem function-size /src/core/proto/proto_socks.c:parse_socks_client() 110 +problem dependency-violation /src/core/proto/proto_socks.c 8 problem function-size /src/feature/client/addressmap.c:addressmap_rewrite() 109 problem function-size /src/feature/client/bridges.c:rewrite_node_address_for_bridge() 126 problem function-size /src/feature/client/circpathbias.c:pathbias_measure_close_rate() 108

1 0

[tor/master] Merge branch 'ticket31176' into ticket31176_merged
by dgoulet＠torproject.org 21 Aug '19

21 Aug '19

commit cc48eff2d3b07a8dd2f621f09217ba29b4e6771c Merge: 4b1e0dd5b 0f4b245b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 21 09:46:20 2019 -0400 Merge branch 'ticket31176' into ticket31176_merged Makefile.am | 3 +- changes/ticket31176 | 5 + scripts/git/pre-commit.git-hook | 4 +- scripts/maint/checkIncludes.py | 183 +------------------- scripts/maint/practracker/exceptions.txt | 45 ++++- scripts/maint/practracker/includes.py | 285 +++++++++++++++++++++++++++++++ scripts/maint/practracker/practracker.py | 23 ++- scripts/maint/practracker/problem.py | 17 ++ src/core/crypto/.may_include | 10 ++ src/core/mainloop/.may_include | 20 +++ src/core/or/.may_include | 38 +++++ src/core/proto/.may_include | 10 ++ 12 files changed, 462 insertions(+), 181 deletions(-) diff --cc Makefile.am index bb5dee52e,e973593bd..d3cce3934 --- a/Makefile.am +++ b/Makefile.am @@@ -166,23 -166,10 +166,24 @@@ EXTRA_DIST+= Makefile.nmake \ README \ ReleaseNotes \ - scripts/maint/practracker/includes.py \ - scripts/maint/checkSpace.pl \ - scripts/maint/practracker - + scripts/maint/checkIncludes.py \ + scripts/maint/checkSpace.pl \ + scripts/maint/practracker/exceptions.txt \ ++ scripts/maint/practracker/includes.py \ + scripts/maint/practracker/metrics.py \ + scripts/maint/practracker/practracker.py \ + scripts/maint/practracker/practracker_tests.py \ + scripts/maint/practracker/problem.py \ + scripts/maint/practracker/testdata/a.c \ + scripts/maint/practracker/testdata/b.c \ + scripts/maint/practracker/testdata/ex0-expected.txt \ + scripts/maint/practracker/testdata/ex0.txt \ + scripts/maint/practracker/testdata/ex1-expected.txt \ + scripts/maint/practracker/testdata/ex1.txt \ + scripts/maint/practracker/testdata/ex.txt \ + scripts/maint/practracker/testdata/not_c_file \ + scripts/maint/practracker/test_practracker.sh \ + scripts/maint/practracker/util.py ## This tells etags how to find mockable function definitions. AM_ETAGSFLAGS=--regex='{c}/MOCK_IMPL([^,]+,\W*$[a-zA-Z0-9_]+$\W*,/\1/s' diff --cc scripts/maint/practracker/exceptions.txt index 4f3943f21,39eb7a437..ce6004fe1 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@@ -67,8 -73,15 +74,16 @@@ problem dependency-violation /src/core/ problem include-count /src/core/mainloop/mainloop.c 63 problem function-size /src/core/mainloop/mainloop.c:conn_close_if_marked() 108 problem function-size /src/core/mainloop/mainloop.c:run_connection_housekeeping() 123 + problem dependency-violation /src/core/mainloop/mainloop.c 49 + problem dependency-violation /src/core/mainloop/mainloop_pubsub.c 1 + problem dependency-violation /src/core/mainloop/mainloop_sys.c 1 + problem dependency-violation /src/core/mainloop/netstatus.c 4 + problem dependency-violation /src/core/mainloop/periodic.c 2 + problem dependency-violation /src/core/or/address_set.c 1 problem file-size /src/core/or/channel.c 3487 +problem file-size /src/core/or/channel.h 780 + problem dependency-violation /src/core/or/channel.c 9 + problem dependency-violation /src/core/or/channelpadding.c 6 problem function-size /src/core/or/channeltls.c:channel_tls_handle_var_cell() 160 problem function-size /src/core/or/channeltls.c:channel_tls_process_versions_cell() 170 problem function-size /src/core/or/channeltls.c:channel_tls_process_netinfo_cell() 214 @@@ -84,14 -99,18 +101,19 @@@ problem function-size /src/core/or/circ problem function-size /src/core/or/circuitlist.c:circuit_find_to_cannibalize() 101 problem function-size /src/core/or/circuitlist.c:circuit_about_to_free() 120 problem function-size /src/core/or/circuitlist.c:circuits_handle_oom() 117 + problem dependency-violation /src/core/or/circuitlist.c 19 problem function-size /src/core/or/circuitmux.c:circuitmux_set_policy() 109 problem function-size /src/core/or/circuitmux.c:circuitmux_attach_circuit() 113 + problem dependency-violation /src/core/or/circuitmux_ewma.c 2 problem file-size /src/core/or/circuitpadding.c 3043 problem function-size /src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 107 +problem file-size /src/core/or/circuitpadding.h 809 + problem dependency-violation /src/core/or/circuitpadding.c 6 problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_relay_hide_intro_circuits() 103 problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_client_hide_rend_circuits() 112 + problem dependency-violation /src/core/or/circuitpadding_machines.c 1 problem function-size /src/core/or/circuitstats.c:circuit_build_times_parse_state() 123 + problem dependency-violation /src/core/or/circuitstats.c 11 problem file-size /src/core/or/circuituse.c 3162 problem function-size /src/core/or/circuituse.c:circuit_is_acceptable() 128 problem function-size /src/core/or/circuituse.c:circuit_expire_building() 394 @@@ -117,13 -139,17 +142,19 @@@ problem include-count /src/core/or/conn problem function-size /src/core/or/connection_or.c:connection_or_group_set_badness_() 105 problem function-size /src/core/or/connection_or.c:connection_or_client_learned_peer_id() 142 problem function-size /src/core/or/connection_or.c:connection_or_compute_authenticate_cell_body() 231 +problem file-size /src/core/or/or.h 1103 +problem include-count /src/core/or/or.h 49 + problem dependency-violation /src/core/or/connection_or.c 20 + problem dependency-violation /src/core/or/dos.c 5 + problem dependency-violation /src/core/or/onion.c 2 + problem dependency-violation /src/core/or/or_periodic.c 1 problem file-size /src/core/or/policies.c 3249 problem function-size /src/core/or/policies.c:policy_summarize() 107 + problem dependency-violation /src/core/or/policies.c 14 problem function-size /src/core/or/protover.c:protover_all_supported() 117 - problem file-size /src/core/or/relay.c 3264 -problem dependency-violation /src/core/or/reasons.c 2 +problem function-size /src/core/or/relay.c:circuit_receive_relay_cell() 127 + problem file-size /src/core/or/relay.c 3263 -problem function-size /src/core/or/relay.c:circuit_receive_relay_cell() 126 ++problem dependency-violation /src/core/or/reasons.c 2 problem function-size /src/core/or/relay.c:relay_send_command_from_edge_() 109 problem function-size /src/core/or/relay.c:connection_ap_process_end_not_open() 192 problem function-size /src/core/or/relay.c:connection_edge_process_relay_cell_not_open() 137 diff --cc scripts/maint/practracker/practracker.py index 0fdfd4a40,16ccec3d7..6483b88da --- a/scripts/maint/practracker/practracker.py +++ b/scripts/maint/practracker/practracker.py @@@ -35,10 -36,8 +36,12 @@@ MAX_FILE_SIZE = 3000 # line MAX_FUNCTION_SIZE = 100 # lines # Recommended number of #includes MAX_INCLUDE_COUNT = 50 +# Recommended file size for headers +MAX_H_FILE_SIZE = 500 +# Recommended include count for headers +MAX_H_INCLUDE_COUNT = 15 + # Recommended number of dependency violations + MAX_DEP_VIOLATIONS = 0 # Map from problem type to functions that adjust for tolerance TOLERANCE_FNS = { @@@ -188,11 -200,10 +208,12 @@@ def main(argv) # 0) Configure our thresholds of "what is a problem actually" filt = problem.ProblemFilter() - filt.addThreshold(problem.FileSizeItem("*", int(args.max_file_size))) - filt.addThreshold(problem.IncludeCountItem("*", int(args.max_include_count))) - filt.addThreshold(problem.FunctionSizeItem("*", int(args.max_function_size))) + filt.addThreshold(problem.FileSizeItem("*.c", int(args.max_file_size))) + filt.addThreshold(problem.IncludeCountItem("*.c", int(args.max_include_count))) + filt.addThreshold(problem.FileSizeItem("*.h", int(args.max_h_file_size))) + filt.addThreshold(problem.IncludeCountItem("*.h", int(args.max_h_include_count))) + filt.addThreshold(problem.FunctionSizeItem("*.c", int(args.max_function_size))) + filt.addThreshold(problem.DependencyViolationItem("*", int(args.max_dependency_violations))) # 1) Get all the .c files we care about files_list = util.get_tor_c_files(TOR_TOPDIR)

1 0

[tor/master] Make includes interface more like the rest of practracker
by dgoulet＠torproject.org 21 Aug '19

21 Aug '19

commit 2a3c727dfed7465090c2b9bae2f5ac88b3c6dca0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 5 17:31:49 2019 -0400 Make includes interface more like the rest of practracker Everything else assumes that somebody else will open the file for it. --- scripts/maint/practracker/includes.py | 17 ++++++++--------- scripts/maint/practracker/practracker.py | 4 +++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/scripts/maint/practracker/includes.py b/scripts/maint/practracker/includes.py index fbd68f4f5..fcc527c98 100755 --- a/scripts/maint/practracker/includes.py +++ b/scripts/maint/practracker/includes.py @@ -103,11 +103,9 @@ class Rules(object): "Forbidden include of {}".format(include), is_advisory=self.is_advisory) - def applyToFile(self, fname): - with open_file(fname) as f: - #print(fname) - for error in self.applyToLines(iter(f), "{}:".format(fname)): - yield error + def applyToFile(self, fname, f): + for error in self.applyToLines(iter(f), "{}:".format(fname)): + yield error def noteUnusedRules(self): for p in self.patterns: @@ -200,14 +198,14 @@ def toposort(graph, limit=100): return all_levels -def consider_include_rules(fname): +def consider_include_rules(fname, f): dirpath = os.path.split(fname)[0] rules_fname = os.path.join(dirpath, RULES_FNAME) rules = load_include_rules(os.path.join(dirpath, RULES_FNAME)) if rules is None: return - for err in rules.applyToFile(fname): + for err in rules.applyToFile(fname, f): yield err list_unused = False @@ -221,8 +219,9 @@ def walk_c_files(topdir="src"): for fname in fnames: if fname_is_c(fname): fullpath = os.path.join(dirpath,fname) - for err in consider_include_rules(fullpath): - yield err + with open(fullpath) as f: + for err in consider_include_rules(fullpath, f): + yield err def run_check_includes(topdir, list_unused=False, log_sorted_levels=False, list_advisories=False): diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py index 66ebb1277..20c8bb5b4 100755 --- a/scripts/maint/practracker/practracker.py +++ b/scripts/maint/practracker/practracker.py @@ -117,8 +117,10 @@ def consider_metrics_for_file(fname, f): for item in consider_function_size(fname, f): yield item + # Check for "upward" includes + f.seek(0) n = 0 - for item in includes.consider_include_rules(real_fname): + for item in includes.consider_include_rules(real_fname, f): n += 1 if n: yield problem.DependencyViolationItem(fname, n)

1 0

[tor/master] Move include-violation checking into its own function.
by dgoulet＠torproject.org 21 Aug '19

21 Aug '19

commit a5971d732eac650d3d5eefd63df1cd4e3a9b13f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 5 17:35:20 2019 -0400 Move include-violation checking into its own function. --- scripts/maint/practracker/practracker.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py index 20c8bb5b4..16ccec3d7 100755 --- a/scripts/maint/practracker/practracker.py +++ b/scripts/maint/practracker/practracker.py @@ -83,6 +83,14 @@ def consider_function_size(fname, f): canonical_function_name = "%s:%s()" % (fname, name) yield problem.FunctionSizeItem(canonical_function_name, lines) +def consider_include_violations(fname, real_fname, f): + n = 0 + for item in includes.consider_include_rules(real_fname, f): + n += 1 + if n: + yield problem.DependencyViolationItem(fname, n) + + ####################################################### def consider_all_metrics(files_list): @@ -119,12 +127,8 @@ def consider_metrics_for_file(fname, f): # Check for "upward" includes f.seek(0) - n = 0 - for item in includes.consider_include_rules(real_fname, f): - n += 1 - if n: - yield problem.DependencyViolationItem(fname, n) - + for item in consider_include_violations(fname, real_fname, f): + yield item HEADER="""\ # Welcome to the exceptions file for Tor's best-practices tracker!

1 0

[translation/snowflake-website-indexhtml_completed] Update translations for snowflake-website-indexhtml_completed
by translation＠torproject.org 21 Aug '19

21 Aug '19

commit 75d5ee875d53148cee23f172fbc7a9ba50f04217 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 21 13:49:12 2019 +0000 Update translations for snowflake-website-indexhtml_completed --- pt_PT/index.html | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/pt_PT/index.html b/pt_PT/index.html new file mode 100644 index 000000000..aa964b52e --- /dev/null +++ b/pt_PT/index.html @@ -0,0 +1,84 @@ +<!DOCTYPE html> +<html> +<head> +<meta http-equiv="content-type" content="text/html; charset=UTF-8"> +<meta charset="utf-8"> +<meta name="viewport" content="width=device-width, initial-scale=1"> +<title>Snowflake</title> +<link rel="stylesheet" href="index_files/index.asc"> +</head> +<body> + <div id="header"><a href="https://www.torproject.org/"><img src="index_files/tor-logo2x.png" alt="Tor" height="50px"></a></div> + <div id="content"> + <h1>SNOWFLAKE</h1> + + <p class="diagram"><img src="index_files/snowflake-schematic.png" alt="Diagram"></p> + + <p>Snowflake é um sistema para derrotar a censura na internet. Pessoas que são + censuradas podem usar o Snowflake para acederem á Internet. As suas ligações são feitas +através de proxies Snowflake, que são executados por voluntários. Para informação mais detalhada +sobre o funcionamento do Snowflake consultar <a href="https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/">documentção Wiki</a></p> + + <div class="clear"> + + <div class="browser"><div class="padding"> + <h3>Explor</h3> + + <p>Se o seu acesso à Internet é censurada, você deve transferir +<a href="https://www.torproject.org/download/">Tor Browser</a></p> + + <p class="screenshot"><img src="index_files/screenshot.png" alt="Tor Browser screenshot"></p> + </div></div> + + <div class="extension"><div class="padding"> + <h3>Extensão</h3> + + <p>Se o seu acesso á Internet <strong>não é</strong> censurado, você deve +considerar instalar a extensão Snowflake para ajudar utilizadores em redes +censuradas. Não há necessidade de se preocupar com os sites que as pessoas +estão a aceder através da sua proxy. O endereço de IP de navegação visivel será +o do Tor exit node, não o seu.</p> + + <p class="addon"><a href="https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/"> +<img src="index_files/firefox150.jpg" alt="Install in Firefox" height="100px"><br><span>Instalar no Firefox</span> +</a> +<a href="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmma…"> +<img src="index_files/chrome150.jpg" alt="Install in Chrome" height="100px"><br><span>Instalar no Chrome</span> +</a> +<span class="clear"></span></p> + </div></div> + + </div> + + <h3>Reportar erros</h3> + + <p>Se você encontrar problemas com o Snowflake como um cliente ou um proxy, +por favor considere reportar o erro. Para o fazer deve,</p> + + <ol> +<li> <a href="https://trac.torproject.org/projects/tor/register">Crie uma + conta</a> ou <a href="https://trac.torproject.org/projects/tor/login">entre</a> + usando o login <b>cypherpunks</b> com a password <b>writecode</b>.</li> + <li> +<a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">Crie um ticket</a> + usando o nosso bug tracker.</li> + </ol> +<p>Por favor, tente ser o mais descritivo possível com o seu bilhete e se +possível incluir mensagens de registo que nos ajudarão a reproduzir o erro +Considere adicionar palavras-chave<em>snowflake-webextension</em>ou<em>snowflake-client</em> +para nos permitir saber que parte do sistema Snowflake esta a causar +problemas</p> + + <h3>Incorporar</h3> + + <p>Agora é possível incorporar o emblema do Snowflake em qualquer website:</p> + + <textarea readonly><iframe src="https://snowflake.torproject.org/embed.html" width="320px" height="200px" frameborder="0" scrolling="no"></iframe></textarea><p>Que se parece com isto:</p> + + <iframe src="index_files/embed.html" scrolling="no" width="320px" height="200px" frameborder="0"></iframe> + + </div> + + +</body> +</html>

1 0

[translation/snowflake-website-indexhtml] Update translations for snowflake-website-indexhtml
by translation＠torproject.org 21 Aug '19

21 Aug '19

commit 23dda068bdd94691f569013e01efdd8cc875c6b9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 21 13:49:07 2019 +0000 Update translations for snowflake-website-indexhtml --- pt_PT/index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pt_PT/index.html b/pt_PT/index.html index 0619a601e..aa964b52e 100644 --- a/pt_PT/index.html +++ b/pt_PT/index.html @@ -56,12 +56,12 @@ o do Tor exit node, não o seu.</p> por favor considere reportar o erro. Para o fazer deve,</p> <ol> -<li>Either <a href="https://trac.torproject.org/projects/tor/register">create an - account</a> or <a href="https://trac.torproject.org/projects/tor/login">log in</a> - using the shared <b>cypherpunks</b> account with password <b>writecode</b>.</li> +<li> <a href="https://trac.torproject.org/projects/tor/register">Crie uma + conta</a> ou <a href="https://trac.torproject.org/projects/tor/login">entre</a> + usando o login <b>cypherpunks</b> com a password <b>writecode</b>.</li> <li> -<a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">File a ticket</a> - using our bug tracker.</li> +<a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">Crie um ticket</a> + usando o nosso bug tracker.</li> </ol> <p>Por favor, tente ser o mais descritivo possível com o seu bilhete e se possível incluir mensagens de registo que nos ajudarão a reproduzir o erro

1 0

[translation/orfox-stringsxml] Update translations for orfox-stringsxml
by translation＠torproject.org 21 Aug '19

21 Aug '19

commit d6a5b179a135648a674084d2828a61ce62a82e2c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 21 13:48:40 2019 +0000 Update translations for orfox-stringsxml --- kab/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kab/strings.xml b/kab/strings.xml new file mode 100644 index 000000000..cb5acbb4f --- /dev/null +++ b/kab/strings.xml @@ -0,0 +1,2 @@ +<resources> + </resources>

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 21 Aug '19

21 Aug '19

commit 262cf721d0c91faf9b241fb1db1801fecad33e02 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 21 13:48:21 2019 +0000 Update translations for mat-gui --- kab.po | 187 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 187 insertions(+) diff --git a/kab.po b/kab.po new file mode 100644 index 000000000..b098724cc --- /dev/null +++ b/kab.po @@ -0,0 +1,187 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-02-10 23:06+0100\n" +"PO-Revision-Date: 2013-02-04 18:44+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Kabyle (http://www.transifex.com/otf/torproject/language/kab/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: kab\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: mat-gui:66 mat-gui:422 mat-gui:445 +msgid "Ready" +msgstr "" + +#: mat-gui:136 +msgid "Choose files" +msgstr "" + +#: mat-gui:144 +msgid "Supported files" +msgstr "" + +#: mat-gui:151 +msgid "All files" +msgstr "" + +#: mat-gui:167 mat-gui:366 mat-gui:417 mat-gui:441 mat-gui:443 +#: data/mat.glade:200 +msgid "Clean" +msgstr "" + +#: mat-gui:168 +msgid "No metadata found" +msgstr "" + +#: mat-gui:170 mat-gui:419 +msgid "Dirty" +msgstr "" + +#: mat-gui:176 +#, python-format +msgid "%s's metadata" +msgstr "" + +#: mat-gui:187 +msgid "Trash your meta, keep your data" +msgstr "" + +#: mat-gui:192 +msgid "Website" +msgstr "" + +#: mat-gui:219 +msgid "Preferences" +msgstr "" + +#: mat-gui:232 +msgid "Reduce PDF quality" +msgstr "" + +#: mat-gui:235 +msgid "Reduce the produced PDF size and quality" +msgstr "" + +#: mat-gui:238 +msgid "Remove unsupported file from archives" +msgstr "" + +#: mat-gui:241 +msgid "Remove non-supported (and so non-anonymised) file from output archive" +msgstr "" + +#: mat-gui:280 +msgid "Unknown" +msgstr "" + +#: mat-gui:325 +msgid "Not-supported" +msgstr "" + +#: mat-gui:339 +msgid "Harmless fileformat" +msgstr "" + +#: mat-gui:341 +msgid "Cant read file" +msgstr "" + +#: mat-gui:343 +msgid "Fileformat not supported" +msgstr "" + +#: mat-gui:346 +msgid "These files can not be processed:" +msgstr "" + +#: mat-gui:351 mat-gui:380 data/mat.glade:239 +msgid "Filename" +msgstr "" + +#: mat-gui:353 +msgid "Reason" +msgstr "" + +#: mat-gui:365 +msgid "Non-supported files in archive" +msgstr "" + +#: mat-gui:379 +msgid "Include" +msgstr "" + +#: mat-gui:397 +#, python-format +msgid "MAT is not able to clean the following files, found in the %s archive" +msgstr "" + +#: mat-gui:413 +#, python-format +msgid "Checking %s" +msgstr "" + +#: mat-gui:428 +#, python-format +msgid "Cleaning %s" +msgstr "" + +#: data/mat.glade:46 +msgid "_File" +msgstr "" + +#: data/mat.glade:95 +msgid "_Edit" +msgstr "" + +#: data/mat.glade:141 +msgid "_Help" +msgstr "" + +#: data/mat.glade:187 +msgid "Add" +msgstr "" + +#: data/mat.glade:256 +msgid "State" +msgstr "" + +#: data/mat.glade:294 data/mat.glade:467 +msgid "Metadata" +msgstr "" + +#: data/mat.glade:354 +msgid "Name" +msgstr "" + +#: data/mat.glade:368 +msgid "Content" +msgstr "" + +#: data/mat.glade:398 +msgid "Supported formats" +msgstr "" + +#: data/mat.glade:456 +msgid "Support" +msgstr "" + +#: data/mat.glade:478 +msgid "Method" +msgstr "" + +#: data/mat.glade:489 +msgid "Remaining" +msgstr "" + +#: data/mat.glade:518 +msgid "Fileformat" +msgstr ""

1 0