Accepting request 908627 from Application:ERP:GNUHealth:Factory

OBS-URL: https://build.opensuse.org/request/show/908627
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/trytond?expand=0&rev=62

fix_werkzeug_2.x.patch

@@ -0,0 +1,54 @@
+diff -U 3 -dHrN -- a/trytond/protocols/wrappers.py b/trytond/protocols/wrappers.py
+--- a/trytond/protocols/wrappers.py	2019-08-11 19:34:43.000000000 +0200
++++ b/trytond/protocols/wrappers.py	2021-07-27 15:59:38.213817153 +0200
+@@ -8,7 +8,6 @@
+ 
+ from werkzeug.wrappers import Request as _Request, Response
+ from werkzeug.utils import cached_property
+-from werkzeug.http import wsgi_to_bytes, bytes_to_wsgi
+ from werkzeug.datastructures import Authorization
+ from werkzeug.exceptions import abort, HTTPException
+ 
+@@ -84,7 +83,8 @@
+ def parse_authorization_header(value):
+     if not value:
+         return
+-    value = wsgi_to_bytes(value)
++    if not isinstance(value, bytes):
++        value = value.encode('latin1')    
+     try:
+         auth_type, auth_info = value.split(None, 1)
+         auth_type = auth_type.lower()
+@@ -98,9 +98,9 @@
+         except Exception:
+             return
+         return Authorization('session', {
+-                'username': bytes_to_wsgi(username),
++                'username': username.decode("latin1"),                
+                 'userid': userid,
+-                'session': bytes_to_wsgi(session),
++                'session': session.decode("latin1"),                
+                 })
+ 
+ 
+@@ -171,16 +171,17 @@
+             pool = Pool()
+             UserApplication = pool.get('res.user.application')
+ 
+-            authorization = wsgi_to_bytes(request.headers['Authorization'])
++            authorization = request.headers['Authorization']            
+             try:
+                 auth_type, auth_info = authorization.split(None, 1)
+                 auth_type = auth_type.lower()
+             except ValueError:
+                 abort(401)
+-            if auth_type != b'bearer':
++            if auth_type != 'bearer':
+                 abort(403)
+ 
+-            application = UserApplication.check(bytes_to_wsgi(auth_info), name)
++            application = UserApplication.check(auth_info, name)
++            
+             if not application:
+                 abort(403)
+             transaction = Transaction()

trytond.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 27 14:04:30 UTC 2021 - Axel Braun <axel.braun@gmx.de>
+
+- fix_werkzeug_2.x.patch added for python-Werkzeug 2.x compatibility 
+
 -------------------------------------------------------------------
 Fri Jun 18 15:48:52 UTC 2021 - Axel Braun <axel.braun@gmx.de>
 

trytond.spec

@@ -36,6 +36,7 @@ Source6:        https://keybase.io/cedrickrier/pgp_keys.asc?fingerprint=7C5A4360
 Source20:       %{name}.service
 Patch0:         fix_werkzeug.patch
 Patch1:         revert_werkzeug_setup.patch
+Patch2:         fix_werkzeug_2.x.patch
 BuildRequires:  fdupes
 BuildRequires:  python3-Werkzeug
 BuildRequires:  python3-bcrypt
@@ -84,6 +85,12 @@ cp %{SOURCE2} .
 %patch0 -p1
 %patch1 -p1
 
+#Werkzeug2 is not compatible with Werkzeug 1.x, so we need a conditional patch
+echo 0%{?suse_version}
+%if 0%{?suse_version} >= 1550
+%patch2 -p1
+%endif
+
 %build
 %python3_build