refactor: 优化ip白名单

2026-03-13 09:20:23 +00:00 · 2026-02-26 16:52:10 +08:00
parent 29c88d6c80
commit 404d5299d0
15 changed files with 8 additions and 35 deletions
--- a/ani-rss-application/src/main/java/ani/rss/auth/fun/IpWhitelist.java
+++ b/ani-rss-application/src/main/java/ani/rss/auth/fun/IpWhitelist.java
@@ -1,6 +1,5 @@
 package ani.rss.auth.fun;

-import ani.rss.commons.CacheUtils;
 import ani.rss.entity.Config;
 import ani.rss.util.basic.CidrRangeChecker;
 import ani.rss.util.other.AuthUtil;
@@ -8,13 +7,10 @@ import ani.rss.util.other.ConfigUtil;
 import cn.hutool.core.lang.PatternPool;
 import cn.hutool.core.net.Ipv4Util;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.crypto.SecureUtil;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;

 import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Function;

@Slf4j
@@ -34,41 +30,33 @@ public class IpWhitelist implements Function<HttpServletRequest, Boolean> {
        if (StrUtil.isBlank(ip)) {
            return false;
        }
-        String key = "IpWhitelist:" + SecureUtil.md5(ipWhitelistStr) + ":" + ip;
        try {
            if (!PatternPool.IPV4.matcher(ip).matches() && !PatternPool.IPV6.matcher(ip).matches()) {
                return false;
            }
-            Boolean b = CacheUtils.get(key);
-            if (Objects.nonNull(b)) {
-                return b;
-            }
            List<String> list = StrUtil.split(ipWhitelistStr, "\n", true, true);
            for (String string : list) {
-                // 判断是否为 ipv4 或 ipv6
-                if (PatternPool.IPV4.matcher(string).matches() || PatternPool.IPV6.matcher(string).matches()) {
-                    if (string.equals(ip)) {
-                        CacheUtils.put(key, Boolean.TRUE, TimeUnit.MINUTES.toMillis(10));
-                        return true;
-                    }
+                if (string.equals(ip)) {
+                    return true;
+                }
+                // 非ipv4
+                if (!PatternPool.IPV4.matcher(string).matches()) {
+                    continue;
                }
                // 通配符，如 192.168.*.1
                if (string.contains("*")) {
                    if (Ipv4Util.matches(string, ip)) {
-                        CacheUtils.put(key, Boolean.TRUE, TimeUnit.MINUTES.toMillis(10));
                        return true;
                    }
                }
                // X.X.X.X/X
                if (CidrRangeChecker.CIDR_PATTERN.matcher(string).matches()) {
                    if (CidrRangeChecker.isIpInRange(ip, string)) {
-                        CacheUtils.put(key, Boolean.TRUE, TimeUnit.MINUTES.toMillis(10));
                        return true;
                    }
                }
                // X.X.X.X-X.X.X.X
                if (isIpInRange(ip, string)) {
-                    CacheUtils.put(key, Boolean.TRUE, TimeUnit.MINUTES.toMillis(10));
                    return true;
                }
            }
@@ -76,7 +64,6 @@ public class IpWhitelist implements Function<HttpServletRequest, Boolean> {
            log.error("ip白名单存在问题");
            log.error(e.getMessage(), e);
        }
-        CacheUtils.put(key, Boolean.FALSE, TimeUnit.MINUTES.toMillis(10));
        return false;
    }

--- a/ani-rss-application/src/main/java/ani/rss/config/SwaggerConfig.java
+++ b/ani-rss-application/src/main/java/ani/rss/config/SwaggerConfig.java
@@ -4,11 +4,9 @@ import ani.rss.commons.MavenUtils;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.ExternalDocumentation;
 import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.headers.Header;
 import io.swagger.v3.oas.models.info.Contact;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.info.License;
-import io.swagger.v3.oas.models.security.OAuthFlows;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
 import org.springframework.context.annotation.Bean;
--- a/ani-rss-ui/src/config/About.vue
+++ b/ani-rss-ui/src/config/About.vue
@@ -99,7 +99,6 @@

 <script setup>
 import {onMounted, ref} from "vue";
-import api from "@/js/api.js";
 import {ElMessage, ElText} from "element-plus";
 import Popconfirm from "@/other/Popconfirm.vue";
 import {Book, Github, Telegram} from "@vicons/fa";
--- a/ani-rss-ui/src/config/Exclude.vue
+++ b/ani-rss-ui/src/config/Exclude.vue
@@ -76,7 +76,6 @@

 <script setup>
 import {ref} from "vue";
-import api from "@/js/api.js";
 import {ElMessage} from "element-plus";
 import {config} from "@/js/http.js";

--- a/ani-rss-ui/src/config/PrioKeys.vue
+++ b/ani-rss-ui/src/config/PrioKeys.vue
@@ -47,7 +47,6 @@

 <script setup>
 import {ref} from "vue";
-import api from "@/js/api.js";
 import {ElMessage} from "element-plus";
 import {Download} from '@element-plus/icons-vue'
 import {config} from "@/js/http.js";
--- a/ani-rss-ui/src/config/basic/BangumiMe.vue
+++ b/ani-rss-ui/src/config/basic/BangumiMe.vue
@@ -65,7 +65,6 @@
 <script setup>

 import {ref} from "vue";
-import api from "@/js/api.js";
 import * as http from "@/js/http.js";

 let me = ref({
--- a/ani-rss-ui/src/config/notification/TelegramNotification.vue
+++ b/ani-rss-ui/src/config/notification/TelegramNotification.vue
@@ -58,7 +58,6 @@

 <script setup>
 import {ElMessage} from "element-plus";
-import api from "@/js/api.js";
 import {ref} from "vue";
 import * as http from "@/js/http.js";

--- a/ani-rss-ui/src/home/Add.vue
+++ b/ani-rss-ui/src/home/Add.vue
@@ -100,7 +100,7 @@ import Mikan from "./Mikan.vue";
 import Ani from "./Ani.vue";
 import Bgm from "./Bgm.vue";
 import {aniData} from "@/js/ani.js";
-import * as http  from "@/js/http.js";
+import * as http from "@/js/http.js";

 const showRss = ref(true)
 const mikan = ref()
--- a/ani-rss-ui/src/home/App.vue
+++ b/ani-rss-ui/src/home/App.vue
@@ -137,7 +137,6 @@ import Config from "./Config.vue";
 import List from "./List.vue";
 import Add from "./Add.vue";
 import Logs from "./Logs.vue";
-import api from "@/js/api.js";
 import {ElMessage} from "element-plus";
 import Popconfirm from "@/other/Popconfirm.vue";
 import Manage from "./Manage.vue";
--- a/ani-rss-ui/src/home/Bgm.vue
+++ b/ani-rss-ui/src/home/Bgm.vue
@@ -37,7 +37,6 @@
 </template>
 <script setup>
 import {ref} from "vue";
-import api from "@/js/api.js";
 import {authorization} from "@/js/global.js";
 import * as http from "@/js/http.js";

--- a/ani-rss-ui/src/home/Collection.vue
+++ b/ani-rss-ui/src/home/Collection.vue
@@ -184,7 +184,6 @@ import {ref} from "vue";
 import {UploadFilled} from "@element-plus/icons-vue";
 import {ElMessage, ElMessageBox} from "element-plus";
 import Bgm from "./Bgm.vue";
-import api from "@/js/api.js";
 import Exclude from "@/config/Exclude.vue";
 import CollectionPreview from "./CollectionPreview.vue";
 import CustomTags from "@/config/CustomTags.vue";
--- a/ani-rss-ui/src/home/Config.vue
+++ b/ani-rss-ui/src/home/Config.vue
@@ -52,7 +52,6 @@
 import {ref} from "vue";
 import {ElMessage} from "element-plus";
 import CryptoJS from "crypto-js";
-import api from "@/js/api.js";
 import Exclude from "@/config/Exclude.vue";
 import Notification from "@/config/Notification.vue";
 import Proxy from "@/config/Proxy.vue";
--- a/ani-rss-ui/src/home/Cover.vue
+++ b/ani-rss-ui/src/home/Cover.vue
@@ -57,7 +57,6 @@
 </template>
 <script setup>
 import {ref} from "vue";
-import api from "@/js/api.js";
 import {ElMessage} from "element-plus";
 import {UploadFilled} from "@element-plus/icons-vue";
 import {authorization} from "@/js/global.js";
@@ -91,7 +90,7 @@ let show = (newAni) => {
 let okLoading = ref(false)
 let ok = () => {
  okLoading.value = true
-  http.setAni(false,ani.value)
+  http.setAni(false, ani.value)
      .then(res => {
        ElMessage.success(res.message)
        window.$reLoadList()
--- a/ani-rss-ui/src/home/StandbyRss.vue
+++ b/ani-rss-ui/src/home/StandbyRss.vue
@@ -86,7 +86,6 @@
 <script setup>
 import {ref} from "vue";
 import Mikan from "./Mikan.vue";
-import api from "@/js/api.js";

 const editIndex = ref(-1)

--- a/ani-rss-ui/src/home/TorrentsInfos.vue
+++ b/ani-rss-ui/src/home/TorrentsInfos.vue
@@ -38,7 +38,6 @@

 <script setup>
 import {ref} from "vue";
-import api from "@/js/api.js";
 import * as http from "@/js/http.js";

 // 记录排序方式