Skip to content
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

Add cleartext traffic check #122

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open

Add cleartext traffic check #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
38b32cf
Add cleartext traffic check
akindofyoga Dec 4, 2019
94bde41
Update OkHttpClientUtils.kt
akindofyoga Dec 4, 2019
d62d286
Update build.gradle
akindofyoga Dec 4, 2019
b19a353
Update OkHttpClientUtils.kt
akindofyoga Dec 4, 2019
378f5dd
Fixed dependency
akindofyoga Dec 4, 2019
553e0d3
Requested changes
akindofyoga Dec 17, 2019
ba1b350
Change substring check
akindofyoga Dec 17, 2019
07d43d7
Fix hostname
akindofyoga Dec 18, 2019
ae20e77
Change url passed to java.net.URL to start with `http:`.
akindofyoga Dec 18, 2019
43fc467
Use okhttp3.HttpUrl instead of java.net.URL
akindofyoga Dec 18, 2019
0b1cf9d
Merge branch 'master' into Cleartext-Traffic
akindofyoga May 8, 2020
eb1ba07
Update dependencies.gradle
akindofyoga May 8, 2020
adffa2d
Update dependencies.gradle
akindofyoga May 8, 2020
19ee487
Update dependencies.gradle
akindofyoga May 8, 2020
686c977
Update build.gradle
akindofyoga May 8, 2020
c64c970
Fix Android dependency.
akindofyoga May 8, 2020
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
2 changes: 2 additions & 0 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ ext.versions = [
]

ext.libs = [
android: "org.robolectric:android-all:10-robolectric-5803371",

appCompat: "androidx.appcompat:appcompat:$versions.appCompat",
material: "com.google.android.material:material:$versions.material",
multiDex: "androidx.multidex:multidex:$versions.multiDex",
Expand Down
1 change: 1 addition & 0 deletions scarlet-websocket-okhttp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ dependencies {
implementation project(':scarlet-core-internal')
implementation libs.rxJava
implementation libs.kotlin.stdlib
compileOnly libs.android

testImplementation project(':scarlet')
testImplementation project(':scarlet-websocket-mockwebserver')
Expand Down
19 changes: 19 additions & 0 deletions ...t-websocket-okhttp/src/main/java/com/tinder/scarlet/websocket/okhttp/OkHttpClientUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,34 @@

package com.tinder.scarlet.websocket.okhttp

import android.os.Build
import android.security.NetworkSecurityPolicy
import com.tinder.scarlet.WebSocket
import com.tinder.scarlet.websocket.okhttp.request.RequestFactory
import com.tinder.scarlet.websocket.okhttp.request.StaticUrlRequestFactory
import okhttp3.HttpUrl
import okhttp3.OkHttpClient
import java.net.UnknownServiceException

fun OkHttpClient.newWebSocketFactory(requestFactory: RequestFactory): WebSocket.Factory {
return OkHttpWebSocket.Factory(OkHttpClientWebSocketConnectionEstablisher(this, requestFactory))
}

fun OkHttpClient.newWebSocketFactory(url: String): WebSocket.Factory {
if (url.startsWith("ws:", ignoreCase = true)) {
try {
if ((Build.VERSION.SDK_INT > 23 &&
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the Platform#isCleartextTrafficPermitted abstraction. we could tackle it in the next PR

!NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted(
HttpUrl.parse("http:${url.substring(3)}")?.host())) ||
(Build.VERSION.SDK_INT == 23 &&
!NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted)) {
throw UnknownServiceException(
"CLEARTEXT communication to $url not permitted by network security policy")
}
} catch (_: ClassNotFoundException) {
// Not running on Android
}
}

return newWebSocketFactory(StaticUrlRequestFactory(url))
}