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

[torbutton/master] Release prep for 2.2
by gk＠torproject.org 04 Jun '19

04 Jun '19

commit 73ef44a6ece304438cf6db89a0c8bbc75d65c16b Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 4 07:44:53 2019 +0000 Release prep for 2.2 --- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index fe236b2c..e1b56304 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +2.2 + * Bug 30469: Add ro translation + * Translations update + 2.1.10 * Bug 30565: sync nocertdb with privatebrowsing.autostart at startup * Translations update diff --git a/src/install.rdf b/src/install.rdf index aa03c8dc..2d855202 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>2.1.10</em:version> + <em:version>2.2</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-1] Revert "Bug 28507: Parse a set of strings in Android Set Preferences"
by gk＠torproject.org 04 Jun '19

04 Jun '19

commit 1666b0186346ab2769614d3b19bc2058fd6f13f0 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue May 28 01:58:14 2019 +0000 Revert "Bug 28507: Parse a set of strings in Android Set Preferences" This reverts commit 894c64799812159b17ee90ca39427d12999a670d. --- .../gecko/preferences/DistroSharedPrefsImport.java | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/preferences/DistroSharedPrefsImport.java b/mobile/android/base/java/org/mozilla/gecko/preferences/DistroSharedPrefsImport.java index 7969aca3d2ac..13047c6f2ff4 100644 --- a/mobile/android/base/java/org/mozilla/gecko/preferences/DistroSharedPrefsImport.java +++ b/mobile/android/base/java/org/mozilla/gecko/preferences/DistroSharedPrefsImport.java @@ -11,13 +11,10 @@ import org.mozilla.gecko.distribution.Distribution; import android.content.Context; import android.content.SharedPreferences; import android.util.Log; -import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import java.util.HashSet; import java.util.Iterator; -import java.util.Set; public class DistroSharedPrefsImport { @@ -61,21 +58,7 @@ public class DistroSharedPrefsImport { } else if (value instanceof Long) { sharedPreferences.putLong(GeckoPreferences.NON_PREF_PREFIX + key, (long) value); } else { - JSONArray jsonArray = preferences.optJSONArray(key); - if (jsonArray != null) { - Set<String> prefValues = new HashSet<String>(); - for (int i = 0; i < jsonArray.length(); i++) { - try { - prefValues.add(jsonArray.getString(i)); - } catch (JSONException e) { - Log.e(LOGTAG, "Unable to parse Android Preferences.", e); - continue; - } - } - sharedPreferences.putStringSet(GeckoPreferences.NON_PREF_PREFIX + key, prefValues); - } else { - Log.d(LOGTAG, "Unknown preference value type whilst importing android preferences from distro file."); - } + Log.d(LOGTAG, "Unknown preference value type whilst importing android preferences from distro file."); } } sharedPreferences.apply();

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-1] fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens
by gk＠torproject.org 04 Jun '19

04 Jun '19

commit 41b5dac4943dcf65582f2638fe6d1b5c80127c0a Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue May 28 14:12:49 2019 +0000 fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens There are rare situations where getSelectedTab() is null. --- mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 0b369ca8d5ab..265081798bf7 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -3134,7 +3134,10 @@ public class BrowserApp extends GeckoApp // When the content loaded in the background (such as about:tor), // it was loaded while mBrowserChrome was GONE. We should refresh the // height now so the page is rendered correctly. - Tabs.getInstance().getSelectedTab().doReload(true); + Tab selectedTab = Tabs.getInstance().getSelectedTab(); + if (selectedTab != null) { + selectedTab.doReload(true); + } // If we finished, then Tor bootstrapped 100% mTorNeedsStart = false;

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-1] Revert "Bug 28507: Add prefs that allow the browser to delete browsing history by default"
by gk＠torproject.org 04 Jun '19

04 Jun '19

