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

Validate content type of responses #3719

Merged
merged 5 commits into from
Nov 21, 2023

Conversation

peternied
Copy link
Member

Description

Makes sure that for response with a body they are returning the expected content type

Issues Resolved

Check List

  • New functionality includes testing
  • New functionality has been documented
  • Commits are signed per the DCO using --signoff

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.

Signed-off-by: Peter Nied <petern@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
@peternied peternied force-pushed the content-type-validate branch 3 times, most recently from 1f424f7 to f699383 Compare November 16, 2023 18:31
Signed-off-by: Peter Nied <petern@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
Copy link
Collaborator

@scrawfor99 scrawfor99 left a comment

Choose a reason for hiding this comment

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

Thanks Peter

@peternied peternied added the backport 2.x backport to 2.x branch label Nov 21, 2023
@peternied peternied merged commit c30c084 into opensearch-project:main Nov 21, 2023
76 checks passed
@peternied peternied deleted the content-type-validate branch November 21, 2023 20:03
@opensearch-trigger-bot
Copy link
Contributor

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:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/security/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security/backport-2.x
# Create a new branch
git switch --create backport/backport-3719-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c30c084b911d00f94683bcccc0d1acd32461a001
# Push it to GitHub
git push --set-upstream origin backport/backport-3719-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.x

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

peternied added a commit to peternied/security that referenced this pull request Nov 21, 2023
…#3719)

Makes sure that for response with a body they are returning the expected
content type

Signed-off-by: Peter Nied <petern@amazon.com>
peternied added a commit to peternied/security that referenced this pull request Nov 21, 2023
…#3719)

Makes sure that for response with a body they are returning the expected
content type

Signed-off-by: Peter Nied <petern@amazon.com>
peternied added a commit to peternied/security that referenced this pull request Nov 21, 2023
…#3719)

Makes sure that for response with a body they are returning the expected
content type

Signed-off-by: Peter Nied <petern@amazon.com>
peternied added a commit to peternied/security that referenced this pull request Nov 21, 2023
…#3719)

Makes sure that for response with a body they are returning the expected
content type

Signed-off-by: Peter Nied <petern@amazon.com>
peternied added a commit that referenced this pull request Nov 22, 2023
Backports c30c084 from #3719

Signed-off-by: Peter Nied <petern@amazon.com>
prabhask5 pushed a commit to prabhask5/opensearch-security that referenced this pull request Jan 11, 2024
Makes sure that for response with a body they are returning the expected
content type

Signed-off-by: Peter Nied <petern@amazon.com>
Signed-off-by: Prabhas Kurapati <prabhask@berkeley.edu>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants