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

Jump to bottom

refactor: remove conscrypt lib, use own trust manager, refine networking #1319

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

refactor: remove conscrypt lib, use own trust manager, refine networking #1319

wants to merge 6 commits into from
+79 −21

Conversation

IndusAryan
Copy link
Contributor

@IndusAryan IndusAryan commented Aug 31, 2024 •
edited
Loading

problem in 5.2.3 version crash in main act

libc             A  Fatal signal 6 (SIGABRT), code -1 (SI_QUEUE) in tid 6215 (are-dns.com/...), pid 6140 (rerelease.debug)
20:27:13.627 DEBUG            A  Cmdline: com.lagradost.cloudstream3.prerelease.debug
20:27:13.627                  A  pid: 6140, tid: 6215, name: are-dns.com/...  >>> com.lagradost.cloudstream3.prerelease.debug <<<
20:27:13.628                  A        #01 pc 0000000000140fbc  /data/app/~~JfrSIQZFGuephQTEoZjZ4g==/com.lagradost.cloudstream3.prerelease.debug-Mz1cwB9b8GbpSAOJie6mXw==/lib/arm64/libconscrypt_jni.so (X509_NAME_print+344) (BuildId: f1446306c60470b344a50f938f9632ca54d8b4e4)
20:27:13.628                  A        #02 pc 000000000014027c  /data/app/~~JfrSIQZFGuephQTEoZjZ4g==/com.lagradost.cloudstream3.prerelease.debug-Mz1cwB9b8GbpSAOJie6mXw==/lib/arm64/libconscrypt_jni.so (X509_print_ex+664) (BuildId: f1446306c60470b344a50f938f9632ca54d8b4e4)
20:27:13.628                  A        #03 pc 00000000000790d8  /data/app/~~JfrSIQZFGuephQTEoZjZ4g==/com.lagradost.cloudstream3.prerelease.debug-Mz1cwB9b8GbpSAOJie6mXw==/lib/arm64/libconscrypt_jni.so (BuildId: f1446306c60470b344a50f938f9632ca54d8b4e4)
20:27:13.628                  A        #06 pc 0000000000467522  [anon:dalvik-classes25.dex extracted in memory from /data/app/~~JfrSIQZFGuephQTEoZjZ4g==/com.lagradost.cloudstream3.prerelease.debug-Mz1cwB9b8GbpSAOJie6mXw==/base.apk!classes25.dex] (org.conscrypt.OpenSSLX509Certificate.toString+34)
20:27:13.628                  A        #12 pc 000000000040b58a  [anon:dalvik-classes25.dex extracted in memory from /data/app/~~JfrSIQZFGuephQTEoZjZ4g==/com.lagradost.cloudstream3.prerelease.debug-Mz1cwB9b8GbpSAOJie6mXw==/base.apk!classes25.dex] (okhttp3.internal.tls.BasicCertificateChainCleaner.clean+326)
20:27:13.628                  A        #14 pc 00000000003f1086  [anon:dalvik-classes25.dex extracted in memory from /data/app/~~JfrSIQZFGuephQTEoZjZ4g==/com.lagradost.cloudstream3.prerelease.debug-Mz1cwB9b8GbpSAOJie6mXw==/base.apk!classes25.dex] (okhttp3.internal.connection.ConnectPlan$connectTls$handshake$1.invoke+50)
20:27:13.628                  A        #16 pc 00000000003f1038  [anon:dalvik-classes25.dex extracted in memory from /data/app/~~JfrSIQZFGuephQTEoZjZ4g==/com.lagradost.cloudstream3.prerelease.debug-Mz1cwB9b8GbpSAOJie6mXw==/base.apk!classes25.dex] (okhttp3.internal.connection.ConnectPlan$connectTls$handshake$1.invoke+0)
20:27:13.628                  A        #18 pc 00000000003d797a  [anon:dalvik-classes25.dex extracted in memory from /data/app/~~JfrSIQZFGuephQTEoZjZ4g==/com.lagradost.cloudstream3.prerelease.debug-Mz1cwB9b8GbpSAOJie6mXw==/base.apk!classes25.dex] (okhttp3.Handshake$peerCertificates$2.invoke+6)
20:27:13.628                  A        #20 pc 00000000003d7958  [anon:dalvik-classes25.dex extracted in memory from /data/app/~~JfrSIQZFGuephQTEoZjZ4g==/com.lagradost.cloudstream3.prerelease.debug-Mz1cwB9b8GbpSAOJie6mXw==/base.apk!classes25.dex] (okhttp3.Handshake$peerCertificates$2.invoke+0)
20:27:13.628                  A        #22 pc 00000000001f32a0  [anon:dalvik-classes25.dex extracted in memory from /data/app/~~JfrSIQZFGuephQTEoZjZ4g==/com.lagradost.cloudstream3.prerelease.debug-Mz1cwB9b8GbpSAOJie6mXw==/base.apk!classes25.dex] (kotlin.SynchronizedLazyImpl.getValue+48)
20:27:13.628                  A        #24 pc 00000000003d7d7c  [anon:dalvik-classes25.dex extracted in memory from /data/app/~~JfrSIQZFGuephQTEoZjZ4g==/com.lagradost.cloudstream3.prerelease.debug-Mz1cwB9b8GbpSAOJie6mXw==/base.apk!classes25.dex] (okhttp3.Handshake.peerCertificates+4)
20:27:13.628                  A        #26 pc 00000000003d04f2  [anon:dalvik-classes25.dex extracted in memory from /data/app/~~JfrSIQZFGuephQTEoZjZ4g==/com.lagradost.cloudstream3.prerelease.debug-Mz1cwB9b8GbpSAOJie6mXw==/base.apk!classes25.dex] (okhttp3.Cache$Entry.writeTo+494)
20:27:13.629                  A        #28 pc 00000000003d143a  [anon:dalvik-classes25.dex extracted in memory from /data/app/~~JfrSIQZFGuephQTEoZjZ4g==/com.lagradost.cloudstream3.prerelease.debug-Mz1cwB9b8GbpSAOJie6mXw==/base.apk!classes25.dex] (okhttp3.Cache.put$okhttp+186)
20:27:13.629                  A        #30 pc 00000000003eaffa  [anon:dalvik-classes25.dex extracted in memory from /data/app/~~JfrSIQZFGuephQTEoZjZ4g==/com.lagradost.cloudstream3.prerelease.debug-Mz1cwB9b8GbpSAOJie6mXw==/base.apk!classes25.dex] (okhttp3.internal.cache.CacheInterceptor.intercept+746)
20:27:13.629                  A        #32 pc 00000000003f91b8  [anon:dalvik-classes25.dex extracted in memory from /data/app/~~JfrSIQZFGuephQTEoZjZ4g==/com.lagradost.cloudstream3.prerelease.debug-Mz1cwB9b8GbpSAOJie6mXw==/base.apk!classes25.dex] (okhttp3.internal.http.RealInterceptorChain.proceed+360)
20:27:13.629                  A        #34 pc 00000000003f7e34  [anon:dalvik-classes25.dex extracted in memory from /data/app/~~JfrSIQZFGuephQTEoZjZ4g==/com.lagradost.cloudstream3.prerelease.debug-Mz1cwB9b8GbpSAOJie6mXw==/base.apk!classes25.dex] (okhttp3.internal.http.BridgeInterceptor.intercept+352)
20:27:13.629                  A        #36 pc 00000000003f91b8  [anon:dalvik-classes25.dex extracted in memory from /data/app/~~JfrSIQZFGuephQTEoZjZ4g==/com.lagradost.cloudstream3.prerelease.debug-Mz1cwB9b8GbpSAOJie6mXw==/base.apk!classes25.dex] (okhttp3.internal.http.RealInterceptorChain.proceed+360)
20:27:13.629                  A        #38 pc 00000000003f9b74  [anon:dalvik-classes25.dex extracted in memory from /data/app/~~JfrSIQZFGuephQTEoZjZ4g==/com.lagradost.cloudstream3.prerelease.debug-Mz1cwB9b8GbpSAOJie6mXw==/base.apk!classes25.dex] (okhttp3.internal.http.RetryAndFollowUpInterceptor.intercept+104)
20:27:13.629                  A        #40 pc 00000000003f91b8  [anon:dalvik-classes25.dex extracted in memory from /data/app/~~JfrSIQZFGuephQTEoZjZ4g==/com.lagradost.cloudstream3.prerelease.debug-Mz1cwB9b8GbpSAOJie6mXw==/base.apk!classes25.dex] (okhttp3.internal.http.RealInterceptorChain.proceed+360)
20:27:13.629                  A        #42 pc 00000000003f4488  [anon:dalvik-classes25.dex extracted in memory from /data/app/~~JfrSIQZFGuephQTEoZjZ4g==/com.lagradost.cloudstream3.prerelease.debug-Mz1cwB9b8GbpSAOJie6mXw==/base.apk!classes25.dex] (okhttp3.internal.connection.RealCall.getResponseWithInterceptorChain$okhttp+288)
20:27:13.629                  A        #44 pc 00000000003f3908  [anon:dalvik-classes25.dex extracted in memory from /data/app/~~JfrSIQZFGuephQTEoZjZ4g==/com.lagradost.cloudstream3.prerelease.debug-Mz1cwB9b8GbpSAOJie6mXw==/base.apk!classes25.dex] (okhttp3.internal.connection.RealCall$AsyncCall.run+100)

