February 2015 - tor-commits - lists.torproject.org

[bridgedb/develop] Fix duplicate sourcing of FontAwesome CSS.
by isis＠torproject.org 02 Feb '15

02 Feb '15

commit 99494d38197f4b11ca9390e7ac34c3521c516b24 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jan 15 20:43:02 2015 +0000 Fix duplicate sourcing of FontAwesome CSS. --- lib/bridgedb/templates/base.html | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bridgedb/templates/base.html b/lib/bridgedb/templates/base.html index 0c80e46..f26837a 100644 --- a/lib/bridgedb/templates/base.html +++ b/lib/bridgedb/templates/base.html @@ -14,7 +14,6 @@  <link rel="stylesheet" href="/assets/css/main.css"> -<link rel="stylesheet" href="/assets/css/font-awesome.min.css">

1 0

[bridgedb/develop] Fix newlines in bridge lines distributed by HTTPServer.
by isis＠torproject.org 02 Feb '15

02 Feb '15

commit dd018316a01533ef614d8180daa8aec180cf0ac8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jan 15 20:48:41 2015 +0000 Fix newlines in bridge lines distributed by HTTPServer. * CHANGES bridge.html template to inline replace '\n' with '<br />' in the bridge lines. * FIXES #12664 https://bugs.torproject.org/12664 --- lib/bridgedb/templates/bridges.html | 39 +++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/lib/bridgedb/templates/bridges.html b/lib/bridgedb/templates/bridges.html index 7e44513..7ac77dd 100644 --- a/lib/bridgedb/templates/bridges.html +++ b/lib/bridgedb/templates/bridges.html @@ -3,23 +3,36 @@ <%inherit file="base.html"/> <%page args="strings, rtl=False, lang='en', answer=0, **kwargs"/> -<div class="container-fluid" - style="width: 98%; align: center; margin: auto;"> - <div class="container-fluid" - style="padding: 2%"> - <h2>${_(strings.BRIDGES[0])}</h2> </div> </div> +<div class="container-narrow"> + <div class="container-fluid"> + % if answer: -<div class="container-fluid" style="width: 98%; align: center; margin: auto;"> -<div class="container-fluid" style="padding: 1px"> -<div class="bridge-lines"> -${answer} -</div> -</div> -</div> -<br \> + <div class="container-fluid" + style="width: 98%; align: center; margin: auto;"> + <div class="container-fluid" + style="padding: 2%"> + <h2>${_(strings.BRIDGES[0])}</h2> + </div> + </div> + + <div class="container-fluid" + style="width: auto; align: center; margin: auto; + position: relative; left: 0%;" + onclick="selectText('bridgelines')"> + <div class="row" id="bridgesrow1"> + <div class="col col-lg-12"> + <div class="bridge-lines" id="bridgelines"> +${answer.replace("\n", "<br />")} + </div> + </div> + </div> + </div> + + <br /> + <br /> <div class="container-fluid" style="width: 100%; align: center; margin: auto;">

1 0

[bridgedb/develop] Add button to bridges.html for hilighting all text bridge lines.
by isis＠torproject.org 02 Feb '15

02 Feb '15

commit 505b9cd09f136c7f2d15322253462b32675eeaa3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jan 15 21:39:29 2015 +0000 Add button to bridges.html for hilighting all text bridge lines. This should hopefully make copying the bridge lines elsewhere less error-prone for users. --- lib/bridgedb/templates/assets/css/custom.css | 3 +- lib/bridgedb/templates/bridges.html | 43 ++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/templates/assets/css/custom.css b/lib/bridgedb/templates/assets/css/custom.css index 3fd1065..0b2684e 100644 --- a/lib/bridgedb/templates/assets/css/custom.css +++ b/lib/bridgedb/templates/assets/css/custom.css @@ -119,4 +119,5 @@ div.bridge-lines { border-radius: 6px 6px 6px 6px; box-shadow: none; -moz-box-sizing: border-box; -} \ No newline at end of file + cursor: copy; +} diff --git a/lib/bridgedb/templates/bridges.html b/lib/bridgedb/templates/bridges.html index 7ac77dd..d3c10c1 100644 --- a/lib/bridgedb/templates/bridges.html +++ b/lib/bridgedb/templates/bridges.html @@ -6,6 +6,33 @@ </div> </div> +<script type="text/javascript"> + // Takes one argument, `element`, which should be a string specifying the id + // of the element whose text should be selected. + function selectText(element) { + try { + var doc = document; + text = doc.getElementById(element); + var range; + var selection; + + if (doc.body.createTextRange) { + range = document.body.createTextRange(); + range.moveToElementText(text); + range.select(); + } else if (window.getSelection) { + selection = window.getSelection(); + range = document.createRange(); + range.selectNodeContents(text); + selection.removeAllRanges(); + selection.addRange(range); + } + } catch (e) { + window.alert(e); + } + } +</script> + <div class="container-narrow"> <div class="container-fluid"> @@ -31,6 +58,17 @@ ${answer.replace("\n", "<br />")} </div> </div> + <div class="container-fluid" + style="width: 100%; align: center; margin: auto;"> + <div class="row" id="bridgesrow2" style="text-align: right; padding-right: 7%;"> + <button class="btn btn-primary disabled" id="selectbtn" + onclick="selectText('bridgelines')" + title="Select all bridge lines"> + <i class="icon icon-2x icon-paste"></i>   ${_("""Select All""")} + </button> + </div> + </div> + <br /> <br /> @@ -92,4 +130,9 @@ ${_("""Uh oh, spaghettios!""")} <br /> % endif +<script type="text/javascript"> + // Make the 'Select All' button clickable: + document.getElementById('selectbtn').className = "btn btn-primary"; +</script> + <hr />

