fix: honor RSSHub access control for rule updates (#1180)

Author: luckycold

package.json

@@ -28,13 +28,13 @@
     "@radix-ui/react-slot": "^1.1.2",
     "@radix-ui/react-switch": "^1.1.3",
     "async-lock": "^1.4.1",
+    "blueimp-md5": "^2.19.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "foxact": "^0.2.44",
     "he": "1.2.0",
     "lodash": "^4.17.21",
     "lucide-react": "^0.475.0",
-    "md5.js": "^1.3.5",
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-hot-toast": "^2.5.1",

pnpm-lock.yaml

@@ -0,0 +1,3 @@
+declare module "blueimp-md5" {
+  export default function md5(value: string): string
+}

src/blueimp-md5.d.ts

@@ -1,5 +1,5 @@
+import md5 from "blueimp-md5"
 import _ from "lodash"
-import MD5 from "md5.js"
 
 import { getConfig } from "./config"
 import { defaultRules } from "./radar-rules"
@@ -47,12 +47,14 @@ export async function getRemoteRules() {
   const config = await getConfig()
   let url = getRadarRulesUrl(config.rsshubDomain)
 
-  if (config.rsshubAccessControl.accessKey) {
-    const path = new URL(url).pathname
-    const code = new MD5()
-      .update(path + config.rsshubAccessControl.accessKey)
-      .digest("hex")
-    url = `${url}?code=${code}`
+  if (config.rsshubAccessControl.accessKey?.trim()) {
+    const accessKey = config.rsshubAccessControl.accessKey.trim()
+
+    if (config.rsshubAccessControl.accessKeyType === "key") {
+      url = `${url}?key=${encodeURIComponent(accessKey)}`
+    } else {
+      url = `${url}?code=${md5(new URL(url).pathname + accessKey)}`
+    }
   }
 
   const res = await fetch(url)

src/lib/rules.ts

@@ -44,5 +44,5 @@ export async function fetchRSSContent(url: string) {
 }
 
 export function getRadarRulesUrl(rsshubDomain: string) {
-  return `${rsshubDomain}/api/radar/rules`
+  return `${rsshubDomain.replace(/\/+$/, "")}/api/radar/rules`
 }

src/lib/utils.ts

@@ -1,4 +1,4 @@
-import MD5 from "md5.js"
+import md5 from "blueimp-md5"
 import { useEffect, useState } from "react"
 import { useCopyToClipboard } from "usehooks-ts"
 
@@ -43,10 +43,10 @@ function RSSItem({
     if (config.rsshubAccessControl.accessKeyType === "key") {
       urlObj.searchParams.append("key", config.rsshubAccessControl.accessKey)
     } else {
-      const md5 = new MD5()
-        .update(urlObj.pathname + config.rsshubAccessControl.accessKey)
-        .digest("hex")
-      urlObj.searchParams.append("code", md5)
+      urlObj.searchParams.append(
+        "code",
+        md5(urlObj.pathname + config.rsshubAccessControl.accessKey),
+      )
     }
 
     url = urlObj.toString()