- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-68.9.0esr-10.0-1] squash! Bug 32418: Allow updates to be disabled via an enterprise policy.
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 686bbbd739c930ee49f6d4ba3909628c22340385 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu May 28 10:14:55 2020 -0400 squash! Bug 32418: Allow updates to be disabled via an enterprise policy. On Linux, avoid reading policies from /etc/firefox/policies/policies.json --- .../components/enterprisepolicies/EnterprisePolicies.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/toolkit/components/enterprisepolicies/EnterprisePolicies.js b/toolkit/components/enterprisepolicies/EnterprisePolicies.js index 5276725703f6..afbfadffbf29 100644 --- a/toolkit/components/enterprisepolicies/EnterprisePolicies.js +++ b/toolkit/components/enterprisepolicies/EnterprisePolicies.js @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// To avoid accessing the Windows Registry or macOS' file system attributes, -// Tor Browser only supports policies.json. -#define JSON_POLICIES_ONLY MOZ_PROXY_BYPASS_PROTECTION +// To ensure that policies intended for Firefox or another browser will not +// be used, Tor Browser only looks for policies in ${InstallDir}/distribution +#define AVOID_SYSTEM_POLICIES MOZ_PROXY_BYPASS_PROTECTION const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" @@ -15,7 +15,7 @@ const { AppConstants } = ChromeUtils.import( ); XPCOMUtils.defineLazyModuleGetters(this, { -#ifndef JSON_POLICIES_ONLY +#ifndef AVOID_SYSTEM_POLICIES WindowsGPOParser: "resource://gre/modules/policies/WindowsGPOParser.jsm", macOSPoliciesParser: "resource://gre/modules/policies/macOSPoliciesParser.jsm", @@ -117,7 +117,7 @@ EnterprisePoliciesManager.prototype = { _chooseProvider() { let provider = null; -#ifndef JSON_POLICIES_ONLY +#ifndef AVOID_SYSTEM_POLICIES if (AppConstants.platform == "win") { provider = new WindowsGPOPoliciesProvider(); } else if (AppConstants.platform == "macosx") { @@ -481,6 +481,7 @@ class JSONPoliciesProvider { _getConfigurationFile() { let configFile = null; +#ifndef AVOID_SYSTEM_POLICIES if (AppConstants.platform == "linux") { let systemConfigFile = Cc["@mozilla.org/file/local;1"].createInstance( Ci.nsIFile @@ -493,6 +494,7 @@ class JSONPoliciesProvider { return systemConfigFile; } } +#endif try { configFile = Services.dirsvc.get("XREAppDist", Ci.nsIFile); @@ -569,7 +571,7 @@ class JSONPoliciesProvider { } } -#ifndef JSON_POLICIES_ONLY +#ifndef AVOID_SYSTEM_POLICIES class WindowsGPOPoliciesProvider { constructor() { this._policies = null;

1 0

[tor-browser-build/master] Bug 34202: Remove unused xz project
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 28172b36ac6442b10985e818f6bd96f2623d093a Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 13 08:40:29 2020 +0000 Bug 34202: Remove unused xz project --- projects/xz/build | 16 ---------------- projects/xz/config | 23 ----------------------- 2 files changed, 39 deletions(-) diff --git a/projects/xz/build b/projects/xz/build deleted file mode 100644 index 4ef654c..0000000 --- a/projects/xz/build +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -distdir=/var/tmp/dist/[% project %] -mkdir -p $distdir -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c('version') %] -./autogen.sh -./configure [% c("var/configure_opt") %] --prefix=$distdir -make -j[% c("buildconf/num_procs") %] install -cd /var/tmp/dist -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/xz/config b/projects/xz/config deleted file mode 100644 index eac35e1..0000000 --- a/projects/xz/config +++ /dev/null @@ -1,23 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 5.2.4 -git_url: https://git.tukaani.org/xz.git -git_hash: 'v[% c("version") %]' -tag_gpg_id: 1 -gpg_keyring: xz.gpg -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -targets: - android: - var: - arch_deps: - - autopoint - configure_opt_project: --disable-shared --disable-xz --disable-xzdec --disable-lzmadec --disable-lzmainfo --disable-lzma-links --disable-scripts --disable-doc - -input_files: - - project: container-image - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]'

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gktpo/bug_34202'
by sysrqb＠torproject.org 29 May '20

29 May '20

commit aa0a75cb536fe257bc3c74f694fa362ff6194b57 Merge: ede6ffb 28172b3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 19:09:46 2020 +0000 Merge remote-tracking branch 'gktpo/bug_34202' projects/xz/build | 16 ---------------- projects/xz/config | 23 ----------------------- 2 files changed, 39 deletions(-)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gktpo/bug_34219'
by sysrqb＠torproject.org 29 May '20

29 May '20

