refactor: remove dangerous role switching features and reorganize code

Author: CuriousLearner

README.md

@@ -64,7 +64,7 @@ def api_endpoint(request):
     return JsonResponse({'users': list(User.objects.values())})
 
 # Class-Based View Mixin
-from django_postgres_anon.decorators import AnonymizedDataMixin
+from django_postgres_anon.mixins import AnonymizedDataMixin
 
 class ReportView(AnonymizedDataMixin, ListView):
     model = SensitiveModel  # ← All queries automatically anonymized!
@@ -89,8 +89,8 @@ POSTGRES_ANON = {'MASKED_GROUP': 'analysts'}
 
 ### 🎭 **Dynamic Data Access**
 
-- 🎯 **Context Managers** - `anonymized_data()` and `database_role()` for temporary role switching
-- 🎨 **Decorators** - `@use_anonymized_data` and `@database_role_required` for view-level control
+- 🎯 **Context Managers** - `anonymized_data()` for temporary role switching
+- 🎨 **Decorators** - `@use_anonymized_data` for view-level control
 - 🧩 **Class-Based Mixins** - `AnonymizedDataMixin` for automatic anonymization in CBVs
 - 🔀 **Smart Middleware** - Group-based automatic role switching for seamless user experience
 
@@ -275,7 +275,7 @@ python manage.py anon_drop [--confirm]
 #### Context Managers
 
 ```python
-from django_postgres_anon.context_managers import anonymized_data, database_role
+from django_postgres_anon.context_managers import anonymized_data
 
 # Use anonymized data in a view
 def sensitive_report(request):
@@ -289,17 +289,12 @@ def custom_report(request):
         data = SensitiveModel.objects.all()
         return JsonResponse({'data': list(data.values())})
 
-# Switch to any database role
-def read_only_operation():
-    with database_role('readonly_user'):
-        # All queries run as readonly_user
-        return MyModel.objects.all()
 ```
 
 #### Decorators
 
 ```python
-from django_postgres_anon.decorators import use_anonymized_data, database_role_required
+from django_postgres_anon.decorators import use_anonymized_data
 from django.utils.decorators import method_decorator
 
 # Function-based views
@@ -311,10 +306,6 @@ def api_endpoint(request):
 def custom_api_endpoint(request):
     return JsonResponse({'data': list(SensitiveModel.objects.values())})
 
-# Require specific database role
-@database_role_required('readonly_user')
-def read_only_operation():
-    return MyModel.objects.all()
 
 # Class-based views with method decorator
 class SensitiveDataView(View):
@@ -327,7 +318,7 @@ class SensitiveDataView(View):
 #### Class-Based View Mixins
 
 ```python
-from django_postgres_anon.decorators import AnonymizedDataMixin
+from django_postgres_anon.mixins import AnonymizedDataMixin
 from django.views.generic import ListView, View
 
 # Automatic anonymization for ListView
@@ -672,8 +663,6 @@ with anonymized_data():                    # Use default masked role
 with anonymized_data('custom_role'):       # Use specific role
 with anonymized_data('role', False):       # Don't auto-create role
 
-# database_role(role_name)
-with database_role('readonly_user'):       # Switch to any database role
 ```
 
 ### Decorators
@@ -685,12 +674,7 @@ with database_role('readonly_user'):       # Switch to any database role
 @use_anonymized_data('custom_role')        # Use specific role
 @use_anonymized_data('role', False)        # Don't auto-create role
 
-# @database_role_required(role_name)
-@database_role_required('readonly_user')   # Require specific role
 
-# Aliases for semantic clarity
-@anonymized_view                           # Alias for @use_anonymized_data
-@masked_data                               # Alternative alias
 ```
 
 ### Mixins

django_postgres_anon/__init__.py

@@ -5,8 +5,8 @@
 - Django models for managing anonymization rules and presets
 - Management commands for initializing, applying, and managing anonymization
 - Middleware for dynamic role switching
