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

Fix example using custom_attr_whitelist and custom_attr_maxval_len in… #981

Merged

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Aug 24, 2022

… ldap documentation

Signed-off-by: Craig Perkins [email protected]

Description

The section on (Advanced) Control LDAP user attributes contains a mistake in the example of how to configure the attributes custom_attr_whitelist and custom_attr_maxval_len, this PR updates the documentation to ensure the example is in the correct area of the security configuration.

Issues Resolved

Related Issue issue from the security repo: opensearch-project/security#2032

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@cwperks cwperks requested a review from a team as a code owner August 24, 2022 13:38
Copy link
Contributor

@cwillum cwillum 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.

@Naarcha-AWS Naarcha-AWS added backport 2.x backport 1.3 PR: Backport label for v1.3.x labels Aug 25, 2022
@Naarcha-AWS Naarcha-AWS merged commit c48cf8c into opensearch-project:main Aug 25, 2022
opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 25, 2022
… ldap documentation (#981)

Signed-off-by: Craig Perkins <[email protected]>

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit c48cf8c)
@opensearch-trigger-bot
Copy link

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-981-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c48cf8c600a9a714b718842836ce47c9b9ac33dd
# Push it to GitHub
git push --set-upstream origin backport/backport-981-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-981-to-2.x.

@cwperks
Copy link
Member Author

cwperks commented Aug 26, 2022

@cwillum @Naarcha-AWS Looks like the backport to 2.x did not work automatically. Should I go ahead and run the manual steps?

@cwillum
Copy link
Contributor

cwillum commented Aug 26, 2022

@cwperks I think we need to break these out into separate backport 2.0, 2.1, and 2.2 PRs. The "2.x" label was an attempt to consolidate the backport operation. We can probably revert and generate a new PR to do this. Will check in with @Naarcha-AWS .

@Naarcha-AWS Naarcha-AWS added backport 2.0 PR: Backport label for v2.0.x backport 2.1 PR: Backport label for 2.1 backport 2.2 PR: Backport label for 2.2 and removed backport 2.x labels Aug 26, 2022
opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 26, 2022
… ldap documentation (#981)

Signed-off-by: Craig Perkins <[email protected]>

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit c48cf8c)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 26, 2022
… ldap documentation (#981)

Signed-off-by: Craig Perkins <[email protected]>

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit c48cf8c)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 26, 2022
… ldap documentation (#981)

Signed-off-by: Craig Perkins <[email protected]>

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit c48cf8c)
Naarcha-AWS pushed a commit that referenced this pull request Aug 26, 2022
… ldap documentation (#981) (#1012)

Signed-off-by: Craig Perkins <[email protected]>

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit c48cf8c)

Co-authored-by: Craig Perkins <[email protected]>
Naarcha-AWS pushed a commit that referenced this pull request Aug 26, 2022
… ldap documentation (#981) (#1011)

Signed-off-by: Craig Perkins <[email protected]>

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit c48cf8c)

Co-authored-by: Craig Perkins <[email protected]>
Naarcha-AWS pushed a commit that referenced this pull request Aug 26, 2022
… ldap documentation (#981) (#1010)

Signed-off-by: Craig Perkins <[email protected]>

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit c48cf8c)

Co-authored-by: Craig Perkins <[email protected]>
@Naarcha-AWS
Copy link
Collaborator

@cwperks: I went ahead and generated the backport PR for 2.0 for you. I was experimenting with the 2.x label. Sorry for the confusion!

Naarcha-AWS pushed a commit that referenced this pull request Aug 29, 2022
… ldap documentation (#981) (#1005)

Signed-off-by: Craig Perkins <[email protected]>

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit c48cf8c)

Co-authored-by: Craig Perkins <[email protected]>
@cwperks
Copy link
Member Author

cwperks commented Aug 30, 2022

Thank you @Naarcha-AWS !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.3 PR: Backport label for v1.3.x backport 2.0 PR: Backport label for v2.0.x backport 2.1 PR: Backport label for 2.1 backport 2.2 PR: Backport label for 2.2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants