Leahnaya/DeathGarden_API_Rebirth
0
0
Fork 0
mirror of https://github.com/wolfswolke/DeathGarden_API_Rebirth.git synced 2026-03-21 17:54:09 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added local_ip to not be logged

Browse Source
This commit is contained in:
ZKWolf 2024-04-25 03:34:11 +02:00
parent 126884155c
commit e7402c011f
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/example_config.yaml
View File

@ -1,3 +1,5 @@
general:
local_ip: 000.000.000.000
graylog:
host: host
use: false

1
src/flask_definitions.py
View File

@ -28,3 +28,4 @@ url_list = config['webhooks']['discord']['url_list']
use_discord = config['webhooks']['discord']['use_discord']
moderation_urls = config['webhooks']['discord']['moderation_urls']
dev_env = os.environ['DEV']
local_ip = config['general']['local_ip']

14
src/logic/global_handlers.py
View File

@ -78,7 +78,7 @@ def _get_remote_ip(check_type="strict"):
if check_type == "strict":
if request.environ.get('HTTP_CF_CONNECTING_IP'):
ip_addr = request.environ['HTTP_CF_CONNECTING_IP']
if ip_addr == "192.168.1.111" or ip_addr == "192.168.1.130":
if ip_addr == "192.168.1.111" or ip_addr == "192.168.1.130" or ip_addr == local_ip:
return None
logger.graylog_logger(level="info", handler="ip_handler", message=f"New Connection from: {ip_addr}")
bogon_check = check_bogon_ip(ip_addr)
@ -88,7 +88,7 @@ def _get_remote_ip(check_type="strict"):
return ip_addr
elif request.environ.get('HTTP_X_FORWARDED_FOR'):
ip_addr = request.environ['HTTP_X_FORWARDED_FOR']
if ip_addr == "127.0.0.1":
if ip_addr == "127.0.0.1" or ip_addr == local_ip:
return None
else:
bogon_check = check_bogon_ip(ip_addr)
@ -99,7 +99,7 @@ def _get_remote_ip(check_type="strict"):
return ip_addr
else:
ip_addr = request.remote_addr
if ip_addr == "127.0.0.1":
if ip_addr == "127.0.0.1" or ip_addr == local_ip:
return None
else:
bogon_check = check_bogon_ip(ip_addr)
@ -109,7 +109,7 @@ def _get_remote_ip(check_type="strict"):
logger.graylog_logger(level="info", handler="ip_handler", message=f"New Connection from: {ip_addr}")
return ip_addr
else:
return "127.0.0.1"
return "ip_not_checked"
def check_for_game_client(check_type="strict"):
@ -151,7 +151,7 @@ class Session_Manager:
self.sessions = {}
self.session_file = "sessions.json"
# Relative Path /app/tmp/sessions.json
self.session_file_path = f"app/tmp/{self.session_file}"
self.session_file_path = f"/app/tmp/{self.session_file}"
def setup(self):
print("Setting up Session Manager")
@ -160,10 +160,12 @@ class Session_Manager:
print("Session File not found, creating new one.")
with open(self.session_file_path, "w") as session_file:
session_file.write("{}")
print("Session File Created")
with open(self.session_file_path, "r") as session_file:
print("Loading Sessions")
self.sessions = json.load(session_file)
print(f"DEBUG Sessions: {self.sessions}")
# print(f"DEBUG Sessions: {self.sessions}")
print("Sessions Loaded")
def create_session(self, user_id):
session_id = str(uuid.uuid4())