mirror of
https://github.com/aiogram/aiogram.git
synced 2026-04-08 16:37:47 +00:00
Some checks failed
Tests / tests (macos-latest, 3.10) (push) Has been cancelled
Tests / tests (macos-latest, 3.11) (push) Has been cancelled
Tests / tests (macos-latest, 3.12) (push) Has been cancelled
Tests / tests (macos-latest, 3.13) (push) Has been cancelled
Tests / tests (ubuntu-latest, 3.10) (push) Has been cancelled
Tests / tests (ubuntu-latest, 3.11) (push) Has been cancelled
Tests / tests (ubuntu-latest, 3.12) (push) Has been cancelled
Tests / tests (ubuntu-latest, 3.13) (push) Has been cancelled
Tests / tests (windows-latest, 3.10) (push) Has been cancelled
Tests / tests (windows-latest, 3.11) (push) Has been cancelled
Tests / tests (windows-latest, 3.12) (push) Has been cancelled
Tests / tests (windows-latest, 3.13) (push) Has been cancelled
Tests / pypy-tests (macos-latest, pypy3.10) (push) Has been cancelled
Tests / pypy-tests (macos-latest, pypy3.11) (push) Has been cancelled
Tests / pypy-tests (ubuntu-latest, pypy3.10) (push) Has been cancelled
Tests / pypy-tests (ubuntu-latest, pypy3.11) (push) Has been cancelled
* Drop py3.9 and pypy3.9 Add pypy3.11 (testing) into `tests.yml` Remove py3.9 from matrix in `tests.yml` Refactor not auto-gen code to be compatible with py3.10+, droping ugly 3.9 annotation. Replace some `from typing` imports to `from collections.abc`, due to deprecation Add `from __future__ import annotations` and `if TYPE_CHECKING:` where possible Add some `noqa` to calm down Ruff in some places, if Ruff will be used as default linting+formatting tool in future Replace some relative imports to absolute Sort `__all__` tuples in `__init__.py` and some other `.py` files Sort `__slots__` tuples in classes Split raises into `msg` and `raise` (`EM101`, `EM102`) to not duplicate error message in the traceback Add `Self` from `typing_extenstion` where possible Resolve typing problem in `aiogram/filters/command.py:18` Concatenate nested `if` statements Convert `HandlerContainer` into a dataclass in `aiogram/fsm/scene.py` Bump tests docker-compose.yml `redis:6-alpine` -> `redis:8-alpine` Bump tests docker-compose.yml `mongo:7.0.6` -> `mongo:8.0.14` Bump pre-commit-config `black==24.4.2` -> `black==25.9.0` Bump pre-commit-config `ruff==0.5.1` -> `ruff==0.13.3` Update Makefile lint for ruff to show fixes Add `make outdated` into Makefile Use `pathlib` instead of `os.path` Bump `redis[hiredis]>=5.0.1,<5.3.0` -> `redis[hiredis]>=6.2.0,<7` Bump `cryptography>=43.0.0` -> `cryptography>=46.0.0` due to security reasons Bump `pytz~=2023.3` -> `pytz~=2025.2` Bump `pycryptodomex~=3.19.0` -> `pycryptodomex~=3.23.0` due to security reasons Bump linting and formatting tools * Add `1726.removal.rst` * Update aiogram/utils/dataclass.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update aiogram/filters/callback_data.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update 1726.removal.rst * Remove `outdated` from Makefile * Add `__slots__` to `HandlerContainer` * Remove unused imports * Add `@dataclass` with `slots=True` to `HandlerContainer` --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
42 lines
1.3 KiB
Python
42 lines
1.3 KiB
Python
from collections.abc import Sequence
|
|
from ipaddress import IPv4Address, IPv4Network
|
|
|
|
DEFAULT_TELEGRAM_NETWORKS = [
|
|
IPv4Network("149.154.160.0/20"),
|
|
IPv4Network("91.108.4.0/22"),
|
|
]
|
|
|
|
|
|
class IPFilter:
|
|
def __init__(self, ips: Sequence[str | IPv4Network | IPv4Address] | None = None):
|
|
self._allowed_ips: set[IPv4Address] = set()
|
|
|
|
if ips:
|
|
self.allow(*ips)
|
|
|
|
def allow(self, *ips: str | IPv4Network | IPv4Address) -> None:
|
|
for ip in ips:
|
|
self.allow_ip(ip)
|
|
|
|
def allow_ip(self, ip: str | IPv4Network | IPv4Address) -> None:
|
|
if isinstance(ip, str):
|
|
ip = IPv4Network(ip) if "/" in ip else IPv4Address(ip)
|
|
if isinstance(ip, IPv4Address):
|
|
self._allowed_ips.add(ip)
|
|
elif isinstance(ip, IPv4Network):
|
|
self._allowed_ips.update(ip.hosts())
|
|
else:
|
|
msg = f"Invalid type of ipaddress: {type(ip)} ('{ip}')"
|
|
raise ValueError(msg)
|
|
|
|
@classmethod
|
|
def default(cls) -> "IPFilter":
|
|
return cls(DEFAULT_TELEGRAM_NETWORKS)
|
|
|
|
def check(self, ip: str | IPv4Address) -> bool:
|
|
if not isinstance(ip, IPv4Address):
|
|
ip = IPv4Address(ip)
|
|
return ip in self._allowed_ips
|
|
|
|
def __contains__(self, item: str | IPv4Address) -> bool:
|
|
return self.check(item)
|