- tbb-commits - lists.torproject.org

[torbutton/master] Bug 24309: Move circuit display to the identity popup.
by gk＠torproject.org 22 May '18

22 May '18

commit 26d4ce95369819a1aeefd30fd52f670fc589b5ea Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Apr 12 15:36:44 2018 -0700 Bug 24309: Move circuit display to the identity popup. New circuit display design by Antonela Debiasi. The new design includes a "Guard" indicator, a "Load New Circuit" button, new Photon-compatible style. --- src/chrome.manifest | 1 + src/chrome/content/popup.xul | 12 -- src/chrome/content/tor-circuit-display.js | 130 +++++++++++++++------ src/chrome/content/tor-circuit-display.xul | 34 ++++++ src/chrome/locale/en/torbutton.dtd | 3 +- src/chrome/locale/en/torbutton.properties | 5 +- src/chrome/skin/relay.svg | 10 ++ src/chrome/skin/tor-circuit-display.css | 176 ++++++++++++++++------------- 8 files changed, 247 insertions(+), 124 deletions(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index 65f55a9..f72fffa 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -15,6 +15,7 @@ overlay chrome://browser/content/aboutDialog.xul chrome://torbutton/content/abou # UI customization overlay chrome://browser/content/baseMenuOverlay.xul chrome://torbutton/content/menu-overlay.xul overlay about:preferences chrome://torbutton/content/privacy-prefs-overlay.xul +overlay chrome://browser/content/browser.xul chrome://torbutton/content/tor-circuit-display.xul # Strings for the about:tbupdate page override chrome://browser/locale/aboutTBUpdate.dtd chrome://torbutton/locale/aboutTBUpdate.dtd diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index 9447b70..b088a82 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -1,6 +1,5 @@ <?xml version="1.0"?> <?xml-stylesheet href="chrome://torbutton/skin/torbutton.css" type="text/css"?> -<?xml-stylesheet href="chrome://torbutton/skin/tor-circuit-display.css" type="text/css"?> <!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> @@ -51,17 +50,6 @@ insertafter="context-stop" oncommand="torbutton_check_for_update()"/> </vbox> - <vbox id="circuit-display-container"> - <div id="circuit-display" xmlns="http://www.w3.org/1999/xhtml" dir="auto"> - <p id="title">&torbutton.circuit_display.title;</p> - <p id="domain">(example.com)</p> - <ul id="circuit-nodes" dir="auto"> - <li>example A</li> - <li>example B</li> - <li>example C</li> - </ul> - </div> - </vbox> </hbox> </panel> </overlay> diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index b5c24f8..cb43499 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -215,7 +215,7 @@ let regionBundle = Services.strings.createBundle( // Convert a country code to a localized country name. // Example: `'de'` -> `'Deutschland'` in German locale. let localizedCountryNameFromCode = function (countryCode) { - if (typeof(countryCode) === "undefined") return undefined; + if (!countryCode) return uiString("unknown_country"); try { return regionBundle.GetStringFromName(countryCode.toLowerCase()); } catch (e) { @@ -249,7 +249,7 @@ let nodeLines = function (nodeData) { (country ? " (" + country + ")" : "")) : // For each non-bridge relay, show its host country and IP. - (country || uiString("unknown_country")) + + country + // As we don't have a bridge, show the IP address // of the node. Use unicode escapes to ensure that // parentheses behave properly in both left-to-right @@ -260,46 +260,90 @@ let nodeLines = function (nodeData) { return result; }; -// __onionSiteRelayLine__. -// When we have an onion site, we simply show the word '(relay)'. -let onionSiteRelayLine = "<li class='relay'>(" + uiString("relay") + ")</li>"; +// __xmlTree(ns, data)__. +// Takes an xml namespace, ns, and a +// data structure representing xml elements like +// [tag, { attr-key: attr-value }, ...xml-children] +// and returns nested xml element objects. +let xmlTree = function xmlTree (ns, data) { + let [type, attrs, ...children] = data; + let element = document.createElementNS(ns, type); + for (let [key, val] of Object.entries(attrs)) { + element.setAttribute(key, val); + } + for (let child of children) { + if (child !== null && child !== undefined) { + element.append(typeof child === "string" ? child : xmlTree(ns, child)); + } + } + return element; +}; + +// __htmlTree(data)__. +// Takes a data structure representing html elements like +// [tag, { attr-key: attr-value }, ...html-children] +// and return nested html element objects. +let htmlTree = data => xmlTree("http://www.w3.org/1999/xhtml", data); + +// __appendHtml(parent, data)__. +// Takes a data structure representing html elements like +// [tag, { attr-key: attr-value }, ...html-children] +// and append nested html element objects to the parent element. +let appendHtml = (parent, data) => parent.appendChild(htmlTree(data)); + +// __circuitCircuitData()__. +// Obtains the circuit used by the given browser. +let currentCircuitData = function (browser) { + if (browser) { + let credentials = browserToCredentialsMap.get(browser); + if (credentials) { + let [SOCKS_username, SOCKS_password] = credentials; + let nodeData = credentialsToNodeDataMap[`${SOCKS_username}|${SOCKS_password}`]; + let domain = SOCKS_username; + return { domain, nodeData }; + } + } + return { domain: null, nodeData: null }; +}; // __updateCircuitDisplay()__. // Updates the Tor circuit display, showing the current domain // and the relay nodes for that domain. let updateCircuitDisplay = function () { - let selectedBrowser = gBrowser.selectedBrowser; - if (selectedBrowser) { - let credentials = browserToCredentialsMap.get(selectedBrowser), - nodeData = null; - if (credentials) { - let [SOCKS_username, SOCKS_password] = credentials; - // Check if we have anything to show for these credentials. - nodeData = credentialsToNodeDataMap[SOCKS_username + "|" + SOCKS_password]; - if (nodeData) { - // Update the displayed domain. - let domain = SOCKS_username; - document.getElementById("domain").innerHTML = "(" + domain + "):"; - // Update the displayed information for the relay nodes. - let lines = nodeLines(nodeData), - nodeInnerHTML = "<li>" + uiString("this_browser") + "</li>"; - for (let line of lines) { - nodeInnerHTML += "<li>" + line + "</li>"; - } - nodeInnerHTML += domain.endsWith(".onion") ? - (onionSiteRelayLine + - onionSiteRelayLine + - onionSiteRelayLine + - "<li>" + uiString("onion_site") + "</li>") : - "<li>" + uiString("internet") + "</li>"; - document.getElementById("circuit-nodes").innerHTML = nodeInnerHTML; + let { domain, nodeData } = currentCircuitData(gBrowser.selectedBrowser); + if (domain && nodeData) { + // Update the displayed information for the relay nodes. + let nodeHtmlList = document.getElementById("circuit-display-nodes"); + let li = (...data) => appendHtml(nodeHtmlList, ["li", {}, ...data]); + nodeHtmlList.innerHTML = ""; + li(uiString("this_browser")); + for (let i = 0; i < nodeData.length; ++i) { + let relayText; + if (nodeData[i].type === "bridge") { + relayText = uiString("tor_bridge") + + ((nodeData[i].bridgeType !== "vanilla") ? `: ${nodeData[i].bridgeType}` : ""); + } else { + relayText = localizedCountryNameFromCode(nodeData[i].countryCode); } - } else { - logger.eclog(5, "no SOCKS credentials found for current document."); + li(relayText, " ", + ["span", { class: "circuit-ip-address" }, nodeData[i].ip], " ", + (i === 0 && nodeData[0].type !== "bridge") ? + ["span", { class: "circuit-guard-info" }, uiString("guard")] : null); } + if (domain.endsWith(".onion")) { + for (let i = 0; i < 3; ++i) { + li(uiString("relay")); + } + } + li(domain); + // Hide the note about guards if we are using a bridge. + document.getElementById("circuit-guard-note-container").style.display = + (nodeData[0].type === "bridge") ? "none" : "block"; + } else { // Only show the Tor circuit if we have credentials and node data. - showCircuitDisplay(credentials && nodeData); + logger.eclog(5, "no SOCKS credentials found for current document."); } + showCircuitDisplay(domain && nodeData); }; // __syncDisplayWithSelectedTab(syncOn)__. @@ -314,7 +358,7 @@ let syncDisplayWithSelectedTab = (function() { } } }; return function (syncOn) { - let popupMenu = document.getElementById("torbutton-context-menu"); + let popupMenu = document.getElementById("identity-popup"); if (syncOn) { // Update the circuit display just before the popup menu is shown. popupMenu.addEventListener("popupshowing", updateCircuitDisplay); @@ -331,6 +375,23 @@ let syncDisplayWithSelectedTab = (function() { }; })(); +// __setupGuardNote()__. +// Call once to show the Guard note as intended. +let setupGuardNote = function () { + let guardNote = document.getElementById("circuit-guard-note-container"); + let guardNoteString = uiString("guard_note"); + let learnMoreString = uiString("learn_more"); + let [noteBefore, name, noteAfter] = guardNoteString.split(/[\[\]]/); + let localeCode = torbutton_get_general_useragent_locale(); + appendHtml(guardNote, + ["div", {}, + noteBefore, ["span", {class: "circuit-guard-name"}, name], + noteAfter, " ", + ["span", {onclick: `gBrowser.selectedTab = gBrowser.addTab('https://tb-manual.torproject.org/${localeCode}');`, + class: "circuit-link"}, + learnMoreString]]); +}; + // ## Main function // __setupDisplay(ipcFile, host, port, password, enablePrefName)__. @@ -338,6 +399,7 @@ let syncDisplayWithSelectedTab = (function() { // the "enablePref" is set to true, and stopped when it is set to false. // A reference to this function (called createTorCircuitDisplay) is exported as a global. let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { + setupGuardNote(); let myController = null, stopCollectingIsolationData = null, stopCollectingBrowserCredentials = null, diff --git a/src/chrome/content/tor-circuit-display.xul b/src/chrome/content/tor-circuit-display.xul new file mode 100644 index 0000000..b4d4ac7 --- /dev/null +++ b/src/chrome/content/tor-circuit-display.xul @@ -0,0 +1,34 @@ +<?xml version="1.0"?> +<?xml-stylesheet href="chrome://torbutton/skin/tor-circuit-display.css" type="text/css"?> + +<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> + +<overlay id="circuit-display-overlay" + xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml"> + <panelview id="identity-popup-mainView"> +  + <xul:hbox id="circuit-display-container" + class="identity-popup-section" + insertafter="identity-popup-security"> + <xul:vbox id="circuit-display-content" flex="1"> + <xul:label id="circuit-display-headline" + class="identity-popup-headline" + value="&torbutton.circuit_display.title;"/> + <html:ul id="circuit-display-nodes" dir="auto"> + <li>example A</li> + <li>example B</li> + <li>example C</li> + </html:ul> + </xul:vbox> + <xul:vbox id="circuit-reload-content" flex="1"> + <html:button id="circuit-reload-button" + onclick="torbutton_new_circuit()"> + &torbutton.circuit_display.new_circuit; + </html:button> + <xul:hbox id="circuit-guard-note-container"> + </xul:hbox> + </xul:vbox> + </xul:hbox> + </panelview> +</overlay> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 7ccad6a..a0ef5f9 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play."> -<!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index 2391e69..468a532 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP unknown torbutton.circuit_display.onion_site = Onion site torbutton.circuit_display.this_browser = This browser -torbutton.circuit_display.relay = relay +torbutton.circuit_display.relay = Relay torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Unknown country +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = Learn more torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. torbutton.panel.tooltip.disabled = Click to enable Tor torbutton.panel.tooltip.enabled = Click to disable Tor diff --git a/src/chrome/skin/relay.svg b/src/chrome/skin/relay.svg new file mode 100644 index 0000000..b2f5f16 --- /dev/null +++ b/src/chrome/skin/relay.svg @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> +  + <title>relay</title> + <desc>Created with Sketch.</desc> + <defs></defs> + <g id="Artboard" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="translate(-448.000000, -65.000000)"> + <path d="M462.904942,71.0268217 L467.575247,74.1403583 C468.095041,73.9073638 468.671277,73.7777778 469.277778,73.7777778 C471.57895,73.7777778 473.444444,75.6432726 473.444444,77.9444444 C473.444444,80.2456163 471.57895,82.1111111 469.277778,82.1111111 C468.296528,82.1111111 467.394661,81.7717448 466.682726,81.2041667 L462.234549,83.9842882 C462.366276,84.5801474 462.366276,85.197587 462.234549,85.7934462 L466.682726,88.5735677 C467.394661,88.006033 468.296528,87.6666667 469.277778,87.6666667 C471.57895,87.6666667 473.444444,89.5321615 473.444444,91.8333333 C473.444444,94.1345052 471.57895,96 469.277778,96 C466.976606,96 465.111111,94.1345052 465.111111,91.8333333 C465.111023,91.5291178 465.144147,91.2258017 465.209896,90.928776 L460.761719,88.1486545 C460.049783,88.7161892 459.147917,89.0555556 458.166667,89.0555556 C455.865495,89.0555556 454,87.1900608 454,84.8888889 C454,82.587717 455.865495,80.7222222 458.166667,80.7222222 C459.147917,80.7222222 460.049783,81.0615885 46 0.761719,81.6291233 L465.209896,78.8490017 C465.145399,78.5577257 465.111111,78.2551215 465.111111,77.9444444 C465.111111,77.2224682 465.29474,76.5433776 465.617841,75.95133 L461.36038,73.1130222 C460.739536,73.5327021 459.990981,73.7777778 459.185185,73.7777778 C457.037411,73.7777778 455.296296,72.0366629 455.296296,69.8888889 C455.296296,67.7411149 457.037411,66 459.185185,66 C461.332959,66 463.074074,67.7411149 463.074074,69.8888889 C463.074074,70.2848045 463.01491,70.6669018 462.904942,71.0268217 Z" id="Line-2" fill="#000000" fill-rule="nonzero"></path> + </g> +</svg> \ No newline at end of file diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index d3b5edc..71c283c 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -4,110 +4,134 @@ a domain, and a bulleted list. Each bullet in the circuit node list is supposed to represent a Tor circuit node, and lines drawn between them to represent Tor network inter-relay connections. - -CSS for line between bullets is derived in part from https://jsfiddle.net/5JP8Q/ */ -/* The circuit-display div encloses all other HTML elements. - Color the background to make circuit display distinct - from the rest of the popup. */ -div#circuit-display { - background-color: #e8f4f4; - font-family: Arial; - width: 100%; - height: 100%; - padding: 8px; - /* Magically keep popup menu from clipping div: */ - display: table-cell; + +#circuit-display-content { + background-image: url(chrome://torbutton/skin/relay.svg); + background-position: 1em 1em; + background-repeat: no-repeat; + background-size: 24px auto; + background-color: rgba(255,255,255,0.4); + background-blend-mode: lighten; cursor: default; + padding: 0.5em 0px 0.5em; + padding-inline-end: 1em; + padding-inline-start: calc(2em + 24px); + width: 100%; } -/* Format the title text. */ -div#circuit-display p#title { - font-size: 15px; - font-weight: bold; - color: #2c26a7; - margin: 0; +#circuit-display-content:-moz-locale-dir(rtl) { + background-position: calc(100% - 1em) 1em; +} + +#circuit-reload-content { + background-color: #f7f7f7; + cursor: default; + padding: 1em 0px 1em; + padding-inline-end: 3em; + padding-inline-start: calc(2em + 24px); + width: 100%; } /* Format the domain text. */ -div#circuit-display p#domain { - font-size: 13px; - color: black; - margin: 4px; +#circuit-display-domain { + opacity: 0.8; +} + +#circuit-div { + position: relative; + margin-inline-start: 6px; } /* Format the circuit node list. */ -ul#circuit-nodes { - font-family: Arial; - font-size: 14px; - color: black; - margin-top: 8px; - padding-left: 8px; - padding-right: 8px; -} - -/* Hide default bullets, and position pseudoelements (our new bullets) relative - to the list items. */ -ul#circuit-nodes li { +ul#circuit-display-nodes { + /* font-family: Arial; */ + font-size: 16px; + line-height: 26px; + /* color: black;*/ + margin-top: 4px; + margin-bottom: 2px; + padding-inline-start: 4px; +} + +/* Hide default bullets, and draw our own bullets */ +ul#circuit-display-nodes li { + background-image: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20width%3D%2715%27%20height%3D%2740%27%3E%3Cg%20style%3D%27stroke%3A%234a4a4a%3Bstroke-width%3A3px%3Bfill%3Awhite%3B%27%3E%3Cline%20x1%3D%2750%25%27%20y1%3D%270%25%27%20x2%3D%2750%25%27%20y2%3D%27100%25%27%2F%3E%3Ccircle%20cx%3D%2750%25%27%20cy%3D%2750%25%27%20r%3D%274.5%27%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A"); + background-position: left center; + background-repeat: no-repeat; list-style: none; - position:relative; + padding-inline-start: 1.5em; } -/* Pad the list item text at left or right to be tastefully - separated from bullets. */ -ul#circuit-nodes li:-moz-dir(ltr) { - padding-left: 18px; +ul#circuit-display-nodes li:-moz-locale-dir(rtl) { + background-position: right center; } -ul#circuit-nodes li:-moz-dir(rtl) { - padding-right: 18px; + +ul#circuit-display-nodes li:first-child { + background-image: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20width%3D%2715%27%20height%3D%2740%27%3E%3Cg%20style%3D%27stroke%3A%234a4a4a%3Bstroke-width%3A3px%3Bfill%3Awhite%3B%27%3E%3Cline%20x1%3D%2750%25%27%20y1%3D%2750%25%27%20x2%3D%2750%25%27%20y2%3D%27100%25%27%2F%3E%3Ccircle%20cx%3D%2750%25%27%20cy%3D%2750%25%27%20r%3D%274.5%27%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A"); +} + +ul#circuit-display-nodes li:last-child { + background-image: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20width%3D%2715%27%20height%3D%2740%27%3E%3Cg%20style%3D%27stroke%3A%234a4a4a%3Bstroke-width%3A3px%3Bfill%3Awhite%3B%27%3E%3Cline%20x1%3D%2750%25%27%20y1%3D%270%25%27%20x2%3D%2750%25%27%20y2%3D%2750%25%27%2F%3E%3Ccircle%20cx%3D%2750%25%27%20cy%3D%2750%25%27%20r%3D%274.5%27%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A"); +} + +.circuit-guard-help { + -moz-context-properties: fill, stroke; + fill: #6200a4; + stroke: #6200a4; +} + +.circuit-ip-address { + font-size: 80%; + opacity: 0.4; + padding-inline-start: 3px; } -/* Drawn bullets, centered vertically for each list item. */ -ul#circuit-nodes li:after { - /* bullets */ - content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20width%3D%2711%27%20height%3D%2711%27%3E%3Ccircle%20cx%3D%275.5%27%20cy%3D%275.5%27%20r%3D%274%27%20style%3D%27stroke%3A%20%23195021%3B%20stroke-width%3A%202px%3B%20fill%3A%20white%3B%27%2F%3E%3C%2Fsvg%3E"); - position: absolute; - top: 1px; +.circuit-guard-info { + font-size: 80%; + font-weight: bold; + color: #6200a4; + padding-inline-start: 3px; } -/* Move the bullets to the far left or right, - depending on text directionality. */ -ul#circuit-nodes li:-moz-dir(ltr):after { - left: 0px; +#circuit-reload-button { + background-color: #0060df; + border-radius: 3px; + border: none; + color: white; + cursor: pointer; + font-size: 18px; + padding: 10px; } -ul#circuit-nodes li:-moz-dir(rtl):after { - right: 0px; + +#circuit-reload-button:hover { + background-color: #0058cf; } -/* Draw a connecting vertical line through the bullets. */ -ul#circuit-nodes li:before { - content: ""; - position: absolute; - border-left: 3px solid #4d363a; - height: 100%; - width: 0px; +#circuit-reload-button:active { + background-color: #0050bf; } -/* Position lines through the middle of the bullet. */ -ul#circuit-nodes li:-moz-dir(ltr):before { - left: 4px; +#circuit-guard-note-container { + margin-top: 10px; } -ul#circuit-nodes li:-moz-dir(rtl):before { - right: 4px; + +#circuit-guard-note-container div { + margin-left: 3px; + margin-right: 3px; } -/* Shorten the first list item's line so that it starts under the bullet. */ -ul#circuit-nodes li:first-child:before { - top: 50%; +.circuit-guard-name { + font-weight: bold; + color: #6200a4; } -/* Shorten the last list item's line so that it ends under the bullet. */ -ul#circuit-nodes li:last-child:before { - height: 50%; +.circuit-link { + cursor: pointer; + color: #0000ee; } -/* Onion site relay node text should be gray. */ -ul#circuit-nodes li.relay { - color: gray; -} \ No newline at end of file +.circuit-link:hover { + text-decoration: underline; +}

1 0

[tor-launcher/master] Bug 20890: Increase control port connection timeout
by gk＠torproject.org 17 May '18

17 May '18

commit 9aa5fd46cb33528150400a9b94c14ad5e9b7d4ee Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed May 16 14:17:16 2018 -0400 Bug 20890: Increase control port connection timeout On slow computers, it can take longer than 30 seconds for Tor Launcher to connect to the tor control port. Increase the timeout to 5 minutes. --- src/components/tl-process.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 53c9919..2bf5a4c 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -38,8 +38,8 @@ TorProcessService.prototype = kWizardProgressPageID: "progress", kInitialControlConnDelayMS: 25, - kMaxControlConnRetryMS: 500, - kControlConnTimeoutMS: 30000, // Wait at most 30 seconds for tor to start. + kMaxControlConnRetryMS: 2000, // Retry at least every 2 seconds. + kControlConnTimeoutMS: 5*60*1000, // Wait at most 5 minutes for tor to start. kStatusUnknown: 0, // Tor process status. kStatusStarting: 1,

1 0

[tor-browser-build/maint-7.5] Bug 26098: Remove amazon-meek
by gk＠torproject.org 16 May '18

16 May '18

commit efa9901ec57d0d78aa1f8034a922da4f792c0ee0 Author: Sina Rabbani <srabbani(a)cymru.com> Date: Tue May 15 13:46:06 2018 -0400 Bug 26098: Remove amazon-meek --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index a3f5326..ad34891 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -41,7 +41,6 @@ pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 85.31.186.98:443 0 pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.27", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); -pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); +pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72");

