From f8a0dfd70647828412be94ec876c86f4380f63e6 Mon Sep 17 00:00:00 2001 From: Enric Tobella Date: Fri, 22 Dec 2017 12:10:06 +0100 Subject: [PATCH 01/34] [ADD] auth_ldaps --- auth_ldaps/README.rst | 66 ++++++++++++++++++++ auth_ldaps/__init__.py | 3 + auth_ldaps/__manifest__.py | 20 ++++++ auth_ldaps/models/__init__.py | 3 + auth_ldaps/models/res_company_ldap.py | 28 +++++++++ auth_ldaps/static/description/icon.png | Bin 0 -> 9455 bytes auth_ldaps/views/res_company_ldap_views.xml | 19 ++++++ 7 files changed, 139 insertions(+) create mode 100644 auth_ldaps/README.rst create mode 100644 auth_ldaps/__init__.py create mode 100644 auth_ldaps/__manifest__.py create mode 100644 auth_ldaps/models/__init__.py create mode 100644 auth_ldaps/models/res_company_ldap.py create mode 100644 auth_ldaps/static/description/icon.png create mode 100644 auth_ldaps/views/res_company_ldap_views.xml diff --git a/auth_ldaps/README.rst b/auth_ldaps/README.rst new file mode 100644 index 0000000000..750b525807 --- /dev/null +++ b/auth_ldaps/README.rst @@ -0,0 +1,66 @@ +.. image:: https://img.shields.io/badge/license-AGPL--3-blue.png + :target: https://www.gnu.org/licenses/agpl + :alt: License: AGPL-3 + +==================== +LDAPS Authentication +==================== + +This module allows to authenticate using a LDAP over SSL system. + +Installation +============ + +To install this module, you need to: + +#. Add the CA certificate of the LDAPS on your server as a trusted certificate + +Configuration +============= + +To configure this module, you need to: + +#. Access Settings / General Settings / LDAP Authentication / LDAP Server +#. Check the ´Use LDAPS´ flag + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/251/11.0 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smash it by providing detailed and welcomed feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Enric Tobella + +Do not contact contributors directly about support or help with technical issues. + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +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. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/auth_ldaps/__init__.py b/auth_ldaps/__init__.py new file mode 100644 index 0000000000..4b76c7b2d5 --- /dev/null +++ b/auth_ldaps/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from . import models diff --git a/auth_ldaps/__manifest__.py b/auth_ldaps/__manifest__.py new file mode 100644 index 0000000000..8a70bfa185 --- /dev/null +++ b/auth_ldaps/__manifest__.py @@ -0,0 +1,20 @@ +# Copyright (C) 2017 Creu Blanca +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +{ + 'name': 'LDAPS authentication', + 'version': '11.0.1.0.0', + 'category': 'Tools', + 'website': 'https://github.com/OCA/server-auth', + 'author': 'Creu Blanca, Odoo Community Association (OCA)', + 'license': 'AGPL-3', + 'installable': True, + 'application': False, + 'summary': 'Allows to use LDAP over SSL authentication', + 'depends': [ + 'auth_ldap', + ], + 'data': [ + 'views/res_company_ldap_views.xml', + ], +} diff --git a/auth_ldaps/models/__init__.py b/auth_ldaps/models/__init__.py new file mode 100644 index 0000000000..499b15f328 --- /dev/null +++ b/auth_ldaps/models/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from . import res_company_ldap diff --git a/auth_ldaps/models/res_company_ldap.py b/auth_ldaps/models/res_company_ldap.py new file mode 100644 index 0000000000..84b5662fa5 --- /dev/null +++ b/auth_ldaps/models/res_company_ldap.py @@ -0,0 +1,28 @@ +# Copyright (C) Creu Blanca +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +import ldap +from odoo import fields, models + + +class CompanyLDAP(models.Model): + _inherit = 'res.company.ldap' + + is_ssl = fields.Boolean(string='Use LDAPS', default=False) + + def get_ldap_dicts(self): + res = super().get_ldap_dicts() + for rec in res: + ldap = self.sudo().browse(rec['id']) + rec['is_ssl'] = ldap.is_ssl or False + return res + + def connect(self, conf): + if conf['is_ssl']: + uri = 'ldaps://%s:%d' % ( + conf['ldap_server'], conf['ldap_server_port']) + connection = ldap.initialize(uri) + if conf['ldap_tls']: + connection.start_tls_s() + return connection + return super().connect(conf) diff --git a/auth_ldaps/static/description/icon.png b/auth_ldaps/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/auth_ldaps/views/res_company_ldap_views.xml b/auth_ldaps/views/res_company_ldap_views.xml new file mode 100644 index 0000000000..3d70c6fa00 --- /dev/null +++ b/auth_ldaps/views/res_company_ldap_views.xml @@ -0,0 +1,19 @@ + + + + + + res.company.ldap.form + res.company.ldap + + + + + + + + + From d2db33d38777f2e9b300e7cb9b9915bd5484b556 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Tue, 16 Oct 2018 09:16:38 +0300 Subject: [PATCH 02/34] [MIG] auth_ldaps: Migration to 12.0 --- auth_ldaps/README.rst | 6 ++++-- auth_ldaps/__manifest__.py | 8 ++++++-- auth_ldaps/models/res_company_ldap.py | 21 +++++++++++++++++---- auth_ldaps/views/res_company_ldap_views.xml | 2 ++ 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/auth_ldaps/README.rst b/auth_ldaps/README.rst index 750b525807..c4b407ed82 100644 --- a/auth_ldaps/README.rst +++ b/auth_ldaps/README.rst @@ -11,9 +11,10 @@ This module allows to authenticate using a LDAP over SSL system. Installation ============ -To install this module, you need to: +To verify LDAPS server certificate, you need to: #. Add the CA certificate of the LDAPS on your server as a trusted certificate +#. Check the Verify certificate´ flag in configuration Configuration ============= @@ -25,7 +26,7 @@ To configure this module, you need to: .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/251/11.0 + :target: https://runbot.odoo-community.org/runbot/251/12.0 Bug Tracker =========== @@ -47,6 +48,7 @@ Contributors ------------ * Enric Tobella +* Alexey Pelykh Do not contact contributors directly about support or help with technical issues. diff --git a/auth_ldaps/__manifest__.py b/auth_ldaps/__manifest__.py index 8a70bfa185..e77f10890f 100644 --- a/auth_ldaps/__manifest__.py +++ b/auth_ldaps/__manifest__.py @@ -1,12 +1,16 @@ # Copyright (C) 2017 Creu Blanca +# Copyright (C) 2018 Brainbean Apps # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). { 'name': 'LDAPS authentication', - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'category': 'Tools', 'website': 'https://github.com/OCA/server-auth', - 'author': 'Creu Blanca, Odoo Community Association (OCA)', + 'author': + 'Braibean Apps (https://brainbeanapps.com), ' + 'Creu Blanca, ' + 'Odoo Community Association (OCA)', 'license': 'AGPL-3', 'installable': True, 'application': False, diff --git a/auth_ldaps/models/res_company_ldap.py b/auth_ldaps/models/res_company_ldap.py index 84b5662fa5..459cb4a94d 100644 --- a/auth_ldaps/models/res_company_ldap.py +++ b/auth_ldaps/models/res_company_ldap.py @@ -1,4 +1,5 @@ # Copyright (C) Creu Blanca +# Copyright (C) 2018 Brainbean Apps # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). import ldap @@ -7,22 +8,34 @@ class CompanyLDAP(models.Model): _inherit = 'res.company.ldap' + _description = 'Company LDAP configuration' is_ssl = fields.Boolean(string='Use LDAPS', default=False) + skip_cert_validation = fields.Boolean( + string='Skip certificate validation', + default=False + ) - def get_ldap_dicts(self): - res = super().get_ldap_dicts() + def _get_ldap_dicts(self): + res = super()._get_ldap_dicts() for rec in res: ldap = self.sudo().browse(rec['id']) rec['is_ssl'] = ldap.is_ssl or False + rec['skip_cert_validation'] = ldap.skip_cert_validation or False return res - def connect(self, conf): + def _connect(self, conf): if conf['is_ssl']: uri = 'ldaps://%s:%d' % ( conf['ldap_server'], conf['ldap_server_port']) connection = ldap.initialize(uri) + if conf['skip_cert_validation']: + connection.set_option( + ldap.OPT_X_TLS_REQUIRE_CERT, + ldap.OPT_X_TLS_ALLOW + ) + connection.set_option(ldap.OPT_X_TLS_NEWCTX, 0) if conf['ldap_tls']: connection.start_tls_s() return connection - return super().connect(conf) + return super()._connect(conf) diff --git a/auth_ldaps/views/res_company_ldap_views.xml b/auth_ldaps/views/res_company_ldap_views.xml index 3d70c6fa00..dbde2dc4af 100644 --- a/auth_ldaps/views/res_company_ldap_views.xml +++ b/auth_ldaps/views/res_company_ldap_views.xml @@ -3,6 +3,7 @@ @@ -12,6 +13,7 @@ + From 7a0fc344cd44761c0ffee1a817f7c7f46672f1cc Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Wed, 17 Oct 2018 14:44:47 +0300 Subject: [PATCH 03/34] [FIX] auth_ldaps: Specify ldap as Python dependency and safely import it --- auth_ldaps/__manifest__.py | 5 +++++ auth_ldaps/models/res_company_ldap.py | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/auth_ldaps/__manifest__.py b/auth_ldaps/__manifest__.py index e77f10890f..8a3bcee162 100644 --- a/auth_ldaps/__manifest__.py +++ b/auth_ldaps/__manifest__.py @@ -18,6 +18,11 @@ 'depends': [ 'auth_ldap', ], + 'external_dependencies': { + 'python': [ + 'ldap', + ], + }, 'data': [ 'views/res_company_ldap_views.xml', ], diff --git a/auth_ldaps/models/res_company_ldap.py b/auth_ldaps/models/res_company_ldap.py index 459cb4a94d..c06dcb456d 100644 --- a/auth_ldaps/models/res_company_ldap.py +++ b/auth_ldaps/models/res_company_ldap.py @@ -2,9 +2,16 @@ # Copyright (C) 2018 Brainbean Apps # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). -import ldap +import logging from odoo import fields, models +_logger = logging.getLogger(__name__) + +try: + import ldap +except (ImportError) as err: + _logger.debug(err) + class CompanyLDAP(models.Model): _inherit = 'res.company.ldap' From 90c9ea872eb41683ac7e4f37e660ccc66fae7936 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Wed, 7 Nov 2018 18:53:21 +0200 Subject: [PATCH 04/34] [12.0][FIX] auth_ldap_attribute_sync & auth_ldaps: author name --- auth_ldaps/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auth_ldaps/__manifest__.py b/auth_ldaps/__manifest__.py index 8a3bcee162..5c8515a9d1 100644 --- a/auth_ldaps/__manifest__.py +++ b/auth_ldaps/__manifest__.py @@ -8,7 +8,7 @@ 'category': 'Tools', 'website': 'https://github.com/OCA/server-auth', 'author': - 'Braibean Apps (https://brainbeanapps.com), ' + 'Brainbean Apps (https://brainbeanapps.com), ' 'Creu Blanca, ' 'Odoo Community Association (OCA)', 'license': 'AGPL-3', From 45c56e90a62b52b031dd931c12ff4ed9cc77c028 Mon Sep 17 00:00:00 2001 From: Bhavesh Odedra Date: Wed, 1 Apr 2020 13:04:19 +0530 Subject: [PATCH 05/34] [IMP] auth_ldaps: black, isort, prettier --- auth_ldaps/__manifest__.py | 37 ++++++++------------- auth_ldaps/models/res_company_ldap.py | 30 ++++++++--------- auth_ldaps/views/res_company_ldap_views.xml | 10 +++--- 3 files changed, 31 insertions(+), 46 deletions(-) diff --git a/auth_ldaps/__manifest__.py b/auth_ldaps/__manifest__.py index 5c8515a9d1..cd4830b1f2 100644 --- a/auth_ldaps/__manifest__.py +++ b/auth_ldaps/__manifest__.py @@ -3,27 +3,18 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). { - 'name': 'LDAPS authentication', - 'version': '12.0.1.0.0', - 'category': 'Tools', - 'website': 'https://github.com/OCA/server-auth', - 'author': - 'Brainbean Apps (https://brainbeanapps.com), ' - 'Creu Blanca, ' - 'Odoo Community Association (OCA)', - 'license': 'AGPL-3', - 'installable': True, - 'application': False, - 'summary': 'Allows to use LDAP over SSL authentication', - 'depends': [ - 'auth_ldap', - ], - 'external_dependencies': { - 'python': [ - 'ldap', - ], - }, - 'data': [ - 'views/res_company_ldap_views.xml', - ], + "name": "LDAPS authentication", + "version": "12.0.1.0.0", + "category": "Tools", + "website": "https://github.com/OCA/server-auth", + "author": "Brainbean Apps (https://brainbeanapps.com), " + "Creu Blanca, " + "Odoo Community Association (OCA)", + "license": "AGPL-3", + "installable": True, + "application": False, + "summary": "Allows to use LDAP over SSL authentication", + "depends": ["auth_ldap",], + "external_dependencies": {"python": ["ldap",],}, + "data": ["views/res_company_ldap_views.xml",], } diff --git a/auth_ldaps/models/res_company_ldap.py b/auth_ldaps/models/res_company_ldap.py index c06dcb456d..9f727218e5 100644 --- a/auth_ldaps/models/res_company_ldap.py +++ b/auth_ldaps/models/res_company_ldap.py @@ -3,6 +3,7 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). import logging + from odoo import fields, models _logger = logging.getLogger(__name__) @@ -14,35 +15,30 @@ class CompanyLDAP(models.Model): - _inherit = 'res.company.ldap' - _description = 'Company LDAP configuration' + _inherit = "res.company.ldap" + _description = "Company LDAP configuration" - is_ssl = fields.Boolean(string='Use LDAPS', default=False) + is_ssl = fields.Boolean(string="Use LDAPS", default=False) skip_cert_validation = fields.Boolean( - string='Skip certificate validation', - default=False + string="Skip certificate validation", default=False ) def _get_ldap_dicts(self): res = super()._get_ldap_dicts() for rec in res: - ldap = self.sudo().browse(rec['id']) - rec['is_ssl'] = ldap.is_ssl or False - rec['skip_cert_validation'] = ldap.skip_cert_validation or False + ldap = self.sudo().browse(rec["id"]) + rec["is_ssl"] = ldap.is_ssl or False + rec["skip_cert_validation"] = ldap.skip_cert_validation or False return res def _connect(self, conf): - if conf['is_ssl']: - uri = 'ldaps://%s:%d' % ( - conf['ldap_server'], conf['ldap_server_port']) + if conf["is_ssl"]: + uri = "ldaps://%s:%d" % (conf["ldap_server"], conf["ldap_server_port"]) connection = ldap.initialize(uri) - if conf['skip_cert_validation']: - connection.set_option( - ldap.OPT_X_TLS_REQUIRE_CERT, - ldap.OPT_X_TLS_ALLOW - ) + if conf["skip_cert_validation"]: + connection.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_ALLOW) connection.set_option(ldap.OPT_X_TLS_NEWCTX, 0) - if conf['ldap_tls']: + if conf["ldap_tls"]: connection.start_tls_s() return connection return super()._connect(conf) diff --git a/auth_ldaps/views/res_company_ldap_views.xml b/auth_ldaps/views/res_company_ldap_views.xml index dbde2dc4af..641f352b4b 100644 --- a/auth_ldaps/views/res_company_ldap_views.xml +++ b/auth_ldaps/views/res_company_ldap_views.xml @@ -1,6 +1,5 @@ - + - +