-- Context managers for temporary role switching (anonymized_data, database_role)
-- Decorators for automatic anonymization in views/functions (use_anonymized_data, database_role_required)
+- Context managers for temporary role switching (anonymized_data)
+- Decorators for automatic anonymization in views/functions (use_anonymized_data)
 - Class-based view mixins for anonymized data access (AnonymizedDataMixin)
 - Utilities for database schema introspection
 - Pre-built presets for common use cases
@@ -157,8 +157,6 @@ def get_available_presets() -> list:
                 "MaskingPreset",
                 "MaskingRule",
                 "anonymized_data",
-                "database_role",
-                "database_role_required",
                 "get_table_columns",
                 "use_anonymized_data",
                 "validate_function_syntax",

django_postgres_anon/context_managers.py

@@ -7,13 +7,9 @@
 from django.db import connection
 
 from django_postgres_anon.config import get_anon_setting
-
-# ErrorHandler no longer needed
 from django_postgres_anon.models import MaskedRole
 from django_postgres_anon.utils import reset_role, switch_to_role
 
-# Simplified error handling - no decorators needed
-
 logger = logging.getLogger(__name__)
 
 
@@ -145,33 +141,3 @@ def _restore_isolation_level(isolation_level: str) -> None:
     """Restore the original transaction isolation level."""
     with connection.cursor() as cursor:
         cursor.execute(f"SET transaction_isolation = '{isolation_level}'")
-
-
-@contextlib.contextmanager
-def database_role(role_name: str):
-    """
-    Lower-level context manager for switching to any database role.
-
-    Args:
-        role_name: Name of the database role to switch to
-
-    Example:
-        >>> with database_role('readonly_user'):
-        ...     # All queries run as readonly_user
-        ...     data = MyModel.objects.all()
-    """
-    role_switched = False
-
-    try:
-        connection.ensure_connection()
-
-        if switch_to_role(role_name, auto_create=False):
-            role_switched = True
-        else:
-            raise RuntimeError(f"Database role '{role_name}' does not exist")
-
-        yield
-
-    finally:
-        if role_switched:
-            reset_role()

django_postgres_anon/decorators.py

@@ -61,65 +61,3 @@ def wrapper(*args, **kwargs):
     else:
         # Called as @use_anonymized_data() or @use_anonymized_data('role')
         return decorator
-
-
-def database_role_required(role_name: str):
-    """
-    Decorator that ensures a specific database role is active during function execution.
-
-    Args:
-        role_name: Name of the database role to switch to
-
-    Example:
-        >>> @database_role_required('readonly_user')
-        >>> def read_only_operation():
-        ...     return MyModel.objects.all()
-
-    Raises:
-        RuntimeError: If the specified role doesn't exist
-    """
-
-    def decorator(func: Callable) -> Callable:
-        @functools.wraps(func)
-        def wrapper(*args, **kwargs):
-            from django_postgres_anon.context_managers import database_role
-
-            with database_role(role_name):
-                return func(*args, **kwargs)
-
-        return wrapper
-
-    return decorator
-
-
-class AnonymizedDataMixin:
-    """
-    Mixin for class-based views to automatically use anonymized data.
-
-    This mixin ensures all database operations within the view use anonymized data
-    by wrapping the dispatch method.
-
-    Example:
-        >>> class SensitiveReportView(AnonymizedDataMixin, ListView):
-        ...     model = User
-        ...     template_name = 'sensitive_report.html'
-        ...     anonymized_role = 'custom_masked_role'  # Optional
-
-        >>> class APIView(AnonymizedDataMixin, View):
-        ...     def get(self, request):
-        ...         users = User.objects.all()  # Automatically anonymized
-        ...         return JsonResponse({'users': list(users.values())})
-    """
-
-    anonymized_role: Optional[str] = None
-    auto_create_role: bool = True
-
-    def dispatch(self, request, *args, **kwargs):
-        """Override dispatch to use anonymized data context"""
-        with anonymized_data(role_name=self.anonymized_role, auto_create=self.auto_create_role):
-            return super().dispatch(request, *args, **kwargs)
-
-
-# Alias for common usage patterns
-anonymized_view = use_anonymized_data  # More semantic alias for views
-masked_data = use_anonymized_data  # Alternative name for clarity

