aiwaf 0.1.9.2.6__py3-none-any.whl → 0.1.9.2.8__py3-none-any.whl

aiwaf/__init__.py

@@ -1,6 +1,6 @@
 default_app_config = "aiwaf.apps.AiwafConfig"
 
-__version__ = "0.1.9.2.6"
+__version__ = "0.1.9.2.8"
 
 # Note: Middleware classes are available from aiwaf.middleware
 # Import them only when needed to avoid circular imports during Django app loading

aiwaf/middleware.py

@@ -85,6 +85,7 @@ class IPAndKeywordBlockMiddleware:
         self.safe_prefixes = self._collect_safe_prefixes()
         self.exempt_keywords = self._get_exempt_keywords()
         self.legitimate_path_keywords = self._get_legitimate_path_keywords()
+        self.malicious_keywords = set(STATIC_KW)  # Initialize malicious keywords
 
     def _get_exempt_keywords(self):
         """Get keywords that should be exempt from blocking"""
@@ -439,6 +440,7 @@ class AIAnomalyMiddleware(MiddlewareMixin):
         super().__init__(get_response)
         # Use the safely loaded global MODEL instead of loading again
         self.model = MODEL
+        self.malicious_keywords = set(STATIC_KW)  # Initialize malicious keywords
 
     def _is_malicious_context(self, request, keyword):
         """

aiwaf/storage.py

@@ -2,10 +2,17 @@ import numpy as np
 import pandas as pd
 from django.conf import settings
 from django.utils import timezone
+import os
+import json
+from collections import defaultdict
 
 # Defer model imports to avoid AppRegistryNotReady during Django app loading
 FeatureSample = BlacklistEntry = IPExemption = DynamicKeyword = None
 
+# Fallback storage for when Django models are unavailable
+_fallback_keywords = defaultdict(int)
+_fallback_storage_path = os.path.join(os.path.dirname(__file__), 'fallback_keywords.json')
+
 def _import_models():
     """Import Django models only when needed and apps are ready."""
     global FeatureSample, BlacklistEntry, IPExemption, DynamicKeyword
@@ -15,9 +22,24 @@ def _import_models():
     
     try:
         from django.apps import apps
-        if apps.ready and apps.is_installed('aiwaf'):
-            from .models import FeatureSample, BlacklistEntry, IPExemption, DynamicKeyword
-    except (ImportError, RuntimeError, Exception):
+        if apps.ready:
+            # Try multiple ways to import models
+            try:
+                # First try: direct import (most reliable)
+                from .models import FeatureSample, BlacklistEntry, IPExemption, DynamicKeyword
+            except ImportError:
+                # Second try: check if aiwaf app is installed under different name
+                for app_config in apps.get_app_configs():
+                    if 'aiwaf' in app_config.name.lower() or 'aiwaf' in app_config.label.lower():
+                        try:
+                            from .models import FeatureSample, BlacklistEntry, IPExemption, DynamicKeyword
+                            break
+                        except ImportError:
+                            continue
+    except (ImportError, RuntimeError, Exception) as e:
+        # Log the error for debugging but don't fail silently
+        import sys
+        print(f"Warning: Could not import AIWAF models: {e}", file=sys.stderr)
         # Keep models as None if can't import
         pass
 
@@ -242,11 +264,40 @@ class ModelExemptionStore:
             return 0
 
 class ModelKeywordStore:
+    @staticmethod
+    def _load_fallback_keywords():
+        """Load keywords from fallback JSON file"""
+        global _fallback_keywords
+        try:
+            if os.path.exists(_fallback_storage_path):
+                with open(_fallback_storage_path, 'r') as f:
+                    data = json.load(f)
+                    _fallback_keywords = defaultdict(int, data)
+        except Exception as e:
+            import sys
+            print(f"Warning: Could not load fallback keywords: {e}", file=sys.stderr)
+    
+    @staticmethod
+    def _save_fallback_keywords():
+        """Save keywords to fallback JSON file"""
+        try:
+            with open(_fallback_storage_path, 'w') as f:
+                json.dump(dict(_fallback_keywords), f, indent=2)
+        except Exception as e:
+            import sys
+            print(f"Warning: Could not save fallback keywords: {e}", file=sys.stderr)
+    
     @staticmethod
     def add_keyword(keyword, count=1):
         """Add a keyword to the dynamic keyword list"""
         _import_models()
         if DynamicKeyword is None:
+            # Use fallback storage
+            ModelKeywordStore._load_fallback_keywords()
+            _fallback_keywords[keyword] += count
+            ModelKeywordStore._save_fallback_keywords()
+            import sys
+            print(f"Warning: Using fallback storage for keyword '{keyword}' - Django models not available.", file=sys.stderr)
             return
         try:
             obj, created = DynamicKeyword.objects.get_or_create(keyword=keyword)
@@ -257,7 +308,12 @@ class ModelKeywordStore:
                 obj.count = count
                 obj.save()
         except Exception as e:
-            print(f"Error adding keyword {keyword}: {e}")
+            # Fallback to file storage on database error
+            ModelKeywordStore._load_fallback_keywords()
+            _fallback_keywords[keyword] += count
+            ModelKeywordStore._save_fallback_keywords()
+            import sys
+            print(f"Database error adding keyword {keyword}, using fallback storage: {e}", file=sys.stderr)
 
     @staticmethod
     def remove_keyword(keyword):
@@ -275,14 +331,22 @@ class ModelKeywordStore:
         """Get top N keywords by count"""
         _import_models()
         if DynamicKeyword is None:
-            return []
+            # Use fallback storage
+            ModelKeywordStore._load_fallback_keywords()
+            sorted_keywords = sorted(_fallback_keywords.items(), key=lambda x: x[1], reverse=True)
+            return [keyword for keyword, count in sorted_keywords[:n]]
         try:
             return list(
                 DynamicKeyword.objects.order_by('-count')[:n]
                 .values_list('keyword', flat=True)
             )
-        except Exception:
-            return []
+        except Exception as e:
+            # Fallback to file storage on database error
+            ModelKeywordStore._load_fallback_keywords()
+            sorted_keywords = sorted(_fallback_keywords.items(), key=lambda x: x[1], reverse=True)
+            import sys
+            print(f"Database error getting top keywords, using fallback storage: {e}", file=sys.stderr)
+            return [keyword for keyword, count in sorted_keywords[:n]]
 
     @staticmethod
     def get_all_keywords():

{aiwaf-0.1.9.2.6.dist-info → aiwaf-0.1.9.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiwaf
-Version: 0.1.9.2.6
+Version: 0.1.9.2.8
 Summary: AI-powered Web Application Firewall
 Home-page: https://github.com/aayushgauba/aiwaf
 Author: Aayush Gauba

{aiwaf-0.1.9.2.6.dist-info → aiwaf-0.1.9.2.8.dist-info}/RECORD

@@ -1,11 +1,11 @@
-aiwaf/__init__.py,sha256=vgc-dT-AtR3_k84Wpmujg4ZRwl6EuU7IR2_KW2B0tBU,220
+aiwaf/__init__.py,sha256=xnE1gh2l0bta59Oy61sIlrsVe7BB_dCE1qFGBjvFTsg,220
 aiwaf/apps.py,sha256=nCez-Ptlv2kaEk5HenA8b1pATz1VfhrHP1344gwcY1A,142
 aiwaf/blacklist_manager.py,sha256=LYCeKFB-7e_C6Bg2WeFJWFIIQlrfRMPuGp30ivrnhQY,1196
 aiwaf/decorators.py,sha256=IUKOdM_gdroffImRZep1g1wT6gNqD10zGwcp28hsJCs,825
-aiwaf/middleware.py,sha256=cpxOI6W45A6qRa9Ulk1StqCTSJjCoBx387FegZB0iMA,31889
+aiwaf/middleware.py,sha256=ThR0Bxw_VbGcOsRMIXMmQ5OMOIAy19z4SulsK7rZ_NM,32053
 aiwaf/middleware_logger.py,sha256=LWZVDAnjh6CGESirA8eMbhGgJKB7lVDGRQqVroH95Lo,4742
 aiwaf/models.py,sha256=vQxgY19BDVMjoO903UNrTZC1pNoLltMU6wbyWPoAEns,2719
-aiwaf/storage.py,sha256=5ImrZMRn3u7HNsPH0fDjWhDrD2tgG2IHVnOXtLz0fk4,10253
+aiwaf/storage.py,sha256=3lnmbML-gFxpPpVl1Huz_cqE6Qt2LMIrYoeHFnFyAz0,13452
 aiwaf/trainer.py,sha256=hswkopOnEQHNkSn79AIk-OWw6zatP2EDhsBBEHQeFYw,26410
 aiwaf/utils.py,sha256=BJk5vJCYdGPl_4QQiknjhCbkzv5HZCXgFcBJDMJpHok,3390
 aiwaf/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -29,8 +29,8 @@ aiwaf/management/commands/test_exemption_fix.py,sha256=ngyGaHUCmQQ6y--6j4q1viZJt
 aiwaf/resources/model.pkl,sha256=5t6h9BX8yoh2xct85MXOO60jdlWyg1APskUOW0jZE1Y,1288265
 aiwaf/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aiwaf/templatetags/aiwaf_tags.py,sha256=XXfb7Tl4DjU3Sc40GbqdaqOEtKTUKELBEk58u83wBNw,357
-aiwaf-0.1.9.2.6.dist-info/licenses/LICENSE,sha256=Ir8PX4dxgAcdB0wqNPIkw84fzIIRKE75NoUil9RX0QU,1069
-aiwaf-0.1.9.2.6.dist-info/METADATA,sha256=iaCG43PeSHGu16Jawzelh5Qi0PoGysvi_BYfWFIcvbA,26824
-aiwaf-0.1.9.2.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aiwaf-0.1.9.2.6.dist-info/top_level.txt,sha256=kU6EyjobT6UPCxuWpI_BvcHDG0I2tMgKaPlWzVxe2xI,6
-aiwaf-0.1.9.2.6.dist-info/RECORD,,
+aiwaf-0.1.9.2.8.dist-info/licenses/LICENSE,sha256=Ir8PX4dxgAcdB0wqNPIkw84fzIIRKE75NoUil9RX0QU,1069
+aiwaf-0.1.9.2.8.dist-info/METADATA,sha256=kLAzz-5iApYmZhxQv27t7i1xi17eAj6GL-r8s6qOYzo,26824
+aiwaf-0.1.9.2.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aiwaf-0.1.9.2.8.dist-info/top_level.txt,sha256=kU6EyjobT6UPCxuWpI_BvcHDG0I2tMgKaPlWzVxe2xI,6
+aiwaf-0.1.9.2.8.dist-info/RECORD,,