commit ede6ffb414a8684f5dab8615836504acf2774734 Merge: e1accd2 40809c5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 17:16:29 2020 +0000 Merge remote-tracking branch 'gktpo/bug_34219' projects/tor/build | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor-browser-build/master] Bug 34219: Enable ZSTD support on Android
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 40809c54c2e198cbe11d0d4f19bc9fd7c242166b Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 14 13:29:38 2020 +0000 Bug 34219: Enable ZSTD support on Android --- projects/tor/build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/tor/build b/projects/tor/build index 30ecc7e..7747549 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -8,6 +8,10 @@ mkdir -p /var/tmp/build TORCONFIGDIR="$distdir/assets/common" libsdir=$distdir/jniLibs/[% c("var/abi") %] mkdir -p $libsdir $TORCONFIGDIR "$distdir/Tor" + # We need to make sure our ZSTD dependencey is properly picked up. + # --enable-zstd is not enough. + export ZSTD_CFLAGS=-I/var/tmp/dist/zstd/include + export ZSTD_LIBS=/var/tmp/dist/zstd/lib/libzstd.a [% END %] [% IF c("var/linux") || c("var/windows") %]

1 0

[tor-android-service/master] Bug 30318: Add snowflake support
by sysrqb＠torproject.org 29 May '20

29 May '20

