Skip to content

Security: WebView auth token domain validation, redirect race condition, and file:// URI removal #1981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Security: WebView auth token domain validation, redirect race condition, and file:// URI removal #1981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b33f90f
Initial plan
Copilot Mar 16, 2026
f7abb0c
Security fixes: WebView URL validation, redirect race condition, and …
Copilot Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data android:scheme="file" />
<data android:scheme="content" />
<data android:mimeType="application/pdf" />
</intent-filter>
Expand Down
21 changes: 19 additions & 2 deletions app/src/main/java/com/infomaniak/drive/ui/OnlyOfficeActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@ class OnlyOfficeActivity : AppCompatActivity() {

val url = intent.getStringExtra(ONLYOFFICE_URL_TAG)!!
val filename = intent.getStringExtra(ONLYOFFICE_FILENAME_TAG)!!

if (!isUrlFromTrustedDomain(url)) {
finish()
return@with
}

val headers = mapOf("Authorization" to "Bearer ${AccountUtils.currentUser?.apiToken?.accessToken}")

CookieManager.getInstance().setAcceptThirdPartyCookies(webView, true)
Expand All @@ -96,8 +102,9 @@ class OnlyOfficeActivity : AppCompatActivity() {

webViewClient = object : WebViewClientCompat() {
override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean {
popBackIfNeeded(request.url.toString())
view.loadUrl(request.url.toString())
val redirectUrl = request.url.toString()
popBackIfNeeded(redirectUrl)
if (!isFinishing) view.loadUrl(redirectUrl)
return true
}
}
Expand Down Expand Up @@ -211,6 +218,16 @@ class OnlyOfficeActivity : AppCompatActivity() {
if (popBackNeeded) finish()
}

private fun isUrlFromTrustedDomain(url: String): Boolean {
return try {
val uri = Uri.parse(url)
val host = uri.host ?: return false
uri.scheme == "https" && (host.endsWith(".infomaniak.com") || host == "infomaniak.com")
} catch (e: Exception) {
false
}
}

private inner class OnlyOfficeWebChromeClient : WebChromeClient() {
override fun onProgressChanged(view: WebView, newProgress: Int) = with(binding) {
progressBar.progress = newProgress
Expand Down