fire-light42
fire-light42 reviewed Sep 11, 2024
View reviewed changes
Copy link
Collaborator

@fire-light42 fire-light42 left a comment

Choose a reason for hiding this comment

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

This needs testing before merge, however before that I want to ask why you restrict the API to hashmap when Map is the interface all maps implement. This allows for HashMap , LinkedHashMap, and TreeMap to share the implementation.

@IndusAryan
Copy link
Contributor Author

not any special reason, hashmap is not necessary, i can revert to map if you want , only thing that can be said it looks consistent or more like strict way of managing headers

@IndusAryan IndusAryan marked this pull request as draft November 17, 2024 18:52
@fire-light42
Copy link
Collaborator

This is still a draft, what are you plans?

@IndusAryan
Copy link
Contributor Author

This is still a draft, what are you plans?

I will upstream it and resolve conflicts this weekend.

@IndusAryan
Merge remote-tracking branch 'origin/master' into sslcerts
f4bd8e8 
# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt
@IndusAryan
L
d262ba5
@IndusAryan IndusAryan marked this pull request as ready for review January 23, 2025 20:06
fire-light42
fire-light42 requested changes Jan 23, 2025
View reviewed changes
app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt Outdated
val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
val dns = settingsManager.getInt(context.getString(R.string.dns_pref), 0)

val builder = OkHttpClient.Builder()
Copy link
Collaborator

Choose a reason for hiding this comment

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

I do not understand, you never use this builder anywhere? Are you sure you dont mean val baseClient = builder....

Copy link
Contributor Author

@IndusAryan IndusAryan Jan 23, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

we building the base client only right with custom dns ?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yes, but where exactly is builder variable used below this line? It looks like it is garbage collected after the return, as it is not used or returned.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Merged into a single builder and returned as one base client

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fire-light42 fire-light42 fire-light42 requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@IndusAryan @fire-light42