commit 6d81ef66c55d5b88f39ee6527f8218b2f2e15cd8 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue May 28 01:58:05 2019 +0000 Revert "Bug 28507: Add prefs that allow the browser to delete browsing history by default" This reverts commit b0b54ec7c7a077e8fc728a75cdd475965a1c2bac. --- .../torbrowser/assets/distribution/preferences.json | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/mobile/android/torbrowser/assets/distribution/preferences.json b/mobile/android/torbrowser/assets/distribution/preferences.json index 0990fba37a8f..bebd14967d8e 100644 --- a/mobile/android/torbrowser/assets/distribution/preferences.json +++ b/mobile/android/torbrowser/assets/distribution/preferences.json @@ -5,18 +5,6 @@ "AndroidPreferences": { "homepage": "about:tor", "startpane_enabled_after_57": true, - "startpane_enabled": true, - "history.clear_on_exit": [ - "private.data.openTabs", - "private.data.history", - "private.data.searchHistory", - "private.data.formdata", - "private.data.cookies_sessions", - "private.data.cache", - "private.data.offlineApps", - "private.data.siteSettings", - "private.data.syncedTabs", - "private.data.passwords" - ] + "startpane_enabled": true } }

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-1] Bug 24920 - Only create Private tabs if browser.privatebrowsing.autostart is true
by gk＠torproject.org 04 Jun '19

04 Jun '19

