- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-128.3.0esr-14.0-1] fixup! [android] Disable features and functionality
by Pier Angelo Vendrame (＠pierov) 26 Sep '24

26 Sep '24

Pier Angelo Vendrame pushed to branch tor-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 264c385b by Dan Ballard at 2024-09-26T17:20:57+00:00 fixup! [android] Disable features and functionality Bug 43113: remove remote settings and SERPTelemetry - - - - - 4 changed files: - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/telemetry/SerpTelemetryRepository.kt - mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/telemetry/BaseSearchTelemetryTest.kt - mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/telemetry/SerpTelemetryRepositoryTest.kt - mobile/android/android-components/components/support/remotesettings/src/main/java/mozilla/components/support/remotesettings/RemoteSettingsClient.kt Changes: ===================================== mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/telemetry/SerpTelemetryRepository.kt ===================================== @@ -8,7 +8,7 @@ import mozilla.appservices.remotesettings.RemoteSettingsResponse import mozilla.components.support.base.log.logger.Logger import mozilla.components.support.ktx.android.org.json.asSequence import mozilla.components.support.ktx.android.org.json.toList -import mozilla.components.support.remotesettings.RemoteSettingsClient +//import mozilla.components.support.remotesettings.RemoteSettingsClient import mozilla.components.support.remotesettings.RemoteSettingsResult import org.jetbrains.annotations.VisibleForTesting import org.json.JSONArray @@ -23,22 +23,22 @@ internal const val REMOTE_ENDPOINT_BUCKET_NAME = "main" * Parse SERP Telemetry json from remote config. */ class SerpTelemetryRepository( - rootStorageDirectory: File, +// rootStorageDirectory: File, private val readJson: () -> JSONObject, - collectionName: String, - serverUrl: String = REMOTE_PROD_ENDPOINT_URL, - bucketName: String = REMOTE_ENDPOINT_BUCKET_NAME, +// collectionName: String, +// serverUrl: String = REMOTE_PROD_ENDPOINT_URL, +// bucketName: String = REMOTE_ENDPOINT_BUCKET_NAME, ) { val logger = Logger("SerpTelemetryRepository") private var providerList: List<SearchProviderModel> = emptyList() - @VisibleForTesting - internal var remoteSettingsClient = RemoteSettingsClient( - serverUrl = serverUrl, - bucketName = bucketName, - collectionName = collectionName, - storageRootDirectory = rootStorageDirectory, - ) +// @VisibleForTesting +// internal var remoteSettingsClient = RemoteSettingsClient( +// serverUrl = serverUrl, +// bucketName = bucketName, +// collectionName = collectionName, +// storageRootDirectory = rootStorageDirectory, +// ) /** * Provides list of search providers from cache or dump and fetches from remotes server . @@ -65,7 +65,7 @@ class SerpTelemetryRepository( val remoteResponse = fetchRemoteResponse() if (remoteResponse.lastModified > cacheLastModified) { providerList = parseRemoteResponse(remoteResponse) - writeToCache(remoteResponse) + //writeToCache(remoteResponse) } } @@ -73,8 +73,9 @@ class SerpTelemetryRepository( * Writes data to local cache. */ @VisibleForTesting - internal suspend fun writeToCache(records: RemoteSettingsResponse): RemoteSettingsResult { - return remoteSettingsClient.write(records) + internal suspend fun writeToCache(/*records: RemoteSettingsResponse*/): RemoteSettingsResult { + return RemoteSettingsResult.NetworkFailure(Exception("Bug-43113: no remote fetching")) +// return remoteSettingsClient.write(records) } /** @@ -104,12 +105,12 @@ class SerpTelemetryRepository( */ @VisibleForTesting internal suspend fun fetchRemoteResponse(): RemoteSettingsResponse { - val result = remoteSettingsClient.fetch() - return if (result is RemoteSettingsResult.Success) { - result.response - } else { - RemoteSettingsResponse(emptyList(), 0u) - } +// val result = remoteSettingsClient.fetch() +// return if (result is RemoteSettingsResult.Success) { +// result.response +// } else { + return RemoteSettingsResponse(emptyList(), 0u) +// } } /** @@ -117,16 +118,16 @@ class SerpTelemetryRepository( */ @VisibleForTesting internal suspend fun loadProvidersFromCache(): Pair<ULong, List<SearchProviderModel>> { - val result = remoteSettingsClient.read() - return if (result is RemoteSettingsResult.Success) { - val response = result.response.records.mapNotNull { - it.fields.toSearchProviderModel() - } - val lastModified = result.response.lastModified - Pair(lastModified, response) - } else { - Pair(0u, emptyList()) - } +// val result = remoteSettingsClient.read() +// return if (result is RemoteSettingsResult.Success) { +// val response = result.response.records.mapNotNull { +// it.fields.toSearchProviderModel() +// } +// val lastModified = result.response.lastModified +// Pair(lastModified, response) +// } else { + return Pair(0u, emptyList()) +// } } } ===================================== mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/telemetry/BaseSearchTelemetryTest.kt ===================================== @@ -27,161 +27,161 @@ import java.io.File @RunWith(AndroidJUnit4::class) class BaseSearchTelemetryTest { - private lateinit var baseTelemetry: BaseSearchTelemetry - private lateinit var handler: BaseSearchTelemetry.SearchTelemetryMessageHandler - - @Mock - private lateinit var mockRepo: SerpTelemetryRepository - - private val mockReadJson: () -> JSONObject = mock() - private val mockRootStorageDirectory: File = mock() - - private fun createMockProviderList(): List<SearchProviderModel> = listOf( - SearchProviderModel( - schema = 1698656464939, - taggedCodes = listOf("monline_7_dg"), - telemetryId = "baidu", - organicCodes = emptyList(), - codeParamName = "tn", - queryParamNames = listOf("wd"), - searchPageRegexp = "^https://(?:m|www)\\\\.baidu\\\\.com/(?:s|baidu)", - followOnParamNames = listOf("oq"), - extraAdServersRegexps = listOf("^https?://www\\\\.baidu\\\\.com/baidu\\\\.php?"), - expectedOrganicCodes = emptyList(), - ), - ) - - private val rawJson = """ - { - "data": [ - { - "schema": 1698656464939, - "taggedCodes": [ - "monline_7_dg" - ], - "telemetryId": "baidu", - "organicCodes": [], - "codeParamName": "tn", - "queryParamNames": [ - "wd" - ], - "searchPageRegexp": "^https://(?:m|www)\\.baidu\\.com/(?:s|baidu)", - "followOnParamNames": [ - "oq" - ], - "extraAdServersRegexps": [ - "^https?://www\\.baidu\\.com/baidu\\.php?" - ], - "id": "19c434a3-d173-4871-9743-290ac92a3f6a", - "last_modified": 1698666532326 - }], - "timestamp": 16 -} - """.trimIndent() - - @Before - fun setup() { - baseTelemetry = spy( - object : BaseSearchTelemetry() { - override suspend fun install( - engine: Engine, - store: BrowserStore, - providerList: List<SearchProviderModel>, - ) { - // mock, do nothing - } - - override fun processMessage(message: JSONObject) { - // mock, do nothing - } - }, - ) - handler = baseTelemetry.SearchTelemetryMessageHandler() - mockRepo = spy(SerpTelemetryRepository(mockRootStorageDirectory, mockReadJson, "test")) - } - - @Test - fun `GIVEN an engine WHEN installWebExtension is called THEN the provided extension is installed in engine`() { - val engine: Engine = mock() - val store: BrowserStore = mock() - val id = "id" - val resourceUrl = "resourceUrl" - val messageId = "messageId" - val extensionInfo = ExtensionInfo(id, resourceUrl, messageId) - - baseTelemetry.installWebExtension(engine, store, extensionInfo) - - verify(engine).installBuiltInWebExtension( - id = eq(id), - url = eq(resourceUrl), - onSuccess = any(), - onError = any(), - ) - } - - @Test - fun `GIVEN a search provider does not exist for the url WHEN getProviderForUrl is called THEN return null`() { - val url = "https://www.mozilla.com/search?q=firefox" - baseTelemetry.providerList = createMockProviderList() - - assertEquals(null, baseTelemetry.getProviderForUrl(url)) - } - - @Test(expected = IllegalStateException::class) - fun `GIVEN an extension message WHEN that cannot be processed THEN throw IllegalStateException`() { - val message = "message" - - handler.onMessage(message, mock()) - } - - @Test - fun `GIVEN an extension message WHEN received THEN pass it to processMessage`() { - val message = JSONObject() - - handler.onMessage(message, mock()) - - verify(baseTelemetry).processMessage(message) - } - - @Test - fun `GIVEN empty cacheResponse WHEN initializeProviderList is called THEN update providerList`(): Unit = - runBlocking { - val localResponse = JSONObject(rawJson) - val cacheResponse: Pair<ULong, List<SearchProviderModel>> = Pair(0u, emptyList()) - - `when`(mockRepo.loadProvidersFromCache()).thenReturn(cacheResponse) - doAnswer { - localResponse - }.`when`(mockReadJson)() - - `when`(mockRepo.parseLocalPreinstalledData(localResponse)).thenReturn(createMockProviderList()) - doReturn(Unit).`when`(mockRepo).fetchRemoteResponse(any()) - - baseTelemetry.setProviderList(mockRepo.updateProviderList()) - - assertEquals(baseTelemetry.providerList.toString(), createMockProviderList().toString()) - } - - @Test - fun `GIVEN non-empty cacheResponse WHEN initializeProviderList is called THEN update providerList`(): Unit = - runBlocking { - val localResponse = JSONObject(rawJson) - val cacheResponse: Pair<ULong, List<SearchProviderModel>> = Pair(123u, createMockProviderList()) - - `when`(mockRepo.loadProvidersFromCache()).thenReturn(cacheResponse) - doAnswer { - localResponse - }.`when`(mockReadJson)() - doReturn(Unit).`when`(mockRepo).fetchRemoteResponse(any()) - - baseTelemetry.setProviderList(mockRepo.updateProviderList()) - - assertEquals(baseTelemetry.providerList.toString(), createMockProviderList().toString()) - } - - fun getProviderForUrl(url: String): SearchProviderModel? { - return createMockProviderList().find { provider -> - provider.searchPageRegexp.pattern.toRegex().containsMatchIn(url) - } - } +// private lateinit var baseTelemetry: BaseSearchTelemetry +// private lateinit var handler: BaseSearchTelemetry.SearchTelemetryMessageHandler +// +// @Mock +// private lateinit var mockRepo: SerpTelemetryRepository +// +// private val mockReadJson: () -> JSONObject = mock() +// private val mockRootStorageDirectory: File = mock() +// +// private fun createMockProviderList(): List<SearchProviderModel> = listOf( +// SearchProviderModel( +// schema = 1698656464939, +// taggedCodes = listOf("monline_7_dg"), +// telemetryId = "baidu", +// organicCodes = emptyList(), +// codeParamName = "tn", +// queryParamNames = listOf("wd"), +// searchPageRegexp = "^https://(?:m|www)\\\\.baidu\\\\.com/(?:s|baidu)", +// followOnParamNames = listOf("oq"), +// extraAdServersRegexps = listOf("^https?://www\\\\.baidu\\\\.com/baidu\\\\.php?"), +// expectedOrganicCodes = emptyList(), +// ), +// ) +// +// private val rawJson = """ +// { +// "data": [ +// { +// "schema": 1698656464939, +// "taggedCodes": [ +// "monline_7_dg" +// ], +// "telemetryId": "baidu", +// "organicCodes": [], +// "codeParamName": "tn", +// "queryParamNames": [ +// "wd" +// ], +// "searchPageRegexp": "^https://(?:m|www)\\.baidu\\.com/(?:s|baidu)", +// "followOnParamNames": [ +// "oq" +// ], +// "extraAdServersRegexps": [ +// "^https?://www\\.baidu\\.com/baidu\\.php?" +// ], +// "id": "19c434a3-d173-4871-9743-290ac92a3f6a", +// "last_modified": 1698666532326 +// }], +// "timestamp": 16 +//} +// """.trimIndent() +// +// @Before +// fun setup() { +// baseTelemetry = spy( +// object : BaseSearchTelemetry() { +// override suspend fun install( +// engine: Engine, +// store: BrowserStore, +// providerList: List<SearchProviderModel>, +// ) { +// // mock, do nothing +// } +// +// override fun processMessage(message: JSONObject) { +// // mock, do nothing +// } +// }, +// ) +// handler = baseTelemetry.SearchTelemetryMessageHandler() +// mockRepo = spy(SerpTelemetryRepository(mockRootStorageDirectory, mockReadJson, "test")) +// } +// +// @Test +// fun `GIVEN an engine WHEN installWebExtension is called THEN the provided extension is installed in engine`() { +// val engine: Engine = mock() +// val store: BrowserStore = mock() +// val id = "id" +// val resourceUrl = "resourceUrl" +// val messageId = "messageId" +// val extensionInfo = ExtensionInfo(id, resourceUrl, messageId) +// +// baseTelemetry.installWebExtension(engine, store, extensionInfo) +// +// verify(engine).installBuiltInWebExtension( +// id = eq(id), +// url = eq(resourceUrl), +// onSuccess = any(), +// onError = any(), +// ) +// } +// +// @Test +// fun `GIVEN a search provider does not exist for the url WHEN getProviderForUrl is called THEN return null`() { +// val url = "https://www.mozilla.com/search?q=firefox" +// baseTelemetry.providerList = createMockProviderList() +// +// assertEquals(null, baseTelemetry.getProviderForUrl(url)) +// } +// +// @Test(expected = IllegalStateException::class) +// fun `GIVEN an extension message WHEN that cannot be processed THEN throw IllegalStateException`() { +// val message = "message" +// +// handler.onMessage(message, mock()) +// } +// +// @Test +// fun `GIVEN an extension message WHEN received THEN pass it to processMessage`() { +// val message = JSONObject() +// +// handler.onMessage(message, mock()) +// +// verify(baseTelemetry).processMessage(message) +// } +// +// @Test +// fun `GIVEN empty cacheResponse WHEN initializeProviderList is called THEN update providerList`(): Unit = +// runBlocking { +// val localResponse = JSONObject(rawJson) +// val cacheResponse: Pair<ULong, List<SearchProviderModel>> = Pair(0u, emptyList()) +// +// `when`(mockRepo.loadProvidersFromCache()).thenReturn(cacheResponse) +// doAnswer { +// localResponse +// }.`when`(mockReadJson)() +// +// `when`(mockRepo.parseLocalPreinstalledData(localResponse)).thenReturn(createMockProviderList()) +// doReturn(Unit).`when`(mockRepo).fetchRemoteResponse(any()) +// +// baseTelemetry.setProviderList(mockRepo.updateProviderList()) +// +// assertEquals(baseTelemetry.providerList.toString(), createMockProviderList().toString()) +// } +// +// @Test +// fun `GIVEN non-empty cacheResponse WHEN initializeProviderList is called THEN update providerList`(): Unit = +// runBlocking { +// val localResponse = JSONObject(rawJson) +// val cacheResponse: Pair<ULong, List<SearchProviderModel>> = Pair(123u, createMockProviderList()) +// +// `when`(mockRepo.loadProvidersFromCache()).thenReturn(cacheResponse) +// doAnswer { +// localResponse +// }.`when`(mockReadJson)() +// doReturn(Unit).`when`(mockRepo).fetchRemoteResponse(any()) +// +// baseTelemetry.setProviderList(mockRepo.updateProviderList()) +// +// assertEquals(baseTelemetry.providerList.toString(), createMockProviderList().toString()) +// } +// +// fun getProviderForUrl(url: String): SearchProviderModel? { +// return createMockProviderList().find { provider -> +// provider.searchPageRegexp.pattern.toRegex().containsMatchIn(url) +// } +// } } ===================================== mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/telemetry/SerpTelemetryRepositoryTest.kt ===================================== @@ -23,70 +23,70 @@ import org.robolectric.RobolectricTestRunner @RunWith(RobolectricTestRunner::class) class SerpTelemetryRepositoryTest { - @Mock - private lateinit var mockRemoteSettingsClient: RemoteSettingsClient - - private lateinit var serpTelemetryRepository: SerpTelemetryRepository - - @Before - fun setup() { - MockitoAnnotations.openMocks(this) - serpTelemetryRepository = SerpTelemetryRepository( - rootStorageDirectory = mock(), - readJson = mock(), - collectionName = "", - serverUrl = "https://test.server", - bucketName = "", - ) - - serpTelemetryRepository.remoteSettingsClient = mockRemoteSettingsClient - } - - @Test - fun `GIVEN non-empty response WHEN writeToCache is called THEN the result is a success`() = runBlocking { - val records = listOf( - RemoteSettingsRecord("1", 123u, false, null, JSONObject()), - RemoteSettingsRecord("2", 456u, true, null, JSONObject()), - ) - val response = RemoteSettingsResponse(records, 125614567U) - - `when`(mockRemoteSettingsClient.write(response)) - .thenReturn(RemoteSettingsResult.Success(response)) - - val result = serpTelemetryRepository.writeToCache(response) - - assertTrue(result is RemoteSettingsResult.Success) - assertEquals(response, (result as RemoteSettingsResult.Success).response) - } - - @Test - fun `GIVEN non-empty response WHEN fetchRemoteResponse is called THEN the result is equal to the response`() = runBlocking { - val records = listOf( - RemoteSettingsRecord("1", 123u, false, null, JSONObject()), - RemoteSettingsRecord("2", 456u, true, null, JSONObject()), - ) - val response = RemoteSettingsResponse(records, 125614567U) - `when`(mockRemoteSettingsClient.fetch()) - .thenReturn(RemoteSettingsResult.Success(response)) - - val result = serpTelemetryRepository.fetchRemoteResponse() - - assertEquals(response, result) - } - - @Test - fun `GIVEN non-empty response WHEN loadProvidersFromCache is called THEN the result is equal to the response`() = runBlocking { - val records = listOf( - RemoteSettingsRecord("1", 123u, false, null, JSONObject()), - RemoteSettingsRecord("2", 456u, true, null, JSONObject()), - ) - val response = RemoteSettingsResponse(records, 125614567U) - `when`(mockRemoteSettingsClient.read()) - .thenReturn(RemoteSettingsResult.Success(response)) - - val result = serpTelemetryRepository.loadProvidersFromCache() - - assertEquals(response.lastModified, result.first) - assertEquals(response.records.mapNotNull { it.fields.toSearchProviderModel() }, result.second) - } +// @Mock +// private lateinit var mockRemoteSettingsClient: RemoteSettingsClient +// +// private lateinit var serpTelemetryRepository: SerpTelemetryRepository +// +// @Before +// fun setup() { +// MockitoAnnotations.openMocks(this) +// serpTelemetryRepository = SerpTelemetryRepository( +// rootStorageDirectory = mock(), +// readJson = mock(), +// collectionName = "", +// serverUrl = "https://test.server", +// bucketName = "", +// ) +// +// serpTelemetryRepository.remoteSettingsClient = mockRemoteSettingsClient +// } +// +// @Test +// fun `GIVEN non-empty response WHEN writeToCache is called THEN the result is a success`() = runBlocking { +// val records = listOf( +// RemoteSettingsRecord("1", 123u, false, null, JSONObject()), +// RemoteSettingsRecord("2", 456u, true, null, JSONObject()), +// ) +// val response = RemoteSettingsResponse(records, 125614567U) +// +// `when`(mockRemoteSettingsClient.write(response)) +// .thenReturn(RemoteSettingsResult.Success(response)) +// +// val result = serpTelemetryRepository.writeToCache(response) +// +// assertTrue(result is RemoteSettingsResult.Success) +// assertEquals(response, (result as RemoteSettingsResult.Success).response) +// } +// +// @Test +// fun `GIVEN non-empty response WHEN fetchRemoteResponse is called THEN the result is equal to the response`() = runBlocking { +// val records = listOf( +// RemoteSettingsRecord("1", 123u, false, null, JSONObject()), +// RemoteSettingsRecord("2", 456u, true, null, JSONObject()), +// ) +// val response = RemoteSettingsResponse(records, 125614567U) +// `when`(mockRemoteSettingsClient.fetch()) +// .thenReturn(RemoteSettingsResult.Success(response)) +// +// val result = serpTelemetryRepository.fetchRemoteResponse() +// +// assertEquals(response, result) +// } +// +// @Test +// fun `GIVEN non-empty response WHEN loadProvidersFromCache is called THEN the result is equal to the response`() = runBlocking { +// val records = listOf( +// RemoteSettingsRecord("1", 123u, false, null, JSONObject()), +// RemoteSettingsRecord("2", 456u, true, null, JSONObject()), +// ) +// val response = RemoteSettingsResponse(records, 125614567U) +// `when`(mockRemoteSettingsClient.read()) +// .thenReturn(RemoteSettingsResult.Success(response)) +// +// val result = serpTelemetryRepository.loadProvidersFromCache() +// +// assertEquals(response.lastModified, result.first) +// assertEquals(response.records.mapNotNull { it.fields.toSearchProviderModel() }, result.second) +// } } ===================================== mobile/android/android-components/components/support/remotesettings/src/main/java/mozilla/components/support/remotesettings/RemoteSettingsClient.kt ===================================== @@ -64,18 +64,20 @@ class RemoteSettingsClient( */ @Suppress("TooGenericExceptionCaught") suspend fun fetch(): RemoteSettingsResult = withContext(Dispatchers.IO) { - try { - val serverRecords = RemoteSettings(config).use { - it.getRecords() - } - RemoteSettingsResult.Success(serverRecords) - } catch (e: RemoteSettingsException) { - Logger.error(e.message.toString()) - RemoteSettingsResult.NetworkFailure(e) - } catch (e: NullPointerException) { - Logger.error(e.message.toString()) - RemoteSettingsResult.NetworkFailure(e) - } +// try { +// val serverRecords = RemoteSettings(config).use { +// it.getRecords() +// } +// RemoteSettingsResult.Success(serverRecords) +// } catch (e: RemoteSettingsException) { +// Logger.error(e.message.toString()) +// RemoteSettingsResult.NetworkFailure(e) +// } catch (e: NullPointerException) { +// Logger.error(e.message.toString()) +// RemoteSettingsResult.NetworkFailure(e) +// } + RemoteSettingsResult.NetworkFailure(Exception("tb-43113: no remote fetching")) + } /** @@ -123,7 +125,8 @@ class RemoteSettingsClient( suspend fun RemoteSettingsClient.readOrFetch(): RemoteSettingsResult { val readResult = read() return if (readResult is RemoteSettingsResult.DiskFailure) { - fetch() + //fetch() + RemoteSettingsResult.NetworkFailure(Exception("tb-43113: no remote fetching")) } else { readResult } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/264c385… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/264c385… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41246: Add updater RewriteRules to make 13.5a10 a watershed.
by Pier Angelo Vendrame (＠pierov) 26 Sep '24