1 0

[tor-browser-build/master] Bug 26098: Remove amazon-meek
by gk＠torproject.org 16 May '18

16 May '18

commit 22af54508a1e98bec13ee9580aac7c1b907043e8 Author: Sina Rabbani <srabbani(a)cymru.com> Date: Tue May 15 13:46:06 2018 -0400 Bug 26098: Remove amazon-meek --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index a3f5326..ad34891 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -41,7 +41,6 @@ pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 85.31.186.98:443 0 pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.27", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); -pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); +pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72");

1 0

[tor-browser-build/master] Bug 26057: make it easy to see commit used in nightly builds
by gk＠torproject.org 15 May '18

15 May '18

commit 78ab93d70e73cf37550f45d6fb8fd61825bc1e95 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed May 9 10:29:18 2018 +0200 Bug 26057: make it easy to see commit used in nightly builds In order to make it easy to see which commit was used, we include the abbreviated commit hash in the filename of all components that are based on master in the nightly build. To do that, we set git_hash to master, and version (which is included in the filename) to '[% c("abbrev") %]". --- projects/obfs4/config | 1 + projects/sandbox/config | 1 + projects/tor-launcher/config | 3 ++- projects/tor/config | 2 +- projects/torbutton/config | 3 ++- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/projects/obfs4/config b/projects/obfs4/config index 916887f..2bae851 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -13,6 +13,7 @@ var: targets: nightly: git_hash: master + version: '[% c("abbrev") %]' tag_gpg_id: 0 input_files: diff --git a/projects/sandbox/config b/projects/sandbox/config index a7ed768..11fe6be 100644 --- a/projects/sandbox/config +++ b/projects/sandbox/config @@ -21,6 +21,7 @@ var: targets: nightly: git_hash: master + version: '[% c("abbrev") %]' tag_gpg_id: 0 input_files: diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index e72ce10..fe21a49 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -13,5 +13,6 @@ input_files: targets: nightly: - version: master + version: '[% c("abbrev") %]' + git_hash: master tag_gpg_id: 0 diff --git a/projects/tor/config b/projects/tor/config index 78d834f..6219ea6 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -18,7 +18,7 @@ var: targets: nightly: - version: master + version: '[% c("abbrev") %]' git_hash: master tag_gpg_id: 0 diff --git a/projects/torbutton/config b/projects/torbutton/config index 93bef30..f153cf6 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -13,5 +13,6 @@ input_files: targets: nightly: - version: master + version: '[% c("abbrev") %]' + git_hash: master tag_gpg_id: 0

