ldap_attrs: escape ldap search filter #5435

rekup · 2022-10-28T08:29:08Z

SUMMARY

Escape ldap search parameter before passing it to search_s

Fixes #5434

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME

ldap_attrs

felixfontein · 2022-10-28T08:33:31Z

Thanks for your contribution! Can you please add a changelog fragment? Thanks.

ansibullbot · 2022-10-28T08:38:11Z

cc @drybjed @jtyr @Noles
click here for bot help

changelogs/fragments/5435-escape-ldap-param.yml

plugins/modules/net_tools/ldap/ldap_attrs.py

felixfontein · 2022-10-28T11:41:14Z

CC @mrvanes

plugins/modules/net_tools/ldap/ldap_attrs.py

felixfontein

Looks correct to me. I'll merge by the end of this week if nobody complains.

felixfontein · 2022-11-02T06:55:38Z

@mrvanes since you're also interested in the LDAP modules, maybe you can take a look here?

felixfontein · 2022-11-03T05:56:00Z

Please note that in #5461 the collection repository was restructured to remove the directory tree in plugins/modules/, and the corresponding tree in tests/unit/plugins/modules/. Your PR modifies files in this directory structure, and unfortunately now has some conflicts, potentially because of this. Please rebase with the current main branch to remove the conflicts.

rekup · 2022-11-03T06:55:59Z

I'm sorry I messed up the rebase. I'll try to fix this

felixfontein · 2022-11-03T06:58:46Z

If that helps, you can find the previous version (inverted) here: https://github.com/ansible-collections/community.general/compare/b2579530da062c7740a9d5f23de1b29b42956f8a..c181f2dd08ed7711cbac620b868ec3f1ec7584e0

Co-authored-by: Felix Fontein <felix@fontein.de>

rekup · 2022-11-03T07:09:00Z

Thanks for your help and reviews @felixfontein, I really appreciate that! I think I've managed to restore the commits.

codecov · 2022-11-03T08:30:08Z

Codecov Report

Merging #5435 (c181f2d) into main (c181f2d) will not change coverage.
The diff coverage is n/a.

❗ Current head c181f2d differs from pull request most recent head a0df4f3. Consider uploading reports for the commit a0df4f3 to get more accurate results

@@           Coverage Diff           @@
##             main    #5435   +/-   ##
=======================================
  Coverage   45.50%   45.50%           
=======================================
  Files         988      988           
  Lines       97111    97111           
  Branches    17743    17743           
=======================================
  Hits        44191    44191           
  Misses      50876    50876           
  Partials     2044     2044

Flag	Coverage Δ
integration	`71.22% <0.00%> (ø)`
sanity	`21.31% <0.00%> (ø)`
stub	`0.00% <0.00%> (ø)`
units	`68.14% <0.00%> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

patchback · 2022-11-04T06:07:10Z

Backport to stable-4: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 1a97ca1 on top of patchback/backports/stable-4/1a97ca1a6f77cabca78d18bfd8a9f46939f11f8a/pr-5435

Backporting merged PR #5435 into main

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
Make sure you have an upstream repo added as a remote too. In these
instructions you'll refer to it by the name upstream. If you don't
have it, here's how you can add it:
```
$ git remote add upstream https://github.com/ansible-collections/community.general.git
```

Ensure you have the latest copy of upstream and prepare a branch
that will hold the backported code:

$ git fetch upstream
$ git checkout -b patchback/backports/stable-4/1a97ca1a6f77cabca78d18bfd8a9f46939f11f8a/pr-5435 upstream/stable-4

Now, cherry-pick PR ldap_attrs: escape ldap search filter #5435 contents into that branch:
```
$ git cherry-pick -x 1a97ca1a6f77cabca78d18bfd8a9f46939f11f8a
```
If it'll yell at you with something like fatal: Commit 1a97ca1a6f77cabca78d18bfd8a9f46939f11f8a is a merge but no -m option was given., add -m 1 as follows intead:
```
$ git cherry-pick -m1 -x 1a97ca1a6f77cabca78d18bfd8a9f46939f11f8a
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR ldap_attrs: escape ldap search filter #5435 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/stable-4/1a97ca1a6f77cabca78d18bfd8a9f46939f11f8a/pr-5435

Create a PR, ensure that the CI is green. If it's not — update it so that
the tests and any other checks pass. This is it!
Now relax and wait for the maintainers to process your pull request
when they have some cycles to do reviews. Don't worry — they'll tell you if
any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback · 2022-11-04T06:07:19Z

Backport to stable-5: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-5/1a97ca1a6f77cabca78d18bfd8a9f46939f11f8a/pr-5435

Backported as #5469

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

* escape ldap search filter * move escape to separate line * add changelog fragment * Update changelogs/fragments/5435-escape-ldap-param.yml Co-authored-by: Felix Fontein <felix@fontein.de> * fix encoding * fixup! fix encoding Co-authored-by: Felix Fontein <felix@fontein.de> (cherry picked from commit 1a97ca1)

felixfontein · 2022-11-04T06:07:38Z

@rekup thanks for fixing this!

* escape ldap search filter * move escape to separate line * add changelog fragment * Update changelogs/fragments/5435-escape-ldap-param.yml Co-authored-by: Felix Fontein <felix@fontein.de> * fix encoding * fixup! fix encoding Co-authored-by: Felix Fontein <felix@fontein.de> (cherry picked from commit 1a97ca1)

* escape ldap search filter * move escape to separate line * add changelog fragment * Update changelogs/fragments/5435-escape-ldap-param.yml Co-authored-by: Felix Fontein <felix@fontein.de> * fix encoding * fixup! fix encoding Co-authored-by: Felix Fontein <felix@fontein.de> (cherry picked from commit 1a97ca1) Co-authored-by: Reto Kupferschmid <kupferschmid@puzzle.ch>