26 Sep '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 12330fab by Pier Angelo Vendrame at 2024-09-26T12:17:46+02:00 Bug 41246: Add updater RewriteRules to make 13.5a10 a watershed. This will not be an actual watershed, as users that are already up to date in the alpha channel might have skipped it, but it will help us to test everything for when we do the watershed update that allows us to have parallel Windows 7 builds from the 13.5 series with 14.0. - - - - - 1 changed file: - projects/release/update_responses_config.yml Changes: ===================================== projects/release/update_responses_config.yml ===================================== @@ -82,6 +82,11 @@ htaccess_rewrite_rules: # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory RewriteRule ^[^/]+/8\.0a[12345678]/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] + # tor-browser#42747: Make 13.5a10 a watershed alpha release + RewriteRule ^[^/]+/\d\..*/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] + RewriteRule ^[^/]+/1[012]\..*/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] + RewriteRule ^[^/]+/13\.0.*/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] + RewriteRule ^[^/]+/13\.5a\d/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] release: | # bug 26570: Redirect pre-8.0 stable users to a separate update directory RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0/release/$0 [last] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag base-browser-128.3.0esr-14.0-1-build1
by Pier Angelo Vendrame (＠pierov) 26 Sep '24

26 Sep '24

Pier Angelo Vendrame pushed new tag base-browser-128.3.0esr-14.0-1-build1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/base-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag base-browser-115.16.0esr-13.5-1-build1
by Pier Angelo Vendrame (＠pierov) 26 Sep '24

