Merge branch 'main' into support/3.2

zatosource · Nov 17, 2023 · d453ccf · d453ccf
2 parents f744cd8 + d7ce042
commit d453ccf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/code/zato-common/src/zato/common/util/url_dispatcher.py b/code/zato-common/src/zato/common/util/url_dispatcher.py
@@ -37,6 +37,18 @@ def get_match_target(config, sep=MISC.SEPARATOR, accept_any_http=accept_any_http
     http_accept = config.get('http_accept') or accept_any_http
     http_accept = http_accept.replace('*', '{}'.format(accept_any_internal)).replace('/', 'HTTP_SEP')
 
-    return '%s%s%s%s%s%s%s' % (config['soap_action'], sep, http_method, sep, http_accept, sep, config['url_path'])
+    # Extract variables needed to build the pattern
+    soap_action = config['soap_action']
+    url_path = config['url_path']
+
+    # Support parentheses in URL paths
+    url_path = url_path.replace('(', r'\(')
+    url_path = url_path.replace(')', r'\)')
+
+    # Build the pattern ..
+    pattern = f'{soap_action}{sep}{http_method}{sep}{http_accept}{sep}{url_path}'
+
+    # .. and return it to our caller
+    return pattern
 
 # ################################################################################################################################
diff --git a/code/zato-server/src/zato/server/ext/zunicorn/_compat.py b/code/zato-server/src/zato/server/ext/zunicorn/_compat.py
@@ -119,7 +119,7 @@ def bytes_to_str(b):
     import urllib.parse
 
     def unquote_to_wsgi_str(string):
-        return _unquote_to_bytes(string).decode('latin-1')
+        return _unquote_to_bytes(string).decode('utf-8')
 
     _unquote_to_bytes = urllib.parse.unquote_to_bytes