Added support for storing IP addresses at login

alembic/versions/da3ce2b00c91_added_ipaddress_table.py

@@ -0,0 +1,35 @@
+"""added IPAddress Table
+
+Revision ID: da3ce2b00c91
+Revises: 64412c0be1f7
+Create Date: 2023-05-11 16:26:33.766461
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utils
+
+
+# revision identifiers, used by Alembic.
+revision = "da3ce2b00c91"
+down_revision = "64412c0be1f7"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "ip_addresses",
+        sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
+        sa.Column("address", sa.String(length=45), nullable=False),
+        sa.Column("account_id", sa.Integer(), nullable=True),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("ip_addresses")
+    # ### end Alembic commands ###

dndserver/handlers/login.py

@@ -4,7 +4,7 @@
 import argon2
 
 from dndserver.database import db
-from dndserver.models import Account
+from dndserver.models import Account, IPAddress
 from dndserver.persistent import sessions
 from dndserver.protos.Account import SC2S_ACCOUNT_LOGIN_REQ, SLOGIN_ACCOUNT_INFO, SS2C_ACCOUNT_LOGIN_RES
 
@@ -39,6 +39,16 @@ def process_login(ctx, msg):
         # TODO: Create new hwid objects and save them to the db here
         res.secretToken = account.secret_token
 
+    # Retrive ip address and associate the ip address to the account id
+    ip_address = ctx.transport.client[0]
+    if not (
+        db.query(IPAddress)
+        .filter((IPAddress.address.ilike(ip_address)) & (IPAddress.account_id.ilike(account.id)))
+        .first()
+    ):
+        address = IPAddress(account_id=account.id, address=ip_address)
+        address.save()
+
     # Return FAIL_PASSWORD on invalid password.
     try:
         argon2.PasswordHasher().verify(account.password, req.password)

dndserver/models.py

@@ -27,6 +27,18 @@ def save(self):
         db.commit()
 
 
+class IPAddress(base):
+    __tablename__ = "ip_addresses"
+
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    address = Column(String(45), nullable=False)
+    account_id = Column(Integer, nullable=True)
+
+    def save(self):
+        db.add(self)
+        db.commit()
+
+
 class Character(base):
     __tablename__ = "characters"
 

dndserver/protocol.py

@@ -16,6 +16,8 @@
     ranking,
     trade,
 )
+from dndserver.models import IPAddress
+from dndserver.database import db
 from dndserver.objects.user import User
 from dndserver.persistent import sessions
 from dndserver.protos import PacketCommand as pc
@@ -38,6 +40,12 @@ def connectionMade(self) -> None:
         user = User()
         sessions[self.transport] = user
 
+        # Retrive ip address of connected client for logging
+        ip_address = self.transport.client[0]
+        if not (db.query(IPAddress).filter((IPAddress.address.ilike(ip_address))).first()):
+            address = IPAddress(address=ip_address)
+            address.save()
+
     def connectionLost(self, reason):
         """Event for when a client disconnects from the server."""
         logger.debug(f"Lost connection to: {self.transport.client[0]}:{self.transport.client[1]}")