commit 1bce86ec5cfff504baf6e61b9d356ff74c62b297 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon May 27 15:55:33 2019 +0000 Bug 24920 - Only create Private tabs if browser.privatebrowsing.autostart is true --- .../base/java/org/mozilla/gecko/BrowserApp.java | 9 +++++++ .../base/java/org/mozilla/gecko/GeckoApp.java | 31 ++++++++++++++++++++++ .../android/base/java/org/mozilla/gecko/Tabs.java | 7 ++++- .../java/org/mozilla/gecko/tabs/TabsPanel.java | 4 +++ mobile/android/chrome/content/browser.js | 2 +- 5 files changed, 51 insertions(+), 2 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 006d5c11f210..0b369ca8d5ab 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -3754,6 +3754,15 @@ public class BrowserApp extends GeckoApp share.setActionProvider(provider); + // Change visibility of new_tab. This may be called before + // mOnlyPrivateTabs is set in GeckoApp::onCreate(). If the PrefHelper + // callback was not already called, then the visibility will be correctly set + // in the callback. + MenuItem newTabMenuItem = (MenuItem) mMenu.findItem(R.id.new_tab); + if (newTabMenuItem != null) { + newTabMenuItem.setVisible(mOnlyPrivateTabs == false); + } + return true; } diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java index 42a4f191d525..64c93d900430 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java @@ -154,6 +154,8 @@ public abstract class GeckoApp extends GeckoActivity */ public static final String PREFS_IS_FIRST_RUN = "telemetry-isFirstRun"; + public static final String PREFS_PRIVATEBROWSING_AUTOSTART = "browser.privatebrowsing.autostart"; + public static final String SAVED_STATE_IN_BACKGROUND = "inBackground"; public static final String SAVED_STATE_PRIVATE_SESSION = "privateSession"; @@ -325,6 +327,8 @@ public abstract class GeckoApp extends GeckoActivity private boolean mPrivateBrowsingSessionOutdated; private static final int MAX_PRIVATE_TABS_UPDATE_WAIT_MSEC = 500; + protected boolean mOnlyPrivateTabs = false; + private volatile HealthRecorder mHealthRecorder; private volatile Locale mLastLocale; @@ -1129,6 +1133,28 @@ public abstract class GeckoApp extends GeckoActivity "ToggleChrome:Show", null); + PrefsHelper.getPref(PREFS_PRIVATEBROWSING_AUTOSTART, + new PrefsHelper.PrefHandlerBase() { + @Override public void prefValue(String pref, boolean value) { + if (pref != PREFS_PRIVATEBROWSING_AUTOSTART) { + return; + } + + mOnlyPrivateTabs = value; + + // Change visibility here in case mMenu is initialized. If it is not initialized, + // then the visibility is set in BrowserApp::onCreateOptionsMenu(). + if (mMenu != null) { + MenuItem newTabMenuItem = (MenuItem) mMenu.findItem(R.id.new_tab); + if (newTabMenuItem != null) { + newTabMenuItem.setVisible(mOnlyPrivateTabs == false); + } + } + + Tabs.getInstance().setOnlyPrivateTabs(mOnlyPrivateTabs); + } + }); + Tabs.getInstance().attachToContext(this, mLayerView, getAppEventDispatcher()); Tabs.registerOnTabsChangedListener(this); @@ -1167,6 +1193,7 @@ public abstract class GeckoApp extends GeckoActivity } // If we are doing a restore, read the session data so we can send it to Gecko later. + GeckoBundle restoreMessage = null; if (!mIsRestoringActivity && mShouldRestore) { final boolean isExternalURL = invokedWithExternalURL(getIntentURI(new SafeIntent(getIntent()))); @@ -2244,6 +2271,10 @@ public abstract class GeckoApp extends GeckoActivity } } + public boolean isOnlyPrivateTabs() { + return mOnlyPrivateTabs; + } + @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1) protected void finishAndShutdown(final boolean restart) { ThreadUtils.assertOnUiThread(); diff --git a/mobile/android/base/java/org/mozilla/gecko/Tabs.java b/mobile/android/base/java/org/mozilla/gecko/Tabs.java index 36d1b474bb87..d139b26cc217 100644 --- a/mobile/android/base/java/org/mozilla/gecko/Tabs.java +++ b/mobile/android/base/java/org/mozilla/gecko/Tabs.java @@ -104,6 +104,7 @@ public class Tabs implements BundleEventListener { private ContentObserver mBookmarksContentObserver; private PersistTabsRunnable mPersistTabsRunnable; private int mPrivateClearColor; + private boolean mOnlyPrivateTabs = true; // Close all tabs including normal and private tabs. @RobocopTarget @@ -208,6 +209,10 @@ public class Tabs implements BundleEventListener { } } + public synchronized void setOnlyPrivateTabs(boolean onlyPrivateTabs) { + mOnlyPrivateTabs = onlyPrivateTabs; + } + public void detachFromContext() { mGeckoView = null; } @@ -989,7 +994,7 @@ public class Tabs implements BundleEventListener { // delayLoad implies background tab boolean background = delayLoad || (flags & LOADURL_BACKGROUND) != 0; - boolean isPrivate = (flags & LOADURL_PRIVATE) != 0 || (intent != null && intent.getBooleanExtra(PRIVATE_TAB_INTENT_EXTRA, false)); + boolean isPrivate = (flags & LOADURL_PRIVATE) != 0 || (intent != null && intent.getBooleanExtra(PRIVATE_TAB_INTENT_EXTRA, false)) || mOnlyPrivateTabs; boolean userEntered = (flags & LOADURL_USER_ENTERED) != 0; boolean desktopMode = (flags & LOADURL_DESKTOP) != 0; boolean external = (flags & LOADURL_EXTERNAL) != 0; diff --git a/mobile/android/base/java/org/mozilla/gecko/tabs/TabsPanel.java b/mobile/android/base/java/org/mozilla/gecko/tabs/TabsPanel.java index 08c107ebb62d..fc27ac03c929 100644 --- a/mobile/android/base/java/org/mozilla/gecko/tabs/TabsPanel.java +++ b/mobile/android/base/java/org/mozilla/gecko/tabs/TabsPanel.java @@ -167,6 +167,10 @@ public class TabsPanel extends LinearLayout final View tabNormal = mTabWidget.addTab(R.drawable.tabs_normal, R.string.tabs_normal); mNormalTabsPanel = tabNormal instanceof ThemedImageButton ? ((ThemedImageButton) tabNormal) : null; + if (mActivity.isOnlyPrivateTabs()) { + tabNormal.setVisibility(View.GONE); + } + final View tabPrivate = mTabWidget.addTab(R.drawable.tabs_private, R.string.tabs_private); mPrivateTabsPanel = tabPrivate instanceof ThemedImageButton ? ((ThemedImageButton) tabPrivate) : null; if (mPrivateTabsPanel != null) { diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index c3430f5b5a4c..5e2291865b89 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -3652,7 +3652,7 @@ Tab.prototype = { // Must be called after appendChild so the docShell has been created. this.setActive(false); - let isPrivate = ("isPrivate" in aParams) && aParams.isPrivate; + let isPrivate = (("isPrivate" in aParams) && aParams.isPrivate) || Services.prefs.getBoolPref("browser.privatebrowsing.autostart"); if (isPrivate) { attrs['privateBrowsingId'] = 1; }

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 04 Jun '19

