blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Closes #3341 - Remove UserAgentRewriter

master
Afzal Najam 2019-07-30 22:19:54 -04:00 committed by Jonathan Almeida
parent ec0bd85f6d
commit 8946bf20c4
2 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt
View File

@ -9,7 +9,6 @@ import mozilla.components.browser.errorpages.ErrorPages
import mozilla.components.browser.errorpages.ErrorType
import mozilla.components.concept.engine.EngineSession
import mozilla.components.concept.engine.request.RequestInterceptor
import org.mozilla.fenix.browser.UserAgentRewriter
import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.exceptions.ExceptionDomains
import org.mozilla.fenix.ext.components
@ -25,8 +24,6 @@ class AppRequestInterceptor(private val context: Context) : RequestInterceptor {
uri
}
UserAgentRewriter.maybeRewriteUserAgent(session, host)
adjustTrackingProtection(host, context, session)
// Accounts uses interception to check for a "success URL" in the sign-in flow to finalize authentication.
return context.components.services.accountsAuthFeature.interceptor.onLoadRequest(session, uri)

41
app/src/main/java/org/mozilla/fenix/browser/UserAgentRewriter.kt
View File

@ -1,41 +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.fenix.browser
import android.os.Build.VERSION.RELEASE
import mozilla.components.concept.engine.EngineSession
import mozilla.components.support.ktx.kotlin.sha1
/**
* Utility to rewrite the User-Agent header for requests to whitelisted domains.
*
* Follow up: https://github.com/mozilla-mobile/fenix/issues/3341
*/
object UserAgentRewriter {
/**
* Updates the User-Agent based on the [whitelistUaFilter] to set the [userAgentGecko69] value.
*/
fun maybeRewriteUserAgent(session: EngineSession, host: String) {
session.settings.userAgentString = if (whitelistUaFilter.contains(host.sha1())) {
userAgentGecko69
} else {
null
}
}
/**
* The white-listed domains.
*/
private val whitelistUaFilter = setOf(
"1b12ecd917215146f79a0ac5e01b3059faadab47",
"a486f819018512f60a8a66324e51be0e1118a91d"
)
/**
* The User-Agent to use for the white-listed domains.
*/
private val userAgentGecko69 = "Mozilla/5.0 (Android $RELEASE; Mobile; rv:69.0) Gecko/69.0 Firefox/69.0"
}