commit ecc251d0a73f7e2034a271efd28036a0108b8688 Author: Georg Koppen <gk(a)torproject.org> Date: Sat May 9 19:33:18 2020 +0000 Bug 30318: Add snowflake support --- service/src/main/assets/common/bridges.txt | 2 ++ .../torproject/android/service/CustomTorInstaller.java | 18 ++++++++++++------ .../org/torproject/android/service/TorService.java | 8 +++++--- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/service/src/main/assets/common/bridges.txt b/service/src/main/assets/common/bridges.txt index 9ab9098..a913c11 100644 --- a/service/src/main/assets/common/bridges.txt +++ b/service/src/main/assets/common/bridges.txt @@ -13,3 +13,5 @@ obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcU obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0 obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0 meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com + +snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72 diff --git a/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java b/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java index 198c981..52bc4fe 100644 --- a/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java +++ b/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java @@ -40,14 +40,17 @@ public class CustomTorInstaller extends TorInstaller { @Override public InputStream openBridgesStream() throws IOException { /* - BridgesList is an overloaded field, which can cause some confusion. The list can be: - 1) a filter like obfs4 or meek OR 2) it can be a custom bridge - For (1), we just pass back all bridges, the filter will occur elsewhere in the library. - For (2) we return the bridge list as a raw stream - If length is greater than 5, then we know this is a custom bridge + BridgesList is an overloaded field, which can cause some confusion. + The list can be: + 1) a filter like obfs4, meek, or snowflake OR + 2) it can be a custom bridge + For (1), we just pass back all bridges, the filter will occur + elsewhere in the library. + For (2) we return the bridge list as a raw stream. + If length is greater than 9, then we know this is a custom bridge */ String userDefinedBridgeList = Prefs.getBridgesList(); - byte bridgeType = (byte) (userDefinedBridgeList.length() > 5 ? 1 : 0); + byte bridgeType = (byte) (userDefinedBridgeList.length() > 9 ? 1 : 0); // Terrible hack. Must keep in sync with topl::addBridgesFromResources. if (bridgeType == 0) { switch (userDefinedBridgeList) { @@ -57,6 +60,9 @@ public class CustomTorInstaller extends TorInstaller { case "meek": bridgeType = 3; break; + case "snowflake": + bridgeType = 4; + break; } } diff --git a/service/src/main/java/org/torproject/android/service/TorService.java b/service/src/main/java/org/torproject/android/service/TorService.java index 16d2537..971c2e9 100644 --- a/service/src/main/java/org/torproject/android/service/TorService.java +++ b/service/src/main/java/org/torproject/android/service/TorService.java @@ -368,10 +368,12 @@ public final class TorService extends Service implements TorServiceConstants, Or //Check bridges to see if we need this File nativeDir = new File(getApplicationInfo().nativeLibraryDir); - File pluggableTransport = new File(nativeDir, "libObfs4proxy.so"); - if(!pluggableTransport.canExecute()) pluggableTransport.setExecutable(true); + File pluggableTransportObfs = new File(nativeDir, "libObfs4proxy.so"); + if(!pluggableTransportObfs.canExecute()) pluggableTransportObfs.setExecutable(true); + File pluggableTransportSnow = new File(nativeDir, "libSnowflake.so"); + if(!pluggableTransportSnow.canExecute()) pluggableTransportSnow.setExecutable(true); - builder.configurePluggableTransportsFromSettings(pluggableTransport); + builder.configurePluggableTransportsFromSettings(pluggableTransportObfs, pluggableTransportSnow); mDataService.updateConfigBuilder(builder); onionProxyManager.getTorInstaller().updateTorConfigCustom (builder.asString());

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] Revert "Bug 1633568 - Introduce a installation ping. r=Grisha, a=RyanVM"
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 163e227bffddc187ee1588bd4802c67991f145a3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 17:27:59 2020 +0000 Revert "Bug 1633568 - Introduce a installation ping. r=Grisha, a=RyanVM" This reverts commit 7163fd7d989bcf114b43cba342f48639024d1141. --- .../base/java/org/mozilla/gecko/BrowserApp.java | 5 +- .../TelemetryInstallationPingDelegate.java | 128 -------------- .../TelemetryInstallationPingBuilder.java | 186 --------------------- .../stores/TelemetryInstallationPingStore.java | 102 ----------- 4 files changed, 1 insertion(+), 420 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 6ce56bcc7e68..2efae19ca7c5 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -146,7 +146,6 @@ import org.mozilla.gecko.tabs.TabHistoryFragment; import org.mozilla.gecko.tabs.TabHistoryPage; import org.mozilla.gecko.tabs.TabsPanel; import org.mozilla.gecko.telemetry.TelemetryCorePingDelegate; -import org.mozilla.gecko.telemetry.TelemetryInstallationPingDelegate; import org.mozilla.gecko.telemetry.TelemetryUploadService; import org.mozilla.gecko.telemetry.measurements.SearchCountMeasurements; import org.mozilla.gecko.telemetry.TelemetryActivationPingDelegate; @@ -336,7 +335,6 @@ public class BrowserApp extends GeckoApp private final TelemetryCorePingDelegate mTelemetryCorePingDelegate = new TelemetryCorePingDelegate(); private final TelemetryActivationPingDelegate mTelemetryActivationPingDelegate = new TelemetryActivationPingDelegate(); - private final TelemetryInstallationPingDelegate mTelemetryInstallationPingDelegate = new TelemetryInstallationPingDelegate(); private final List<BrowserAppDelegate> delegates = Collections.unmodifiableList(Arrays.asList( new ScreenshotDelegate(), @@ -344,9 +342,8 @@ public class BrowserApp extends GeckoApp new ReaderViewBookmarkPromotion(), mTelemetryCorePingDelegate, mTelemetryActivationPingDelegate, - mTelemetryInstallationPingDelegate, new OfflineTabStatusDelegate(), - new AdjustBrowserAppDelegate(mTelemetryCorePingDelegate, mTelemetryInstallationPingDelegate) + new AdjustBrowserAppDelegate(mTelemetryCorePingDelegate) )); @NonNull diff --git a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryInstallationPingDelegate.java b/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryInstallationPingDelegate.java deleted file mode 100644 index 55657a0d0efa..000000000000 --- a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryInstallationPingDelegate.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at http://mozilla.org/MPL/2.0/. - */ - -package org.mozilla.gecko.telemetry; - -import android.support.annotation.NonNull; -import android.util.Log; - -import com.adjust.sdk.AdjustAttribution; - -import org.mozilla.gecko.BrowserApp; -import org.mozilla.gecko.GeckoAppShell; -import org.mozilla.gecko.adjust.AttributionHelperListener; -import org.mozilla.gecko.delegates.BrowserAppDelegate; -import org.mozilla.gecko.telemetry.pingbuilders.TelemetryInstallationPingBuilder; -import org.mozilla.gecko.telemetry.pingbuilders.TelemetryInstallationPingBuilder.PingReason; -import org.mozilla.gecko.telemetry.schedulers.TelemetryUploadAllPingsImmediatelyScheduler; -import org.mozilla.gecko.telemetry.stores.TelemetryInstallationPingStore; -import org.mozilla.gecko.util.ThreadUtils; - -import java.io.IOException; - -public class TelemetryInstallationPingDelegate - extends BrowserAppDelegate - implements AttributionHelperListener { - - private static final String LOGTAG = "InstallPingDelegate"; - - @Override - public void onStart(BrowserApp browserApp) { - if (!TelemetryUploadService.isUploadEnabledByAppConfig(browserApp)) { - return; - } - - // Keep everything off of main thread. Don't need to burden it with telemetry. - ThreadUtils.postToBackgroundThread(() -> { - TelemetryInstallationPingStore store; - try { - store = new TelemetryInstallationPingStore(); - } catch (IllegalStateException e) { - // The store constructor might throw an IllegalStateException if it cannot access - // the store directory. - // This has been observed on CI mochitests, not sure about if this would also reproduce - // in the real world. - // We'll retry at the next app start. - Log.w(LOGTAG, "Cannot access ping's storage directory. Will retry later"); - return; - } - - // First allow for stored pings to be re-uploaded if the previous upload did not succeed. - // (A successful upload would delete the pings persisted to disk) - if (store.getCount() != 0) { - store.queuePingsForUpload(new TelemetryUploadAllPingsImmediatelyScheduler()); - } - - // Only need one of each pings. Check if we should create a new one. - if (!TelemetryInstallationPingStore.hasLightPingBeenQueuedForUpload()) { - TelemetryOutgoingPing ping = new TelemetryInstallationPingBuilder() - .setReason(PingReason.APP_STARTED) - .build(); - - try { - store.storePing(ping); - store.queuePingsForUpload(new TelemetryUploadAllPingsImmediatelyScheduler()); - store.setLightPingQueuedForUpload(); - } catch (IOException e) { - // #storePing() might throw in the process of persisting to disk. - // Nothing to do. At the next app start we'll try again to create a new ping, - // store and upload that. - Log.w(LOGTAG, "Could not store ping. Will try again later"); - } - } - }); - } - - @Override - public void onAttributionChanged(@NonNull final AdjustAttribution attribution) { - if (!TelemetryUploadService.isUploadEnabledByAppConfig(GeckoAppShell.getApplicationContext())) { - return; - } - - // Keep everything off of main thread. Don't need to burden it with telemetry. - ThreadUtils.postToBackgroundThread(() -> { - TelemetryInstallationPingStore store; - try { - store = new TelemetryInstallationPingStore(); - } catch (IllegalStateException e) { - // The store constructor might throw an IllegalStateException if it cannot access - // the store directory. - // This has been observed on CI mochitests, not sure about if this would also reproduce - // in the real world. - // Since the attributionChanged callback only fire once IRL this would mean we won't - // be sending the "adjust-available" ping. - Log.w(LOGTAG, "Cannot access ping's storage directory. " + - "Cannot send the \"adjust-available\" ping"); - return; - } - - // First allow for stored pings to be re-uploaded if the previous upload did not succeed. - // (A successful upload would delete the pings persisted to disk) - if (store.getCount() != 0) { - store.queuePingsForUpload(new TelemetryUploadAllPingsImmediatelyScheduler()); - } - - // It may be possible that in the app's lifetime Adjust campaigns are changed. - // Sanity check that the "adjust-available" ping has not yet been send. - if (!TelemetryInstallationPingStore.hasFullPingBeenQueuedForUpload()) { - TelemetryOutgoingPing ping = new TelemetryInstallationPingBuilder() - .setReason(PingReason.ADJUST_AVAILABLE) - .setAdjustProperties(attribution) - .build(); - - try { - store.storePing(ping); - store.queuePingsForUpload(new TelemetryUploadAllPingsImmediatelyScheduler()); - store.setFullPingQueuedForUpload(); - } catch (IOException e) { - // #storePing() might throw in the process of persisting to disk. - // Nothing we can do. The "adjust-available" ping is lost. - Log.w(LOGTAG, "Could not store the \"adjust-available\" ping"); - } - } - }); - } -} diff --git a/mobile/android/base/java/org/mozilla/gecko/telemetry/pingbuilders/TelemetryInstallationPingBuilder.java b/mobile/android/base/java/org/mozilla/gecko/telemetry/pingbuilders/TelemetryInstallationPingBuilder.java deleted file mode 100644 index 24f94c1d06a3..000000000000 --- a/mobile/android/base/java/org/mozilla/gecko/telemetry/pingbuilders/TelemetryInstallationPingBuilder.java +++ /dev/null @@ -1,186 +0,0 @@ -/* - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at http://mozilla.org/MPL/2.0/. - */ - -package org.mozilla.gecko.telemetry.pingbuilders; - -import android.content.Context; -import android.content.SharedPreferences; -import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.util.Log; - -import com.adjust.sdk.AdjustAttribution; - -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.GeckoAppShell; -import org.mozilla.gecko.GeckoSharedPrefs; -import org.mozilla.gecko.GeckoThread; -import org.mozilla.gecko.Locales; -import org.mozilla.gecko.util.DateUtil; -import org.mozilla.gecko.util.HardwareUtils; - -import java.lang.reflect.Method; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.Locale; - -public class TelemetryInstallationPingBuilder extends TelemetryPingBuilder { - private static final String LOGTAG = "InstallPingBuilder"; - - public enum PingReason { - APP_STARTED("app-started"), - ADJUST_AVAILABLE("adjust-available"); - - PingReason(String reason) { - this.value = reason; - } - - public final String value; - } - - private static final String PING_TYPE = "installation"; - private static final int PING_FORMAT_VERSION = 1; - - private static final String PREF_KEY_SEQ_NUMBER = "installationPingSeqNumber"; - - private static final String PING_VERSION = "v"; - private static final String REASON = "reason"; - private static final String PING_QUEUED_TIMES = "seq"; - private static final String CLIENT_ID = "client_id"; - private static final String DEVICE_ID = "device_id"; - private static final String LOCALE = "locale"; - private static final String OS_NAME = "os"; - private static final String OS_VERSION = "osversion"; - private static final String DEVICE_MANUFACTURER = "manufacturer"; - private static final String DEVICE_MODEL = "model"; - private static final String DEVICE_ABI = "arch"; - private static final String PROFILE_DATE = "profile_date"; - private static final String PING_CREATION_TIME = "created"; - private static final String TIMEZONE_OFFSET = "tz"; - private static final String APP_NAME = "app_name"; - private static final String RELEASE_CHANNEL = "channel"; - private static final String ADJUST_CAMPAIGN = "campaign"; - private static final String ADJUST_ADGROUP = "adgroup"; - private static final String ADJUST_CREATIVE = "creative"; - private static final String ADJUST_NETWORK = "network"; - - public TelemetryInstallationPingBuilder() { - super(UNIFIED_TELEMETRY_VERSION, false); - setPayloadConstants(); - } - - @Override - public String getDocType() { - return PING_TYPE; - } - - @Override - public String[] getMandatoryFields() { - return new String[]{ - PING_VERSION, - REASON, - PING_QUEUED_TIMES, - CLIENT_ID, - DEVICE_ID, - LOCALE, - OS_NAME, - OS_VERSION, - DEVICE_MANUFACTURER, - DEVICE_MODEL, - DEVICE_ABI, - PROFILE_DATE, - PING_CREATION_TIME, - TIMEZONE_OFFSET, - APP_NAME, - RELEASE_CHANNEL, - }; - } - - public @NonNull TelemetryInstallationPingBuilder setReason(@NonNull PingReason reason) { - payload.put(REASON, reason.value); - - return this; - } - - public @NonNull TelemetryInstallationPingBuilder setAdjustProperties(@NonNull final AdjustAttribution attribution) { - payload.put(ADJUST_CAMPAIGN, attribution.campaign); - payload.put(ADJUST_ADGROUP, attribution.adgroup); - payload.put(ADJUST_CREATIVE, attribution.creative); - payload.put(ADJUST_NETWORK, attribution.network); - - return this; - } - - private void setPayloadConstants() { - payload.put(PING_VERSION, PING_FORMAT_VERSION); - payload.put(PING_QUEUED_TIMES, incrementAndGetQueueTimes()); - payload.put(CLIENT_ID, getGeckoClientID()); - payload.put(DEVICE_ID, getAdvertisingId()); - payload.put(LOCALE, Locales.getLanguageTag(Locale.getDefault())); - payload.put(OS_NAME, TelemetryPingBuilder.OS_NAME); - payload.put(OS_VERSION, Integer.toString(Build.VERSION.SDK_INT)); - payload.put(DEVICE_MANUFACTURER, Build.MANUFACTURER); - payload.put(DEVICE_MODEL, Build.MODEL); - payload.put(DEVICE_ABI, HardwareUtils.getRealAbi()); - payload.put(PROFILE_DATE, getGeckoProfileCreationDate()); - payload.put(PING_CREATION_TIME, new SimpleDateFormat("yyyy-MM-dd", Locale.US).format(new Date())); - payload.put(TIMEZONE_OFFSET, DateUtil.getTimezoneOffsetInMinutesForGivenDate(Calendar.getInstance())); - payload.put(APP_NAME, AppConstants.MOZ_APP_BASENAME); - payload.put(RELEASE_CHANNEL, AppConstants.MOZ_UPDATE_CHANNEL); - } - - private @Nullable String getGeckoClientID() { - // zero-ed Gecko profile that respects the expected format "8-4-4-4-12" chars - String clientID = "00000000-0000-0000-0000-000000000000"; - try { - clientID = GeckoThread.getActiveProfile().getClientId(); - } catch (Exception e) { - Log.w(LOGTAG, "Could not get Gecko Client ID", e); - } - - return clientID; - } - - private @Nullable String getAdvertisingId() { - String advertisingId = null; - try { - final Class<?> clazz = Class.forName("org.mozilla.gecko.advertising.AdvertisingUtil"); - final Method getAdvertisingId = clazz.getMethod("getAdvertisingId", Context.class); - advertisingId = (String) getAdvertisingId.invoke(clazz, GeckoAppShell.getApplicationContext()); - } catch (Exception e) { - Log.w(LOGTAG, "Could not get advertising ID", e); - } - - return advertisingId; - } - - // Ensure sequential increment and return in all instances. - private static synchronized int incrementAndGetQueueTimes() { - final SharedPreferences sharedPrefs = GeckoSharedPrefs.forProfile(GeckoAppShell.getApplicationContext()); - - // 1-based, always incremented - final int incrementedSeqNumber = sharedPrefs.getInt(PREF_KEY_SEQ_NUMBER, 0) + 1; - sharedPrefs.edit().putInt(PREF_KEY_SEQ_NUMBER, incrementedSeqNumber).apply(); - - return incrementedSeqNumber; - } - - private int getGeckoProfileCreationDate() { - // The method returns days since epoch. An int is enough. - int date = 0; - try { - date = TelemetryActivationPingBuilder.getProfileCreationDate( - GeckoAppShell.getApplicationContext(), - GeckoThread.getActiveProfile()).intValue(); - } catch (NullPointerException e) { - Log.w(LOGTAG, "Could not get Gecko profile creation date", e); - } - - return date; - } -} diff --git a/mobile/android/base/java/org/mozilla/gecko/telemetry/stores/TelemetryInstallationPingStore.java b/mobile/android/base/java/org/mozilla/gecko/telemetry/stores/TelemetryInstallationPingStore.java deleted file mode 100644 index c6aacab25e73..000000000000 --- a/mobile/android/base/java/org/mozilla/gecko/telemetry/stores/TelemetryInstallationPingStore.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at http://mozilla.org/MPL/2.0/. - */ - -package org.mozilla.gecko.telemetry.stores; - -import android.content.SharedPreferences; -import android.os.Parcel; -import android.os.Parcelable; -import android.support.annotation.NonNull; - -import org.mozilla.gecko.GeckoAppShell; -import org.mozilla.gecko.GeckoSharedPrefs; -import org.mozilla.gecko.GeckoThread; -import org.mozilla.gecko.telemetry.schedulers.TelemetryUploadAllPingsImmediatelyScheduler; - -import java.io.File; - -public class TelemetryInstallationPingStore extends TelemetryJSONFilePingStore { - private static final String PREF_KEY_WAS_LIGHT_PING_STORED = "wasLightInstallationPingStored"; - private static final String PREF_KEY_WAS_FULL_PING_STORED = "wasFullInstallationPingStored"; - private static final String INSTALLATION_PING_STORE_DIR = "installation_ping"; - private static final String DEFAULT_PROFILE = "default"; - - public TelemetryInstallationPingStore() { - super(getInstallationPingStoreDir(), getCurrentProfileName()); - } - - public TelemetryInstallationPingStore(@NonNull final File storeDir, @NonNull final String profileName) { - super(storeDir, profileName); - } - - @Override - public void maybePrunePings() { - // no-op - // Successfully uploaded pings will be deleted in onUploadAttemptComplete(..). - } - - public void queuePingsForUpload(@NonNull final TelemetryUploadAllPingsImmediatelyScheduler scheduler) { - scheduler.scheduleUpload(GeckoAppShell.getApplicationContext(), this); - } - - public static boolean hasLightPingBeenQueuedForUpload() { - return getSharedPrefs().getBoolean(PREF_KEY_WAS_LIGHT_PING_STORED, false); - } - - public static boolean hasFullPingBeenQueuedForUpload() { - return getSharedPrefs().getBoolean(PREF_KEY_WAS_FULL_PING_STORED, false); - } - - public void setLightPingQueuedForUpload() { - getSharedPrefs().edit().putBoolean(PREF_KEY_WAS_LIGHT_PING_STORED, true).apply(); - } - - public void setFullPingQueuedForUpload() { - getSharedPrefs().edit().putBoolean(PREF_KEY_WAS_FULL_PING_STORED, true).apply(); - } - - private static @NonNull SharedPreferences getSharedPrefs() { - return GeckoSharedPrefs.forProfile(GeckoAppShell.getApplicationContext()); - } - - private static @NonNull File getInstallationPingStoreDir() { - return GeckoAppShell.getApplicationContext().getFileStreamPath(INSTALLATION_PING_STORE_DIR); - } - - private static @NonNull String getCurrentProfileName() { - return GeckoThread.getActiveProfile() != null ? - GeckoThread.getActiveProfile().getName() : - DEFAULT_PROFILE; - } - - - // Class needs to be Parcelable as it will be passed through Intents - public static final Parcelable.Creator<TelemetryInstallationPingStore> CREATOR = - new Parcelable.Creator<TelemetryInstallationPingStore>() { - - @Override - public TelemetryInstallationPingStore createFromParcel(final Parcel source) { - final String storeDirPath = source.readString(); - final String profileName = source.readString(); - return new TelemetryInstallationPingStore(new File(storeDirPath), profileName); - } - - @Override - public TelemetryInstallationPingStore[] newArray(final int size) { - return new TelemetryInstallationPingStore[size]; - } - }; - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(final Parcel dest, final int flags) { - super.writeToParcel(dest, flags); - } -}

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] Revert "Bug 1633568 - AdjustHelper can inform more listeners about Attribution changes. r=Grisha, a=RyanVM"
by sysrqb＠torproject.org 29 May '20

