Skip to content
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

LDAP: Search all DNs for users #38891

Merged
merged 5 commits into from
Sep 14, 2021
Merged

LDAP: Search all DNs for users #38891

merged 5 commits into from
Sep 14, 2021

Conversation

sakjur
Copy link
Contributor

@sakjur sakjur commented Sep 6, 2021

What this PR does / why we need it:

Fixes bug when using multiple search base DNs for LDAP.

  • Fix bug
  • Test

Which issue(s) this PR fixes:

Fixes #39028

Special notes for your reviewer:

Look at each commit individually, almost all changes line-wise are in 450631f which is a plain conversion from Convey to Testify.

alexanderzobnin
alexanderzobnin previously approved these changes Sep 7, 2021
@sakjur sakjur marked this pull request as ready for review September 9, 2021 10:03
@sakjur sakjur requested a review from a team as a code owner September 9, 2021 10:03
@sakjur sakjur requested review from sdboyer, malcolmholmes, alexanderzobnin, a team and xlson and removed request for a team September 9, 2021 10:03
@sakjur sakjur added this to the 8.2.0 milestone Sep 9, 2021
@sakjur sakjur dismissed alexanderzobnin’s stale review September 9, 2021 12:37

I've added far too much to this PR to feel good about merging based on the initial review 😇

@sakjur sakjur modified the milestones: 8.2.0, 8.1.4 Sep 9, 2021
@sakjur sakjur added the old backport v8.1.x Mark PR for automatic backport to v8.1.x label Sep 9, 2021
Copy link
Contributor

@xlson xlson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

And great work on the tests :)

@sakjur sakjur merged commit ad971cc into grafana:main Sep 14, 2021
@sakjur sakjur deleted the emil/ldap/multi-dn-search branch September 14, 2021 08:49
grafanabot pushed a commit that referenced this pull request Sep 14, 2021
sakjur added a commit that referenced this pull request Sep 14, 2021
(cherry picked from commit ad971cc)

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
@sunker sunker added this to the 8.1.4 milestone Sep 16, 2021
stevepostill pushed a commit to Reveal-International/grafana that referenced this pull request Nov 3, 2021
…-github to revdev

* commit '56aebaac32bd7a82f84a571969b51c62ba54fd6d': (23 commits)
  "Release: Updated versions in package to 8.1.4" (grafana#39273)
  Docs: Update azuread docs to mention about env variables (grafana#39203) (grafana#39265)
  Docs: plugin migration guide 7.0.0 to 8.0.0 (grafana#38911) (grafana#39246)
  Docs: Added "manageAlerts" provisioning option. (grafana#38836) (grafana#39253)
  BarChart: Fix legend and tooltip colors off by 1 after data refresh (grafana#39234) (grafana#39252)
  Update silences.md (grafana#38834) (grafana#39243)
  Explore: Ensure logs volume bar colors match legend colors (grafana#39072) (grafana#39120)
  Graph: make old graph panel thresholds work even if ngalert is enabled  (grafana#38918) (grafana#39233)
  Fix regex to identify / as separator (grafana#39220)
  [v8.1.x] BarChart: fix stale bar values and x axis labels
  Add link to default template (grafana#39106) (grafana#39138)
  Doc: Created a separate topic for AWS authentication  (grafana#39012) (grafana#39160)
  LDAP: Search all DNs for users (grafana#38891) (grafana#39167)
  Docs: Fix broken link to signed GCS URLs docs (grafana#39144) (grafana#39149)
  [v8.1.x] Variables: Fix not updating inside a Panel when the preceding Row uses "Repeat For" (grafana#39141)
  Docs: Improve v8 upgrade notes for SQL data sources (grafana#38792) (grafana#39124)
  Explore: Trace view now shows trace start time in selected timezone (grafana#39054) (grafana#39093)
  Alerting: Fix notification channel migration (grafana#38983) (grafana#39053)
  Annotations: Fixes blank panels for queries with unknown data sources (grafana#39017) (grafana#39034)
  Copy cue.mod and packages/grafana-schema to container workdir (grafana#38998) (grafana#39018)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
add to changelog area/backend old backport v8.1.x Mark PR for automatic backport to v8.1.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

LDAP: Only the first baseDN is searched when listing LDAP users
5 participants