remove ctx factory due to risks

Author: RayBB

openlibrary/core/fulltext.py

@@ -80,26 +80,4 @@ async def fulltext_search_async(q, page=1, limit=100, js=False, facets=False):
     return ia_results
 
 
-def ctx_func_factory():
-    """Factory function that returns setup_ctx_site for use with async_bridge.wrap
-    TODO: next time we use this in a different context, we should consider generalizing it.
-    """
-
-    forwarded_for = web.ctx.env.get('HTTP_X_FORWARDED_FOR', 'ol-internal')
-    user_agent = web.ctx.env.get('HTTP_USER_AGENT', '')
-
-    async def setup_env_vars():
-        from infogami.utils.delegate import create_site
-
-        web.ctx.site = create_site()
-        web.ctx.env = {
-            'HTTP_X_FORWARDED_FOR': forwarded_for,
-            'HTTP_USER_AGENT': user_agent,
-        }
-
-    return setup_env_vars
-
-
-fulltext_search = async_bridge.wrap(
-    fulltext_search_async, init_ctx_factory=ctx_func_factory
-)
+fulltext_search = async_bridge.wrap(fulltext_search_async)

openlibrary/utils/async_utils.py

@@ -26,22 +26,10 @@ def __init__(self):
     def run[T](self, coro: Coroutine[Any, Any, T]) -> T:
         return asyncio.run_coroutine_threadsafe(coro, self._loop).result()
 
-    def wrap(
-        self,
-        func: Callable[P, Coroutine[Any, Any, T]],
-        init_ctx_factory: (
-            Callable[[], Callable[[], Coroutine[Any, Any, None]]] | None
-        ) = None,
-    ) -> Callable[P, T]:
-        """Wrap an async function so it can be called from sync code, preserving type hints.
-
-        init_ctx_factory is a factory function that returns a function that can be called to initialize the context.
-        We must do this because we need to capture the request context when the request comes in, not when the wrapper is defined.
-        """
+    def wrap(self, func: Callable[P, Coroutine[Any, Any, T]]) -> Callable[P, T]:
+        """Wrap an async function so it can be called from sync code, preserving type hints."""
 
         def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
-            if init_ctx_factory:
-                self.run(init_ctx_factory()())
             return self.run(func(*args, **kwargs))
 
         return wrapper