From 2e88a29825a4ff5782642126923fefd16a3125b3 Mon Sep 17 00:00:00 2001 From: "mathieu.brunot" Date: Thu, 14 Mar 2019 01:13:58 +0100 Subject: [PATCH 1/4] :sparkles: Fallback to normal login by default --- README.md | 4 ++-- taiga_contrib_ldap_auth_ext/services.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8976200..b34dfed 100644 --- a/README.md +++ b/README.md @@ -81,8 +81,8 @@ LDAP_FULL_NAME_ATTRIBUTE = 'displayName' # Taiga super users group id #LDAP_GROUP_ADMIN = 'OU=TaigaAdmin,DC=example,DC=net' -# Fallback on normal authentication method if this LDAP auth fails. Uncomment to enable. -# LDAP_FALLBACK = "normal" +# Fallback on normal authentication method if LDAP auth fails. Uncomment to disable and only allow LDAP login. +#LDAP_FALLBACK = "" # Function to map LDAP username to local DB user unique identifier. # Upon successful LDAP bind, will override returned username attribute diff --git a/taiga_contrib_ldap_auth_ext/services.py b/taiga_contrib_ldap_auth_ext/services.py index 8204343..7bb9362 100644 --- a/taiga_contrib_ldap_auth_ext/services.py +++ b/taiga_contrib_ldap_auth_ext/services.py @@ -24,7 +24,7 @@ from . import connector -FALLBACK = getattr(settings, 'LDAP_FALLBACK', '') +FALLBACK = getattr(settings, 'LDAP_FALLBACK', 'normal') SLUGIFY = getattr(settings, 'LDAP_MAP_USERNAME_TO_UID', '') EMAIL_MAP = getattr(settings, 'LDAP_MAP_EMAIL', '') From f9041c1dc0b1dab92018a82463136f4c38140d65 Mon Sep 17 00:00:00 2001 From: "mathieu.brunot" Date: Thu, 14 Mar 2019 01:41:43 +0100 Subject: [PATCH 2/4] :wrench: Add github templates --- .github/ISSUE_TEMPLATE/bug_report.md | 43 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 20 +++++++++++ 2 files changed, 63 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..f0d6d23 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,43 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: bug +assignees: madmath03 + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +Provide commands or configuration file if possible. + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Project (please complete the following information):** + - Project Version: [e.g. version 0.4.0] + +**Desktop (please complete the following information):** + - OS: [e.g. iOS] + - Browser [e.g. chrome, safari] + - Version [e.g. 22] + +**Smartphone (please complete the following information):** + - Device: [e.g. iPhone6] + - OS: [e.g. iOS8.1] + - Browser [e.g. stock browser, safari] + - Version [e.g. 22] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..019ab10 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: enhancement +assignees: madmath03 + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. From 0c63f5417a775f2208a4d489a210a1ee4e03953f Mon Sep 17 00:00:00 2001 From: "mathieu.brunot" Date: Thu, 14 Mar 2019 01:55:11 +0100 Subject: [PATCH 3/4] :memo: Add contribution guidelines --- CONTRIBUTING.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..c346d77 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,24 @@ +Contributing +============ + +First of all, **thank you** for contributing, **you are awesome**! + +You can report bugs or request new features by creating an [issue](https://github.com/Monogramm/taiga-contrib-ldap-auth-ext/issues), or submit a [pull request](https://github.com/Monogramm/taiga-contrib-ldap-auth-ext/pulls) with your contribution. + +Here are a few rules to follow in order to ease code reviews and discussions before maintainers accept and merge your work. + +You MUST follow the [The Best of the Best Practices (BOBP) Guide for Python](https://gist.github.com/sloria/7001839). If you don't know about any of them, you should really read the recommendations. + +You SHOULD write tests. + +You SHOULD write documentation. + +Please, write [commit messages that make sense](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html), and [rebase your branch](http://git-scm.com/book/en/Git-Branching-Rebasing) before submitting your Pull Request. + +If possible, use [gitmoji](https://gitmoji.carloscuesta.me/) in your commit message to ease code reviews. + +One may ask you to [squash your commits](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html) too. This is used to "clean" your Pull Request before merging it (we don't want commits such as `fix tests`, `fix 2`, `fix 3`, etc.). + +Also, while creating your Pull Request on GitHub, you MUST write a description which gives the context and/or explains why you are creating it. If your Pull Request is related to one or several issues, you SHOULD reference them in your PR description. + +Thank you! From f90be55e5119961e3ce9125710f2b47b543b823a Mon Sep 17 00:00:00 2001 From: "mathieu.brunot" Date: Thu, 14 Mar 2019 01:55:52 +0100 Subject: [PATCH 4/4] :bookmark: Release 0.4.1 --- setup.py | 2 +- taiga_contrib_ldap_auth_ext/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index d2bc60c..f49a9cd 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ version = ":versiontools:taiga_contrib_ldap_auth_ext:", description = "The (extended) Taiga plugin for ldap authentication", long_description = "Extended Taiga.io plugin for LDAP authentication. This is a fork of ensky/taiga-contrib-ldap-auth which also retrieves the various contributions and other forks into one.", - download_url = 'https://github.com/Monogramm/taiga-contrib-ldap-auth-ext/archive/v0.4.0.tar.gz', + download_url = 'https://github.com/Monogramm/taiga-contrib-ldap-auth-ext/archive/v0.4.1.tar.gz', keywords = 'taiga, ldap, auth, plugin', author = 'madmath03', author_email = 'mathieu.brunot@monogramm.io', diff --git a/taiga_contrib_ldap_auth_ext/__init__.py b/taiga_contrib_ldap_auth_ext/__init__.py index 8f5402d..68abed9 100644 --- a/taiga_contrib_ldap_auth_ext/__init__.py +++ b/taiga_contrib_ldap_auth_ext/__init__.py @@ -11,6 +11,6 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -__version__ = (0, 4, 0) +__version__ = (0, 4, 1) default_app_config = "taiga_contrib_ldap_auth_ext.apps.TaigaContribLDAPAuthAppConfig"