Beta License: AGPL-3 OCA/server-auth Translate me on Weblate Try me on Runbot

+

This module allows to authenticate using a LDAP over SSL system.

+

Table of contents

+ +
+

Installation

+

To verify LDAPS server certificate, you need to:

+
    +
  1. Add the CA certificate of the LDAPS on your server as a trusted certificate
    2. +
  2. Check the Verify certificate´ flag in configuration
    3. +
+
+
+

Configuration

+

To configure this module, you need to:

+
    +
  1. Access Settings / General Settings / LDAP Authentication / LDAP Server
    2. +
  2. Check the ´Use LDAPS´ flag
    3. +
+
+
+

Bug Tracker

+

Bugs are tracked on GitHub 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.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+ +
+ +
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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-auth project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+ + + From 0b82f939c63c294ca90864166c807e708f63bfad Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Sun, 8 Nov 2020 08:08:18 +0200 Subject: [PATCH 11/34] [UPD] Brainbean Apps => CorporateHub --- auth_ldaps/README.rst | 7 +++++-- auth_ldaps/__manifest__.py | 5 ++--- auth_ldaps/readme/CONTRIBUTORS.rst | 5 ++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/auth_ldaps/README.rst b/auth_ldaps/README.rst index 93c78704cc..9ed3c324d1 100644 --- a/auth_ldaps/README.rst +++ b/auth_ldaps/README.rst @@ -64,14 +64,17 @@ Credits Authors ~~~~~~~ -* Brainbean Apps (https://brainbeanapps.com) +* CorporateHub * Creu Blanca Contributors ~~~~~~~~~~~~ * Enric Tobella -* Alexey Pelykh +* `CorporateHub `__ + + * Alexey Pelykh + * Bhavesh Odedra Maintainers diff --git a/auth_ldaps/__manifest__.py b/auth_ldaps/__manifest__.py index 3bf43b6675..debc595950 100644 --- a/auth_ldaps/__manifest__.py +++ b/auth_ldaps/__manifest__.py @@ -1,5 +1,6 @@ # Copyright (C) 2017 Creu Blanca # Copyright (C) 2018 Brainbean Apps +# Copyright 2020 CorporateHub (https://corporatehub.eu) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). { @@ -7,9 +8,7 @@ "version": "13.0.1.0.0", "category": "Tools", "website": "https://github.com/OCA/server-auth", - "author": "Brainbean Apps (https://brainbeanapps.com), " - "Creu Blanca, " - "Odoo Community Association (OCA)", + "author": "CorporateHub, " "Creu Blanca, " "Odoo Community Association (OCA)", "license": "AGPL-3", "installable": True, "application": False, diff --git a/auth_ldaps/readme/CONTRIBUTORS.rst b/auth_ldaps/readme/CONTRIBUTORS.rst index 35b2ecf8d6..520f7dfbac 100644 --- a/auth_ldaps/readme/CONTRIBUTORS.rst +++ b/auth_ldaps/readme/CONTRIBUTORS.rst @@ -1,3 +1,6 @@ * Enric Tobella -* Alexey Pelykh +* `CorporateHub `__ + + * Alexey Pelykh + * Bhavesh Odedra From 87cf16eca9228aaa81b29fb06bdfea70a7842ebb Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Sun, 8 Nov 2020 11:12:19 +0000 Subject: [PATCH 12/34] [UPD] README.rst --- auth_ldaps/static/description/index.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/auth_ldaps/static/description/index.html b/auth_ldaps/static/description/index.html index 9f907c7d5a..c36887fd0a 100644 --- a/auth_ldaps/static/description/index.html +++ b/auth_ldaps/static/description/index.html @@ -412,7 +412,7 @@

Credits

Authors

@@ -420,7 +420,10 @@

Authors

Contributors

From 89d89d9966af160937a6c7776dc45d22bb51036c Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Sun, 8 Nov 2020 11:12:20 +0000 Subject: [PATCH 13/34] auth_ldaps 13.0.1.0.1 --- auth_ldaps/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auth_ldaps/__manifest__.py b/auth_ldaps/__manifest__.py index debc595950..e60e62900e 100644 --- a/auth_ldaps/__manifest__.py +++ b/auth_ldaps/__manifest__.py @@ -5,7 +5,7 @@ { "name": "LDAPS authentication", - "version": "13.0.1.0.0", + "version": "13.0.1.0.1", "category": "Tools", "website": "https://github.com/OCA/server-auth", "author": "CorporateHub, " "Creu Blanca, " "Odoo Community Association (OCA)", From 5d9b67a9fabf7ff6a1a263a2d928dd6eedd2c5f2 Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Mon, 30 Nov 2020 12:21:38 +0100 Subject: [PATCH 14/34] [MIG][14.0] auth_ldaps --- auth_ldaps/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auth_ldaps/__manifest__.py b/auth_ldaps/__manifest__.py index e60e62900e..45760894bb 100644 --- a/auth_ldaps/__manifest__.py +++ b/auth_ldaps/__manifest__.py @@ -5,7 +5,7 @@ { "name": "LDAPS authentication", - "version": "13.0.1.0.1", + "version": "14.0.1.0.0", "category": "Tools", "website": "https://github.com/OCA/server-auth", "author": "CorporateHub, " "Creu Blanca, " "Odoo Community Association (OCA)", From c4fafb884d948983e607849675e137e8ddbccdb3 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Tue, 2 Feb 2021 19:20:37 +0000 Subject: [PATCH 15/34] [UPD] Update auth_ldaps.pot --- auth_ldaps/i18n/auth_ldaps.pot | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/auth_ldaps/i18n/auth_ldaps.pot b/auth_ldaps/i18n/auth_ldaps.pot index be4faeeeac..dcec2a16d0 100644 --- a/auth_ldaps/i18n/auth_ldaps.pot +++ b/auth_ldaps/i18n/auth_ldaps.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 13.0\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -18,6 +18,21 @@ msgstr "" msgid "Company LDAP configuration" msgstr "" +#. module: auth_ldaps +#: model:ir.model.fields,field_description:auth_ldaps.field_res_company_ldap__display_name +msgid "Display Name" +msgstr "" + +#. module: auth_ldaps +#: model:ir.model.fields,field_description:auth_ldaps.field_res_company_ldap__id +msgid "ID" +msgstr "" + +#. module: auth_ldaps +#: model:ir.model.fields,field_description:auth_ldaps.field_res_company_ldap____last_update +msgid "Last Modified on" +msgstr "" + #. module: auth_ldaps #: model:ir.model.fields,field_description:auth_ldaps.field_res_company_ldap__skip_cert_validation msgid "Skip certificate validation" From 059fdda45ca30e413304aedc3dabea3816153744 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Tue, 2 Feb 2021 20:14:18 +0000 Subject: [PATCH 16/34] [UPD] README.rst --- auth_ldaps/README.rst | 10 +++++----- auth_ldaps/static/description/index.html | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/auth_ldaps/README.rst b/auth_ldaps/README.rst index 9ed3c324d1..1ff15e65e5 100644 --- a/auth_ldaps/README.rst +++ b/auth_ldaps/README.rst @@ -14,13 +14,13 @@ LDAPS authentication :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--auth-lightgray.png?logo=github - :target: https://github.com/OCA/server-auth/tree/13.0/auth_ldaps + :target: https://github.com/OCA/server-auth/tree/14.0/auth_ldaps :alt: OCA/server-auth .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/server-auth-13-0/server-auth-13-0-auth_ldaps + :target: https://translation.odoo-community.org/projects/server-auth-14-0/server-auth-14-0-auth_ldaps :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/251/13.0 + :target: https://runbot.odoo-community.org/runbot/251/14.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -54,7 +54,7 @@ Bug Tracker Bugs are tracked on `GitHub 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -90,6 +90,6 @@ 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-auth `_ project on GitHub. +This module is part of the `OCA/server-auth `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/auth_ldaps/static/description/index.html b/auth_ldaps/static/description/index.html index c36887fd0a..e78beb566d 100644 --- a/auth_ldaps/static/description/index.html +++ b/auth_ldaps/static/description/index.html @@ -367,7 +367,7 @@

LDAPS authentication

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/server-auth Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/server-auth Translate me on Weblate Try me on Runbot

This module allows to authenticate using a LDAP over SSL system.

Table of contents

@@ -404,7 +404,7 @@

Bug Tracker

Bugs are tracked on GitHub 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.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -434,7 +434,7 @@

Maintainers

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-auth project on GitHub.

+

This module is part of the OCA/server-auth project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

From 92cca4c58bbf0b5f8a95afb5de126a80599d340f Mon Sep 17 00:00:00 2001 From: Sergio Zanchetta Date: Fri, 12 Feb 2021 08:38:53 +0000 Subject: [PATCH 17/34] Added translation using Weblate (Italian) --- auth_ldaps/i18n/it.po | 45 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 auth_ldaps/i18n/it.po diff --git a/auth_ldaps/i18n/it.po b/auth_ldaps/i18n/it.po new file mode 100644 index 0000000000..797e0064b0 --- /dev/null +++ b/auth_ldaps/i18n/it.po @@ -0,0 +1,45 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * auth_ldaps +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. module: auth_ldaps +#: model:ir.model,name:auth_ldaps.model_res_company_ldap +msgid "Company LDAP configuration" +msgstr "" + +#. module: auth_ldaps +#: model:ir.model.fields,field_description:auth_ldaps.field_res_company_ldap__display_name +msgid "Display Name" +msgstr "" + +#. module: auth_ldaps +#: model:ir.model.fields,field_description:auth_ldaps.field_res_company_ldap__id +msgid "ID" +msgstr "" + +#. module: auth_ldaps +#: model:ir.model.fields,field_description:auth_ldaps.field_res_company_ldap____last_update +msgid "Last Modified on" +msgstr "" + +#. module: auth_ldaps +#: model:ir.model.fields,field_description:auth_ldaps.field_res_company_ldap__skip_cert_validation +msgid "Skip certificate validation" +msgstr "" + +#. module: auth_ldaps +#: model:ir.model.fields,field_description:auth_ldaps.field_res_company_ldap__is_ssl +msgid "Use LDAPS" +msgstr "" From c3526ec8a37cd36a60887bfac8b650a18f1f332a Mon Sep 17 00:00:00 2001 From: Sergio Zanchetta Date: Fri, 12 Feb 2021 08:45:23 +0000 Subject: [PATCH 18/34] Translated using Weblate (Italian) Currently translated at 100.0% (6 of 6 strings) Translation: server-auth-14.0/server-auth-14.0-auth_ldaps Translate-URL: https://translation.odoo-community.org/projects/server-auth-14-0/server-auth-14-0-auth_ldaps/it/ --- auth_ldaps/i18n/it.po | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/auth_ldaps/i18n/it.po b/auth_ldaps/i18n/it.po index 797e0064b0..afd6db55a9 100644 --- a/auth_ldaps/i18n/it.po +++ b/auth_ldaps/i18n/it.po @@ -6,40 +6,42 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2021-02-12 10:45+0000\n" +"Last-Translator: Sergio Zanchetta \n" "Language-Team: none\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" #. module: auth_ldaps #: model:ir.model,name:auth_ldaps.model_res_company_ldap msgid "Company LDAP configuration" -msgstr "" +msgstr "Configurazione LDAP azienda" #. module: auth_ldaps #: model:ir.model.fields,field_description:auth_ldaps.field_res_company_ldap__display_name msgid "Display Name" -msgstr "" +msgstr "Nome visualizzato" #. module: auth_ldaps #: model:ir.model.fields,field_description:auth_ldaps.field_res_company_ldap__id msgid "ID" -msgstr "" +msgstr "ID" #. module: auth_ldaps #: model:ir.model.fields,field_description:auth_ldaps.field_res_company_ldap____last_update msgid "Last Modified on" -msgstr "" +msgstr "Ultima modifica il" #. module: auth_ldaps #: model:ir.model.fields,field_description:auth_ldaps.field_res_company_ldap__skip_cert_validation msgid "Skip certificate validation" -msgstr "" +msgstr "Saltare verifica del certificato" #. module: auth_ldaps #: model:ir.model.fields,field_description:auth_ldaps.field_res_company_ldap__is_ssl msgid "Use LDAPS" -msgstr "" +msgstr "Usare LDAPS" From 5fea19d1b5711780d43a1a61dd1ab5a6840cc7e8 Mon Sep 17 00:00:00 2001 From: Sergio Zanchetta Date: Tue, 2 Mar 2021 17:24:13 +0000 Subject: [PATCH 19/34] Translated using Weblate (Italian) Currently translated at 100.0% (6 of 6 strings) Translation: server-auth-14.0/server-auth-14.0-auth_ldaps Translate-URL: https://translation.odoo-community.org/projects/server-auth-14-0/server-auth-14-0-auth_ldaps/it/ --- auth_ldaps/i18n/it.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/auth_ldaps/i18n/it.po b/auth_ldaps/i18n/it.po index afd6db55a9..941f79046c 100644 --- a/auth_ldaps/i18n/it.po +++ b/auth_ldaps/i18n/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2021-02-12 10:45+0000\n" +"PO-Revision-Date: 2021-03-02 19:45+0000\n" "Last-Translator: Sergio Zanchetta \n" "Language-Team: none\n" "Language: it\n" @@ -44,4 +44,4 @@ msgstr "Saltare verifica del certificato" #. module: auth_ldaps #: model:ir.model.fields,field_description:auth_ldaps.field_res_company_ldap__is_ssl msgid "Use LDAPS" -msgstr "Usare LDAPS" +msgstr "Utilizzare LDAPS" From 3a82e6cc518ee57b58ac831709fab916fd3ae9f1 Mon Sep 17 00:00:00 2001 From: hugues de keyzer Date: Tue, 9 Nov 2021 11:03:31 +0100 Subject: [PATCH 20/34] [FIX] fix ldaps certificate verification --- auth_ldaps/models/res_company_ldap.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/auth_ldaps/models/res_company_ldap.py b/auth_ldaps/models/res_company_ldap.py index 4f331fc41d..e48e010726 100644 --- a/auth_ldaps/models/res_company_ldap.py +++ b/auth_ldaps/models/res_company_ldap.py @@ -35,7 +35,15 @@ def _connect(self, conf): connection = ldap.initialize(uri) if conf["skip_cert_validation"]: connection.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_ALLOW) - connection.set_option(ldap.OPT_X_TLS_NEWCTX, 0) + # this creates a new tls context, which is required to apply + # the options, but it also clears the default options defined + # in the openldap's configuration file, such as the TLS_CACERT + # option, which specifies the file containing the trusted + # certificates. this causes certificate verification to fail, + # even if it would succeed with the default options. this is + # why this is only called if we want to skip certificate + # verification. + connection.set_option(ldap.OPT_X_TLS_NEWCTX, 0) if conf["ldap_tls"]: connection.start_tls_s() return connection From 1a6c3f11336bb3ca7d0cf8d51de5b99b6982cb43 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Tue, 22 Mar 2022 21:31:10 +0000 Subject: [PATCH 21/34] auth_ldaps 14.0.1.0.1 --- auth_ldaps/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auth_ldaps/__manifest__.py b/auth_ldaps/__manifest__.py index 45760894bb..2265f336b7 100644 --- a/auth_ldaps/__manifest__.py +++ b/auth_ldaps/__manifest__.py @@ -5,7 +5,7 @@ { "name": "LDAPS authentication", - "version": "14.0.1.0.0", + "version": "14.0.1.0.1", "category": "Tools", "website": "https://github.com/OCA/server-auth", "author": "CorporateHub, " "Creu Blanca, " "Odoo Community Association (OCA)", From bea6d383b29cf5fa6242f61d02a3cac1e6dee11a Mon Sep 17 00:00:00 2001 From: Alexander Bigga Date: Wed, 14 Sep 2022 11:38:23 +0200 Subject: [PATCH 22/34] [IMP] auth_ldaps: black, isort, prettier --- auth_ldaps/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auth_ldaps/__manifest__.py b/auth_ldaps/__manifest__.py index 2265f336b7..78b12bcd54 100644 --- a/auth_ldaps/__manifest__.py +++ b/auth_ldaps/__manifest__.py @@ -5,7 +5,7 @@ { "name": "LDAPS authentication", - "version": "14.0.1.0.1", + "version": "15.0.1.0.0", "category": "Tools", "website": "https://github.com/OCA/server-auth", "author": "CorporateHub, " "Creu Blanca, " "Odoo Community Association (OCA)", From 92ed5fc2d5921f2808003fb19d30bc6398cacbca Mon Sep 17 00:00:00 2001 From: Alexander Bigga Date: Wed, 14 Sep 2022 11:55:38 +0200 Subject: [PATCH 23/34] [MIG] auth_ldaps: Migration to 15.0 --- auth_ldaps/README.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/auth_ldaps/README.rst b/auth_ldaps/README.rst index 1ff15e65e5..b7cd91095e 100644 --- a/auth_ldaps/README.rst +++ b/auth_ldaps/README.rst @@ -14,16 +14,16 @@ LDAPS authentication :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--auth-lightgray.png?logo=github - :target: https://github.com/OCA/server-auth/tree/14.0/auth_ldaps + :target: https://github.com/OCA/server-auth/tree/15.0/auth_ldaps :alt: OCA/server-auth .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png :target: https://translation.odoo-community.org/projects/server-auth-14-0/server-auth-14-0-auth_ldaps :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/251/14.0 + :target: https://runbot.odoo-community.org/runbot/251/15.0 :alt: Try me on Runbot -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| This module allows to authenticate using a LDAP over SSL system. @@ -38,7 +38,7 @@ Installation To verify LDAPS server certificate, you need to: #. Add the CA certificate of the LDAPS on your server as a trusted certificate -#. Check the Verify certificate´ flag in configuration +#. Check the `Verify certificate` flag in configuration Configuration ============= @@ -46,7 +46,7 @@ Configuration To configure this module, you need to: #. Access Settings / General Settings / LDAP Authentication / LDAP Server -#. Check the ´Use LDAPS´ flag +#. Check the `Use LDAPS` flag Bug Tracker =========== @@ -54,7 +54,7 @@ Bug Tracker Bugs are tracked on `GitHub 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -90,6 +90,6 @@ 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-auth `_ project on GitHub. +This module is part of the `OCA/server-auth `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. From 39ad4508dc3e26767c78f27ca5b292cbe2edfb0c Mon Sep 17 00:00:00 2001 From: Alexander Bigga Date: Wed, 14 Sep 2022 15:59:04 +0200 Subject: [PATCH 24/34] Update readme with oca-gen-addon-readme --- auth_ldaps/README.rst | 8 ++++---- auth_ldaps/readme/CONFIGURE.rst | 2 +- auth_ldaps/readme/INSTALL.rst | 2 +- auth_ldaps/static/description/index.html | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/auth_ldaps/README.rst b/auth_ldaps/README.rst index b7cd91095e..22a83b6885 100644 --- a/auth_ldaps/README.rst +++ b/auth_ldaps/README.rst @@ -17,13 +17,13 @@ LDAPS authentication :target: https://github.com/OCA/server-auth/tree/15.0/auth_ldaps :alt: OCA/server-auth .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/server-auth-14-0/server-auth-14-0-auth_ldaps + :target: https://translation.odoo-community.org/projects/server-auth-15-0/server-auth-15-0-auth_ldaps :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png :target: https://runbot.odoo-community.org/runbot/251/15.0 :alt: Try me on Runbot -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| This module allows to authenticate using a LDAP over SSL system. @@ -38,7 +38,7 @@ Installation To verify LDAPS server certificate, you need to: #. Add the CA certificate of the LDAPS on your server as a trusted certificate -#. Check the `Verify certificate` flag in configuration +#. Check the ``Verify certificate`` flag in configuration Configuration ============= @@ -46,7 +46,7 @@ Configuration To configure this module, you need to: #. Access Settings / General Settings / LDAP Authentication / LDAP Server -#. Check the `Use LDAPS` flag +#. Check the ``Use LDAPS`` flag Bug Tracker =========== diff --git a/auth_ldaps/readme/CONFIGURE.rst b/auth_ldaps/readme/CONFIGURE.rst index 9942eaa67b..24de15cd0f 100644 --- a/auth_ldaps/readme/CONFIGURE.rst +++ b/auth_ldaps/readme/CONFIGURE.rst @@ -1,4 +1,4 @@ To configure this module, you need to: #. Access Settings / General Settings / LDAP Authentication / LDAP Server -#. Check the ´Use LDAPS´ flag +#. Check the ``Use LDAPS`` flag diff --git a/auth_ldaps/readme/INSTALL.rst b/auth_ldaps/readme/INSTALL.rst index 19bbb88aa6..cc477fe506 100644 --- a/auth_ldaps/readme/INSTALL.rst +++ b/auth_ldaps/readme/INSTALL.rst @@ -1,4 +1,4 @@ To verify LDAPS server certificate, you need to: #. Add the CA certificate of the LDAPS on your server as a trusted certificate -#. Check the Verify certificate´ flag in configuration +#. Check the ``Verify certificate`` flag in configuration diff --git a/auth_ldaps/static/description/index.html b/auth_ldaps/static/description/index.html index e78beb566d..2a55fdfe9e 100644 --- a/auth_ldaps/static/description/index.html +++ b/auth_ldaps/static/description/index.html @@ -3,7 +3,7 @@ - + LDAPS authentication