Closed
Conversation
When python expression is evaluated in odoo form an action or qweb, we are checking the opcodes generated by the evaluation of this code. We do such a verification, because the code from actions and templates can be written by someone having not access to the server and we don't want to let them perform actions out of the scope of their database. In python 3.11, some opcodes from previous versions of Python have been renamed, grouped or sepcified. There are also new ones that have been introduce. In this PR, we are whitelisting the new ones that are needed by odoo to properly work in this version of Python. X-original-commit: 81e4f9a
see lxml/lxml@cc5ddbb X-original-commit: 2d13fa9 Co-authored-by: Xavier Morel (xmo) <xmo@odoo.com>
X-original-commit: 8daf517
In latest versions of werkzeug, the `werkzeug.urls` module has been reduced to remove feature present in urllib.parse. This commit vendored the old version to avoid breaking compatibility with older versions of odoo on ubuntu Noble, without adapting the whole codebase. This should/may be removed in stable by adaptaing eveything to urlib. This version of the lib was minimalized to avoid redondunce with feature still present in werkzeug.urls. Some unused features in odoo are still vendored for ease but are not exposed on the werkzeug.urls for now. X-original-commit: 0dc85a2
Some of the non canononical timezones are not present in Ubuntu Noble, it would be a better practice to only use canonical timezones in data and tests. Note that this is not a real fix for all cases since the database that ran on Ubuntu Jammy and are moved to an ubuntu Noble server will have the issue with timezones already in database. One of the possible fix would be to manage that during upgrades, but this isn't a verry flexible solution since upgrade are meant to manage chyange of version, not change of server. If an old 17.0 versions needs to be moved to a Noble server, this won't work. Another solution would be to install package like tzdata-legacy that may keep the old timezones but it is not the only think since TAI-10 are also in this package. This solution is not ideal because non canonical timezone will still be shown in the dropdown. We would need to filter them. A last solution would be to add the support for those old timezones by monkeypatching the lib. This way, only new timezones would be shown but non canonical one won't crash when used. This is not ideal either because we may need to keep this for a while. But in combination with the upgrade solution, it may work proprely. X-original-commit: e9b62b4
In ubuntu noble, some timezone where removed leading to errors when trying to assign/access them. This was partially fixed in the code by removing all references to old timezones but one issue remains: if a database contains timezones that are not defined in the os, the resolution will fail and break at runtime This patches proposes to alter timezone to fallback on the new canonical timezone if the timezone was removed. This list was generated by checking all symlink in /usr/share/zoneinfo in ubuntu 22.04 that disapeared in ubuntu 24.04 This solutions will work when moving a database from one server to another, even without migration. The all_timezone is not modified on purpose to avoid breaking existing logic. This list may be used to define if a timezone is known by postgress, define selection fiels, .... we don"t want to increase the list in those case. Some other logic using all_timezone may need to be updated but This will be done in master. X-original-commit: e531d8e
The main purpose of this test is to ensure that line return are removed, but all other special character are kept once the file is saved. Unfortunately, werkzeug versions have different strategies on how to quote the filename, removing less special character in latest versions like after pallets/werkzeug@babfc93 This also changes after the changes that removed werkzeug urls methods replacing them by urllib, making the behaviour different again. This commit makes the test more robust by checking that the filename correspond to the expeted one once unquoted, not comparing the quoted versions. X-original-commit: 52a2675
X-original-commit: e73094c
Contributor
Contributor
Author
|
This PR targets saas-17.2 and is part of the forward-port chain. Further PRs will be created up to master. More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port |
Contributor
|
@fw-bot r+ |
robodoo
pushed a commit
that referenced
this pull request
Apr 7, 2024
When python expression is evaluated in odoo form an action or qweb, we are checking the opcodes generated by the evaluation of this code. We do such a verification, because the code from actions and templates can be written by someone having not access to the server and we don't want to let them perform actions out of the scope of their database. In python 3.11, some opcodes from previous versions of Python have been renamed, grouped or sepcified. There are also new ones that have been introduce. In this PR, we are whitelisting the new ones that are needed by odoo to properly work in this version of Python. X-original-commit: 81e4f9a Part-of: #160850
robodoo
pushed a commit
that referenced
this pull request
Apr 7, 2024
see lxml/lxml@cc5ddbb X-original-commit: 2d13fa9 Part-of: #160850 Co-authored-by: Xavier Morel (xmo) <xmo@odoo.com>
robodoo
pushed a commit
that referenced
this pull request
Apr 7, 2024
In latest versions of werkzeug, the `werkzeug.urls` module has been reduced to remove feature present in urllib.parse. This commit vendored the old version to avoid breaking compatibility with older versions of odoo on ubuntu Noble, without adapting the whole codebase. This should/may be removed in stable by adaptaing eveything to urlib. This version of the lib was minimalized to avoid redondunce with feature still present in werkzeug.urls. Some unused features in odoo are still vendored for ease but are not exposed on the werkzeug.urls for now. X-original-commit: 0dc85a2 Part-of: #160850
robodoo
pushed a commit
that referenced
this pull request
Apr 7, 2024
Some of the non canononical timezones are not present in Ubuntu Noble, it would be a better practice to only use canonical timezones in data and tests. Note that this is not a real fix for all cases since the database that ran on Ubuntu Jammy and are moved to an ubuntu Noble server will have the issue with timezones already in database. One of the possible fix would be to manage that during upgrades, but this isn't a verry flexible solution since upgrade are meant to manage chyange of version, not change of server. If an old 17.0 versions needs to be moved to a Noble server, this won't work. Another solution would be to install package like tzdata-legacy that may keep the old timezones but it is not the only think since TAI-10 are also in this package. This solution is not ideal because non canonical timezone will still be shown in the dropdown. We would need to filter them. A last solution would be to add the support for those old timezones by monkeypatching the lib. This way, only new timezones would be shown but non canonical one won't crash when used. This is not ideal either because we may need to keep this for a while. But in combination with the upgrade solution, it may work proprely. X-original-commit: e9b62b4 Part-of: #160850
robodoo
pushed a commit
that referenced
this pull request
Apr 7, 2024
In ubuntu noble, some timezone where removed leading to errors when trying to assign/access them. This was partially fixed in the code by removing all references to old timezones but one issue remains: if a database contains timezones that are not defined in the os, the resolution will fail and break at runtime This patches proposes to alter timezone to fallback on the new canonical timezone if the timezone was removed. This list was generated by checking all symlink in /usr/share/zoneinfo in ubuntu 22.04 that disapeared in ubuntu 24.04 This solutions will work when moving a database from one server to another, even without migration. The all_timezone is not modified on purpose to avoid breaking existing logic. This list may be used to define if a timezone is known by postgress, define selection fiels, .... we don"t want to increase the list in those case. Some other logic using all_timezone may need to be updated but This will be done in master. X-original-commit: e531d8e Part-of: #160850
robodoo
pushed a commit
that referenced
this pull request
Apr 7, 2024
The main purpose of this test is to ensure that line return are removed, but all other special character are kept once the file is saved. Unfortunately, werkzeug versions have different strategies on how to quote the filename, removing less special character in latest versions like after pallets/werkzeug@babfc93 This also changes after the changes that removed werkzeug urls methods replacing them by urllib, making the behaviour different again. This commit makes the test more robust by checking that the filename correspond to the expeted one once unquoted, not comparing the quoted versions. X-original-commit: 52a2675 Part-of: #160850
robodoo
pushed a commit
that referenced
this pull request
Apr 7, 2024
closes #160850 X-original-commit: e73094c Related: odoo/enterprise#60223 Signed-off-by: Xavier Dollé (xdo) <xdo@odoo.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.

This pr backports some fixed for python3.11 and introduces new fixes for Ubuntu Noble, such as timezones.
Forward-Port-Of: #160842
Forward-Port-Of: #151989