Fix obfuscation plugin config lookup and request state handling

- Use short name "obfuscate_tags" for config lookup to match config.yaml
- Handle None config values with `(context.get("config") or {})`
- Add state property to RequestAdapter for header modifications check
- Check request.state.header_modifications in should_obfuscate_private_tags
- Update migration test default ports to 9000 and add obfuscation tests

Author: Tommel71

gsrest/app.py

@@ -444,10 +444,11 @@ async def setup_plugins(app: FastAPI):
         )
         builtin_plugin = ObfuscateTags
         name = f"{builtin_plugin.__module__}"
+        short_name = name.split(".")[-1]
         app.state.plugins.append(builtin_plugin)
-        app.state.plugin_contexts[name] = {"config": config.get_plugin_config(name)}
+        plugin_config = config.get_plugin_config(short_name)
+        app.state.plugin_contexts[name] = {"config": plugin_config}
         if hasattr(builtin_plugin, "setup"):
-            plugin_config = config.get_plugin_config(name)
             setup_args = {
                 "config": plugin_config,
                 "context": app.state.plugin_contexts[name],

gsrest/builtin/plugins/obfuscate_tags/obfuscate_tags.py

@@ -104,7 +104,7 @@ def before_response(cls, context: dict, request: Request, result: Any) -> None:
                 for x in get_request_header(request, GROUPS_HEADER_NAME, "").split(",")
             ]
 
-        obfuscate_tagpack_uri_rule = context.get("config", {}).get(
+        obfuscate_tagpack_uri_rule = (context.get("config") or {}).get(
             "obfuscate_tagpack_uri_rule", None
         )
 

gsrest/dependencies.py

@@ -256,4 +256,11 @@ def get_username(request) -> Optional[str]:
 
 
 def should_obfuscate_private_tags(request) -> bool:
+    # Check header modifications from plugin middleware first
+    header_mods = getattr(request, "state", None)
+    if header_mods is not None:
+        header_mods = getattr(header_mods, "header_modifications", {})
+        if header_mods.get(GROUPS_HEADER_NAME) == OBFUSCATION_MARKER_GROUP:
+            return True
+    # Fall back to checking actual headers
     return request.headers.get(GROUPS_HEADER_NAME, "") == OBFUSCATION_MARKER_GROUP

gsrest/routes/base.py

@@ -62,6 +62,10 @@ def __getitem__(self, key):
     def headers(self):
         return self._fastapi_request.headers
 
+    @property
+    def state(self):
+        return self._fastapi_request.state
+
 
 def apply_plugin_hooks(request: Request, result):
     """Apply plugin response hooks to a result.

tests/test_fastapi_migration.py

@@ -8,8 +8,8 @@
     # Start old server on port 9001
     GS_REST_DEV_PORT=9001 make serve-old
 
-    # Start new FastAPI server on port 9002
-    uv run uvicorn gsrest.app:create_app --factory --port 9002
+    # Start new FastAPI server on port 9000
+    uv run uvicorn gsrest.app:create_app --factory --port 9000
 
     # Run comparison tests
     uv run pytest tests/test_fastapi_migration.py -v -s
@@ -33,12 +33,13 @@
 
 # Server endpoints - can be overridden via environment variables
 OLD_SERVER = os.environ.get("OLD_SERVER", "http://localhost:9001")
-NEW_SERVER = os.environ.get("NEW_SERVER", "http://localhost:9002")
+NEW_SERVER = os.environ.get("NEW_SERVER", "http://localhost:9000")
 
 HEADERS = {"Content-Type": "application/json", "Accept": "application/json"}
 
 # Test data constants
 BTC_ADDRESS = "1Archive1n2C579dMsAu3iC6tWzuQJz8dN"
+BTC_ADDRESS_PRIVATE_TAGS = "3D4gm7eGSXiEkWS5V3hN9kDVo2eDGBK4eA"  # Address with potentially private tags
 ETH_ADDRESS = "0xdac17f958d2ee523a2206206994597c13d831ec7"
 BTC_ENTITY = 109578
 BTC_TX = "4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b"
@@ -681,6 +682,55 @@ def test_supported_tokens(self):
         self.assert_endpoint_equal("eth/supported_tokens")
 
 
+class TestAddressObfuscation(MigrationTestBase):
+    """Test address/entity endpoints to verify tag obfuscation behavior is consistent.
+
+    These tests verify that tag/actor obfuscation works identically between
+    the old aiohttp and new FastAPI implementations for addresses with:
+    - Public tags (1Archive1n2C579dMsAu3iC6tWzuQJz8dN - Internet Archive)
+    - Potentially private tags (3D4gm7eGSXiEkWS5V3hN9kDVo2eDGBK4eA)
+
+    Tests use endpoints where obfuscation is actually applied:
+    - /addresses/{addr}/entity - obfuscates best_address_tag and actors
+    - /addresses/{addr}/tag_summary - obfuscates via tag_transformer in service
+    - /entities/{entity}/tags - obfuscates private tag labels
+    """
+
+    @pytest.mark.migration
+    @pytest.mark.parametrize("address", [BTC_ADDRESS, BTC_ADDRESS_PRIVATE_TAGS])
+    def test_address_entity_obfuscation(self, address):
+        """Test address entity endpoint (obfuscation applies to best_address_tag and actors)."""
+        self.assert_endpoint_equal(f"btc/addresses/{address}/entity")
+
+    @pytest.mark.migration
+    @pytest.mark.parametrize("address", [BTC_ADDRESS, BTC_ADDRESS_PRIVATE_TAGS])
+    def test_tag_summary_obfuscation(self, address):
+        """Test tag_summary endpoint with obfuscation.
+
+        This endpoint uses a tag_transformer in the service layer which checks
+        should_obfuscate_private_tags(). Without private group headers,
+        private tags should be obfuscated.
+        """
+        self.assert_endpoint_equal(
+            f"btc/addresses/{address}/tag_summary?include_best_cluster_tag=true"
+        )
+
+    @pytest.mark.migration
+    @pytest.mark.parametrize("address", [BTC_ADDRESS, BTC_ADDRESS_PRIVATE_TAGS])
+    def test_entity_tags_obfuscation(self, address):
+        """Test entity tags endpoint (obfuscation applies to private tags).
+
+        Looks up the entity ID from the address first, then compares entity tags.
+        """
+        # Get entity ID from address
+        data, status, _ = get_response(NEW_SERVER, f"btc/addresses/{address}/entity")
+        assert status == 200, f"Failed to get entity for {address}"
+        entity_id = data["entity"]
+
+        # Compare entity tags between old and new
+        self.assert_endpoint_equal(f"btc/entities/{entity_id}/tags")
+
+
 class TestSearchParameters(MigrationTestBase):
     """Test search endpoint with various parameter configurations."""
 

tests/test_regression.py

@@ -126,6 +126,7 @@ def compare_instances(call) -> Dict[str, Any]:
         logger.error(f"Error during testing: {e}")
         raise
 
+
 @pytest.mark.regression
 def test_conversions():
     """Run the regression test and return the comparison result."""