26 Sep '24

Pier Angelo Vendrame pushed new tag base-browser-115.16.0esr-13.5-1-build1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/base-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.3.0esr-14.0-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 26 Sep '24

26 Sep '24

Pier Angelo Vendrame pushed to branch mullvad-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 4657541e by Morgan at 2024-09-26T10:28:23+02:00 fixup! Firefox preference overrides. Bug 43163: Disable offscreen canvas until verified it is not fingerprintable - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -383,6 +383,8 @@ pref("webgl.disable-fail-if-major-performance-caveat", true); // tor-browser#16404: disable until we investigate it further (#22333) pref("webgl.enable-webgl2", false); pref("browser.link.open_newwindow.restriction", 0); // Bug 9881: Open popups in new tabs (to avoid fullscreen popups) +// tor-browser#42767: Disable offscreen canvas until verified it is not fingerprintable +pref("gfx.offscreencanvas.enabled", false); // Prevent scripts from moving and resizing open windows pref("dom.disable_window_move_resize", true); // Set video VP9 to 0 for everyone (bug 22548) View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/465… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/465… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.3.0esr-14.0-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 26 Sep '24

26 Sep '24

Pier Angelo Vendrame pushed to branch base-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 4657541e by Morgan at 2024-09-26T10:28:23+02:00 fixup! Firefox preference overrides. Bug 43163: Disable offscreen canvas until verified it is not fingerprintable - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -383,6 +383,8 @@ pref("webgl.disable-fail-if-major-performance-caveat", true); // tor-browser#16404: disable until we investigate it further (#22333) pref("webgl.enable-webgl2", false); pref("browser.link.open_newwindow.restriction", 0); // Bug 9881: Open popups in new tabs (to avoid fullscreen popups) +// tor-browser#42767: Disable offscreen canvas until verified it is not fingerprintable +pref("gfx.offscreencanvas.enabled", false); // Prevent scripts from moving and resizing open windows pref("dom.disable_window_move_resize", true); // Set video VP9 to 0 for everyone (bug 22548) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4657541… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4657541… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.3.0esr-14.0-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 26 Sep '24

