From 265705e3917837e957f64bd424efc119146e22b7 Mon Sep 17 00:00:00 2001 From: BarsTiger Date: Mon, 24 Jul 2023 23:31:29 +0300 Subject: [PATCH] Password in WebConnectionMessage, avatar in WebMessageMessage --- dragonion_core/proto/web/webmessage/connection.py | 1 + dragonion_core/proto/web/webmessage/message.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/dragonion_core/proto/web/webmessage/connection.py b/dragonion_core/proto/web/webmessage/connection.py index 6cadb8c..6f02d22 100644 --- a/dragonion_core/proto/web/webmessage/connection.py +++ b/dragonion_core/proto/web/webmessage/connection.py @@ -14,6 +14,7 @@ class WebConnectionMessage: """ username: str public_key: bytes + password: str type: Final = "connect" diff --git a/dragonion_core/proto/web/webmessage/message.py b/dragonion_core/proto/web/webmessage/message.py index 43707b2..b17b024 100644 --- a/dragonion_core/proto/web/webmessage/message.py +++ b/dragonion_core/proto/web/webmessage/message.py @@ -19,6 +19,7 @@ class WebMessageMessage: :param message: Encrypted b64-encoded message """ username: str + avatar: str message: bytes type: Final = "message" @@ -47,6 +48,7 @@ class WebBroadcastableBuilder: :param keys: Dict with public keys in format username:public_key """ from_user: str + avatar: str message_content: str keys: dict[str, bytes] @@ -60,6 +62,7 @@ class WebBroadcastableBuilder: self.broadcastable.messages[username] = WebMessageMessage( username=self.from_user, + avatar=self.avatar, message=base64.urlsafe_b64encode(public_key.encrypt( self.message_content.encode(), padding=padding.OAEP(