allow authentification via 'additional_headers'

mock_tests/conftest.py

@@ -1,12 +1,18 @@
 import pytest
-from pytest_httpserver import HTTPServer
+from pytest_httpserver import HTTPServer, HeaderValueMatcher
 
 
 MOCK_IP = "127.0.0.1"
 MOCK_PORT = 23536
 CLIENT_ID = "DoesNotMatter"
 MOCK_SERVER_URL = "http://" + MOCK_IP + ":" + str(MOCK_PORT)
 
+# pytest_httpserver 'Authorization' HeaderValueMatcher does not work with Bearer tokens.
+# Hence, overwrite it with the default header value matcher that just compares for equality.
+HeaderValueMatcher.DEFAULT_MATCHERS[
+    "Authorization"
+] = HeaderValueMatcher.default_header_value_matcher
+
 
 @pytest.fixture(scope="session")
 def httpserver_listen_address():

mock_tests/test_auth.py

@@ -140,17 +140,16 @@ def test_auth_header_without_weaviate_auth(weaviate_mock):
 
 def test_auth_header_with_catchall_proxy(weaviate_mock, recwarn):
     """Test that the client can handle situations in which a proxy returns a catchall page for all requests."""
-    bearer_token = "OTHER TOKEN"
-    weaviate_mock.expect_request(
-        "/v1/schema", headers={"Authorization": "Bearer " + bearer_token}
-    ).respond_with_json({})
+    weaviate_mock.expect_request("/v1/schema").respond_with_json({})
     weaviate_mock.expect_request("/v1/.well-known/openid-configuration").respond_with_data(
         "JsonCannotParseThis"
     )
 
     client = weaviate.Client(
         url=MOCK_SERVER_URL,
-        additional_headers={"Authorization": "Bearer " + bearer_token},
+        auth_client_secret=weaviate.AuthClientPassword(
+            username="test-username", password="test-password"
+        ),
     )
     client.schema.delete_all()  # some call that includes authorization
 
@@ -206,7 +205,7 @@ def handler(request: Request):
     assert str(w.message).startswith("Con001")
 
 
-def test_with_simple_auth_no_oidc(weaviate_mock, recwarn):
+def test_with_simple_auth_no_oidc_via_api_key(weaviate_mock, recwarn):
     weaviate_mock.expect_request(
         "/v1/schema", headers={"Authorization": "Bearer " + "Super-secret-key"}
     ).respond_with_json({})
@@ -219,3 +218,17 @@ def test_with_simple_auth_no_oidc(weaviate_mock, recwarn):
 
     weaviate_mock.check_assertions()
     assert len(recwarn) == 0
+
+
+def test_with_simple_auth_no_oidc_via_additional_headers(weaviate_mock, recwarn):
+    weaviate_mock.expect_request(
+        "/v1/schema", headers={"Authorization": "Bearer " + "Super-secret-key"}
+    ).respond_with_json({})
+
+    client = weaviate.Client(
+        url=MOCK_SERVER_URL, additional_headers={"Authorization": "Bearer " + "Super-secret-key"}
+    )
+    client.schema.delete_all()
+
+    weaviate_mock.check_assertions()
+    assert len(recwarn) == 0

weaviate/connect/connection.py

@@ -132,6 +132,10 @@ def _create_session(self, auth_client_secret: Optional[AuthCredentials]) -> None
             self._session = requests.Session()
             return
 
+        if "authorization" in self._headers and auth_client_secret is None:
+            self._session = requests.Session()
+            return
+
         oidc_url = self.url + self._api_version_path + "/.well-known/openid-configuration"
         response = requests.get(
             oidc_url,