29 May '20

commit b53e2d8fb7fa0c5dc6c7f98bb57a71b24c033c00 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 17:28:34 2020 +0000 Revert "Bug 1633568 - AdjustHelper can inform more listeners about Attribution changes. r=Grisha, a=RyanVM" This reverts commit 4d64699b7d664a70793431effc2f4e054ebf9230. --- .../org/mozilla/gecko/adjust/AdjustBrowserAppDelegate.java | 8 ++++---- .../base/java/org/mozilla/gecko/adjust/AdjustHelper.java | 14 ++++++-------- .../org/mozilla/gecko/adjust/AdjustHelperInterface.java | 2 +- .../mozilla/gecko/adjust/AttributionHelperListener.java | 11 ++--------- .../java/org/mozilla/gecko/adjust/StubAdjustHelper.java | 2 +- .../mozilla/gecko/telemetry/TelemetryCorePingDelegate.java | 7 ++----- 6 files changed, 16 insertions(+), 28 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustBrowserAppDelegate.java b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustBrowserAppDelegate.java index f160e971def3..aee0bba63a8a 100644 --- a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustBrowserAppDelegate.java +++ b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustBrowserAppDelegate.java @@ -13,18 +13,18 @@ import org.mozilla.gecko.util.IntentUtils; public class AdjustBrowserAppDelegate extends BrowserAppDelegate { private final AdjustHelperInterface adjustHelper; - private final AttributionHelperListener[] attributionHelperListeners; + private final AttributionHelperListener attributionHelperListener; - public AdjustBrowserAppDelegate(AttributionHelperListener... attributionHelperListeners) { + public AdjustBrowserAppDelegate(AttributionHelperListener attributionHelperListener) { this.adjustHelper = AdjustConstants.getAdjustHelper(); - this.attributionHelperListeners = attributionHelperListeners; + this.attributionHelperListener = attributionHelperListener; } @Override public void onCreate(BrowserApp browserApp, Bundle savedInstanceState) { adjustHelper.onCreate(browserApp, AdjustConstants.MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN, - attributionHelperListeners); + attributionHelperListener); final boolean isInAutomation = IntentUtils.getIsInAutomationFromEnvironment( new SafeIntent(browserApp.getIntent())); diff --git a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelper.java b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelper.java index 410a172e7750..19399e735bb5 100644 --- a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelper.java +++ b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelper.java @@ -21,9 +21,9 @@ import org.mozilla.gecko.AppConstants; public class AdjustHelper implements AdjustHelperInterface, OnAttributionChangedListener { private static final String LOGTAG = AdjustHelper.class.getSimpleName(); - private AttributionHelperListener[] attributionListeners; + private AttributionHelperListener attributionListener; - public void onCreate(final Context context, final String maybeAppToken, final AttributionHelperListener... listeners) { + public void onCreate(final Context context, final String maybeAppToken, final AttributionHelperListener listener) { final String environment; final LogLevel logLevel; if (AppConstants.MOZILLA_OFFICIAL) { @@ -37,7 +37,7 @@ public class AdjustHelper implements AdjustHelperInterface, OnAttributionChanged // We've got install tracking turned on -- we better have a token! throw new IllegalArgumentException("maybeAppToken must not be null"); } - attributionListeners = listeners; + attributionListener = listener; AdjustConfig config = new AdjustConfig(context, maybeAppToken, environment); config.setLogLevel(logLevel); config.setOnAttributionChangedListener(this); @@ -62,16 +62,14 @@ public class AdjustHelper implements AdjustHelperInterface, OnAttributionChanged @Override public void onAttributionChanged(AdjustAttribution attribution) { - if (attributionListeners == null) { + if (attributionListener == null) { throw new IllegalStateException("Expected non-null attribution listener."); } if (attribution == null) { - Log.e(LOGTAG, "Adjust attribution is null. Skipping informing listeners about this."); + Log.e(LOGTAG, "Adjust attribution is null; skipping campaign id retrieval."); return; } - for (AttributionHelperListener listener: attributionListeners) { - listener.onAttributionChanged(attribution); - } + attributionListener.onCampaignIdChanged(attribution.campaign); } } diff --git a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelperInterface.java b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelperInterface.java index 0e4b9ff6455c..aeb7b4334e9f 100644 --- a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelperInterface.java +++ b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelperInterface.java @@ -13,7 +13,7 @@ public interface AdjustHelperInterface { * Register the Application with the Adjust SDK. * @param appToken the (secret!) Adjust SDK per-application token to register with; may be null. */ - void onCreate(final Context context, final String appToken, final AttributionHelperListener... listener); + void onCreate(final Context context, final String appToken, final AttributionHelperListener listener); void onPause(); void onResume(); diff --git a/mobile/android/base/java/org/mozilla/gecko/adjust/AttributionHelperListener.java b/mobile/android/base/java/org/mozilla/gecko/adjust/AttributionHelperListener.java index ada55838707a..6dadd2261d7a 100644 --- a/mobile/android/base/java/org/mozilla/gecko/adjust/AttributionHelperListener.java +++ b/mobile/android/base/java/org/mozilla/gecko/adjust/AttributionHelperListener.java @@ -5,20 +5,13 @@ package org.mozilla.gecko.adjust; -import android.support.annotation.NonNull; - -import com.adjust.sdk.AdjustAttribution; - /** * Because of how our build module dependencies are structured, we aren't able to use * the {@link com.adjust.sdk.OnAttributionChangedListener} directly outside of {@link AdjustHelper}. * If the Adjust SDK is enabled, this listener should be notified when {@link com.adjust.sdk.OnAttributionChangedListener} * is fired (i.e. this listener would be daisy-chained to the Adjust one). The listener also - * inherits thread-safety from GeckoSharedPrefs which is used to store the attribution. + * inherits thread-safety from GeckoSharedPrefs which is used to store the campaign ID. */ public interface AttributionHelperListener { - /** - * @param attribution - new Adjust attribution configuration. - */ - void onAttributionChanged(@NonNull final AdjustAttribution attribution); + void onCampaignIdChanged(String campaignId); } diff --git a/mobile/android/base/java/org/mozilla/gecko/adjust/StubAdjustHelper.java b/mobile/android/base/java/org/mozilla/gecko/adjust/StubAdjustHelper.java index 386bd97c05e2..ddfed84bd73b 100644 --- a/mobile/android/base/java/org/mozilla/gecko/adjust/StubAdjustHelper.java +++ b/mobile/android/base/java/org/mozilla/gecko/adjust/StubAdjustHelper.java @@ -9,7 +9,7 @@ import android.content.Context; import android.content.Intent; public class StubAdjustHelper implements AdjustHelperInterface { - public void onCreate(final Context context, final String appToken, final AttributionHelperListener... listeners) { + public void onCreate(final Context context, final String appToken, final AttributionHelperListener listener) { // Do nothing. } diff --git a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingDelegate.java b/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingDelegate.java index 5b54657d319c..fa00a37a7c16 100644 --- a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingDelegate.java +++ b/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingDelegate.java @@ -9,14 +9,11 @@ package org.mozilla.gecko.telemetry; import android.accessibilityservice.AccessibilityServiceInfo; import android.content.Context; import android.content.SharedPreferences; -import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.WorkerThread; import android.util.Log; import android.view.accessibility.AccessibilityManager; -import com.adjust.sdk.AdjustAttribution; - import org.json.JSONArray; import org.json.JSONException; import org.mozilla.gecko.BrowserApp; @@ -276,7 +273,7 @@ public class TelemetryCorePingDelegate extends BrowserAppDelegateWithReference } @Override - public void onAttributionChanged(@NonNull final AdjustAttribution attribution) { - CampaignIdMeasurements.updateCampaignIdPref(getBrowserApp(), attribution.campaign); + public void onCampaignIdChanged(String campaignId) { + CampaignIdMeasurements.updateCampaignIdPref(getBrowserApp(), campaignId); } }

1 0

[tor-browser-build/master] Bug 31128: Move Windows containers to Debian 10
by sysrqb＠torproject.org 29 May '20

29 May '20

commit e1accd273fd41b6ede9a3690d1a7b5206a5edb5d Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 15 07:07:42 2020 +0000 Bug 31128: Move Windows containers to Debian 10 --- projects/firefox/config | 5 ----- rbm.conf | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index b6a8440..272634d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -107,11 +107,6 @@ targets: # We need this to install wine32 dpkg --add-architecture i386 [% END -%] - echo 'deb http://ftp.debian.org/debian stretch-backports main' >> /etc/apt/sources.list - post_pkginst: | - # We need to have at least 3.0.3 which Mozilla is using in the - # mingw-w64/clang build process - apt-get -y -t stretch-backports install wine[% IF c("var/windows-i686") %]32[% END %] compiler: mingw-w64-clang windows-i686: diff --git a/rbm.conf b/rbm.conf index 592c265..ba1cc23 100644 --- a/rbm.conf +++ b/rbm.conf @@ -350,7 +350,7 @@ targets: var: windows: 1 container: - suite: stretch + suite: buster arch: amd64 configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]" [% c("var/configure_opt_project") %]' CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]'

1 0

[tor-browser-build/master] Bug 31129: Move macOS containers to Debian 10
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 96c528a80b689becbd8faca040db15c48543ce8f Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 14 10:24:07 2020 +0000 Bug 31129: Move macOS containers to Debian 10 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 628e33d..592c265 100644 --- a/rbm.conf +++ b/rbm.conf @@ -378,7 +378,7 @@ targets: osx: 1 osname: osx-x86_64 container: - suite: stretch + suite: buster arch: amd64 compiler: 'macosx-toolchain' configure_opt: '--host=x86_64-apple-darwin11 CC="x86_64-apple-darwin11-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin11-clang++ [% c("var/FLAGS") %]" [% c("var/configure_opt_project") %]'

1 0