1 0

[tor-browser-build/master] Bug 25318: Add Tor Browser nightly builds email notification
by gk＠torproject.org 08 May '18

08 May '18

commit 4580c03c937e8ccab86446d60a0d4ee29b7c07c8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 23 13:35:39 2018 +0200 Bug 25318: Add Tor Browser nightly builds email notification Authentication configuration for the email setup is stored in group_vars/boklm-tbb-nightly/dma-auth.yml, encrypted using ansible-vault. The file contains the dma_auth_conf variable, which is the content of the /etc/dma/auth.conf file. --- tools/ansible/Makefile | 2 +- tools/ansible/boklm-tbb-nightly-build.yml | 1 + .../ansible/group_vars/boklm-tbb-nightly/dma-auth.yml | 10 ++++++++++ tools/ansible/group_vars/boklm-tbb-nightly/dma.yml | 8 ++++++++ .../group_vars/boklm-tbb-nightly/tbb-nightly-build.yml | 2 ++ tools/ansible/roles/mta/tasks/main.yml | 18 ++++++++++++++++++ .../roles/tbb-nightly-build/templates/testsuite-config | 5 +++++ 7 files changed, 45 insertions(+), 1 deletion(-) diff --git a/tools/ansible/Makefile b/tools/ansible/Makefile index 72deb5b..ea63a44 100644 --- a/tools/ansible/Makefile +++ b/tools/ansible/Makefile @@ -5,4 +5,4 @@ fpcentral: ANSIBLE_CONFIG='$((a)D)/ansible-fpcentral.cfg' ansible-playbook -i inventory --ask-become-pass fpcentral.yml boklm-tbb-nightly-build: - ansible-playbook -i inventory boklm-tbb-nightly-build.yml + ansible-playbook --vault-password-file=~/ansible-vault/boklm-tbb-nightly -i inventory boklm-tbb-nightly-build.yml diff --git a/tools/ansible/boklm-tbb-nightly-build.yml b/tools/ansible/boklm-tbb-nightly-build.yml index cc37e23..2fe48cd 100644 --- a/tools/ansible/boklm-tbb-nightly-build.yml +++ b/tools/ansible/boklm-tbb-nightly-build.yml @@ -5,3 +5,4 @@ - role: tbb-builder - role: tbb-nightly-build - role: unattended-upgrades + - role: mta diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/dma-auth.yml b/tools/ansible/group_vars/boklm-tbb-nightly/dma-auth.yml new file mode 100644 index 0000000..254291c --- /dev/null +++ b/tools/ansible/group_vars/boklm-tbb-nightly/dma-auth.yml @@ -0,0 +1,10 @@ +$ANSIBLE_VAULT;1.1;AES256 +64353537366566623534653938363036396164303631616138313130663766626463303034336564 +6339346639633765383534653561646366626665393333340a343533636436333838633039363265 +33393762363563323338356634396137393466616336326337323761643332363438313735646135 +6633326462616261310a663738306463613237326164663533326230316662333935333361636334 +61336433633964643631653230633861393131646532666536653738376261386535356636666262 +30303761333230623662323037376130386134373939613861343233363038636464623132363135 +66386532346165303839346563383934633462386534383330636432356166666238383332353930 +39316439653733376239343661373265303033323237366132366161316535636165336539333130 +3033 diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/dma.yml b/tools/ansible/group_vars/boklm-tbb-nightly/dma.yml new file mode 100644 index 0000000..b210a3a --- /dev/null +++ b/tools/ansible/group_vars/boklm-tbb-nightly/dma.yml @@ -0,0 +1,8 @@ +--- +dma_conf: | + SMARTHOST mail.riseup.net + AUTHPATH /etc/dma/auth.conf + SECURETRANSFER + STARTTLS + MAILNAME /etc/mailname + MASQUERADE boklm-tbb-nightly(a)riseup.net diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml index ebaadfe..77c4ad6 100644 --- a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml +++ b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml @@ -1,3 +1,5 @@ --- nightly_build_hostname: f4amtbsowhix7rrf.onion nightly_build_url: 'http://{{ nightly_build_hostname }}' +nightly_build_email_from: "'Tor Browser Nightly Builds (boklm) <boklm-tbb-nightly(a)riseup.net>'," +nightly_build_email_to: "[ 'boklm(a)torproject.org', 'gk(a)torproject.org' ]," diff --git a/tools/ansible/roles/mta/tasks/main.yml b/tools/ansible/roles/mta/tasks/main.yml index de469d8..9c5ac49 100644 --- a/tools/ansible/roles/mta/tasks/main.yml +++ b/tools/ansible/roles/mta/tasks/main.yml @@ -4,3 +4,21 @@ apt: name: dma state: present + +- name: create dma auth.conf + copy: + dest: /etc/dma/auth.conf + mode: 0640 + owner: root + group: mail + content: "{{ dma_auth_conf }}" + when: dma_auth_conf is defined + +- name: create dma.conf + copy: + dest: /etc/dma/dma.conf + mode: 0640 + owner: root + group: mail + content: "{{ dma_conf }}" + when: dma_conf is defined diff --git a/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config b/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config index b537f56..c07c52c 100644 --- a/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config +++ b/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config @@ -23,5 +23,10 @@ my %res = ( name => $name, args => [ $testsuite ], tags => [ 'nightly' ], + 'reports-url' => '{{ nightly_build_url }}/reports/', + 'email-subject' => '[build result: [% success ? "ok" : "failed" %]] [% options.name %]', + {% if nightly_build_email_to is defined %}'email-report' => 1,{% endif %} + {% if nightly_build_email_to is defined %}'email-to' => {{ nightly_build_email_to }}{% endif %} + {% if nightly_build_email_from is defined %}'email-from' => {{ nightly_build_email_from }}{% endif %} ); %res;