04 Jun '19

commit c0b811aa874554f98b055fbbe7b356a6757bd3e8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 4 04:50:09 2019 +0000 Update translations for tor-launcher-properties_completed --- th/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/th/torlauncher.properties b/th/torlauncher.properties index 469c164ed..3d587f172 100644 --- a/th/torlauncher.properties +++ b/th/torlauncher.properties @@ -83,7 +83,7 @@ torlauncher.bootstrapWarning.done=สำเร็จ torlauncher.bootstrapWarning.connectrefused=ถูกปฏิเสธการเชื่อมต่อ torlauncher.bootstrapWarning.misc=เบ็ดเตล็ด torlauncher.bootstrapWarning.resourcelimit=ทรัพยากรไม่เพียงพอ -torlauncher.bootstrapWarning.identity=ตัวตนไม่ถูกต้อง +torlauncher.bootstrapWarning.identity=ข้อมูลประจำตัวไม่ตรงกัน torlauncher.bootstrapWarning.timeout=นานเกินไปในการเชื่อมต่อ torlauncher.bootstrapWarning.noroute=หาเส้นทางไปหา host ไม่พบ torlauncher.bootstrapWarning.ioerror=อ่าน/เขียน ผิดพลาด

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 04 Jun '19

04 Jun '19

commit 7c278efd4c17f091c4d1222001436913f4628923 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 4 04:50:03 2019 +0000 Update translations for tor-launcher-properties --- th/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/th/torlauncher.properties b/th/torlauncher.properties index 469c164ed..3d587f172 100644 --- a/th/torlauncher.properties +++ b/th/torlauncher.properties @@ -83,7 +83,7 @@ torlauncher.bootstrapWarning.done=สำเร็จ torlauncher.bootstrapWarning.connectrefused=ถูกปฏิเสธการเชื่อมต่อ torlauncher.bootstrapWarning.misc=เบ็ดเตล็ด torlauncher.bootstrapWarning.resourcelimit=ทรัพยากรไม่เพียงพอ -torlauncher.bootstrapWarning.identity=ตัวตนไม่ถูกต้อง +torlauncher.bootstrapWarning.identity=ข้อมูลประจำตัวไม่ตรงกัน torlauncher.bootstrapWarning.timeout=นานเกินไปในการเชื่อมต่อ torlauncher.bootstrapWarning.noroute=หาเส้นทางไปหา host ไม่พบ torlauncher.bootstrapWarning.ioerror=อ่าน/เขียน ผิดพลาด

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 04 Jun '19

04 Jun '19

