Merge pull request #42 from aquamarine5/v1.7-security-dev

aquamarine5 · web-flow · commit 73266d538c80 · 2025-05-29T10:51:31.000+08:00
v1.7.2: `SponsorList` is fetched from remote server, hackdoor after restricted user of `BlockedContent`
diff --git a/app/build.gradle b/app/build.gradle
@@ -37,8 +37,8 @@ android {
         applicationId = "org.aquamarine5.brainspark.chaoxingsignfaker"
         minSdk = 26
         targetSdk = 35
-        versionCode = 107010001
-        versionName = "1.7.1-stable-250518"
+        versionCode = 107022025
+        versionName = "1.7.2-stable-250529"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/org/aquamarine5/brainspark/chaoxingsignfaker/components/BlockedContent.kt b/app/src/main/java/org/aquamarine5/brainspark/chaoxingsignfaker/components/BlockedContent.kt
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2025, @aquamarine5 (@海蓝色的咕咕鸽). All Rights Reserved.
+ * Author: aquamarine5@163.com (Github: https://github.com/aquamarine5) and Brainspark (previously RenegadeCreation)
+ * Repository: https://github.com/aquamarine5/ChaoxingSignFaker
+ */
+
+package org.aquamarine5.brainspark.chaoxingsignfaker.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import com.alibaba.fastjson2.JSONObject
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import okhttp3.Request
+import org.aquamarine5.brainspark.chaoxingsignfaker.R
+import org.aquamarine5.brainspark.chaoxingsignfaker.api.ChaoxingHttpClient
+
+private const val UNBLOCKED_BUTTON_CLICK_LIMIT = 10
+
+@Composable
+fun BlockedContent(content: @Composable () -> Unit) {
+    val bannedFidList = remember { mutableStateListOf<Int>() }
+    var unblockedButtonClickCount by remember { mutableIntStateOf(0) }
+    LaunchedEffect(Unit) {
+        withContext(Dispatchers.IO){
+            ChaoxingHttpClient.instance?.okHttpClient?.newCall(
+                Request.Builder()
+                    .get()
+                    .url("http://cdn.aquamarine5.fun/chaoxingsignfaker_banlist.json")
+                    .build()
+            )?.execute().use {
+                bannedFidList.addAll(
+                    JSONObject.parseObject(it?.body?.string()).getJSONArray("banfids")
+                        .toList(Int::class.java)
+                )
+            }
+        }
+    }
+    if (unblockedButtonClickCount < UNBLOCKED_BUTTON_CLICK_LIMIT && bannedFidList.contains(
+            ChaoxingHttpClient.instance!!.userEntity.fid
+        )
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(16.dp),
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            IconButton(onClick = {
+                unblockedButtonClickCount++
+            }, modifier = Modifier.size(48.dp)) {
+                Icon(painterResource(R.drawable.ic_user_lock), null)
+            }
+            Spacer(modifier = Modifier.height(8.dp))
+            Text("受限于应用策略，当前账号无法使用此功能")
+        }
+    } else {
+        content()
+    }
+}
diff --git a/app/src/main/java/org/aquamarine5/brainspark/chaoxingsignfaker/components/SponsorAlertDialog.kt b/app/src/main/java/org/aquamarine5/brainspark/chaoxingsignfaker/components/SponsorAlertDialog.kt
@@ -16,21 +16,27 @@ import android.provider.MediaStore
 import android.widget.Toast
 import androidx.activity.compose.LocalActivity
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
@@ -46,12 +52,14 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toBitmap
+import com.alibaba.fastjson2.JSONObject
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import okhttp3.Request
 import org.aquamarine5.brainspark.chaoxingsignfaker.R
 import org.aquamarine5.brainspark.chaoxingsignfaker.UMengHelper
 import org.aquamarine5.brainspark.chaoxingsignfaker.api.ChaoxingHttpClient
@@ -65,19 +73,29 @@ private const val SPONSOR_IMAGE_FILENAME_BASE = "ChaoxingSignFaker_sponsor"
 @Composable
 fun SponsorAlertDialog(showDialog: MutableState<Boolean>) {
     val context = LocalActivity.current!!.applicationContext
-    val sponsorList = listOf(
-        listOf("Xcellent","18.80"),
-        listOf("催什么崔", "8.88"),
-        listOf("不愿透露姓名的耿先生", "8.88"),
-        listOf("不愿透露姓名的景先生", "7.66"),
-        listOf("G*.", "6.66"),
-        listOf("R*e","6.66"),
-        listOf("不愿透露姓名的高先生", "6.66"),
-        listOf("云端哥特", "6.60"),
-        listOf("*.", "6.00"),
-        listOf("死后世界战线", "5.88"),
-        listOf("不愿透露姓名的张先生", "2.88"),
-    )
+    val sponsorList = remember { mutableStateListOf<List<String>>() }
+    LaunchedEffect(Unit) {
+        withContext(Dispatchers.IO){
+            ChaoxingHttpClient.instance?.okHttpClient?.newCall(
+                Request.Builder()
+                    .get()
+                    .url("http://cdn.aquamarine5.fun/chaoxingsignfaker_sponsor.json")
+                    .build()
+            )?.execute().use {
+                val json = JSONObject.parseObject(it?.body?.string())
+                val list = json.getJSONArray("sponsorList")
+                if (list.isNotEmpty()) {
+                    sponsorList.clear()
+                    for (i in 0 until list.size) {
+                        val item = list.getJSONArray(i)
+                        if (item.size == 2) {
+                            sponsorList.add(listOf(item.getString(0), item.getString(1)))
+                        }
+                    }
+                }
+            }
+        }
+    }
     val coroutineScope = rememberCoroutineScope()
     val permissionCheck =
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) rememberPermissionState(
@@ -221,7 +239,7 @@ fun SponsorAlertDialog(showDialog: MutableState<Boolean>) {
                 )
                 Spacer(modifier = Modifier.height(4.dp))
                 Text(buildAnnotatedString {
-                    sponsorList.forEach {
+                    sponsorList.forEachIndexed { index, it->
                         withStyle(SpanStyle(fontWeight = FontWeight.Bold)) {
                             append(it[0])
                         }
@@ -236,9 +254,11 @@ fun SponsorAlertDialog(showDialog: MutableState<Boolean>) {
                             append(it[1])
                         }
                         append(" 元")
+                        if(index!=sponsorList.size-1)
                         append("\n")
                     }
-                })
+                },modifier=Modifier.border(1.dp, MaterialTheme.colorScheme.primary,
+                    RoundedCornerShape(4.dp)).padding(8.dp))
             }
         })
     }
diff --git a/app/src/main/java/org/aquamarine5/brainspark/chaoxingsignfaker/screen/CourseListScreen.kt b/app/src/main/java/org/aquamarine5/brainspark/chaoxingsignfaker/screen/CourseListScreen.kt
