rpm/trytond
SHA256
1
0
Fork 0
forked from pool/trytond
Code Pull Requests Activity

- Version 6.0.17

Browse Source 
* Werkzeug 2.0 compatibility added
  * fix_werkzeug_2.x.patch removed

OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/trytond?expand=0&rev=140
This commit is contained in:
Axel Braun 2022-04-19 18:13:50 +00:00 committed by Git OBS Bridge
parent acab459f18
commit a9d95f8c0c
3 changed files with 4 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
fix_werkzeug_2.x.patch
View File

@ -1,52 +0,0 @@
--- a/trytond/protocols/wrappers.py
+++ b/trytond/protocols/wrappers.py
@@ -12,7 +12,6 @@
from http import client as HTTPStatus
from werkzeug.wrappers import Request as _Request, Response
-from werkzeug.http import wsgi_to_bytes, bytes_to_wsgi
from werkzeug.datastructures import Authorization
from werkzeug.exceptions import abort, HTTPException
@@ -113,7 +112,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()
@@ -127,9 +127,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"),
})
@@ -214,16 +214,16 @@
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(HTTPStatus.UNAUTHORIZED)
- if auth_type != b'bearer':
+ if auth_type != 'bearer':
abort(HTTPStatus.FORBIDDEN)
- application = UserApplication.check(bytes_to_wsgi(auth_info), name)
+ application = UserApplication.check(auth_info, name)
if not application:
abort(HTTPStatus.FORBIDDEN)
transaction = Transaction()

4
trytond.changes
View File

@ -1,7 +1,9 @@
-------------------------------------------------------------------
Mon Apr 18 19:25:02 UTC 2022 - Axel Braun <axel.braun@gmx.de>
- Version 6.0.17 - Bugfix Release
- Version 6.0.17
* Werkzeug 2.0 compatibility added
* fix_werkzeug_2.x.patch removed
-------------------------------------------------------------------
Mon Mar 7 14:27:27 UTC 2022 - Axel Braun <axel.braun@gmx.de>

9
trytond.spec
View File

@ -34,8 +34,7 @@ Source5: http://downloads.tryton.org/%{majorver}/%{name}-%{version}.tar.g
Source6: https://keybase.io/cedrickrier/pgp_keys.asc?fingerprint=7C5A4360F6DF81ABA91FD54D6FF50AFE03489130#/%{name}.keyring
Source7: openSUSE-trytond-setup
Source20: %{name}.service
Patch0: fix_werkzeug_2.x.patch
Patch1: Update_changed_fields_6.0.diff
Patch0: Update_changed_fields_6.0.diff
BuildRequires: fdupes
BuildRequires: python3-Werkzeug
BuildRequires: python3-bcrypt
@ -85,13 +84,7 @@ security.
%setup -q
cp %{SOURCE1} .
#Werkzeug2 is not compatible with Werkzeug 1.x, so we need a conditional patch
echo 0%{?suse_version}
%if 0%{?suse_version} >= 1550
%patch0 -p1
%endif
%patch1 -p1
%build
%python3_build