Fix encryption: support direct RSA-OAEP and hybrid RSA+AES-GCM modes

app.py

@@ -8,6 +8,7 @@ import logging
 from contextlib import asynccontextmanager
 from typing import Optional, Tuple
 
+import ipaddress
 import httpx
 from fastapi import FastAPI, Query, Request, Depends, HTTPException, status
 from fastapi.middleware.cors import CORSMiddleware
@@ -158,6 +159,8 @@ async def get_data(
                     "user_id": item.user_id,
                     "refer_url": item.refer_url,
                     "ip_address": item.ip_address,
+                    "ipv4_address": item.ipv4_address,
+                    "ipv6_address": item.ipv6_address,
                     "country": item.country,
                     "region": item.region,
                     "json_data": item.json_data,
@@ -242,6 +245,21 @@ async def blink(
         # Get geolocation from IP address
         country, region = await get_geolocation(ip_address)
         
+        # Determine IPv4 vs IPv6
+        ipv4_address = None
+        ipv6_address = None
+        
+        if ip_address:
+            try:
+                ip_obj = ipaddress.ip_address(ip_address)
+                if isinstance(ip_obj, ipaddress.IPv4Address):
+                    ipv4_address = ip_address
+                elif isinstance(ip_obj, ipaddress.IPv6Address):
+                    ipv6_address = ip_address
+            except ValueError:
+                # Invalid IP address format, just keep it in ip_address
+                pass
+        
         # Store each decrypted result as separate records
         records_created = 0
         for json_data in decrypted_results:
@@ -249,6 +267,8 @@ async def blink(
                 user_id=user_id,
                 refer_url=refer_url,
                 ip_address=ip_address,
+                ipv4_address=ipv4_address,
+                ipv6_address=ipv6_address,
                 country=country,
                 region=region,
                 json_data=json_data
@@ -262,6 +282,8 @@ async def blink(
                 user_id=user_id,
                 refer_url=refer_url,
                 ip_address=ip_address,
+                ipv4_address=ipv4_address,
+                ipv6_address=ipv6_address,
                 country=country,
                 region=region,
                 json_data={"encrypted_length": len(encrypted_data)}

models.py

@@ -23,6 +23,8 @@ class BlinkData(Base):
     user_id = Column(String(20), index=True, nullable=False)
     refer_url = Column(Text, nullable=True)
     ip_address = Column(String(45), nullable=True)  # IPv6 can be up to 45 chars
+    ipv4_address = Column(String(15), nullable=True)
+    ipv6_address = Column(String(45), nullable=True)
     country = Column(String(100), nullable=True)  # Country from IP geolocation
     region = Column(String(100), nullable=True)   # Region/State from IP geolocation
     json_data = Column(JSON, nullable=True)

templates/index.html

@@ -232,7 +232,8 @@
                         <th>ID</th>
                         <th>User ID</th>
                         <th>Refer URL</th>
-                        <th>IP Address</th>
+                        <th>IPv4</th>
+                        <th>IPv6</th>
                         <th>Country</th>
                         <th>Region</th>
                         <th>JSON Data</th>
@@ -298,7 +299,8 @@
                     <td>${item.id}</td>
                     <td class="user-id">${item.user_id}</td>
                     <td class="refer-url" title="${item.refer_url || ''}">${item.refer_url || '-'}</td>
-                    <td class="ip-address">${item.ip_address || '-'}</td>
+                    <td class="ip-address">${item.ipv4_address || '-'}</td>
+                    <td class="ip-address">${item.ipv6_address || '-'}</td>
                     <td>${item.country || '-'}</td>
                     <td>${item.region || '-'}</td>
                     <td><pre class="json-data">${JSON.stringify(item.json_data, null, 2)}</pre></td>