PBH-BTN / PeerBanHelper

自动封禁不受欢迎、吸血和异常的 BT 客户端,并支持自定义规则。PeerId黑名单/UserAgent黑名单/IP CIDR/假进度/超量下载/进度回退/多播追猎/连锁封禁/伪装检测 支持 qBittorrent/Transmission/Deluge/BiglyBT
GNU General Public License v3.0
550 stars 16 forks source link

添加远程黑名单订阅规则模块 #109

Closed PluieM closed 1 month ago

PluieM commented 1 month ago

可以用于订阅 BTN-Collected-Rules 提供的ip黑名单

Summary by CodeRabbit

coderabbitai[bot] commented 1 month ago

Walkthrough

The recent changes introduce a new IPBlackRuleList module in the PeerBanHelperServer, enabling dynamic peer banning based on IP blacklist subscriptions. These updates enhance the server's functionality by incorporating advanced IP management features.

Changes

File Path Change Summary
setup-webui.sh Updated directory change command to use single quotes for paths with spaces.
.../com/ghostchu/peerbanhelper/PeerBanHelperServer.java Added IPBlackRuleList module registration.
.../module/impl/rule/IPBlackRuleList.java Introduced IP blacklist management module with various supporting methods.
.../text/Lang.java Added a constant string for IP rule matches.
src/main/resources/profile.yml Included IP address blocking rules in the configuration file.
pom.xml Added dependencies for hutool-bloomFilter and hutool-crypto with hutool.version.

Poem

🐇💻 In the realm of code, where algorithms play, A new rule emerges to guide the way. IP addresses locked in a digital dance, PeerBanHelper evolves, taking a chance. Let's toast to this tech tale, a symphony in code, Where the CodeRabbit hops, in the binary abode.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share - [X](https://twitter.com/intent/tweet?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A&url=https%3A//coderabbit.ai) - [Mastodon](https://mastodon.social/share?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A%20https%3A%2F%2Fcoderabbit.ai) - [Reddit](https://www.reddit.com/submit?title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&text=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code.%20Check%20it%20out%3A%20https%3A//coderabbit.ai) - [LinkedIn](https://www.linkedin.com/sharing/share-offsite/?url=https%3A%2F%2Fcoderabbit.ai&mini=true&title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&summary=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code)
Tips ### Chat There are 3 ways to chat with [CodeRabbit](https://coderabbit.ai): - Review comments: Directly reply to a review comment made by CodeRabbit. Example: - `I pushed a fix in commit .` - `Generate unit testing code for this file.` - `Open a follow-up GitHub issue for this discussion.` - Files and specific lines of code (under the "Files changed" tab): Tag `@coderabbitai` in a new review comment at the desired location with your query. Examples: - `@coderabbitai generate unit testing code for this file.` - `@coderabbitai modularize this function.` - PR comments: Tag `@coderabbitai` in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples: - `@coderabbitai generate interesting stats about this repository and render them as a table.` - `@coderabbitai show all the console.log statements in this repository.` - `@coderabbitai read src/utils.ts and generate unit testing code.` - `@coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.` Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. ### CodeRabbit Commands (invoked as PR comments) - `@coderabbitai pause` to pause the reviews on a PR. - `@coderabbitai resume` to resume the paused reviews. - `@coderabbitai review` to trigger a review. This is useful when automatic reviews are disabled for the repository. - `@coderabbitai resolve` resolve all the CodeRabbit review comments. - `@coderabbitai help` to get help. Additionally, you can add `@coderabbitai ignore` anywhere in the PR description to prevent this PR from being reviewed. ### CodeRabbit Configration File (`.coderabbit.yaml`) - You can programmatically configure CodeRabbit by adding a `.coderabbit.yaml` file to the root of your repository. - Please see the [configuration documentation](https://docs.coderabbit.ai/guides/configure-coderabbit) for more information. - If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: `# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json` ### Documentation and Community - Visit our [Documentation](https://coderabbit.ai/docs) for detailed information on how to use CodeRabbit. - Join our [Discord Community](https://discord.com/invite/GsXnASn26c) to get help, request features, and share feedback. - Follow us on [X/Twitter](https://twitter.com/coderabbitai) for updates and announcements.
Ghost-chu commented 1 month ago

好不容易把IP从PBH里面整理出来,你怎么又给塞回去了🌚

目前规则性能还有点感人,缓存设计也不到位,大量规则会导致PBH性能明显下降,这个PR晚一些等性能重构好了再开会比较好。

同时也缺少规则缓存和规则定时更新。

PluieM commented 1 month ago

有现成的规则订阅不用我难受啊🤣 做了一些调整,用bloom过滤器改善了一下匹配ip时的性能,订阅规则的本地缓存和定时更新加上了

Ghost-chu commented 1 month ago

LGTM

Ghost-chu commented 1 month ago

突然意识到Bloom匹配的时候是不是不兼容CIDR

PluieM commented 1 month ago

突然意识到Bloom匹配的时候是不是不兼容CIDR

是的,只能精确匹配具体的ip,CIDR只能先转成对应的ip列表才能走bloom过滤,这个逻辑稍后补上

Ghost-chu commented 1 month ago

突然意识到Bloom匹配的时候是不是不兼容CIDR

是的,只能精确匹配具体的ip,CIDR只能先转成对应的ip列表才能走bloom过滤,这个逻辑稍后补上

CIDR单独拉出来匹配吧,碰到大范围的IPV6 CIDR,转成IP列表是内存噩梦

PluieM commented 1 month ago

突然意识到Bloom匹配的时候是不是不兼容CIDR

是的,只能精确匹配具体的ip,CIDR只能先转成对应的ip列表才能走bloom过滤,这个逻辑稍后补上

CIDR单独拉出来匹配吧,碰到大范围的IPV6 CIDR,转成IP列表是内存噩梦

确实,不过每次bloom过滤查不到都得走CIDR再查一遍,如果CIDR匹配项太多效率肯定有影响,初步考虑ipv4的CIDR地址如果前缀大于20则转为精确ip处理。ipv6的话运营商通常给下发的是/64的,还是老老实实走CIDR匹配,没啥好的思路