microsoft-agents-hosting-aiohttp 1.3.0__tar.gz → 1.4.0.dev13__tar.gz

{microsoft_agents_hosting_aiohttp-1.3.0/microsoft_agents_hosting_aiohttp.egg-info → microsoft_agents_hosting_aiohttp-1.4.0.dev13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-aiohttp
-Version: 1.3.0
+Version: 1.4.0.dev13
 Summary: Integration library for Microsoft Agents with aiohttp
 Author: Microsoft Corporation
 License-Expression: MIT
@@ -15,7 +15,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: microsoft-agents-hosting-core==1.3.0
+Requires-Dist: microsoft-agents-hosting-core==1.4.0.dev13
 Requires-Dist: aiohttp>=3.11.11
 Dynamic: license-file
 Dynamic: requires-dist

microsoft_agents_hosting_aiohttp-1.4.0.dev13/VERSION.txt

@@ -0,0 +1 @@
+1.4.0.dev13

{microsoft_agents_hosting_aiohttp-1.3.0 → microsoft_agents_hosting_aiohttp-1.4.0.dev13}/microsoft_agents/hosting/aiohttp/cloud_adapter.py

@@ -24,16 +24,20 @@ class CloudAdapter(HttpAdapterBase, AgentHttpAdapter):
         *,
         connection_manager: Connections | None = None,
         channel_service_client_factory: ChannelServiceClientFactoryBase | None = None,
+        channel_service_client_factory_options: dict | None = None,
     ):
         """
         Initializes a new instance of the CloudAdapter class.
 
         :param connection_manager: Optional connection manager for OAuth.
-        :param channel_service_client_factory: The factory to use to create the channel service client.
+        :param channel_service_client_factory: Factory for creating channel service clients.
+        :param channel_service_client_factory_options: Optional dictionary of options to pass to the channel service client factory
+            This is only used if channel_service_client_factory is not provided and connection_manager is provided.
         """
         super().__init__(
             connection_manager=connection_manager,
             channel_service_client_factory=channel_service_client_factory,
+            channel_service_client_factory_options=channel_service_client_factory_options,
         )
 
     async def process(self, request: Request, agent: Agent) -> Optional[Response]:
@@ -68,4 +72,5 @@ class CloudAdapter(HttpAdapterBase, AgentHttpAdapter):
         return Response(
             status=http_response.status_code,
             headers=http_response.headers,
+            content_type=http_response.content_type,
         )

{microsoft_agents_hosting_aiohttp-1.3.0 → microsoft_agents_hosting_aiohttp-1.4.0.dev13}/microsoft_agents/hosting/aiohttp/jwt_authorization_middleware.py

@@ -2,7 +2,7 @@
 # Licensed under the MIT License.
 
 import functools
-
+import logging
 from typing import cast
 
 from aiohttp.web import Request, middleware, json_response
@@ -11,6 +11,25 @@ from microsoft_agents.hosting.core.authorization import AgentAuthConfiguration
 from microsoft_agents.hosting.core.authorization.jwt import _authorize_request
 from microsoft_agents.hosting.core.http import HttpResponse
 
+logger = logging.getLogger(__name__)
+
+_GENERIC_AUTH_ERROR = {"error": "Invalid token or authentication failed."}
+
+
+def _extract_bearer_token(auth_header: str) -> str | None:
+    """Extracts the bearer token from a raw Authorization header value.
+
+    Surrounding whitespace on the token is ignored for backward compatibility.
+    Returns None for anything malformed so callers can respond with a
+    consistent 401 instead of raising.
+    """
+    parts = auth_header.split(maxsplit=1)
+    if len(parts) != 2 or parts[0].lower() != "bearer":
+        return None
+
+    token = parts[1].strip()
+    return token if token and not any(char.isspace() for char in token) else None
+
 
 async def _jwt_authorization_middleware(request: Request, handler):
     """
@@ -21,6 +40,18 @@ async def _jwt_authorization_middleware(request: Request, handler):
     )
 
     auth_header = request.headers.get("Authorization")
+    if auth_header is not None:
+        # aiohttp-specific tolerance: trailing whitespace (spaces/tabs) after
+        # the bearer token is ignored for backward compatibility, but internal
+        # or extra non-whitespace content is rejected. Normalizing here keeps
+        # the shared `_authorize_request` parsing (used identically by the
+        # FastAPI adapter) strict and unchanged.
+        token = _extract_bearer_token(auth_header)
+        if token is None:
+            logger.warning("Malformed authorization header.")
+            return json_response(_GENERIC_AUTH_ERROR, status=401)
+        auth_header = f"Bearer {token}"
+
     res = await _authorize_request(auth_header, auth_config)
 
     if isinstance(res, HttpResponse):

{microsoft_agents_hosting_aiohttp-1.3.0 → microsoft_agents_hosting_aiohttp-1.4.0.dev13/microsoft_agents_hosting_aiohttp.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-aiohttp
-Version: 1.3.0
+Version: 1.4.0.dev13
 Summary: Integration library for Microsoft Agents with aiohttp
 Author: Microsoft Corporation
 License-Expression: MIT
@@ -15,7 +15,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: microsoft-agents-hosting-core==1.3.0
+Requires-Dist: microsoft-agents-hosting-core==1.4.0.dev13
 Requires-Dist: aiohttp>=3.11.11
 Dynamic: license-file
 Dynamic: requires-dist

microsoft_agents_hosting_aiohttp-1.4.0.dev13/microsoft_agents_hosting_aiohttp.egg-info/requires.txt

@@ -0,0 +1,2 @@
+microsoft-agents-hosting-core==1.4.0.dev13
+aiohttp>=3.11.11

microsoft_agents_hosting_aiohttp-1.3.0/VERSION.txt

@@ -1 +0,0 @@
-1.3.0

microsoft_agents_hosting_aiohttp-1.3.0/microsoft_agents_hosting_aiohttp.egg-info/requires.txt

@@ -1,2 +0,0 @@
-microsoft-agents-hosting-core==1.3.0
-aiohttp>=3.11.11