-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
[MIG] dbfilter_from_header: Migration to 12.0 #1558
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
OCA-git-bot
merged 9 commits into
OCA:12.0
from
coopiteasy:12.0-mig-dbfilter_from_header
Jul 29, 2019
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
dc25c48
[ADD] dbfilter_from_header
hbrunn e14a4b0
[MIG] dbfilter_from_header: Migration to 8.0
sbidoul 1658852
[ADD] - dbfilter_from_header: Added module to version 9.0.
fv-clearcorp 8593d93
[ADD] - cherry picked 5737ebc
sbidoul 27ff7cf
[FIX] - dbfilter_from_header: Updated the module to latest conventions.
fv-clearcorp d965fac
[MIG] migrate dbfilter_from_header to 10.0 (#571)
JosDeGraeve ef42a49
[11.0][MIG] dbfilter_from_header
2550261
[FIX] dbfilter_from_header: prevent autoloading
nilshamerlinck a183841
[MIG] dbfilter_from_header: Migration to 12.0
remytms File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| ==================== | ||
| dbfilter_from_header | ||
| ==================== | ||
|
|
||
| .. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| !! This file is generated by oca-gen-addon-readme !! | ||
| !! changes will be overwritten. !! | ||
| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
|
|
||
| .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png | ||
| :target: https://odoo-community.org/page/development-status | ||
| :alt: Beta | ||
| .. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png | ||
| :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html | ||
| :alt: License: AGPL-3 | ||
| .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--tools-lightgray.png?logo=github | ||
| :target: https://github.com/OCA/server-tools/tree/12.0/dbfilter_from_header | ||
| :alt: OCA/server-tools | ||
| .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png | ||
| :target: https://translation.odoo-community.org/projects/server-tools-12-0/server-tools-12-0-dbfilter_from_header | ||
| :alt: Translate me on Weblate | ||
| .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png | ||
| :target: https://runbot.odoo-community.org/runbot/149/12.0 | ||
| :alt: Try me on Runbot | ||
|
|
||
| |badge1| |badge2| |badge3| |badge4| |badge5| | ||
|
|
||
| This addon lets you pass a dbfilter as a HTTP header. | ||
|
|
||
| This is interesting for setups where database names can't be mapped to proxied host names. | ||
|
|
||
| **Table of contents** | ||
|
|
||
| .. contents:: | ||
| :local: | ||
|
|
||
| Installation | ||
| ============ | ||
|
|
||
| To install this module, you only need to add it to your addons, and load it as | ||
| a server-wide module. | ||
|
|
||
| This can be done with the ``server_wide_modules`` parameter in ``/etc/odoo.conf`` | ||
| or with the ``--load`` command-line parameter | ||
|
|
||
| ``server_wide_modules = "web, dbfilter_from_header"`` | ||
|
|
||
| Configuration | ||
| ============= | ||
|
|
||
| Please keep in mind that the standard odoo dbfilter configuration is still | ||
| applied before looking at the regular expression in the header. | ||
|
|
||
| * For nginx, use: | ||
|
|
||
| ``proxy_set_header X-Odoo-dbfilter [your filter regex];`` | ||
|
|
||
| * For caddy, use: | ||
|
|
||
| ``proxy_header X-Odoo-dbfilter [your filter regex]`` | ||
|
|
||
| * For Apache, use: | ||
|
|
||
| ``RequestHeader set X-Odoo-dbfilter [your filter regex]`` | ||
|
|
||
| And make sure that proxy mode is enabled in Odoo's configuration file: | ||
|
|
||
| ``proxy_mode = True`` | ||
|
|
||
| Usage | ||
| ===== | ||
|
|
||
| To use this module, you need to complete installation and configuration | ||
| parts. | ||
|
|
||
| Bug Tracker | ||
| =========== | ||
|
|
||
| Bugs are tracked on `GitHub Issues <https://github.com/OCA/server-tools/issues>`_. | ||
| In case of trouble, please check there if your issue has already been reported. | ||
| If you spotted it first, help us smashing it by providing a detailed and welcomed | ||
| `feedback <https://github.com/OCA/server-tools/issues/new?body=module:%20dbfilter_from_header%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_. | ||
|
|
||
| Do not contact contributors directly about support or help with technical issues. | ||
|
|
||
| Credits | ||
| ======= | ||
|
|
||
| Authors | ||
| ~~~~~~~ | ||
|
|
||
| * Therp BV | ||
|
|
||
| Contributors | ||
| ~~~~~~~~~~~~ | ||
|
|
||
| * Stéphane Bidoul <stephane.bidoul@acsone.eu> | ||
| * Yannick Vaucher <yannick.vaucher@camptocamp.com> | ||
| * Alexandre Fayolle <alexandre.fayolle@camptocamp.com> | ||
| * Holger Brunn <hbrunn@therp.nl> | ||
| * Laurent Mignon (aka lmi) <laurent.mignon@acsone.eu> | ||
| * Sandy Carter <sandy.carter@savoirfairelinux.com> | ||
| * Fabio Vilchez <fabio.vilchez@clearcorp.co.cr> | ||
| * Jos De Graeve <Jos.DeGraeve@apertoso.be> | ||
| * Lai Tim Siu (Quaritle Limited) <info@quartile.co> | ||
|
|
||
| Maintainers | ||
| ~~~~~~~~~~~ | ||
|
|
||
| This module is maintained by the OCA. | ||
|
|
||
| .. image:: https://odoo-community.org/logo.png | ||
| :alt: Odoo Community Association | ||
| :target: https://odoo-community.org | ||
|
|
||
| OCA, or the Odoo Community Association, is a nonprofit organization whose | ||
| mission is to support the collaborative development of Odoo features and | ||
| promote its widespread use. | ||
|
|
||
| This module is part of the `OCA/server-tools <https://github.com/OCA/server-tools/tree/12.0/dbfilter_from_header>`_ project on GitHub. | ||
|
|
||
| You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
|
|
||
| from . import override |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| # © 2013 Therp BV | ||
| # © 2014 ACSONE SA/NV | ||
| # Copyright 2018 Quartile Limited | ||
| # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). | ||
|
|
||
| { | ||
| "name": "dbfilter_from_header", | ||
| "summary": "Filter databases with HTTP headers", | ||
| "version": "12.0.1.0.0", | ||
| "website": "https://github.com/OCA/server-tools", | ||
| "author": "Therp BV, " | ||
| "Odoo Community Association (OCA)", | ||
| "license": "AGPL-3", | ||
| "complexity": "normal", | ||
| "category": "Tools", | ||
| "depends": [ | ||
| 'web', | ||
| ], | ||
| "auto_install": False, | ||
| 'installable': True, | ||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| # Translation of Odoo Server. | ||
| # This file contains the translation of the following modules: | ||
| # | ||
| msgid "" | ||
| msgstr "" | ||
| "Project-Id-Version: Odoo Server 11.0\n" | ||
| "Report-Msgid-Bugs-To: \n" | ||
| "Last-Translator: <>\n" | ||
| "Language-Team: \n" | ||
| "MIME-Version: 1.0\n" | ||
| "Content-Type: text/plain; charset=UTF-8\n" | ||
| "Content-Transfer-Encoding: \n" | ||
| "Plural-Forms: \n" | ||
|
|
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| # © 2013 Therp BV | ||
| # © 2014 ACSONE SA/NV | ||
| # Copyright 2018 Quartile Limited | ||
| # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). | ||
|
|
||
| import logging | ||
| import re | ||
| from odoo import http | ||
| from odoo.tools import config | ||
|
|
||
| db_filter_org = http.db_filter | ||
|
|
||
|
|
||
| def db_filter(dbs, httprequest=None): | ||
| dbs = db_filter_org(dbs, httprequest) | ||
| httprequest = httprequest or http.request.httprequest | ||
| db_filter_hdr = httprequest.environ.get('HTTP_X_ODOO_DBFILTER') | ||
| if db_filter_hdr: | ||
| dbs = [db for db in dbs if re.match(db_filter_hdr, db)] | ||
| return dbs | ||
|
|
||
|
|
||
| if config.get('proxy_mode') and \ | ||
| 'dbfilter_from_header' in config.get('server_wide_modules'): | ||
| _logger = logging.getLogger(__name__) | ||
| _logger.info('monkey patching http.db_filter') | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. is it really necessary to log? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. it works this way in the previous versions |
||
| http.db_filter = db_filter | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| Please keep in mind that the standard odoo dbfilter configuration is still | ||
| applied before looking at the regular expression in the header. | ||
|
|
||
| * For nginx, use: | ||
|
|
||
| ``proxy_set_header X-Odoo-dbfilter [your filter regex];`` | ||
|
|
||
| * For caddy, use: | ||
|
|
||
| ``proxy_header X-Odoo-dbfilter [your filter regex]`` | ||
|
|
||
| * For Apache, use: | ||
|
|
||
| ``RequestHeader set X-Odoo-dbfilter [your filter regex]`` | ||
|
|
||
| And make sure that proxy mode is enabled in Odoo's configuration file: | ||
|
|
||
| ``proxy_mode = True`` |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| * Stéphane Bidoul <stephane.bidoul@acsone.eu> | ||
| * Yannick Vaucher <yannick.vaucher@camptocamp.com> | ||
| * Alexandre Fayolle <alexandre.fayolle@camptocamp.com> | ||
| * Holger Brunn <hbrunn@therp.nl> | ||
| * Laurent Mignon (aka lmi) <laurent.mignon@acsone.eu> | ||
| * Sandy Carter <sandy.carter@savoirfairelinux.com> | ||
| * Fabio Vilchez <fabio.vilchez@clearcorp.co.cr> | ||
| * Jos De Graeve <Jos.DeGraeve@apertoso.be> | ||
| * Lai Tim Siu (Quaritle Limited) <info@quartile.co> |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| This addon lets you pass a dbfilter as a HTTP header. | ||
|
|
||
| This is interesting for setups where database names can't be mapped to proxied host names. |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| To install this module, you only need to add it to your addons, and load it as | ||
| a server-wide module. | ||
|
|
||
| This can be done with the ``server_wide_modules`` parameter in ``/etc/odoo.conf`` | ||
| or with the ``--load`` command-line parameter | ||
|
|
||
| ``server_wide_modules = "web, dbfilter_from_header"`` |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| To use this module, you need to complete installation and configuration | ||
| parts. |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please add the website tag with the value: https://github.com/OCA/server-tools