commit 6a9943f3160cf7711295d18432af48645e90bdf8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 4 04:20:12 2019 +0000 Update translations for tor-launcher-properties_completed --- th/torlauncher.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/th/torlauncher.properties b/th/torlauncher.properties index 5ddd1d82f..469c164ed 100644 --- a/th/torlauncher.properties +++ b/th/torlauncher.properties @@ -70,14 +70,14 @@ torlauncher.bootstrapStatus.loading_descriptors=กำลังดึงข้ torlauncher.bootstrapStatus.enough_dirinfo=การโหลดข้อมูลrelay เสร็จสิ้น torlauncher.bootstrapStatus.ap_conn_pt=กำลังสร้างวงจร: กำลังเชื่อมต่อกับสะพาน torlauncher.bootstrapStatus.ap_conn_done_pt=กำลังสร้างวงจร: เชื่อมต่อกับสะพานแล้ว -torlauncher.bootstrapStatus.ap_conn_proxy=กำลังสร้างวงจร: เชื่อมต่อกับพร็อกซี +torlauncher.bootstrapStatus.ap_conn_proxy=กำลังสร้างวงจร: กำลังเชื่อมต่อกับพร็อกซี torlauncher.bootstrapStatus.ap_conn_done_proxy=กำลังสร้างวงจร: เชื่อมต่อกับพร็อกซีแล้ว torlauncher.bootstrapStatus.ap_conn=กำลังสร้างวงจร: กำลังเชื่อมต่อกับTor relay torlauncher.bootstrapStatus.ap_conn_done=กำลังสร้างวงจร: เชื่อมต่อกับ Tor relay แล้ว -torlauncher.bootstrapStatus.ap_handshake=กำลังสร้างวงจร: กำลังต่อรองกับ Tor relay -torlauncher.bootstrapStatus.ap_handshake_done=กำลังสร้างวงจร: ต่อรองกับ Tor relay เสร็จแล้ว -torlauncher.bootstrapStatus.circuit_create=กำลังสร้างวงจร: ติดต่อวงจร Tor -torlauncher.bootstrapStatus.done=เชื่อมต่อสู่เครือข่าย Tor เรียบร้อย! +torlauncher.bootstrapStatus.ap_handshake=กำลังสร้างวงจร: กำลังติดต่อกับ Tor relay +torlauncher.bootstrapStatus.ap_handshake_done=กำลังสร้างวงจร: ติดต่อกับ Tor relay เสร็จแล้ว +torlauncher.bootstrapStatus.circuit_create=กำลังสร้างวงจร: กำลังสร้างการเชื่อมต่อวงจร Tor +torlauncher.bootstrapStatus.done=เชื่อมต่อเครือข่าย Tor เรียบร้อยแล้ว torlauncher.bootstrapWarning.done=สำเร็จ torlauncher.bootstrapWarning.connectrefused=ถูกปฏิเสธการเชื่อมต่อ

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 04 Jun '19

04 Jun '19

commit 26d5b76a0ca6f0933a3eed510b37b4ec8ce1196d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 4 04:20:04 2019 +0000 Update translations for tor-launcher-properties --- th/torlauncher.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/th/torlauncher.properties b/th/torlauncher.properties index 5ddd1d82f..469c164ed 100644 --- a/th/torlauncher.properties +++ b/th/torlauncher.properties @@ -70,14 +70,14 @@ torlauncher.bootstrapStatus.loading_descriptors=กำลังดึงข้ torlauncher.bootstrapStatus.enough_dirinfo=การโหลดข้อมูลrelay เสร็จสิ้น torlauncher.bootstrapStatus.ap_conn_pt=กำลังสร้างวงจร: กำลังเชื่อมต่อกับสะพาน torlauncher.bootstrapStatus.ap_conn_done_pt=กำลังสร้างวงจร: เชื่อมต่อกับสะพานแล้ว -torlauncher.bootstrapStatus.ap_conn_proxy=กำลังสร้างวงจร: เชื่อมต่อกับพร็อกซี +torlauncher.bootstrapStatus.ap_conn_proxy=กำลังสร้างวงจร: กำลังเชื่อมต่อกับพร็อกซี torlauncher.bootstrapStatus.ap_conn_done_proxy=กำลังสร้างวงจร: เชื่อมต่อกับพร็อกซีแล้ว torlauncher.bootstrapStatus.ap_conn=กำลังสร้างวงจร: กำลังเชื่อมต่อกับTor relay torlauncher.bootstrapStatus.ap_conn_done=กำลังสร้างวงจร: เชื่อมต่อกับ Tor relay แล้ว -torlauncher.bootstrapStatus.ap_handshake=กำลังสร้างวงจร: กำลังต่อรองกับ Tor relay -torlauncher.bootstrapStatus.ap_handshake_done=กำลังสร้างวงจร: ต่อรองกับ Tor relay เสร็จแล้ว -torlauncher.bootstrapStatus.circuit_create=กำลังสร้างวงจร: ติดต่อวงจร Tor -torlauncher.bootstrapStatus.done=เชื่อมต่อสู่เครือข่าย Tor เรียบร้อย! +torlauncher.bootstrapStatus.ap_handshake=กำลังสร้างวงจร: กำลังติดต่อกับ Tor relay +torlauncher.bootstrapStatus.ap_handshake_done=กำลังสร้างวงจร: ติดต่อกับ Tor relay เสร็จแล้ว +torlauncher.bootstrapStatus.circuit_create=กำลังสร้างวงจร: กำลังสร้างการเชื่อมต่อวงจร Tor +torlauncher.bootstrapStatus.done=เชื่อมต่อเครือข่าย Tor เรียบร้อยแล้ว torlauncher.bootstrapWarning.done=สำเร็จ torlauncher.bootstrapWarning.connectrefused=ถูกปฏิเสธการเชื่อมต่อ