1 0

[tor-browser-build/master] Bug 25817: add ansible roles for tbb-nightly setup
by gk＠torproject.org 08 May '18

08 May '18

commit a2f565643d4c34a49712c37e3931dd6f80da7ba1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 16 19:30:02 2018 +0200 Bug 25817: add ansible roles for tbb-nightly setup --- README | 43 ++------ tools/ansible/Makefile | 3 + tools/ansible/README | 6 ++ tools/ansible/boklm-tbb-nightly-build.yml | 7 ++ .../boklm-tbb-nightly/tbb-nightly-build.yml | 3 + tools/ansible/inventory | 4 + .../roles/tbb-nightly-build/defaults/main.yml | 11 ++ .../roles/tbb-nightly-build/handlers/main.yml | 5 + .../ansible/roles/tbb-nightly-build/tasks/main.yml | 84 +++++++++++++++ .../roles/tbb-nightly-build/templates/nginx.conf | 16 +++ .../tbb-nightly-build/templates/rbm.local.conf | 116 +++++++++++++++++++++ .../tbb-nightly-build/templates/start-tbb-nightly | 5 + .../tbb-nightly-build/templates/testsuite-config | 27 +++++ .../tbb-nightly-build/templates/www-index.html | 10 ++ 14 files changed, 306 insertions(+), 34 deletions(-) diff --git a/README b/README index d498c05..a20b659 100644 --- a/README +++ b/README @@ -138,43 +138,18 @@ Automated builds using tbb-testsuite ------------------------------------ The Tor Browser testsuite scripts can also be used to do nightly builds -and publish the build logs. +and publish the build logs. The recommended way to do that is to use +the ansible roles from the tools/ansible directory. See next section +for details. -If you want to do that, start by cloning the git repository: - $ git clone https://git.torproject.org/boklm/tor-browser-bundle-testsuite.git +Using ansible to set up a nightly build machine +----------------------------------------------- -Install some dependencies: - - # apt-get install -y libdata-dump-perl libfile-slurp-perl \ - libio-captureoutput-perl perlmagick libjson-perl \ - libwww-perl liblwp-protocol-https-perl libtemplate-perl \ - libyaml-syck-perl libdatetime-perl \ - libemail-sender-perl libemail-simple-perl libfile-type-perl \ - libipc-run-perl libxml-libxml-perl - -Copy the config/tor-browser_build-boklm file and edit it: - - $ cd tor-browser-bundle-testsuite - $ cp config/tor-browser_build-boklm config/tor-browser_build-$user - $ vim config/tor-browser_build-$user - -Change the publish_dir and publish_url options. The publish_dir option is -the local directory where the builds will be stored. The publish_url -option is the public URL where the builds will be available. - -Copy the tools/tor-browser-builds-boklm file and edit it to change the ---config= option: - - $ cp tools/tor-browser-builds-boklm tools/tor-browser-builds-$user - $ vim tools/tor-browser-builds-$user - -You can now run ./tools/tor-browser-builds-$user to start the build, and -add it to your crontab. - -The html build reports will be available in the reports/ directory, and -the build files in the tor-browser-builds/ directory (unless you changed -the publish_dir option). +The directory tools/ansible contains some ansible roles to set up a +nightly build machine. You can look at the playbook defined in +boklm-tbb-nightly-build.yml and variables in group_vars/boklm-tbb-nightly/ +for an example of how it can be used. Signing builds diff --git a/tools/ansible/Makefile b/tools/ansible/Makefile index 608f932..72deb5b 100644 --- a/tools/ansible/Makefile +++ b/tools/ansible/Makefile @@ -3,3 +3,6 @@ ansible-tbb-build: fpcentral: ANSIBLE_CONFIG='$((a)D)/ansible-fpcentral.cfg' ansible-playbook -i inventory --ask-become-pass fpcentral.yml + +boklm-tbb-nightly-build: + ansible-playbook -i inventory boklm-tbb-nightly-build.yml diff --git a/tools/ansible/README b/tools/ansible/README index 6b2e6a4..dc69ad7 100644 --- a/tools/ansible/README +++ b/tools/ansible/README @@ -16,3 +16,9 @@ fpcentral: you need to be in the fpcentral tpo ldap group. Your ldap password will be asked, to sudo to the fpcentral user. +boklm-tbb-nightly-build: + This target is used by boklm to deploy a nightly build machine. If + anybody else wants to set up their own nightly builds, it is possible to + do it by adding a new host to the inventory file and making copies of + group_vars/boklm-tbb-nightly/ and boklm-tbb-nightly-build.yml. + diff --git a/tools/ansible/boklm-tbb-nightly-build.yml b/tools/ansible/boklm-tbb-nightly-build.yml new file mode 100644 index 0000000..cc37e23 --- /dev/null +++ b/tools/ansible/boklm-tbb-nightly-build.yml @@ -0,0 +1,7 @@ +--- + +- hosts: boklm-tbb-nightly-build + roles: + - role: tbb-builder + - role: tbb-nightly-build + - role: unattended-upgrades diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml new file mode 100644 index 0000000..ebaadfe --- /dev/null +++ b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml @@ -0,0 +1,3 @@ +--- +nightly_build_hostname: f4amtbsowhix7rrf.onion +nightly_build_url: 'http://{{ nightly_build_hostname }}' diff --git a/tools/ansible/inventory b/tools/ansible/inventory index 32a5805..fc25842 100644 --- a/tools/ansible/inventory +++ b/tools/ansible/inventory @@ -1,8 +1,12 @@ build-sunet-a ansible_ssh_user=root ansible_ssh_host=build-sunet-a.torproject.net fpcentral ansible_become=True ansible_become_method=sudo ansible_become_user=fpcentral ansible_ssh_host=forrestii.torproject.org allow_world_readable_tmpfiles=True +boklm-tbb-nightly-build ansible_ssh_user=root ansible_become_method=su [tbb-build] build-sunet-a [fpcentral] fpcentral + +[boklm-tbb-nightly] +boklm-tbb-nightly-build diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml new file mode 100644 index 0000000..d84a161 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -0,0 +1,11 @@ +--- +nightly_build_user: tbb-nightly +nightly_build_cron_hour: 2 +nightly_build_cron_minute: 20 +nightly_build_keep_builds: 2 +testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite" +testsuite_git_url: https://git.torproject.org/boklm/tor-browser-bundle-testsuite.git +testsuite_git_commit: 348ad855711382089c4fbf1badfec58e31a6c148 +nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" +nightly_build_nginx_enable: true +nightly_build_nginx_listen: 127.0.0.1:80 diff --git a/tools/ansible/roles/tbb-nightly-build/handlers/main.yml b/tools/ansible/roles/tbb-nightly-build/handlers/main.yml new file mode 100644 index 0000000..3350d73 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/handlers/main.yml @@ -0,0 +1,5 @@ +--- +- name: restart nginx + service: + name: nginx + state: restarted diff --git a/tools/ansible/roles/tbb-nightly-build/tasks/main.yml b/tools/ansible/roles/tbb-nightly-build/tasks/main.yml new file mode 100644 index 0000000..64d31a9 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/tasks/main.yml @@ -0,0 +1,84 @@ +--- +- name: create tbb-nightly user + user: + name: "{{ nightly_build_user }}" + comment: "Tor Browser Nightly Builds" + groups: tbb-build + createhome: yes + home: "/home/{{ nightly_build_user }}" + +- name: clone tor browser testsuite + become: yes + become_user: "{{ nightly_build_user }}" + git: + repo: "{{ testsuite_git_url }}" + dest: "{{ testsuite_dir }}" + version: "{{ testsuite_git_commit }}" + +- name: install testsuite dependencies + command: "{{ testsuite_dir }}/install-deps" + +- name: add testsuite config + template: + src: testsuite-config + dest: "{{ testsuite_dir }}/config/tbb-nightly" + mode: 0644 + owner: "{{ nightly_build_user }}" + +- name: create rbm-config directory + file: + path: '{{ testsuite_dir }}/rbm-config/' + state: directory + owner: '{{ nightly_build_user }}' + mode: 0755 + +- name: add rbm config + template: + src: rbm.local.conf + dest: "{{ testsuite_dir }}/rbm-config/tbb-nightly.rbm.local.conf" + mode: 0644 + owner: "{{ nightly_build_user }}" + +- name: add start-tbb-nightly script + template: + src: start-tbb-nightly + dest: "/home/{{ nightly_build_user }}/start-tbb-nightly" + mode: 0755 + owner: "{{ nightly_build_user }}" + +- name: add cron to start nighly build + cron: + name: tbb-nightly-build + user: "{{ nightly_build_user }}" + hour: "{{ nightly_build_cron_hour }}" + minute: "{{ nightly_build_cron_minute }}" + job: "/home/{{ nightly_build_user }}/start-tbb-nightly" + +- name: create wwwdir + file: + path: '{{ nightly_build_wwwdir }}' + state: directory + owner: '{{ nightly_build_user }}' + mode: 0755 + +- name: add index page + template: + src: www-index.html + dest: "{{ nightly_build_wwwdir }}/index.html" + mode: 0644 + owner: "{{ nightly_build_user }}" + +- name: install nginx + apt: + name: nginx + state: present + when: nightly_build_nginx_enable + +- name: add nginx config + template: + src: nginx.conf + dest: /etc/nginx/sites-enabled/tbb-nightly-build + mode: 0644 + notify: + - restart nginx + when: nightly_build_nginx_enable diff --git a/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf b/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf new file mode 100644 index 0000000..9d44bec --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf @@ -0,0 +1,16 @@ +server { + listen {{ nightly_build_nginx_listen }}; + server_name {{ nightly_build_hostname }}; + root {{ nightly_build_wwwdir }}; + index index.html; + location / { + try_files $uri $uri/ =404; + } + location /reports { + alias {{ testsuite_dir }}/reports; + } + location /tor-browser-builds { + alias {{ testsuite_dir }}/tor-browser-builds; + autoindex on; + } +} diff --git a/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf b/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf new file mode 100644 index 0000000..fcd6b34 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf @@ -0,0 +1,116 @@ +--- +### This file is used to override options from rbm.conf to adapt them +### to your local setup. +### +### Copy this file as rbm.local.conf to enable it, and uncomment the +### options you want to modify. + + +### The tmp_dir option defines where temporary files are stored. The +### builds are made from this directory, so using a directory on a fast +### disk can improve build time. By default we are using a tmp directory +### under the tor-browser-build directory. +#tmp_dir: /tmp + +### The debug option defines whether a debugging shell should be opened +### automatically in the build directory/container in case of build +### failure. If you are doing automated builds, you might want to disable +### this. +#debug: 0 + +### The build_log option defines in which file the build logs of each +### component are stored. If you set it to '-' the logs are output on +### stdout and stderr. +#build_log: '-' + +### By default, the logs from previous builds are kept in the log files. +### If you set build_log_append to 0, then previous logs are cleaned +### when starting a new build. +#build_log_append: 0 + +buildconf: + buildconf: 1 + + ### The buildconf/num_procs option can be used to select the number of + ### build processes to run simultaneously. You can also use the + ### RBM_NUM_PROCS environment variable. The default is 4. + #num_procs: 8 + + ### The buildconf/git_signtag_opt option is useful when you tag a release. + ### It is used to set the 'git tag' argument to select the keyid for + ### signing the tag. + #git_signtag_opt: '-u keyid' + +var: + local_conf: 1 + + ### The var/sign_build option defines if you want to sign the + ### sha256sums-unsigned-build.txt file with gpg. + #sign_build: 1 + + ### The var/sign_build_gpg_opts option can be used to define some gpg + ### options to select the key to use to sign the sha256sums-unsigned-build.txt + ### file. + #sign_build_gpg_opts: '--local-user XXXXXXXX' + + ### The clean configuration is used by the cleaning script to find the + ### branches and build targets you are using, to compute the list of + ### files that should be kept. + ### + ### If you only do alpha builds for all platforms, you can use the + ### following configuration: + clean: + HEAD: + - project: release + target: + - alpha + - torbrowser-all + - project: release + target: + - nightly + - torbrowser-all + # + ### If you are doing 'release' builds in the maint-7.0 branch and + ### 'alpha' builds in the master branch, you can use the following + ### configuration: + #clean: + # master: + # - project: release + # target: + # - alpha + # - torbrowser-all + # maint-7.0: + # - project: release + # target: + # - release + # - torbrowser-all + +targets: + + ### testbuild is based on alpha by default. Uncomment this if you want it + ### to be based on nightly. + #torbrowser-testbuild: + # - testbuild + # - nightly + + testbuild: + var: + testbuild: 1 + + ### Uncomment this if you want to create mar files in your test build. + #build_mar: 1 + + nightly: + + ### By default 'fetch' is set to 1 for nightly builds, meaning that new + ### commits will be fetched automatically during each build. You can + ### disable this during development if you want to do rebuilds to test + ### a specific change, but don't want rebuilds caused by unrelated + ### changes, or if you want to decide at which point new commits are + ### fetched. When 'fetch' is set to 'if_needed', new commits will only + ### be fetched if the selected commit (or branch, or tag) is not present, + ### which means that existing branches won't be updated. In that case + ### you can fetch new commits by running 'make fetch'. + fetch: 'if_needed' + +# vim: filetype=yaml sw=2 diff --git a/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly b/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly new file mode 100644 index 0000000..3c1847d --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly @@ -0,0 +1,5 @@ +#!/bin/sh +cd {{ testsuite_dir }} +export RBM_NO_DEBUG=1 +./tbb-testsuite --config=tbb-nightly "$@" +./tools/prune-old-builds/prune-old-builds --prefix '' --days {{ nightly_build_keep_builds }} ./tor-browser-builds diff --git a/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config b/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config new file mode 100644 index 0000000..b537f56 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config @@ -0,0 +1,27 @@ +# vim: filetype=perl expandtab +use strict; +use FindBin; +use DateTime; +use TBBTestSuite::TestSuite::TorBrowserBuild; + +my $date = DateTime->now->ymd; +my $name = "tor-browser-$date"; + +if (-d "$options->{'reports-dir'}/r/$name") { + print "Doing nothing: $name already done\n"; + return ( args => [] ); +} + +my $testsuite = TBBTestSuite::TestSuite::TorBrowserBuild->new({ + publish_dir => "$FindBin::Bin/tor-browser-builds/$date", + publish_url => "{{ nightly_build_url }}/tor-browser-builds/$date", + rbm_local_conf => "$FindBin::Bin/rbm-config/tbb-nightly.rbm.local.conf", + make_clean => 1, + }); + +my %res = ( + name => $name, + args => [ $testsuite ], + tags => [ 'nightly' ], +); +%res; diff --git a/tools/ansible/roles/tbb-nightly-build/templates/www-index.html b/tools/ansible/roles/tbb-nightly-build/templates/www-index.html new file mode 100644 index 0000000..05050d8 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/www-index.html @@ -0,0 +1,10 @@ +<html> +<head> + <title>Tor Browser Nightly Builds</title> +</head> +<body> + <h1>Tor Browser Nightly Builds</title> + <a href="reports/"><h3>Build Reports</h3></a> + <a href="tor-browser-builds/"><h3>Build files</h3></a> +</body> +</html>

