Minidodo/igncore
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

WS_Relay salt... cast to bytes.

Browse Source
This commit is contained in:
Minidodo
2021-09-06 22:13:52 +02:00
parent 496781fc0f
commit fc832399ac
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/standard/datanet/relay_controller.py
+3 -4
View File
@@ -74,7 +74,7 @@ class RelayController:
"Relay Messages", ) "Relay Messages", )
self.setting_service.register(self.module_name, "ws_relay_salt", "IGNCore", self.setting_service.register(self.module_name, "ws_relay_salt", "IGNCore",
TextSettingType(["IGNCore", "IgnCore"]), TextSettingType(["IGNCore", "IgnCore"]),
"Relay Messages", ) "Salt for relayed messages (used together with the encryption key)")
self.initialize_encrypter(self.setting_service.get("websocket_encryption_key").get_value()) self.initialize_encrypter(self.setting_service.get("websocket_encryption_key").get_value())
self.setting_service.register_change_listener("websocket_relay_enabled", self.websocket_relay_update) self.setting_service.register_change_listener("websocket_relay_enabled", self.websocket_relay_update)
@@ -82,12 +82,11 @@ class RelayController:
self.setting_service.register_change_listener("websocket_encryption_key", self.websocket_relay_update) self.setting_service.register_change_listener("websocket_encryption_key", self.websocket_relay_update)
def get_org_channel_prefix(self): def get_org_channel_prefix(self):
return self.setting_service.get_value( return self.setting_service.get_value("ws_relay_prefix") or self.public_channel_service.get_org_name() or self.bot.get_char_name()
"ws_relay_prefix") or self.public_channel_service.get_org_name() or self.bot.get_char_name()
def initialize_encrypter(self, password): def initialize_encrypter(self, password):
if password: if password:
salt = self.setting_service.get("ws_relay_salt").get_value() salt = bytes(self.setting_service.get("ws_relay_salt").get_value(), encoding="utf-8")
kdf = PBKDF2HMAC( kdf = PBKDF2HMAC(
algorithm=hashes.SHA256(), algorithm=hashes.SHA256(),
length=32, length=32,