django_postgres_anon/mixins.py

@@ -0,0 +1,33 @@
+"""Class-based view mixins for Django PostgreSQL Anonymizer"""
+
+from typing import Optional
+
+from django_postgres_anon.context_managers import anonymized_data
+
+
+class AnonymizedDataMixin:
+    """
+    Mixin for class-based views to automatically use anonymized data.
+
+    This mixin ensures all database operations within the view use anonymized data
+    by wrapping the dispatch method.
+
+    Example:
+        >>> class SensitiveReportView(AnonymizedDataMixin, ListView):
+        ...     model = User
+        ...     template_name = 'sensitive_report.html'
+        ...     anonymized_role = 'custom_masked_role'  # Optional
+
+        >>> class APIView(AnonymizedDataMixin, View):
+        ...     def get(self, request):
+        ...         users = User.objects.all()  # Automatically anonymized
+        ...         return JsonResponse({'users': list(users.values())})
+    """
+
+    anonymized_role: Optional[str] = None
+    auto_create_role: bool = True
+
+    def dispatch(self, request, *args, **kwargs):
+        """Override dispatch to use anonymized data context"""
+        with anonymized_data(role_name=self.anonymized_role, auto_create=self.auto_create_role):
+            return super().dispatch(request, *args, **kwargs)

example_project/README.md

@@ -9,7 +9,7 @@ This example project demonstrates how to integrate and use django-postgres-anony
 - **Presets**: Loading and using pre-built anonymization presets
 - **Admin Integration**: Django admin interface with anonymization actions
 - **Interactive Demo**: Web interface to explore anonymization features
-- **Context Managers**: Temporary anonymized data access with `anonymized_data()` and `database_role()`
+- **Context Managers**: Temporary anonymized data access with `anonymized_data()`
 - **Decorators**: Function and class-based view decorators for automatic anonymization
 - **Function Validation**: Real-time validation and testing of anonymization functions
 - **Data Comparison**: Side-by-side comparison of original vs anonymized data

example_project/sample_app/anonymization_views.py

@@ -14,8 +14,9 @@
 from django.views.decorators.http import require_http_methods
 from django.views.generic import TemplateView
 
-from django_postgres_anon.context_managers import anonymized_data, database_role
-from django_postgres_anon.decorators import AnonymizedDataMixin, database_role_required, use_anonymized_data
+from django_postgres_anon.context_managers import anonymized_data
+from django_postgres_anon.decorators import use_anonymized_data
+from django_postgres_anon.mixins import AnonymizedDataMixin
 from django_postgres_anon.models import MaskingPreset, MaskingRule
 from django_postgres_anon.utils import suggest_anonymization_functions, validate_function_syntax
 
@@ -37,10 +38,9 @@ def context_manager_demo(request: HttpRequest) -> HttpResponse:
     }
 
     try:
-        # Normal data access - explicitly use default role to bypass middleware
-        with database_role("sanyamkhurana"):  # Use default role to get unmasked data
-            normal_users = list(User.objects.values("username", "email", "first_name", "last_name")[:5])
-            context["normal_data"] = normal_users
+        # Normal data access - direct query without role switching
+        normal_users = list(User.objects.values("username", "email", "first_name", "last_name")[:5])
+        context["normal_data"] = normal_users
 
         # Using anonymized_data context manager
         try:
@@ -51,14 +51,14 @@ def context_manager_demo(request: HttpRequest) -> HttpResponse:
             logger.warning(f"Anonymized data context manager failed: {e}")
             context["anonymized_data"] = [{"error": f"Context manager failed: {e}"}]
 