1 0

[bridgedb/develop] Change test_HTTPServer.py to account for '<br />'s in bridge lines.
by isis＠torproject.org 02 Feb '15

02 Feb '15

commit d8b9815c4e612834b7bb6be35ac1476617fa31ba Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jan 22 21:56:58 2015 +0000 Change test_HTTPServer.py to account for '<br />'s in bridge lines. * FIXES three failing unittests in test_HTTPServer.py: - test_render_GET_RTLlang - test_render_GET_RTLlang_obfs3 - test_render_GET_vanilla --- lib/bridgedb/test/test_HTTPServer.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_HTTPServer.py b/lib/bridgedb/test/test_HTTPServer.py index 42fbdef..fccbee8 100644 --- a/lib/bridgedb/test/test_HTTPServer.py +++ b/lib/bridgedb/test/test_HTTPServer.py @@ -539,7 +539,15 @@ class WebResourceBridgesTests(unittest.TestCase): soup = BeautifulSoup(page) well = soup.find('div', {'class': 'bridge-lines'}) content = well.renderContents().strip() - bridges = [b.strip() for b in content.splitlines()] + lines = content.splitlines() + + bridges = [] + for line in lines: + bridgelines = line.split('<br />') + for bridge in bridgelines: + if bridge: # It still could be an empty string at this point + bridges.append(bridge) + return bridges def test_render_GET_vanilla(self):

1 0

[bridgedb/develop] Fix word wrapping for bridgelines by adding a custom scrollbar.
by isis＠torproject.org 02 Feb '15

02 Feb '15

commit c542e055433a7b696d51e88195a025840b8852b6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jan 15 21:42:43 2015 +0000 Fix word wrapping for bridgelines by adding a custom scrollbar. --- lib/bridgedb/templates/assets/css/custom.css | 41 ++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/templates/assets/css/custom.css b/lib/bridgedb/templates/assets/css/custom.css index 0b2684e..f0bde6f 100644 --- a/lib/bridgedb/templates/assets/css/custom.css +++ b/lib/bridgedb/templates/assets/css/custom.css @@ -112,12 +112,47 @@ div.bridge-lines { line-height: 175%; color: rgb(44, 62, 80); word-break: break-all; - word-wrap: break-word; - white-space: pre-wrap; + word-wrap: normal; + white-space: nowrap; + overflow-x: auto; + z-index: 1000; background-color: rgb(236, 240, 241); - border: 1px solid transparent; + border: 0px solid transparent; border-radius: 6px 6px 6px 6px; + border-color: #2C3E50; box-shadow: none; + box-sizing: border-box; -moz-box-sizing: border-box; cursor: copy; } + +div.bridge-lines.-webkit-scrollbar { + width: 9px; + height: 9px; +} +div.bridge-lines.-webkit-scrollbar-button.start.decrement { + display: block; + height: 0; + background-color: transparent; +} +div.bridge-lines.-webkit-scrollbar-button.end.increment { + display: block; + height: 0; + background-color: transparent; +} +div.bridge-lines.-webkit-scrollbar-track-piece { + background-color: #FAFAFA; + -webkit-border-radius: 0; + -webkit-border-bottom-right-radius: 6px; + -webkit-border-bottom-left-radius: 6px; +} +div.bridge-lines.-webkit-scrollbar-thumb.vertical { + height: 50px; + background-color: #999; + -webkit-border-radius: 6px; +} +div.bridge-lines.-webkit-scrollbar-thumb.horizontal{ + width: 50px; + background-color: #999; + -webkit-border-radius: 6px; +}

1 0

[bridgedb/develop] Merge branch 'fix/12664-bridgeline-newlines_r2' into develop
by isis＠torproject.org 02 Feb '15

02 Feb '15

commit ff37a1408fbc8b0972c48a2270c2e82b8cc21ca5 Merge: d6115a8 d8b9815 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Feb 2 19:06:24 2015 +0000 Merge branch 'fix/12664-bridgeline-newlines_r2' into develop lib/bridgedb/templates/assets/css/custom.css | 3 +- lib/bridgedb/templates/base.html | 13 ++-- lib/bridgedb/templates/bridges.html | 82 ++++++++++++++++++++++---- lib/bridgedb/test/test_HTTPServer.py | 10 +++- 4 files changed, 85 insertions(+), 23 deletions(-)

1 0

[bridgedb/develop] Merge branch 'fix/14064-bridgeline-wrapping_r2' into develop
by isis＠torproject.org 02 Feb '15

02 Feb '15

commit f1bdddb8f00bfb0e5abaf387d37ec811a544448d Merge: ff37a14 c542e05 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Feb 2 19:23:47 2015 +0000 Merge branch 'fix/14064-bridgeline-wrapping_r2' into develop lib/bridgedb/templates/assets/css/custom.css | 41 ++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-)

