Files
opensearch-pyd/test_opensearchpy/test_client/test_utils.py
T
nathaliellenaa b9e48dc847 Fix AuthorizationException with AWSV4SignerAsyncAuth when the doc ID has special characters. (#848)
* Lifecycle integration tests.

Signed-off-by: dblock <dblock@amazon.com>

* Added a test that makes sure the slash is properly encoded.

Signed-off-by: dblock <dblock@amazon.com>

* Added more tests for signer and _make_path.

Signed-off-by: Nathalie Jonathan <nathhjo@amazon.com>

* Prevent AIOHttpConnection from encoding the url a second time.

Signed-off-by: Nathalie Jonathan <nathhjo@amazon.com>

---------

Signed-off-by: dblock <dblock@amazon.com>
Signed-off-by: Nathalie Jonathan <nathhjo@amazon.com>
Co-authored-by: dblock <dblock@amazon.com>
2024-11-27 17:50:22 -05:00

238 lines
8.2 KiB
Python

# SPDX-License-Identifier: Apache-2.0
#
# The OpenSearch Contributors require contributions made to
# this file be licensed under the Apache-2.0 license or a
# compatible open source license.
#
# Modifications Copyright OpenSearch Contributors. See
# GitHub history for details.
#
# Licensed to Elasticsearch B.V. under one or more contributor
# license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright
# ownership. Elasticsearch B.V. licenses this file to you under
# the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
from typing import Any
from opensearchpy.client.utils import _bulk_body, _escape, _make_path, query_params
from ..test_cases import TestCase
class TestQueryParams(TestCase):
def setup_method(self, _: Any) -> None:
self.calls: Any = []
@query_params("simple_param")
def func_to_wrap(self, *args: Any, **kwargs: Any) -> None:
self.calls.append((args, kwargs))
def test_handles_params(self) -> None:
self.func_to_wrap(params={"simple_param_2": "2"}, simple_param="3")
self.assertEqual(
self.calls,
[
(
(),
{
"params": {"simple_param": b"3", "simple_param_2": "2"},
"headers": {},
},
)
],
)
def test_handles_headers(self) -> None:
self.func_to_wrap(headers={"X-Opaque-Id": "app-1"})
self.assertEqual(
self.calls, [((), {"params": {}, "headers": {"x-opaque-id": "app-1"}})]
)
def test_handles_opaque_id(self) -> None:
self.func_to_wrap(opaque_id="request-id")
self.assertEqual(
self.calls, [((), {"params": {}, "headers": {"x-opaque-id": "request-id"}})]
)
def test_handles_empty_none_and_normalization(self) -> None:
self.func_to_wrap(params=None)
self.assertEqual(self.calls[-1], ((), {"params": {}, "headers": {}}))
self.func_to_wrap(headers=None)
self.assertEqual(self.calls[-1], ((), {"params": {}, "headers": {}}))
self.func_to_wrap(headers=None, params=None)
self.assertEqual(self.calls[-1], ((), {"params": {}, "headers": {}}))
self.func_to_wrap(headers={}, params={})
self.assertEqual(self.calls[-1], ((), {"params": {}, "headers": {}}))
self.func_to_wrap(headers={"X": "y"})
self.assertEqual(self.calls[-1], ((), {"params": {}, "headers": {"x": "y"}}))
def test_non_escaping_params(self) -> None:
# the query_params decorator doesn't validate "timeout" it simply avoids escaping as it did
self.func_to_wrap(simple_param="x", timeout="4s")
self.assertEqual(
self.calls[-1],
((), {"params": {"simple_param": b"x", "timeout": "4s"}, "headers": {}}),
)
self.func_to_wrap(simple_param="x", timeout=4, ignore=5, request_timeout=6)
self.assertEqual(
self.calls[-1],
(
(),
{
"params": {
"simple_param": b"x",
"timeout": 4,
"ignore": 5,
"request_timeout": 6,
},
"headers": {},
},
),
)
def test_per_call_authentication(self) -> None:
self.func_to_wrap(api_key=("name", "key"))
self.assertEqual(
self.calls[-1],
((), {"headers": {"authorization": "ApiKey bmFtZTprZXk="}, "params": {}}),
)
self.func_to_wrap(http_auth=("user", "password"))
self.assertEqual(
self.calls[-1],
(
(),
{
"headers": {"authorization": "Basic dXNlcjpwYXNzd29yZA=="},
"params": {},
},
),
)
self.func_to_wrap(http_auth="abcdef")
self.assertEqual(
self.calls[-1],
((), {"headers": {"authorization": "Basic abcdef"}, "params": {}}),
)
# If one or the other is 'None' it's all good!
self.func_to_wrap(http_auth=None, api_key=None)
self.assertEqual(self.calls[-1], ((), {"headers": {}, "params": {}}))
self.func_to_wrap(http_auth="abcdef", api_key=None)
self.assertEqual(
self.calls[-1],
((), {"headers": {"authorization": "Basic abcdef"}, "params": {}}),
)
# If both are given values an error is raised.
with self.assertRaises(ValueError) as e:
self.func_to_wrap(http_auth="key", api_key=("1", "2"))
self.assertEqual(
str(e.exception),
"Only one of 'http_auth' and 'api_key' may be passed at a time",
)
class TestMakePath(TestCase):
def test_handles_unicode(self) -> None:
from urllib.parse import quote
id = "中文"
self.assertEqual(
_make_path("some-index", "type", quote(id)),
"/some-index/type/%25E4%25B8%25AD%25E6%2596%2587",
)
def test_handles_single_arg(self) -> None:
from urllib.parse import quote
id = "idwith!char"
self.assertEqual(
_make_path("some-index", "type", quote(id)),
"/some-index/type/idwith%2521char",
)
def test_handles_multiple_args(self) -> None:
from urllib.parse import quote
ids = ["id!with@char", "another#id$here"]
quoted_ids = [quote(id) for id in ids]
self.assertEqual(
_make_path("some-index", "type", quoted_ids),
"/some-index/type/id%2521with%2540char,another%2523id%2524here",
)
def test_handles_arrays_of_args(self) -> None:
self.assertEqual(
"/index1,index2/type1,type2/doc1,doc2",
_make_path(
("index1", "index2"), ["type1", "type2"], tuple(["doc1", "doc2"])
),
)
from urllib.parse import quote
ids = [quote("$id!1"), quote("id*@2"), quote("#id3#")]
self.assertEqual(
_make_path("some-index", ids, "type"),
"/some-index/%2524id%25211,id%252A%25402,%2523id3%2523/type",
)
class TestEscape(TestCase):
def test_handles_ascii(self) -> None:
string = "abc123"
self.assertEqual(b"abc123", _escape(string))
def test_handles_unicode(self) -> None:
string = "中文"
self.assertEqual(b"\xe4\xb8\xad\xe6\x96\x87", _escape(string))
def test_handles_bytestring(self) -> None:
string = b"celery-task-meta-c4f1201f-eb7b-41d5-9318-a75a8cfbdaa0"
self.assertEqual(string, _escape(string))
class TestBulkBody(TestCase):
def test_proper_bulk_body_as_string_is_not_modified(self) -> None:
string_body = '"{"index":{ "_index" : "test"}}\n{"field1": "value1"}"\n'
self.assertEqual(string_body, _bulk_body(None, string_body))
def test_proper_bulk_body_as_bytestring_is_not_modified(self) -> None:
bytestring_body = b'"{"index":{ "_index" : "test"}}\n{"field1": "value1"}"\n'
self.assertEqual(bytestring_body, _bulk_body(None, bytestring_body))
def test_bulk_body_as_string_adds_trailing_newline(self) -> None:
string_body = '"{"index":{ "_index" : "test"}}\n{"field1": "value1"}"'
self.assertEqual(
'"{"index":{ "_index" : "test"}}\n{"field1": "value1"}"\n',
_bulk_body(None, string_body),
)
def test_bulk_body_as_bytestring_adds_trailing_newline(self) -> None:
bytestring_body = b'"{"index":{ "_index" : "test"}}\n{"field1": "value1"}"'
self.assertEqual(
b'"{"index":{ "_index" : "test"}}\n{"field1": "value1"}"\n',
_bulk_body(None, bytestring_body),
)