thomas/monutil
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

Added some RabbitMQ amendments.

Browse source
This commit is contained in:
Thomas Williams 2024-08-19 18:08:36 +01:00
parent 20a2a2be26
commit 46d895d900
Signed by: thomas
GPG key ID: EB8F975CF60BCBFF
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rabbitmq.py
View file

@ -88,6 +88,12 @@ class rabbitMQClient:
manager.insertURLLog(result[0], result[1], result[2], result[4], result[5]) manager.insertURLLog(result[0], result[1], result[2], result[4], result[5])
ch.basic_ack(delivery_tag=method.delivery_tag) ch.basic_ack(delivery_tag=method.delivery_tag)
if result[3] == 'ipBlock':
result[2] = datetime.datetime.fromisoformat(result[2])
manager = logsManager(config.sqlServer, config.sqlDatabase, config.sqlUsername, config.sqlPassword)
manager.insertIPBlock(result[0], result[1], result[4], result[5], result[6], result[2], config.ipinfoAPIToken)
context = ssl.create_default_context( context = ssl.create_default_context(
cafile=self.ca) cafile=self.ca)
context.verify_mode = ssl.CERT_REQUIRED context.verify_mode = ssl.CERT_REQUIRED

8
reportIPBlock.py
View file

@ -10,7 +10,6 @@ def main():
print("Usage: python script.py <blockedIPAddress> <jail> <live>") print("Usage: python script.py <blockedIPAddress> <jail> <live>")
sys.exit(1) sys.exit(1)
manager = logsManager(config.sqlServer, config.sqlDatabase, config.sqlUsername, config.sqlPassword)
hostname = socket.gethostname() hostname = socket.gethostname()
ipAddress = socket.gethostbyname(hostname) ipAddress = socket.gethostbyname(hostname)
blockedIPAddress = sys.argv[1] blockedIPAddress = sys.argv[1]
@ -21,7 +20,14 @@ def main():
print(hostname, ipAddress, blockedIPAddress, jail, live, logTime, token) print(hostname, ipAddress, blockedIPAddress, jail, live, logTime, token)
if not config.loggingMode == 'none' and not config.loggingMode == 'rabbitmq':
manager = logsManager(config.sqlServer, config.sqlDatabase, config.sqlUsername, config.sqlPassword)
manager.insertIPBlock(hostname, ipAddress, blockedIPAddress, jail, live, logTime, token) manager.insertIPBlock(hostname, ipAddress, blockedIPAddress, jail, live, logTime, token)
if config.loggingMode == 'rabbitmq':
rabbitmq.publish(hostname + '|' + socket.gethostbyname(socket.gethostname()) + '|' + str(logTime) + '|' + 'ipBlock' + '|' + str(blockedIPAddress) + '|' + str(jail) + '|' str(live)
if __name__ == "__main__": if __name__ == "__main__":
main() main()