对上报的 snapshot 中的本地地址在生成规则时进行过滤

PBH-BTN · Oct 6, 2024 · d151363 · d151363
1 parent 44cc2b3
commit d151363
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/main/java/com/ghostchu/btn/sparkle/module/analyse/AnalyseService.java b/src/main/java/com/ghostchu/btn/sparkle/module/analyse/AnalyseService.java
@@ -6,6 +6,7 @@
 import com.ghostchu.btn.sparkle.util.IPMerger;
 import com.ghostchu.btn.sparkle.util.IPUtil;
 import com.ghostchu.btn.sparkle.util.MsgUtil;
+import inet.ipaddr.IPAddressString;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.LockModeType;
 import jakarta.persistence.PersistenceContext;
@@ -127,12 +128,19 @@ AggregatedUploads AS (
         var ips = ipMerger.merge(queryResult.stream().map(arr -> IPUtil.toString(((InetAddress) arr[1]))).collect(Collectors.toList()));
         List<AnalysedRule> rules = new ArrayList<>();
         for (String ip : ips) {
-            rules.add(new AnalysedRule(
-                    null,
-                    ip,
-                    OVER_DOWNLOAD,
-                    "Generated at " + MsgUtil.getNowDateTimeString()
-            ));
+            try {
+                if (new IPAddressString(ip).getAddress().isLocal()) {
+                    continue;
+                }
+                rules.add(new AnalysedRule(
+                        null,
+                        ip,
+                        OVER_DOWNLOAD,
+                        "Generated at " + MsgUtil.getNowDateTimeString()
+                ));
+            } catch (Exception ignored) {
+
+            }
         }
         analysedRuleRepository.deleteAllByModule(OVER_DOWNLOAD);
         analysedRuleRepository.saveAll(rules);

diff --git a/src/main/java/com/ghostchu/btn/sparkle/module/tracker/TrackerController.java b/src/main/java/com/ghostchu/btn/sparkle/module/tracker/TrackerController.java
@@ -53,7 +53,6 @@ public byte[] announce() {
         Validate.isTrue(infoHash.length == 20);
         Validate.notBlank(req.getParameter("peer_id"));
         byte[] peerId = req.getParameter("peer_id").getBytes(StandardCharsets.ISO_8859_1);
-        String peerIp = Optional.ofNullable(req.getParameter("ip")).orElse(ip(req));
         Validate.isTrue(StringUtils.isNumeric(req.getParameter("port")));
         int port = Integer.parseInt(req.getParameter("port"));
         Validate.isTrue(StringUtils.isNumeric(req.getParameter("uploaded")));