1 0

[snowflake/master] Cache certificates across program restarts.
by phw＠torproject.org 03 Jun '19

03 Jun '19

commit 11efa42e4cc056b6d65bd7889ac2919fbb6d48c3 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue May 14 14:25:57 2019 -0700 Cache certificates across program restarts. So far, we request a certificate each time we start the broker. Let's Encrypt maintains several rate limiters and if we exceed one of them, we won't get a certificate. Worse, since we don't store certificates, we won't even be able to use an old one. This patch uses autocert's DirCache structure to cache certificates on disk. This patch fixes <https://bugs.torproject.org/30512>. --- broker/broker.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/broker/broker.go b/broker/broker.go index 274d87c..408488c 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -251,6 +251,7 @@ func robotsTxtHandler(w http.ResponseWriter, r *http.Request) { func main() { var acmeEmail string var acmeHostnamesCommas string + var acmeCertCacheDir string var addr string var geoipDatabase string var geoip6Database string @@ -263,6 +264,7 @@ func main() { flag.StringVar(&acmeHostnamesCommas, "acme-hostnames", "", "comma-separated hostnames for TLS certificate") flag.StringVar(&certFilename, "cert", "", "TLS certificate file") flag.StringVar(&keyFilename, "key", "", "TLS private key file") + flag.StringVar(&acmeCertCacheDir, "acme-cert-cache", "acme-cert-cache", "directory in which certificates should be cached") flag.StringVar(&addr, "addr", ":443", "address to listen on") flag.StringVar(&geoipDatabase, "geoipdb", "/usr/share/tor/geoip", "path to correctly formatted geoip database mapping IPv4 address ranges to country codes") flag.StringVar(&geoip6Database, "geoip6db", "/usr/share/tor/geoip6", "path to correctly formatted geoip database mapping IPv6 address ranges to country codes") @@ -329,7 +331,7 @@ func main() { // Handle the various ways of setting up TLS. The legal configurations // are: - // --acme-hostnames (with optional --acme-email) + // --acme-hostnames (with optional --acme-email and/or --acme-cert-cache) // --cert and --key together // --disable-tls // The outputs of this block of code are the disableTLS, @@ -338,7 +340,15 @@ func main() { acmeHostnames := strings.Split(acmeHostnamesCommas, ",") log.Printf("ACME hostnames: %q", acmeHostnames) + var cache autocert.Cache + if err = os.MkdirAll(acmeCertCacheDir, 0700); err != nil { + log.Printf("Warning: Couldn't create cache directory %q (reason: %s) so we're *not* using our certificate cache.", acmeCertCacheDir, err) + } else { + cache = autocert.DirCache(acmeCertCacheDir) + } + certManager := autocert.Manager{ + Cache: cache, Prompt: autocert.AcceptTOS, HostPolicy: autocert.HostWhitelist(acmeHostnames...), Email: acmeEmail,

1 0