Mirrored_Repos/houdini
1
0
Fork 0
mirror of https://github.com/solero/houdini.git synced 2024-11-12 13:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hash player IP addresses in sha3_512 before storage

Browse Source
This commit is contained in:
Ben 2020-02-14 21:45:21 +00:00
parent f2924d9a54
commit 54cbb7c203
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
houdini.sql
View File

@ -1058,7 +1058,7 @@ CREATE TABLE login (
id SERIAL, id SERIAL,
penguin_id INT NOT NULL, penguin_id INT NOT NULL,
date TIMESTAMP NOT NULL, date TIMESTAMP NOT NULL,
ip_address CHAR(255) NOT NULL, ip_hash CHAR(128) NOT NULL,
minutes_played INT NOT NULL DEFAULT 0, minutes_played INT NOT NULL DEFAULT 0,
PRIMARY KEY (id), PRIMARY KEY (id),
CONSTRAINT login_ibfk_1 FOREIGN KEY (penguin_id) REFERENCES penguin (id) ON DELETE RESTRICT ON UPDATE CASCADE CONSTRAINT login_ibfk_1 FOREIGN KEY (penguin_id) REFERENCES penguin (id) ON DELETE RESTRICT ON UPDATE CASCADE
@ -1071,7 +1071,7 @@ COMMENT ON TABLE login IS 'Penguin login records';
COMMENT ON COLUMN login.id IS 'Unique login ID'; COMMENT ON COLUMN login.id IS 'Unique login ID';
COMMENT ON COLUMN login.penguin_id IS 'Login penguin ID'; COMMENT ON COLUMN login.penguin_id IS 'Login penguin ID';
COMMENT ON COLUMN login.date IS 'Login date'; COMMENT ON COLUMN login.date IS 'Login date';
COMMENT ON COLUMN login.ip_address IS 'Connection IP address'; COMMENT ON COLUMN login.ip_hash IS 'Connection IP address';
COMMENT ON COLUMN login.minutes_played IS 'Minutes played for session'; COMMENT ON COLUMN login.minutes_played IS 'Minutes played for session';
DROP TABLE IF EXISTS penguin_postcard; DROP TABLE IF EXISTS penguin_postcard;

2
houdini/data/penguin.py
View File

@ -156,7 +156,7 @@ class Login(db.Model):
id = db.Column(db.Integer, primary_key=True, server_default=db.text("nextval('\"login_id_seq\"'::regclass)")) id = db.Column(db.Integer, primary_key=True, server_default=db.text("nextval('\"login_id_seq\"'::regclass)"))
penguin_id = db.Column(db.ForeignKey('penguin.id', ondelete='CASCADE', onupdate='CASCADE'), nullable=False) penguin_id = db.Column(db.ForeignKey('penguin.id', ondelete='CASCADE', onupdate='CASCADE'), nullable=False)
date = db.Column(db.DateTime, nullable=False, server_default=db.text("now()")) date = db.Column(db.DateTime, nullable=False, server_default=db.text("now()"))
ip_address = db.Column(db.CHAR(255), nullable=False) ip_hash = db.Column(db.CHAR(255), nullable=False)
minutes_played = db.Column(db.Integer, nullable=False, server_default=db.text("0")) minutes_played = db.Column(db.Integer, nullable=False, server_default=db.text("0"))

6
houdini/handlers/play/navigation.py
View File

@ -9,6 +9,7 @@ from houdini.constants import ClientType, StatusField
import random import random
import time import time
import pytz import pytz
import hashlib
from datetime import date, datetime from datetime import date, datetime
@ -139,9 +140,12 @@ async def handle_disconnect_room(p):
await p.room.remove_penguin(p) await p.room.remove_penguin(p)
minutes_played = (datetime.now() - p.login_timestamp).total_seconds() / 60.0 minutes_played = (datetime.now() - p.login_timestamp).total_seconds() / 60.0
ip = p.peer_name[0] + p.server.config.auth_key
hashed_ip = hashlib.sha3_512(ip.encode()).hexdigest()
await Login.create(penguin_id=p.id, await Login.create(penguin_id=p.id,
date=p.login_timestamp, date=p.login_timestamp,
ip_address=p.peer_name[0], ip_hash=hashed_ip,
minutes_played=minutes_played) minutes_played=minutes_played)
await p.update(minutes_played=p.minutes_played + minutes_played).apply() await p.update(minutes_played=p.minutes_played + minutes_played).apply()