26 Sep '24

Pier Angelo Vendrame pushed to branch tor-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 45d15cbc by Morgan at 2024-09-26T10:26:43+02:00 fixup! Firefox preference overrides. Bug 43163: Disable offscreen canvas until verified it is not fingerprintable - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -383,6 +383,8 @@ pref("webgl.disable-fail-if-major-performance-caveat", true); // tor-browser#16404: disable until we investigate it further (#22333) pref("webgl.enable-webgl2", false); pref("browser.link.open_newwindow.restriction", 0); // Bug 9881: Open popups in new tabs (to avoid fullscreen popups) +// tor-browser#42767: Disable offscreen canvas until verified it is not fingerprintable +pref("gfx.offscreencanvas.enabled", false); // Prevent scripts from moving and resizing open windows pref("dom.disable_window_move_resize", true); // Set video VP9 to 0 for everyone (bug 22548) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/45d15cb… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/45d15cb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-13.5a10-build1
by morgan (＠morgan) 26 Sep '24

26 Sep '24

morgan pushed new tag tbb-13.5a10-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.5a10] Bug 41244: Prepare Tor Browser 13.5a10.
by morgan (＠morgan) 26 Sep '24

26 Sep '24

morgan pushed to branch maint-13.5a10 at The Tor Project / Applications / tor-browser-build Commits: 2d07612b by Pier Angelo Vendrame at 2024-09-25T19:33:21+02:00 Bug 41244: Prepare Tor Browser 13.5a10. This is a release to test that the updater changes work as expected also in 115.x and the changes needed for a watershed release. - - - - - 5 changed files: - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/firefox/config - projects/release/update_responses_config.yml - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,35 @@ +Tor Browser 13.5a10 - September 25 2024 + * Windows + macOS + Linux + * Updated Firefox to 115.15.0esr + * Updated NoScript to 11.4.37 + * Updated OpenSSL to 3.0.15 + * Windows + macOS + * Bug 42747: Windows 7/8 and macOS 10.12-10.14 Legacy/Maintenance [tor-browser] + * Build System + * Windows + macOS + Linux + * Updated Go to 1.21.12 + +Tor Browser 14.0a6 - September 19 2024 + * All Platforms + * Bug 42831: Remove the shopping components [tor-browser] + * Bug 43144: Ensure non-privacy browsing also sets the GPC header [tor-browser] + * Windows + macOS + Linux + * Bug 42698: Bridge card background contrast is low for bridge-moji [tor-browser] + * Bug 42718: Remove the firefox-view button from UI, even when always-on private-browsing mode is disabled [tor-browser] + * Bug 42740: Stop trying to hide "Restore previous session" [tor-browser] + * Bug 43072: moz-message-bar does not get announced on Orca screen-reader [tor-browser] + * Bug 43083: Backport fix for Mozilla 1436462 [tor-browser] + * Linux + * Bug 43141: Hardcode Arimo as a system-ui font [tor-browser] + * Bug 41237: Add some aliases to our Linux font config for compatibility [tor-browser-build] + * Android + * Bug 41550: Remove unused extensions from Tor Browser for Android [tor-browser] + * Bug 43052: Remove non private tabs icon and "other device tabs" from tab view [tor-browser] + * Bug 43129: about:neterror cannot display SVG on Android with Security Level Safest [tor-browser] + * Bug 43145: Backport Android security fix from 130.0.1 [tor-browser] + * Bug 43146: Update the icon of DuckDuckGo onion search engine on Android [tor-browser] + * Bug 43147: Remove unused search plugins from the apk files [tor-browser] + Tor Browser 13.5.4 - September 16 2024 * All Platforms * Updated NoScript to 11.4.37 ===================================== projects/firefox/config ===================================== @@ -17,9 +17,9 @@ var: firefox_platform_version: 115.15.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '13.5' - browser_rebase: 1 + browser_rebase: 2 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 4 + browser_build: 1 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' ===================================== projects/release/update_responses_config.yml ===================================== @@ -84,6 +84,11 @@ htaccess_rewrite_rules: # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory RewriteRule ^[^/]+/8\.0a[12345678]/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] + # tor-browser#42747: Make 13.5a10 a watershed alpha release + RewriteRule ^[^/]+/\d\..*/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] + RewriteRule ^[^/]+/1[012]\..*/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] + RewriteRule ^[^/]+/13\.0.*/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] + RewriteRule ^[^/]+/13\.5a\d/.* https://aus1.torproject.org/torbrowser/update_pre13.5a10/alpha/$0 [last] release: | # bug 26570: Redirect pre-8.0 stable users to a separate update directory RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0/release/$0 [last] ===================================== projects/translation/config ===================================== @@ -12,19 +12,19 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: d69ac083437e60d681fdefce6aa1fde96e2f1eaf + git_hash: 16446c485b3be4198a7e79bfcac6510784a18506 targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: 022b7eea73017cd3a1fae66b8c4bd8d7b867107f + git_hash: a2bf4c2f45736958ac99f60e60b9f6d0e94454c3 targets: nightly: git_hash: 'tor-browser' mullvad-browser: mullvad-browser: '[% INCLUDE build %]' - git_hash: bff8092bbe5ae93b2c162ade300d739b2cd9e92d + git_hash: 78212a3da2439e436ac5f73d8e3eb908145c3ece targets: nightly: git_hash: 'mullvad-browser' @@ -32,7 +32,7 @@ steps: fenix: '[% INCLUDE build %]' # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. - git_hash: 2a9884fadf15e57f6a661f12ede1312cc71602c1 + git_hash: 12b033e4192448315794f5fe8203fe91dcc29a8c compress_tar: 'zst' targets: nightly: ===================================== rbm.conf ===================================== @@ -73,18 +73,18 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '13.5.4' + torbrowser_version: '13.5a10' torbrowser_build: 'build1' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. - browser_release_date: '2024/09/16 20:57:05' + browser_release_date: '2024/09/25 17:00:00' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' updater_enabled: 1 build_mar: 1 torbrowser_incremental_from: - - 13.5.3 - - 13.5.2 - - 13.5.1 + - 13.5a9 + - 13.5a8 + - 13.5a7 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' # By default, we sort the list of installed packages. This allows sharing View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new branch mullvad-browser-115.16.0esr-13.5-1
by Pier Angelo Vendrame (＠pierov) 26 Sep '24

26 Sep '24

Pier Angelo Vendrame pushed new branch mullvad-browser-115.16.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0