Fix Cloudflare interceptor

The solution was to force every request on shosetsu to always have the same user agent.
shosetsuorg · Aug 29, 2022 · 289dd65 · 289dd65
1 parent fd2d0c2
commit 289dd65
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/android/src/main/java/app/shosetsu/android/application/ShosetsuApplication.kt b/android/src/main/java/app/shosetsu/android/application/ShosetsuApplication.kt
@@ -9,9 +9,12 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.work.Configuration
+import app.shosetsu.android.BuildConfig
+import app.shosetsu.android.R
 import app.shosetsu.android.common.SettingKey
 import app.shosetsu.android.common.consts.Notifications
 import app.shosetsu.android.common.consts.ShortCuts
+import app.shosetsu.android.common.consts.USER_AGENT
 import app.shosetsu.android.common.ext.fileOut
 import app.shosetsu.android.common.ext.launchIO
 import app.shosetsu.android.common.ext.logE
@@ -25,8 +28,6 @@ import app.shosetsu.android.viewmodel.factory.ViewModelFactory
 import app.shosetsu.lib.ShosetsuSharedLib
 import app.shosetsu.lib.lua.ShosetsuLuaLib
 import app.shosetsu.lib.lua.shosetsuGlobals
-import app.shosetsu.android.BuildConfig
-import app.shosetsu.android.R
 import com.google.android.material.color.DynamicColors
 import kotlinx.coroutines.runBlocking
 import okhttp3.OkHttpClient
@@ -204,7 +205,7 @@ class ShosetsuApplication : Application(), LifecycleEventObserver, DIAware,
 		}
 
 		ShosetsuSharedLib.shosetsuHeaders = arrayOf(
-			"User-Agent" to "Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Firefox/102.0"
+			"User-Agent" to USER_AGENT
 		)
 	}
 

diff --git a/android/src/main/java/app/shosetsu/android/common/consts/Constants.kt b/android/src/main/java/app/shosetsu/android/common/consts/Constants.kt
@@ -16,7 +16,7 @@ package app.shosetsu.android.common.consts
  * You should have received a copy of the GNU General Public License
  * along with shosetsu.  If not, see <https://www.gnu.org/licenses/>.
  */
-
+const val USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Firefox/102.0"
 
 const val SELECTED_STROKE_WIDTH: Int = 8
 

diff --git a/android/src/main/java/app/shosetsu/android/providers/network/NetworkControls.kt b/android/src/main/java/app/shosetsu/android/providers/network/NetworkControls.kt
@@ -1,5 +1,6 @@
 package app.shosetsu.android.providers.network
 
+import app.shosetsu.android.common.consts.USER_AGENT
 import app.shosetsu.android.common.ext.logI
 import app.shosetsu.android.common.utils.CookieJarSync
 import okhttp3.OkHttpClient
@@ -32,7 +33,7 @@ import java.util.logging.Logger
 fun createOkHttpClient(): OkHttpClient = OkHttpClient.Builder()
 	.cookieJar(CookieJarSync)
 	.addInterceptor {
-		val r = it.request()
+		val r = it.request().newBuilder().header("User-Agent", USER_AGENT).build()
 		it.logI(r.toString())
 		val response = it.proceed(r)
 		it.logI(response.toString())

diff --git a/android/src/main/java/app/shosetsu/android/ui/webView/WebViewApp.kt b/android/src/main/java/app/shosetsu/android/ui/webView/WebViewApp.kt
@@ -11,14 +11,15 @@ import android.webkit.CookieManager
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.appcompat.app.AppCompatActivity
+import app.shosetsu.android.R
 import app.shosetsu.android.activity.MainActivity
 import app.shosetsu.android.common.consts.BundleKeys.BUNDLE_URL
+import app.shosetsu.android.common.consts.USER_AGENT
 import app.shosetsu.android.common.ext.launchUI
 import app.shosetsu.android.common.ext.logI
 import app.shosetsu.android.common.ext.logV
 import app.shosetsu.android.common.ext.openInBrowser
 import app.shosetsu.android.common.utils.CookieJarSync
-import app.shosetsu.android.R
 import app.shosetsu.android.databinding.ActivityWebviewBinding
 import app.shosetsu.android.databinding.ActivityWebviewBinding.inflate
 import okhttp3.Cookie
@@ -95,6 +96,7 @@ class WebViewApp : AppCompatActivity(), DIAware {
 			setDisplayHomeAsUpEnabled(true)
 		}
 
+		binding.webview.settings.userAgentString = USER_AGENT
 		binding.webview.settings.javaScriptEnabled = true
 		CookieManager.getInstance().setAcceptThirdPartyCookies(binding.webview, true)