Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

add option to encrypt channel_log log files line-by-line

Browse source
This commit is contained in:
jesopo 2020-02-20 14:56:04 +00:00
parent 3ccb594e10
commit 0667ac8c5f
3 changed files with 39 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/bot.conf.example
View file

@ -33,6 +33,9 @@ module-whitelist =
# path to an external directory for modules to be found in # path to an external directory for modules to be found in
external-modules = external-modules =
# optional PEM public key used to encrypt channel_log log lines
log-key =
# https://openweathermap.org/api # https://openweathermap.org/api
openweathermap-api-key = openweathermap-api-key =

14
modules/channel_log.py
View file

@ -26,10 +26,16 @@ class Module(ModuleManager.BaseModule):
return self.data_directory("%s/%s.log" % (server_name, sanitised_name)) return self.data_directory("%s/%s.log" % (server_name, sanitised_name))
def _log(self, server, channel, line): def _log(self, server, channel, line):
if self._enabled(server, channel): if self._enabled(server, channel):
with open(self._file(str(server), str(channel)), "a") as log: timestamp = utils.datetime.format.datetime_human(
timestamp = utils.datetime.format.datetime_human( datetime.datetime.now())
datetime.datetime.now()) log_line = "%s %s" % (timestamp, line)
log.write("%s %s\n" % (timestamp, line))
if "log-key" in self.bot.config:
log_line = "\x02%s" % utils.security.a_encrypt(
self.bot.config["log-key"], log_line)
with open(self._file(str(server), str(channel)), "a") as log_file:
log_file.write("%s\n" % log_line)
@utils.hook("formatted.message.channel") @utils.hook("formatted.message.channel")
@utils.hook("formatted.notice.channel") @utils.hook("formatted.notice.channel")

27
src/utils/security.py
View file

@ -1,4 +1,4 @@
import hmac, socket, ssl, typing import base64, hmac, socket, ssl, typing
def ssl_context(cert: str=None, key: str=None, verify: bool=True def ssl_context(cert: str=None, key: str=None, verify: bool=True
) -> ssl.SSLContext: ) -> ssl.SSLContext:
@ -24,3 +24,28 @@ def ssl_wrap(sock: socket.socket, cert: str=None, key: str=None,
def constant_time_compare(a: typing.AnyStr, b: typing.AnyStr) -> bool: def constant_time_compare(a: typing.AnyStr, b: typing.AnyStr) -> bool:
return hmac.compare_digest(a, b) return hmac.compare_digest(a, b)
from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives import serialization
from cryptography.hazmat.primitives import hashes
from cryptography.hazmat.primitives.asymmetric import padding
def a_encrypt(key_filename: str, data: str):
with open(key_filename, "rb") as key_file:
key_content = key_file.read()
key = serialization.load_pem_public_key(
key_content, backend=default_backend())
out = key.encrypt(data.encode("utf8"), padding.OAEP(
mgf=padding.MGF1(algorithm=hashes.SHA256()),
algorithm=hashes.SHA256(), label=None))
return base64.b64encode(out).decode("iso-8859-1")
def a_decrypt(key_filename: str, data: str):
with open(key_filename, "rb") as key_file:
key_content = key_file.read()
key = serialization.load_pem_private_key(
key_content, password=None, backend=default_backend())
out = key.decrypt(base64.b64decode(data), padding.OAEP(
mgf=padding.MGF1(algorithm=hashes.SHA256()),
algorithm=hashes.SHA256(), label=None))
return out.decode("utf8")