aiwaf 0.1.9.1.7__tar.gz → 0.1.9.1.8__tar.gz

{aiwaf-0.1.9.1.7 → aiwaf-0.1.9.1.8}/PKG-INFO

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

{aiwaf-0.1.9.1.7 → aiwaf-0.1.9.1.8}/aiwaf/__init__.py

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

{aiwaf-0.1.9.1.7 → aiwaf-0.1.9.1.8}/aiwaf/management/commands/aiwaf_reset.py

@@ -1,5 +1,6 @@
 from django.core.management.base import BaseCommand
 from aiwaf.storage import get_blacklist_store, get_exemption_store
+import sys
 
 class Command(BaseCommand):
     help = 'Reset AI-WAF by clearing all blacklist and exemption (whitelist) entries'
@@ -26,12 +27,29 @@ class Command(BaseCommand):
         exemptions_only = options['exemptions_only']
         confirm = options['confirm']
         
-        blacklist_store = get_blacklist_store()
-        exemption_store = get_exemption_store()
+        try:
+            blacklist_store = get_blacklist_store()
+            exemption_store = get_exemption_store()
+        except Exception as e:
+            self.stdout.write(self.style.ERROR(f'Error initializing stores: {e}'))
+            return
         
-        # Count current entries
-        blacklist_count = len(blacklist_store.get_all())
-        exemption_count = len(exemption_store.get_all())
+        # Count current entries safely
+        try:
+            blacklist_entries = blacklist_store.get_all()
+            blacklist_count = len(blacklist_entries)
+        except Exception as e:
+            self.stdout.write(self.style.WARNING(f'Warning: Could not count blacklist entries: {e}'))
+            blacklist_count = 0
+            blacklist_entries = []
+        
+        try:
+            exemption_entries = exemption_store.get_all()
+            exemption_count = len(exemption_entries)
+        except Exception as e:
+            self.stdout.write(self.style.WARNING(f'Warning: Could not count exemption entries: {e}'))
+            exemption_count = 0
+            exemption_entries = []
         
         if blacklist_only and exemptions_only:
             self.stdout.write(self.style.ERROR('Cannot use both --blacklist-only and --exemptions-only flags'))
@@ -55,29 +73,47 @@ class Command(BaseCommand):
         self.stdout.write(f"AI-WAF Reset: {action}")
         
         if not confirm:
-            response = input("Are you sure you want to proceed? [y/N]: ")
-            if response.lower() not in ['y', 'yes']:
-                self.stdout.write(self.style.WARNING('Operation cancelled'))
+            try:
+                response = input("Are you sure you want to proceed? [y/N]: ")
+                if response.lower() not in ['y', 'yes']:
+                    self.stdout.write(self.style.WARNING('Operation cancelled'))
+                    return
+            except (EOFError, KeyboardInterrupt):
+                self.stdout.write(self.style.WARNING('\nOperation cancelled'))
                 return
         
         # Perform the reset
-        deleted_counts = {'blacklist': 0, 'exemptions': 0}
+        deleted_counts = {'blacklist': 0, 'exemptions': 0, 'errors': []}
         
         if clear_blacklist:
             # Clear blacklist entries
-            blacklist_entries = blacklist_store.get_all()
-            for entry in blacklist_entries:
-                blacklist_store.remove_ip(entry['ip_address'])
-            deleted_counts['blacklist'] = len(blacklist_entries)
+            try:
+                for entry in blacklist_entries:
+                    try:
+                        blacklist_store.remove_ip(entry['ip_address'])
+                        deleted_counts['blacklist'] += 1
+                    except Exception as e:
+                        deleted_counts['errors'].append(f"Error removing blacklist IP {entry.get('ip_address', 'unknown')}: {e}")
+            except Exception as e:
+                deleted_counts['errors'].append(f"Error clearing blacklist: {e}")
         
         if clear_exemptions:
             # Clear exemption entries
-            exemption_entries = exemption_store.get_all()
-            for entry in exemption_entries:
-                exemption_store.remove_ip(entry['ip_address'])
-            deleted_counts['exemptions'] = len(exemption_entries)
+            try:
+                for entry in exemption_entries:
+                    try:
+                        exemption_store.remove_ip(entry['ip_address'])
+                        deleted_counts['exemptions'] += 1
+                    except Exception as e:
+                        deleted_counts['errors'].append(f"Error removing exemption IP {entry.get('ip_address', 'unknown')}: {e}")
+            except Exception as e:
+                deleted_counts['errors'].append(f"Error clearing exemptions: {e}")
         
         # Report results
