Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Add validation for zero and invalid peer IDs in get_peer_type an… #96

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Add validation for zero and invalid peer IDs in get_peer_type an… #96

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 28 additions & 41 deletions pyrogram/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,76 +282,63 @@ def unpack_inline_message_id(inline_message_id: str) -> "raw.base.InputBotInline


def get_raw_peer_id(
peer: Union[
raw.base.Peer,
raw.base.RequestedPeer,
raw.base.InputPeer
]
) -> Optional[int]:
"""Get the raw peer id from a Peer object"""
if (
isinstance(peer, raw.types.PeerUser)
or isinstance(peer, raw.types.RequestedPeerUser)
or isinstance(peer, raw.types.InputPeerUser)
):
peer: Union[raw.base.Peer, raw.base.RequestedPeer, raw.base.InputPeer]
) -> Optional[int]:
"""Get the raw peer ID from a Peer object"""

if isinstance(peer, (raw.types.PeerUser, raw.types.RequestedPeerUser, raw.types.InputPeerUser)):
return peer.user_id

if (
isinstance(peer, raw.types.PeerChat)
or isinstance(peer, raw.types.RequestedPeerChat)
or isinstance(peer, raw.types.InputPeerChat)
):
elif isinstance(peer, (raw.types.PeerChat, raw.types.RequestedPeerChat, raw.types.InputPeerChat)):
return peer.chat_id

if (
isinstance(peer, raw.types.PeerChannel)
or isinstance(peer, raw.types.RequestedPeerChannel)
or isinstance(peer, raw.types.InputPeerChannel)
):
elif isinstance(peer, (raw.types.PeerChannel, raw.types.RequestedPeerChannel, raw.types.InputPeerChannel)):
return peer.channel_id

return None
return None # Return None explicitly when peer type does not match


def get_peer_id(peer: Union[raw.base.Peer, raw.base.InputPeer]) -> int:
"""Get the non-raw peer id from a Peer object"""
if (
isinstance(peer, raw.types.PeerUser)
or isinstance(peer, raw.types.InputPeerUser)
):
"""Get the non-raw peer ID from a Peer object"""

if isinstance(peer, (raw.types.PeerUser, raw.types.InputPeerUser)):
return peer.user_id

if (
isinstance(peer, raw.types.PeerChat)
or isinstance(peer, raw.types.InputPeerChat)
):
return -peer.chat_id
elif isinstance(peer, (raw.types.PeerChat, raw.types.InputPeerChat)):
return -peer.chat_id # Return negative chat_id for PeerChat

if (
isinstance(peer, raw.types.PeerChannel)
or isinstance(peer, raw.types.InputPeerChannel)
):
return MAX_CHANNEL_ID - peer.channel_id

raise ValueError(f"Peer type invalid: {peer}")
elif isinstance(peer, (raw.types.PeerChannel, raw.types.InputPeerChannel)):
return MAX_CHANNEL_ID - peer.channel_id # Return ID based on MAX_CHANNEL_ID for PeerChannel

# Raise an error if an unknown peer type is encountered
raise ValueError(f"Invalid Peer type: {type(peer).__name__}")


def get_peer_type(peer_id: int) -> str:
"""Determine the type of peer from the peer_id."""
if peer_id == 0:
raise ValueError("Peer id cannot be zero")

if peer_id < 0:
if MIN_CHAT_ID <= peer_id:
return "chat"

if MIN_CHANNEL_ID <= peer_id < MAX_CHANNEL_ID:
return "channel"

elif 0 < peer_id <= MAX_USER_ID:
return "user"

raise ValueError(f"Peer id invalid: {peer_id}")


def get_channel_id(peer_id: int) -> int:
return MAX_CHANNEL_ID - peer_id
"""Convert peer_id to a channel id."""
# Check if it's a valid channel peer ID before conversion
if not (MIN_CHANNEL_ID <= peer_id < MAX_CHANNEL_ID):
raise ValueError(f"Invalid channel peer id: {peer_id}")

return MAX_CHANNEL_ID - peer_id

def btoi(b: bytes) -> int:
return int.from_bytes(b, "big")
Expand Down
Loading