* escape ldap search filter * move escape to separate line * add changelog fragment * Update changelogs/fragments/5435-escape-ldap-param.yml Co-authored-by: Felix Fontein <felix@fontein.de> * fix encoding * fixup! fix encoding Co-authored-by: Felix Fontein <felix@fontein.de>

* escape ldap search filter * move escape to separate line * add changelog fragment * Update changelogs/fragments/5435-escape-ldap-param.yml Co-authored-by: Felix Fontein <felix@fontein.de> * fix encoding * fixup! fix encoding Co-authored-by: Felix Fontein <felix@fontein.de> (cherry picked from commit 1a97ca1) Co-authored-by: Reto Kupferschmid <kupferschmid@puzzle.ch>

* escape ldap search filter * move escape to separate line * add changelog fragment * Update changelogs/fragments/5435-escape-ldap-param.yml Co-authored-by: Felix Fontein <felix@fontein.de> * fix encoding * fixup! fix encoding Co-authored-by: Felix Fontein <felix@fontein.de>

felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-4 labels Oct 28, 2022

ansibullbot added WIP Work in progress bug This issue/PR relates to a bug module module net_tools plugins plugin (any type) small_patch Hopefully easy to review labels Oct 28, 2022

rekup marked this pull request as ready for review October 28, 2022 08:40

ansibullbot removed WIP Work in progress small_patch Hopefully easy to review labels Oct 28, 2022

felixfontein reviewed Oct 28, 2022

View reviewed changes

changelogs/fragments/5435-escape-ldap-param.yml Outdated Show resolved Hide resolved

plugins/modules/net_tools/ldap/ldap_attrs.py Outdated Show resolved Hide resolved

felixfontein reviewed Oct 29, 2022

View reviewed changes

plugins/modules/net_tools/ldap/ldap_attrs.py Outdated Show resolved Hide resolved

felixfontein changed the title ~~escape ldap search filter~~ ldap_attrs: escape ldap search filter Oct 29, 2022

mrvanes mentioned this pull request Oct 31, 2022

geen change status bij ldap-wijzigingen SURFscz/SRAM-deploy#360

Closed

felixfontein approved these changes Nov 1, 2022

View reviewed changes

ansibullbot added the has_issue label Nov 1, 2022

mrvanes mentioned this pull request Nov 1, 2022

Remove ldap-modify script and replace with community.general.ldap_ tasks SURFscz/SRAM-deploy#363

Merged

rekup mentioned this pull request Nov 2, 2022

Allow for DN's to have {x} prefix on first RDN #5450

Merged

ansibullbot added needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR labels Nov 3, 2022

rekup closed this Nov 3, 2022

rekup force-pushed the fix/ldap_attrs_escape branch from b257953 to c181f2d Compare November 3, 2022 06:48

rekup and others added 6 commits November 3, 2022 08:02

escape ldap search filter

41c3c7b

move escape to separate line

d68c6fe

add changelog fragment

622f3da

Update changelogs/fragments/5435-escape-ldap-param.yml

d7a56f6

Co-authored-by: Felix Fontein <felix@fontein.de>

fix encoding

9ebe7cb

fixup! fix encoding

a0df4f3

rekup reopened this Nov 3, 2022

felixfontein approved these changes Nov 3, 2022

View reviewed changes

ansibullbot removed needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR labels Nov 3, 2022

felixfontein merged commit 1a97ca1 into ansible-collections:main Nov 4, 2022

felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label Nov 4, 2022

patchback bot mentioned this pull request Nov 4, 2022

[PR #5435/1a97ca1a backport][stable-5] ldap_attrs: escape ldap search filter #5469

Merged

felixfontein mentioned this pull request Nov 4, 2022

[stable-4] ldap_attrs: escape ldap search filter #5470

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ldap_attrs: escape ldap search filter #5435

ldap_attrs: escape ldap search filter #5435

rekup commented Oct 28, 2022

felixfontein commented Oct 28, 2022

ansibullbot commented Oct 28, 2022

felixfontein commented Oct 28, 2022

felixfontein left a comment

felixfontein commented Nov 2, 2022

felixfontein commented Nov 3, 2022

rekup commented Nov 3, 2022

felixfontein commented Nov 3, 2022

rekup commented Nov 3, 2022

codecov bot commented Nov 3, 2022 •

edited

Loading

patchback bot commented Nov 4, 2022 •

edited

Loading

patchback bot commented Nov 4, 2022 •

edited

Loading

felixfontein commented Nov 4, 2022

ldap_attrs: escape ldap search filter #5435

ldap_attrs: escape ldap search filter #5435

Conversation

rekup commented Oct 28, 2022

SUMMARY

ISSUE TYPE

COMPONENT NAME

felixfontein commented Oct 28, 2022

ansibullbot commented Oct 28, 2022

felixfontein commented Oct 28, 2022

felixfontein left a comment

Choose a reason for hiding this comment

felixfontein commented Nov 2, 2022

felixfontein commented Nov 3, 2022

rekup commented Nov 3, 2022

felixfontein commented Nov 3, 2022

rekup commented Nov 3, 2022

codecov bot commented Nov 3, 2022 • edited Loading

Codecov Report

patchback bot commented Nov 4, 2022 • edited Loading

Backport to stable-4: 💔 cherry-picking failed — conflicts found

Backporting merged PR #5435 into main

patchback bot commented Nov 4, 2022 • edited Loading

Backport to stable-5: 💚 backport PR created

felixfontein commented Nov 4, 2022

codecov bot commented Nov 3, 2022 •

edited

Loading

patchback bot commented Nov 4, 2022 •

edited

Loading

patchback bot commented Nov 4, 2022 •

edited

Loading