1 0

[tor-browser-build/maint-7.5] Bug 20892: use sha256sums-signed-build.txt in download_missing_versions
by gk＠torproject.org 07 May '18

07 May '18

commit da514cdf49e89fb5efbb969cfd74dd561d50f54e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Feb 2 16:10:34 2018 +0100 Bug 20892: use sha256sums-signed-build.txt in download_missing_versions This fixes the download of the osx64 mar files. Previously we were unsigning the downloaded mar files and checking them with sha256sums-unsigned-build.txt. The signed osx64 mar files include files that are code-signed, so unsigning the mar file is not enough to get a mar file matching sha256sums-unsigned-build.txt. --- tools/update-responses/update_responses | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index b68e46a..658f451 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -526,22 +526,22 @@ sub download_version { my $destdir = "$releases_dir/$version"; my $urldir = "$config->{download}{archive_url}/$version"; print "Downloading version $version\n"; - foreach my $file (qw(sha256sums-unsigned-build.txt sha256sums-unsigned-build.txt.asc)) { + foreach my $file (qw(sha256sums-signed-build.txt sha256sums-signed-build.txt.asc)) { if (getstore("$urldir/$file", "$tmpdir/$file") != 200) { exit_error "Error downloading $urldir/$file"; } } if (system('gpg', '--no-default-keyring', '--keyring', "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', - "$tmpdir/sha256sums-unsigned-build.txt.asc", - "$tmpdir/sha256sums-unsigned-build.txt")) { + "$tmpdir/sha256sums-signed-build.txt.asc", + "$tmpdir/sha256sums-signed-build.txt")) { exit_error "Error checking gpg signature for version $version"; } mkdir $destdir; - move "$tmpdir/sha256sums-unsigned-build.txt.asc", "$destdir/sha256sums-unsigned-build.txt.asc"; - move "$tmpdir/sha256sums-unsigned-build.txt", "$destdir/sha256sums-unsigned-build.txt"; + move "$tmpdir/sha256sums-signed-build.txt.asc", "$destdir/sha256sums-signed-build.txt.asc"; + move "$tmpdir/sha256sums-signed-build.txt", "$destdir/sha256sums-signed-build.txt"; my %sums = map { chomp; reverse split ' ', $_ } - read_file "$destdir/sha256sums-unsigned-build.txt"; + read_file "$destdir/sha256sums-signed-build.txt"; my $martools = 'mar-tools-' . osname . '.zip'; exit_error "Error downloading $urldir/$martools\n" @@ -557,19 +557,13 @@ sub download_version { unless $sums{$martools} eq sha256_hex(read_file("$tmpdir/$martools")); move "$tmpdir/$martools", "$destdir/$martools"; move "$tmpdir/$martools.asc", "$destdir/$martools.asc"; - extract_martools($config, $version); foreach my $file (sort grep { $_ =~ m/\.mar$/ } keys %sums) { print "Downloading $file\n"; exit_error "Error downloading $urldir/$file\n" unless getstore("$urldir/$file", "$tmpdir/$file") == 200; - if ($sums{$file} ne sha256_hex(read_file("$tmpdir/$file"))) { - exit_error "Error unsigning $file" - if system('signmar', '-r', "$tmpdir/$file", "$tmpdir/$file.u"); - exit_error "Wrong checksum for $file" - unless $sums{$file} eq sha256_hex(read_file("$tmpdir/$file.u")); - move "$tmpdir/$file.u", "$tmpdir/$file"; - } + exit_error "Wrong checksum for $file" + unless $sums{$file} eq sha256_hex(read_file("$tmpdir/$file")); move "$tmpdir/$file", "$destdir/$file"; } }

1 0

[tor-browser-build/master] Release preparations for 8.0a7
by gk＠torproject.org 03 May '18

03 May '18

commit 88f2fc7c4731c73337e0e8f9fb20c87f4768b719 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 3 08:00:17 2018 +0000 Release preparations for 8.0a7 Changelog update and versions bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 16 ++++++++++++++++ projects/tor-launcher/config | 2 +- rbm.conf | 4 ++-- 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 04cd7dd..4e42939 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index ee79a15..4458d48 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,13 +1,13 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.7.3 + firefox_platform_version: 52.8.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.0 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index b9d3941..089cbad 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,19 @@ +Tor Browser 8.0a7 -- May 9 2018 + * All platforms + * Update Firefox to 52.8.0esr + * Update Tor Launcher to 0.2.15.2 + * Bug 25807: Change front domain to unbreak Moat + * Translations update + * Bug 25973: Backport off-by-one fix (bug 1352073) + * Bug 25938: Backport fix for cross-origin header leak (bug 1334776) + * Bug 25458: Fix broken UI customization + * Bug 25898: Make Youtube videos play automatically again + * Bug 25980: Improve backport of bug 1448771 (fixes broken Orfox build) + * OS X + * Bug 26010: Change Snowflake rendezvous to use the Azure domain front + * Linux + * Bug 26010: Change Snowflake rendezvous to use the Azure domain front + Tor Browser 8.0a6 -- April 19 2018 * All platforms * Update Tor to 0.3.3.5-rc diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 1d67b05..e72ce10 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.15.1 +version: 0.2.15.2 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 87ab109..bb53bcb 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0a6' + torbrowser_version: '8.0a7' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.0a5 + - 8.0a6 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-launcher/master] Release preparations for 0.2.15.2
by gk＠torproject.org 03 May '18

03 May '18

commit 462e972213a2aedeee238361c47931dfa187fd7a Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 3 07:25:15 2018 +0000 Release preparations for 0.2.15.2 --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index d0debd0..2686aee 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.15.1</em:version> + <em:version>0.2.15.2</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0