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

[tor/master] config: Make CLEAR with a nonempty value into a nonfatal assertion.
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit 870874fec8cadf3a3e91f63cd7f25757b1ec8b8a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 11:28:21 2019 -0400 config: Make CLEAR with a nonempty value into a nonfatal assertion. When we parse a CLEAR line (e.g., "/OrPort" or /OrPort blah blah"), we always suppress the value, even if one exists. That means that the block of code was meant to handle CLEAR lines didn't actually do anything, since we previously handled them the same way as with other empty values. Closes ticket 31529. --- changes/ticket31529 | 5 +++++ src/app/config/confparse.c | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/changes/ticket31529 b/changes/ticket31529 new file mode 100644 index 000000000..84f982214 --- /dev/null +++ b/changes/ticket31529 @@ -0,0 +1,5 @@ + o Minor features (debugging): + - Log a nonfatal assertion failure if we encounter a configuration + line whose command is "CLEAR" but which has a nonempty value. + This should be impossible, according to the rules of our + configuration line parsing. Closes ticket 31529. diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index f20a361ba..ecc4e8656 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -652,9 +652,14 @@ config_assign_line(const config_mgr_t *mgr, void *options, } return 0; } else if (c->command == CONFIG_LINE_CLEAR && !clear_first) { - // XXXX This is unreachable, since a CLEAR line always has an - // XXXX empty value. - config_reset(mgr, options, mvar, use_defaults); // LCOV_EXCL_LINE + // This block is unreachable, since a CLEAR line always has an + // empty value, and so will trigger be handled by the previous + // "if (!strlen(c->value))" block. + + // LCOV_EXCL_START + tor_assert_nonfatal_unreached(); + config_reset(mgr, options, mvar, use_defaults); + // LCOV_EXCL_STOP } if (options_seen && ! config_var_is_cumulative(cvar)) {

1 0

[tor/master] Merge branch 'tor-github/pr/1292'
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit c29f05b159ae51472cd2a183a36cb9d352c082e5 Merge: cdd7e8897 870874fec Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Sep 5 17:06:58 2019 +0300 Merge branch 'tor-github/pr/1292' changes/ticket31529 | 5 +++++ src/app/config/confparse.c | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'tor-github/pr/1261'
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit cdd7e889703fbc089780f446715b7b41ccbf688e Merge: 2591440fa 0127888b0 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Sep 5 17:02:53 2019 +0300 Merge branch 'tor-github/pr/1261' changes/bug27284 | 5 ++++ src/feature/dirparse/microdesc_parse.c | 11 +++++++ src/feature/nodelist/microdesc_st.h | 2 ++ src/feature/nodelist/nodelist.c | 3 +- src/test/test_microdesc.c | 52 +++++++++++++++++++++++++++++++++- 5 files changed, 70 insertions(+), 3 deletions(-)

1 0

[tor/master] Check IPv6 exit policies on microdescriptors in node_exit_policy_rejects_all()
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit be4a60945d724ca964d9d53f57cad6190a500077 Author: Neel Chauhan <neel(a)neelc.org> Date: Sun Aug 25 20:22:57 2019 -0400 Check IPv6 exit policies on microdescriptors in node_exit_policy_rejects_all() --- changes/bug27284 | 5 +++++ src/feature/dirparse/microdesc_parse.c | 11 +++++++++++ src/feature/nodelist/microdesc_st.h | 2 ++ src/feature/nodelist/nodelist.c | 3 +-- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/changes/bug27284 b/changes/bug27284 new file mode 100644 index 000000000..14fc2082f --- /dev/null +++ b/changes/bug27284 @@ -0,0 +1,5 @@ + o Minor bugfixes (ipv6): + - When parsing microdescriptors, we should check the IPv6 exit policy + alongside IPv4. Previously, we checked both exit policies for only + router info structures, while microdescriptors were IPv4-only. Fixes + bug 27284; bugfix on 0.2.3.1-alpha. Patch by Neel Chauhan. diff --git a/src/feature/dirparse/microdesc_parse.c b/src/feature/dirparse/microdesc_parse.c index 22cc1e272..e02dfcf11 100644 --- a/src/feature/dirparse/microdesc_parse.c +++ b/src/feature/dirparse/microdesc_parse.c @@ -92,6 +92,12 @@ find_start_of_next_microdesc(const char *s, const char *eos) #undef NEXT_LINE } +static inline int +policy_is_reject_star_or_null(struct short_policy_t *policy) +{ + return !policy || short_policy_is_reject_star(policy); +} + /** Parse as many microdescriptors as are found from the string starting at * <b>s</b> and ending at <b>eos</b>. If allow_annotations is set, read any * annotations we recognize and ignore ones we don't. @@ -250,6 +256,11 @@ microdescs_parse_from_string(const char *s, const char *eos, md->ipv6_exit_policy = parse_short_policy(tok->args[0]); } + if (policy_is_reject_star_or_null(md->exit_policy) && + policy_is_reject_star_or_null(md->ipv6_exit_policy)) { + md->policy_is_reject_star = 1; + } + smartlist_add(result, md); okay = 1; diff --git a/src/feature/nodelist/microdesc_st.h b/src/feature/nodelist/microdesc_st.h index c8265cb77..e017c46c7 100644 --- a/src/feature/nodelist/microdesc_st.h +++ b/src/feature/nodelist/microdesc_st.h @@ -33,6 +33,8 @@ struct microdesc_t { unsigned int no_save : 1; /** If true, this microdesc has an entry in the microdesc_map */ unsigned int held_in_map : 1; + /** True iff the exit policy for this router rejects everything. */ + unsigned int policy_is_reject_star : 1; /** Reference count: how many node_ts have a reference to this microdesc? */ unsigned int held_by_nodes; diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c index 21914c6c6..6ae8d2bcb 100644 --- a/src/feature/nodelist/nodelist.c +++ b/src/feature/nodelist/nodelist.c @@ -1424,8 +1424,7 @@ node_exit_policy_rejects_all(const node_t *node) if (node->ri) return node->ri->policy_is_reject_star; else if (node->md) - return node->md->exit_policy == NULL || - short_policy_is_reject_star(node->md->exit_policy); + return node->md->policy_is_reject_star; else return 1; }

1 0

[tor/master] Add tests for IPv6 exit policies on microdescriptors
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit 0127888b0623696d654125b4fa69200485e65a7f Author: Neel Chauhan <neel(a)neelc.org> Date: Sun Aug 25 22:32:07 2019 -0400 Add tests for IPv6 exit policies on microdescriptors --- src/test/test_microdesc.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c index 53ee79918..ad211c7ea 100644 --- a/src/test/test_microdesc.c +++ b/src/test/test_microdesc.c @@ -648,6 +648,41 @@ static const char MD_PARSE_TEST_DATA[] = "ntor-onion-key k2yFqTU2vzMCQDEiE/j9UcEHxKrXMLpB3IL0or09sik=\n" "id rsa1024 2A8wYpHxnkKJ92orocvIQBzeHlE\n" "p6 allow 80\n" + /* Good 11: Normal, non-exit relay with ipv6 address */ + "onion-key\n" + "-----BEGIN RSA PUBLIC KEY-----\n" + "MIGJAoGBAM7uUtq5F6h63QNYIvC+4NcWaD0DjtnrOORZMkdpJhinXUOwce3cD5Dj\n" + "sgdN1wJpWpTQMXJ2DssfSgmOVXETP7qJuZyRprxalQhaEATMDNJA/66Ml1jSO9mZ\n" + "+8Xb7m/4q778lNtkSbsvMaYD2Dq6k2QQ3kMhr9z8oUtX0XA23+pfAgMBAAE=\n" + "-----END RSA PUBLIC KEY-----\n" + "a [::1:2:3:4]:9090\n" + "a 18.0.0.1:9999\n" + "ntor-onion-key k2yFqTU2vzMCQDEiE/j9UcEHxKrXMLpB3IL0or09sik=\n" + "id rsa1024 2A8wYpHxnkKJ92orocvIQBzeHlE\n" + /* Good 12: Normal, exit relay with ipv6 address */ + "onion-key\n" + "-----BEGIN RSA PUBLIC KEY-----\n" + "MIGJAoGBAM7uUtq5F6h63QNYIvC+4NcWaD0DjtnrOORZMkdpJhinXUOwce3cD5Dj\n" + "sgdN1wJpWpTQMXJ2DssfSgmOVXETP7qJuZyRprxalQhaEATMDNJA/66Ml1jSO9mZ\n" + "+8Xb7m/4q778lNtkSbsvMaYD2Dq6k2QQ3kMhr9z8oUtX0XA23+pfAgMBAAE=\n" + "-----END RSA PUBLIC KEY-----\n" + "a [::1:2:3:4]:9090\n" + "a 18.0.0.1:9999\n" + "ntor-onion-key k2yFqTU2vzMCQDEiE/j9UcEHxKrXMLpB3IL0or09sik=\n" + "p accept 20-23,43,53,79-81,88,110,143,194,220,389,443,464,531,543-544\n" + "id rsa1024 2A8wYpHxnkKJ92orocvIQBzeHlE\n" + /* Good 13: Normal, exit relay with only ipv6 exit policy */ + "onion-key\n" + "-----BEGIN RSA PUBLIC KEY-----\n" + "MIGJAoGBAM7uUtq5F6h63QNYIvC+4NcWaD0DjtnrOORZMkdpJhinXUOwce3cD5Dj\n" + "sgdN1wJpWpTQMXJ2DssfSgmOVXETP7qJuZyRprxalQhaEATMDNJA/66Ml1jSO9mZ\n" + "+8Xb7m/4q778lNtkSbsvMaYD2Dq6k2QQ3kMhr9z8oUtX0XA23+pfAgMBAAE=\n" + "-----END RSA PUBLIC KEY-----\n" + "a [::1:2:3:4]:9090\n" + "a 18.0.0.1:9999\n" + "ntor-onion-key k2yFqTU2vzMCQDEiE/j9UcEHxKrXMLpB3IL0or09sik=\n" + "p6 accept 20-23,43,53,79-81,88,110,143,194,220,389,443,464,531,543-544\n" + "id rsa1024 2A8wYpHxnkKJ92orocvIQBzeHlE\n" ; #ifdef HAVE_CFLAG_WOVERLENGTH_STRINGS ENABLE_GCC_WARNING(overlength-strings) @@ -665,7 +700,7 @@ test_md_parse(void *arg) smartlist_t *mds = microdescs_parse_from_string(MD_PARSE_TEST_DATA, NULL, 1, SAVED_NOWHERE, invalid); - tt_int_op(smartlist_len(mds), OP_EQ, 11); + tt_int_op(smartlist_len(mds), OP_EQ, 14); tt_int_op(smartlist_len(invalid), OP_EQ, 4); test_memeq_hex(smartlist_get(invalid,0), @@ -712,6 +747,21 @@ test_md_parse(void *arg) tt_assert(tor_addr_family(&md->ipv6_addr) == AF_INET6); tt_int_op(md->ipv6_orport, OP_EQ, 9090); + md = smartlist_get(mds, 11); + tt_assert(tor_addr_family(&md->ipv6_addr) == AF_INET6); + tt_int_op(md->ipv6_orport, OP_EQ, 9090); + tt_int_op(md->policy_is_reject_star, OP_EQ, 1); + + md = smartlist_get(mds, 12); + tt_assert(tor_addr_family(&md->ipv6_addr) == AF_INET6); + tt_int_op(md->ipv6_orport, OP_EQ, 9090); + tt_int_op(md->policy_is_reject_star, OP_EQ, 0); + + md = smartlist_get(mds, 13); + tt_assert(tor_addr_family(&md->ipv6_addr) == AF_INET6); + tt_int_op(md->ipv6_orport, OP_EQ, 9090); + tt_int_op(md->policy_is_reject_star, OP_EQ, 0); + done: SMARTLIST_FOREACH(mds, microdesc_t *, mdsc, microdesc_free(mdsc)); smartlist_free(mds);

1 0

[community/master] Add code of conduct from remote repository
by hiro＠torproject.org 05 Sep '19

05 Sep '19

commit fb39e68719548fb7a3345a85958e969988152478 Author: hiro <hiro(a)torproject.org> Date: Thu Sep 5 15:59:17 2019 +0200 Add code of conduct from remote repository --- content/training/code-of-conduct/contents.lr | 2 +- lego | 2 +- templates/two-columns-page.html | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/content/training/code-of-conduct/contents.lr b/content/training/code-of-conduct/contents.lr index 0f3eab0..6d39f0d 100644 --- a/content/training/code-of-conduct/contents.lr +++ b/content/training/code-of-conduct/contents.lr @@ -20,6 +20,6 @@ html: two-columns-page.html --- body: -##Code of Conduct for Trainers +## Code of Conduct for Trainers The Tor Project is committed to fostering an inclusive environment and community. Tor is a place where people should feel safe to engage, share their point of view, and participate. You can find our code of conduct [here](https://gitweb.torproject.org/community/policies.git/tree/code_of_con… diff --git a/lego b/lego index 62b25f1..4911d14 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 62b25f1cba4a7af931ccd8f4420d0669812db09c +Subproject commit 4911d14b482d292742f5f0e30130e4b6817f56f8 diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html index 4ccb30e..199a452 100644 --- a/templates/two-columns-page.html +++ b/templates/two-columns-page.html @@ -14,6 +14,11 @@ </div> {% endfor %} </div> + + {% if this.path == "/training/code-of-conduct" %} + {{ render_text("https://gitweb.torproject.org/community/policies.git/plain/code_of_conduct.…")|safe }} + {% endif %} + <div class="card mt-5"> <ul class="list-group list-group-flush">  @@ -23,4 +28,4 @@ </ul> </div> </div> -</div> \ No newline at end of file +</div>

1 0

[lego/master] Fix plugin
by hiro＠torproject.org 05 Sep '19

05 Sep '19

commit 4911d14b482d292742f5f0e30130e4b6817f56f8 Author: hiro <hiro(a)torproject.org> Date: Thu Sep 5 15:57:25 2019 +0200 Fix plugin --- packages/txt-to-html/lektor_txt_to_html.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/txt-to-html/lektor_txt_to_html.py b/packages/txt-to-html/lektor_txt_to_html.py index 48b86d1..3fba7e9 100644 --- a/packages/txt-to-html/lektor_txt_to_html.py +++ b/packages/txt-to-html/lektor_txt_to_html.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- + # -*- coding: utf-8 -*- #pylint: disable=wrong-import-position import sys @@ -18,7 +18,8 @@ class TxtToHtmlPlugin(Plugin): def text(url=None): webFile = request.urlopen(url) - content = webFile.read() + charset = webFile.info().get_content_charset() + content = webFile.read().decode(charset) text ="<pre>" + content + "</pre>" return text

1 0

[lego/master] Fix typo
by hiro＠torproject.org 05 Sep '19

05 Sep '19

commit 16edbaec21f976e6ebc1b28dd2f804aa8f3246c4 Author: hiro <hiro(a)torproject.org> Date: Thu Sep 5 15:52:53 2019 +0200 Fix typo --- packages/txt-to-html/lektor_txt_to_html.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/txt-to-html/lektor_txt_to_html.py b/packages/txt-to-html/lektor_txt_to_html.py index 4c5ae3d..48b86d1 100644 --- a/packages/txt-to-html/lektor_txt_to_html.py +++ b/packages/txt-to-html/lektor_txt_to_html.py @@ -16,7 +16,7 @@ class TxtToHtmlPlugin(Plugin): def on_setup_env(self, **extra): - def stream(url=None): + def text(url=None): webFile = request.urlopen(url) content = webFile.read() text ="<pre>" + content + "</pre>"

1 0

[lego/master] Fix typo
by hiro＠torproject.org 05 Sep '19

05 Sep '19

commit b5691c8332c7957a4427bd8798c17239d9685424 Author: hiro <hiro(a)torproject.org> Date: Thu Sep 5 15:52:03 2019 +0200 Fix typo --- packages/txt-to-html/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/txt-to-html/setup.py b/packages/txt-to-html/setup.py index 82416d2..63cd871 100644 --- a/packages/txt-to-html/setup.py +++ b/packages/txt-to-html/setup.py @@ -10,7 +10,7 @@ setup( py_modules=['lektor_txt_to_html'], entry_points={ 'lektor.plugins': [ - 'xml-to-html = lektor_txt_to_html:TxtToHtmlPlugin', + 'txt-to-html = lektor_txt_to_html:TxtToHtmlPlugin', ] } )

1 0

[lego/master] Rename plugin
by hiro＠torproject.org 05 Sep '19

05 Sep '19

commit 6d3efb7096fa60561df56f873601a655ecabf1b7 Author: hiro <hiro(a)torproject.org> Date: Thu Sep 5 15:51:01 2019 +0200 Rename plugin --- packages/{txt-to-markdown => txt-to-html}/LICENSE | 0 packages/{txt-to-markdown => txt-to-html}/README | 0 packages/{txt-to-markdown => txt-to-html}/README.md | 0 .../lektor_txt_to_html.py} | 4 ++-- packages/txt-to-html/setup.py | 16 ++++++++++++++++ packages/txt-to-markdown/setup.py | 16 ---------------- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/txt-to-markdown/LICENSE b/packages/txt-to-html/LICENSE similarity index 100% rename from packages/txt-to-markdown/LICENSE rename to packages/txt-to-html/LICENSE diff --git a/packages/txt-to-markdown/README b/packages/txt-to-html/README similarity index 100% rename from packages/txt-to-markdown/README rename to packages/txt-to-html/README diff --git a/packages/txt-to-markdown/README.md b/packages/txt-to-html/README.md similarity index 100% rename from packages/txt-to-markdown/README.md rename to packages/txt-to-html/README.md diff --git a/packages/txt-to-markdown/lektor_txt_to_markdown.py b/packages/txt-to-html/lektor_txt_to_html.py similarity index 81% rename from packages/txt-to-markdown/lektor_txt_to_markdown.py rename to packages/txt-to-html/lektor_txt_to_html.py index ae3bc05..4c5ae3d 100644 --- a/packages/txt-to-markdown/lektor_txt_to_markdown.py +++ b/packages/txt-to-html/lektor_txt_to_html.py @@ -9,9 +9,9 @@ from lektor.pluginsystem import Plugin from urllib import request -class TxtToMarkdownPlugin(Plugin): +class TxtToHtmlPlugin(Plugin): name = u'TXT to Markdown' - description = u'Lektor plugin to add a remote TXT doc into Markdown.' + description = u'Lektor plugin to add a remote TXT doc into HTML.' def on_setup_env(self, **extra): diff --git a/packages/txt-to-html/setup.py b/packages/txt-to-html/setup.py new file mode 100644 index 0000000..82416d2 --- /dev/null +++ b/packages/txt-to-html/setup.py @@ -0,0 +1,16 @@ +from setuptools import setup + +setup( + name='lektor-txt-to-html', + version='0.1', + author=u'Hiro', + author_email='hiro(a)torproject.org', + url='https://github.com/torproject/lego/packages/txt-to-html', + license='GPL', + py_modules=['lektor_txt_to_html'], + entry_points={ + 'lektor.plugins': [ + 'xml-to-html = lektor_txt_to_html:TxtToHtmlPlugin', + ] + } +) diff --git a/packages/txt-to-markdown/setup.py b/packages/txt-to-markdown/setup.py deleted file mode 100644 index 7633c38..0000000 --- a/packages/txt-to-markdown/setup.py +++ /dev/null @@ -1,16 +0,0 @@ -from setuptools import setup - -setup( - name='lektor-txt-to-markdown', - version='0.1', - author=u'Hiro', - author_email='hiro(a)torproject.org', - url='https://github.com/torproject/lego/packages/txt-to-markdown', - license='GPL', - py_modules=['lektor_txt_to_markdown'], - entry_points={ - 'lektor.plugins': [ - 'xml-to-html = lektor_txt_to_markdown:TxtToMarkdownPlugin', - ] - } -)

1 0