+        if deleted_counts['errors']:
+            for error in deleted_counts['errors']:
+                self.stdout.write(self.style.WARNING(f"⚠️  {error}"))
+        
         if clear_blacklist and clear_exemptions:
             self.stdout.write(
                 self.style.SUCCESS(
@@ -93,3 +129,8 @@ class Command(BaseCommand):
             self.stdout.write(
                 self.style.SUCCESS(f"✅ Exemptions cleared: Deleted {deleted_counts['exemptions']} entries")
             )
+        
+        if deleted_counts['errors']:
+            self.stdout.write(
+                self.style.WARNING(f"⚠️  Completed with {len(deleted_counts['errors'])} errors (see above)")
+            )

aiwaf-0.1.9.1.8/aiwaf/management/commands/clear_blacklist.py

@@ -0,0 +1,66 @@
+from django.core.management.base import BaseCommand
+from aiwaf.storage import get_blacklist_store
+
+class Command(BaseCommand):
+    help = 'Clear all blacklist entries (fast method)'
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            '--confirm',
+            action='store_true',
+            help='Skip confirmation prompt'
+        )
+
+    def handle(self, *args, **options):
+        confirm = options['confirm']
+        
+        try:
+            blacklist_store = get_blacklist_store()
+        except Exception as e:
+            self.stdout.write(self.style.ERROR(f'Error initializing blacklist store: {e}'))
+            return
+        
+        # Count current entries safely
+        try:
+            blacklist_entries = blacklist_store.get_all()
+            blacklist_count = len(blacklist_entries)
+        except Exception as e:
+            self.stdout.write(self.style.WARNING(f'Warning: Could not count blacklist entries: {e}'))
+            # Try to get count using clear_all method which returns count
+            blacklist_count = "unknown number of"
+        
+        # Show what will be cleared
+        self.stdout.write(f"Clear Blacklist: Will remove {blacklist_count} blacklist entries")
+        
+        if not confirm:
+            try:
+                response = input("Are you sure you want to proceed? [y/N]: ")
+                if response.lower() not in ['y', 'yes']:
+                    self.stdout.write(self.style.WARNING('Operation cancelled'))
+                    return
+            except (EOFError, KeyboardInterrupt):
+                self.stdout.write(self.style.WARNING('\nOperation cancelled'))
+                return
+        
+        # Perform the reset using clear_all for better performance
+        try:
+            if hasattr(blacklist_store, 'clear_all'):
+                deleted_count = blacklist_store.clear_all()
+                self.stdout.write(
+                    self.style.SUCCESS(f"✅ Blacklist cleared: Deleted {deleted_count} entries")
+                )
+            else:
+                # Fallback to individual deletion
+                deleted_count = 0
+                for entry in blacklist_entries:
+                    try:
+                        blacklist_store.remove_ip(entry['ip_address'])
+                        deleted_count += 1
+                    except Exception as e:
+                        self.stdout.write(self.style.WARNING(f"⚠️  Error removing IP {entry.get('ip_address', 'unknown')}: {e}"))
+                
+                self.stdout.write(
+                    self.style.SUCCESS(f"✅ Blacklist cleared: Deleted {deleted_count} entries")
+                )
+        except Exception as e:
+            self.stdout.write(self.style.ERROR(f'Error clearing blacklist: {e}'))

{aiwaf-0.1.9.1.7 → aiwaf-0.1.9.1.8}/aiwaf/storage.py

@@ -132,6 +132,31 @@ class ModelBlacklistStore:
         except Exception:
             return []
 
+    @staticmethod
+    def get_all():
+        """Get all blacklist entries as dictionaries"""
+        _import_models()
+        if BlacklistEntry is None:
+            return []
+        try:
+            return list(BlacklistEntry.objects.values('ip_address', 'reason', 'created_at'))
+        except Exception:
+            return []
+
+    @staticmethod
+    def clear_all():
+        """Clear all blacklist entries"""
+        _import_models()
+        if BlacklistEntry is None:
+            return 0
+        try:
+            count = BlacklistEntry.objects.count()
+            BlacklistEntry.objects.all().delete()
+            return count
+        except Exception as e:
+            print(f"Error clearing all blacklist entries: {e}")
+            return 0
+
 class ModelExemptionStore:
     @staticmethod
     def is_exempted(ip):
@@ -192,6 +217,20 @@ class ModelExemptionStore:
         except Exception:
             return []
 
+    @staticmethod
+    def clear_all():
+        """Clear all exemption entries"""
+        _import_models()
+        if IPExemption is None:
+            return 0
+        try:
+            count = IPExemption.objects.count()
+            IPExemption.objects.all().delete()
+            return count
+        except Exception as e:
+            print(f"Error clearing all exemption entries: {e}")
+            return 0
+
 class ModelKeywordStore:
     @staticmethod
     def add_keyword(keyword, count=1):

{aiwaf-0.1.9.1.7 → aiwaf-0.1.9.1.8}/aiwaf.egg-info/PKG-INFO

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

{aiwaf-0.1.9.1.7 → aiwaf-0.1.9.1.8}/aiwaf.egg-info/SOURCES.txt

@@ -25,6 +25,7 @@ aiwaf/management/commands/aiwaf_diagnose.py
 aiwaf/management/commands/aiwaf_logging.py
 aiwaf/management/commands/aiwaf_reset.py
 aiwaf/management/commands/check_dependencies.py
+aiwaf/management/commands/clear_blacklist.py
 aiwaf/management/commands/clear_cache.py
 aiwaf/management/commands/debug_csv.py
 aiwaf/management/commands/detect_and_train.py

{aiwaf-0.1.9.1.7 → aiwaf-0.1.9.1.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aiwaf"
-version = "0.1.9.1.7"
+version = "0.1.9.1.8"
 description = "AI-powered Web Application Firewall"
 readme = "README.md"
 requires-python = ">=3.8"

{aiwaf-0.1.9.1.7 → aiwaf-0.1.9.1.8}/setup.py

@@ -9,7 +9,7 @@ long_description = (HERE / "README.md").read_text(encoding="utf-8")
 
 setup(
     name="aiwaf",
-    version="0.1.9.1.7",
+    version="0.1.9.1.8",
     description="AI‑driven, self‑learning Web Application Firewall for Django",
     long_description=long_description,
     long_description_content_type="text/markdown",