-        # Using database_role context manager
+        # Using anonymized_data with specific role
         try:
-            with database_role("masked_reader"):
+            with anonymized_data("masked_reader"):
                 role_users = list(User.objects.values("username", "email", "first_name", "last_name")[:5])
                 context["role_switched_data"] = role_users
         except Exception as e:
-            logger.warning(f"Database role context manager failed: {e}")
-            context["role_switched_data"] = [{"error": f"Role switch failed: {e}"}]
+            logger.warning(f"Anonymized data with custom role failed: {e}")
+            context["role_switched_data"] = [{"error": f"Custom role failed: {e}"}]
 
     except Exception as e:
         logger.error(f"Context manager demo error: {e}")
@@ -80,26 +80,6 @@ def decorated_user_list(request: HttpRequest) -> JsonResponse:
         return JsonResponse({"error": str(e)}, status=500)
 
 
-@database_role_required("masked_reader")
-def role_required_view(request: HttpRequest) -> JsonResponse:
-    """View using the @database_role_required decorator"""
-    try:
-        customers = Customer.objects.select_related("user").values(
-            "user__username", "user__email", "phone", "ssn", "annual_income"
-        )[:5]
-
-        return JsonResponse(
-            {
-                "message": "Data accessed with @database_role_required decorator",
-                "customers": list(customers),
-                "required_role": "masked_reader",
-            }
-        )
-    except Exception as e:
-        logger.error(f"Role required view error: {e}")
-        return JsonResponse({"error": str(e)}, status=500)
-
-
 @method_decorator(login_required, name="dispatch")
 class AnonymizedCustomerView(AnonymizedDataMixin, TemplateView):
     """Class-based view using AnonymizedDataMixin to show only anonymized data"""

example_project/templates/sample_app/anonymized_customer_view.html

@@ -223,7 +223,7 @@ <h5 class="mb-0">
             <div class="card-body">
                 <h6>Class-based View with Mixin</h6>
                 <div style="position: relative;">
-                    <pre style="background: #f6f8fa; border: 1px solid #e1e4e8; border-radius: 6px; padding: 16px; margin: 0; font-family: 'SFMono-Regular', Consolas, monospace; font-size: 13px; line-height: 1.45;"><code><span style="color: #d73a49; font-weight: 600;">from</span> django_postgres_anon.decorators <span style="color: #d73a49; font-weight: 600;">import</span> AnonymizedDataMixin
+                    <pre style="background: #f6f8fa; border: 1px solid #e1e4e8; border-radius: 6px; padding: 16px; margin: 0; font-family: 'SFMono-Regular', Consolas, monospace; font-size: 13px; line-height: 1.45;"><code><span style="color: #d73a49; font-weight: 600;">from</span> django_postgres_anon.mixins <span style="color: #d73a49; font-weight: 600;">import</span> AnonymizedDataMixin
 <span style="color: #d73a49; font-weight: 600;">from</span> django.views.generic <span style="color: #d73a49; font-weight: 600;">import</span> TemplateView
 
 <span style="color: #d73a49; font-weight: 600;">class</span> <span style="color: #6f42c1;">AnonymizedCustomerView</span>(<span style="color: #6f42c1;">AnonymizedDataMixin</span>, <span style="color: #6f42c1;">TemplateView</span>):

example_project/templates/sample_app/context_manager_demo.html

@@ -103,11 +103,11 @@ <h5 class="mb-0">
                 </h5>
             </div>
             <div class="card-body">
-                <p class="small text-muted">Using <code>database_role()</code> context manager:</p>
+                <p class="small text-muted">Using <code>anonymized_data()</code> with custom role:</p>
                 <div style="position: relative;">