1 0

[tor/master] Add more parenthesis to the definition of ARRAY_LENGTH
by nickm＠torproject.org 02 Feb '15

02 Feb '15

commit 5c807f30e4890357d91cb62bbc51be55722396cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 2 14:14:35 2015 -0500 Add more parenthesis to the definition of ARRAY_LENGTH --- src/common/util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/util.h b/src/common/util.h index 175a078..ea774bd 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -565,7 +565,7 @@ STATIC int format_helper_exit_status(unsigned char child_state, const char *libor_get_digests(void); -#define ARRAY_LENGTH(x) (sizeof(x)) / sizeof(x[0]) +#define ARRAY_LENGTH(x) ((sizeof(x)) / sizeof(x[0])) #endif

1 0

[tor/master] Allow reading torrc from stdin.
by nickm＠torproject.org 02 Feb '15

02 Feb '15

commit fe328d192e76324ab788436318000ed1f20f8786 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Jan 25 16:42:42 2015 +0200 Allow reading torrc from stdin. --- src/or/config.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c index 568baec..3ff60e5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4204,6 +4204,17 @@ find_torrc_filename(config_line_t *cmd_arg, return fname; } +/** Read the torrc from standard input and return it as a string. + * Upon failure, return NULL. + */ +static char * +load_torrc_from_stdin(config_line_t *cmd_arg) +{ + size_t sz_out; + + return read_file_to_str_until_eof(STDIN_FILENO,SIZE_MAX,&sz_out); +} + /** Load a configuration file from disk, setting torrc_fname or * torrc_defaults_fname if successful. * @@ -4344,7 +4355,19 @@ options_init_from_torrc(int argc, char **argv) cf = tor_strdup(""); } else { cf_defaults = load_torrc_from_disk(cmdline_only_options, 1); - cf = load_torrc_from_disk(cmdline_only_options, 0); + + const config_line_t *f_line = config_line_find(cmdline_only_options, + "-f"); + + const int read_torrc_from_stdin = + (f_line != NULL && strcmp(f_line->value, "-") == 0); + + if (read_torrc_from_stdin) { + cf = load_torrc_from_stdin(cmdline_only_options); + } else { + cf = load_torrc_from_disk(cmdline_only_options, 0); + } + if (!cf) { if (config_line_find(cmdline_only_options, "--allow-missing-torrc")) { cf = tor_strdup("");

1 0

[tor/master] Updating manpage for 13865.
by nickm＠torproject.org 02 Feb '15

02 Feb '15

commit 1ebed7cc7758fdfc3786ef9c1edfa4388f43e8e2 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Jan 26 21:33:19 2015 +0200 Updating manpage for 13865. --- doc/tor.1.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5302b33..4d7069e 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -42,7 +42,8 @@ COMMAND-LINE OPTIONS [[opt-f]] **-f** __FILE__:: Specify a new configuration file to contain further Tor configuration - options. (Default: @CONFDIR@/torrc, or $HOME/.torrc if that file is not + options OR pass *-* to make Tor read its configuration from standard + input. (Default: @CONFDIR@/torrc, or $HOME/.torrc if that file is not found) [[opt-allow-missing-torrc]] **--allow-missing-torrc**::

1 0