-                    <pre style="background: #f6f8fa; border: 1px solid #e1e4e8; border-radius: 6px; padding: 16px; margin: 0; font-family: 'SFMono-Regular', Consolas, monospace; font-size: 13px; line-height: 1.45;"><code><span style="color: #d73a49; font-weight: 600;">from</span> django_postgres_anon.context_managers <span style="color: #d73a49; font-weight: 600;">import</span> database_role
+                    <pre style="background: #f6f8fa; border: 1px solid #e1e4e8; border-radius: 6px; padding: 16px; margin: 0; font-family: 'SFMono-Regular', Consolas, monospace; font-size: 13px; line-height: 1.45;"><code><span style="color: #d73a49; font-weight: 600;">from</span> django_postgres_anon.context_managers <span style="color: #d73a49; font-weight: 600;">import</span> anonymized_data
 
-<span style="color: #d73a49; font-weight: 600;">with</span> <span style="color: #6f42c1;">database_role</span>(<span style="color: #032f62;">'masked_reader'</span>):
+<span style="color: #d73a49; font-weight: 600;">with</span> <span style="color: #6f42c1;">anonymized_data</span>(<span style="color: #032f62;">'masked_reader'</span>):
     User.objects.<span style="color: #6f42c1;">values</span>(<span style="color: #032f62;">'username'</span>, <span style="color: #032f62;">'email'</span>)[<span style="color: #005cc5;">:</span><span style="color: #005cc5;">5</span>]</code></pre>
                     <button onclick="copyCode(this)" style="position: absolute; top: 8px; right: 8px; background: #0366d6; color: white; border: none; border-radius: 4px; padding: 4px 8px; font-size: 11px; cursor: pointer; opacity: 0.7;" title="Copy code">
                         Copy
@@ -148,8 +148,8 @@ <h5 class="mb-0">
             <div class="card-body">
                 <p class="mb-3">Ready to use this in your project? Copy and paste this code:</p>
                 <div style="position: relative;">
-                    <pre style="background: #f6f8fa; border: 1px solid #e1e4e8; border-radius: 6px; padding: 16px; margin: 0; font-family: 'SFMono-Regular', Consolas, monospace; font-size: 13px; line-height: 1.45;"><code><span style="color: #6a737d; font-style: italic;"># Import the context managers</span>
-<span style="color: #d73a49; font-weight: 600;">from</span> django_postgres_anon.context_managers <span style="color: #d73a49; font-weight: 600;">import</span> anonymized_data, database_role
+                    <pre style="background: #f6f8fa; border: 1px solid #e1e4e8; border-radius: 6px; padding: 16px; margin: 0; font-family: 'SFMono-Regular', Consolas, monospace; font-size: 13px; line-height: 1.45;"><code><span style="color: #6a737d; font-style: italic;"># Import the context manager</span>
+<span style="color: #d73a49; font-weight: 600;">from</span> django_postgres_anon.context_managers <span style="color: #d73a49; font-weight: 600;">import</span> anonymized_data
 
 <span style="color: #6a737d; font-style: italic;"># Basic usage in your views</span>
 <span style="color: #d73a49; font-weight: 600;">def</span> <span style="color: #6f42c1;">my_view</span>(request):
@@ -158,7 +158,7 @@ <h5 class="mb-0">
         users = User.objects.<span style="color: #6f42c1;">all</span>()
 
     <span style="color: #6a737d; font-style: italic;"># Or use specific role</span>
-    <span style="color: #d73a49; font-weight: 600;">with</span> <span style="color: #6f42c1;">database_role</span>(<span style="color: #032f62;">'masked_reader'</span>):
+    <span style="color: #d73a49; font-weight: 600;">with</span> <span style="color: #6f42c1;">anonymized_data</span>(<span style="color: #032f62;">'masked_reader'</span>):
         customers = Customer.objects.<span style="color: #6f42c1;">all</span>()
 
     <span style="color: #d73a49; font-weight: 600;">return</span> <span style="color: #6f42c1;">render</span>(request, <span style="color: #032f62;">'template.html'</span>, {<span style="color: #032f62;">'users'</span>: users})</code></pre>