Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Add PreserveHttpMethodOnRedirect switch to Web cmdlets#18894

Merged
daxian-dbw merged 33 commits into
PowerShell:masterPowerShell/PowerShell:masterfrom
CarloToso:WebCmdlets-persist-HTTP-methodCarloToso/PowerShell:WebCmdlets-persist-HTTP-methodCopy head branch name to clipboard
Feb 14, 2023
Merged

Add PreserveHttpMethodOnRedirect switch to Web cmdlets#18894
daxian-dbw merged 33 commits into
PowerShell:masterPowerShell/PowerShell:masterfrom
CarloToso:WebCmdlets-persist-HTTP-methodCarloToso/PowerShell:WebCmdlets-persist-HTTP-methodCopy head branch name to clipboard

Conversation

@CarloToso

@CarloToso CarloToso commented Jan 6, 2023

Copy link
Copy Markdown
Contributor

PR Summary

Add -PreserveHttpMethodOnRedirect switch to preserve the original HTTP method used in Invoke-RestMethod, and Invoke-WebRequest upon redirect.

Replace some code with switch expressions

PR Context

Fixes #14531

PR Checklist

Comment on lines +1285 to +1294
switch (statusCode)
{
case HttpStatusCode.Moved:
case HttpStatusCode.Found:
case HttpStatusCode.MultipleChoices:
return requestMethod == WebRequestMethod.Post;
case HttpStatusCode.SeeOther:
return requestMethod != WebRequestMethod.Get && requestMethod != WebRequestMethod.Head;
default:
return false;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

@CarloToso CarloToso Jan 6, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes, the only difference is SocketsHttpHandler uses HttpMethod requestMethod and we use WebRequestMethod requestMethod.

Maybe we could replace Method with httpMethod

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

We have private HttpMethod GetHttpMethod(WebRequestMethod method) for the conversion.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

We need RequestRequiresForceGet for the cases when we set handler.AllowAutoRedirect = false and WebRequestPSCmdlet handles the redirect

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I see. Thanks for clarify!

@iSazonov iSazonov added WG-Cmdlets-Utility cmdlets in the Microsoft.PowerShell.Utility module CL-General Indicates that a PR should be marked as a general cmdlet change in the Change Log labels Jan 6, 2023
bool sessionRedirect = WebSession.MaximumRedirection > 0 || WebSession.MaximumRedirection == -1;

if (keepAuthorization && IsRedirectCode(response.StatusCode) && response.Headers.Location is not null)
if ((keepAuthorization || (PreserveHTTPMethodOnRedirect && sessionRedirect)) && IsRedirectCode(response.StatusCode) && response.Headers.Location is not null)

@iSazonov iSazonov Jan 7, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

If we use sessionRedirect only here we can put PreserveHTTPMethodOnRedirect in line 1328 too.
Condition looks too complex :-) Is it correct?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I think the current behaviour of if (keepAuthorization..) is wrong, I tested it by setting keepAuthorization = true --> this sets handleRetirect = true --> and then handler.AllowAutoRedirect = false. Without sessionRedirect it ignores MaximumRedirection.
Test: maunally set keepAuthorization = true before the if, then
Invoke-WebRequest "http://mockbin.org/redirect/308?to=https://mockbin.org/redirect/302?to=https://mockbin.org/status/200" -MaximumRedirection 0 -SkipHttpErrorCheck --> expected 308, result 200

Proposed fix --> if (keepAuthorization && sessionRedirect && IsRedirectCode(response.StatusCode) && response.Headers.Location is not null)

@iSazonov iSazonov Jan 7, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

If you think there is a bug in redirection please open new PR and keep the PR only for adding new parameter.
(I believe the new parameter shouldn't change redirection logic.)


// This indicates GetResponse will handle redirects.
if (handleRedirect)
if (handleRedirect || PreserveHTTPMethodOnRedirect)

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I suggest changing the code block as in your another PR to avoid merge conflict.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I will change it after we merge the other PR

@ghost

ghost commented Jan 21, 2023

Copy link
Copy Markdown

This pull request has been automatically marked as Review Needed because it has been there has not been any activity for 7 days.
Maintainer, please provide feedback and/or mark it as Waiting on Author

@iSazonov

Copy link
Copy Markdown
Collaborator

@SteveL-MSFT @PaulHigin Do you have any objections to this new parameter?

@ghost ghost removed the Review - Needed The PR is being reviewed label Feb 10, 2023
@SteveL-MSFT

Copy link
Copy Markdown
Member

@iSazonov I think the parameter name is fine

@SteveL-MSFT SteveL-MSFT left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@ghost ghost added Waiting on Author The PR was reviewed and requires changes or comments from the author before being accept and removed Waiting on Author The PR was reviewed and requires changes or comments from the author before being accept labels Feb 14, 2023
@pull-request-quantifier-deprecated

Copy link
Copy Markdown

This PR has 76 quantified lines of changes. In general, a change size of upto 200 lines is ideal for the best PR experience!


Quantification details

Label      : Small
Size       : +47 -29
Percentile : 30.4%

Total files changed: 2

Change summary by file extension:
.cs : +21 -27
.ps1 : +26 -2

Change counts above are quantified counts, based on the PullRequestQuantifier customizations.

Why proper sizing of changes matters

Optimal pull request sizes drive a better predictable PR flow as they strike a
balance between between PR complexity and PR review overhead. PRs within the
optimal size (typical small, or medium sized PRs) mean:

  • Fast and predictable releases to production:
    • Optimal size changes are more likely to be reviewed faster with fewer
      iterations.
    • Similarity in low PR complexity drives similar review times.
  • Review quality is likely higher as complexity is lower:
    • Bugs are more likely to be detected.
    • Code inconsistencies are more likely to be detected.
  • Knowledge sharing is improved within the participants:
    • Small portions can be assimilated better.
  • Better engineering practices are exercised:
    • Solving big problems by dividing them in well contained, smaller problems.
    • Exercising separation of concerns within the code changes.

What can I do to optimize my changes

  • Use the PullRequestQuantifier to quantify your PR accurately
    • Create a context profile for your repo using the context generator
    • Exclude files that are not necessary to be reviewed or do not increase the review complexity. Example: Autogenerated code, docs, project IDE setting files, binaries, etc. Check out the Excluded section from your prquantifier.yaml context profile.
    • Understand your typical change complexity, drive towards the desired complexity by adjusting the label mapping in your prquantifier.yaml context profile.
    • Only use the labels that matter to you, see context specification to customize your prquantifier.yaml context profile.
  • Change your engineering behaviors
    • For PRs that fall outside of the desired spectrum, review the details and check if:
      • Your PR could be split in smaller, self-contained PRs instead
      • Your PR only solves one particular issue. (For example, don't refactor and code new features in the same PR).

How to interpret the change counts in git diff output

  • One line was added: +1 -0
  • One line was deleted: +0 -1
  • One line was modified: +1 -1 (git diff doesn't know about modified, it will
    interpret that line like one addition plus one deletion)
  • Change percentiles: Change characteristics (addition, deletion, modification)
    of this PR in relation to all other PRs within the repository.


Was this comment helpful? 👍  :ok_hand:  :thumbsdown: (Email)
Customize PullRequestQuantifier for this repository.

@CarloToso CarloToso requested review from daxian-dbw and removed request for PaulHigin February 14, 2023 09:07
@daxian-dbw daxian-dbw merged commit 60b4e97 into PowerShell:master Feb 14, 2023
@CarloToso CarloToso deleted the WebCmdlets-persist-HTTP-method branch February 14, 2023 21:56
@ghost

ghost commented Mar 14, 2023

Copy link
Copy Markdown

🎉v7.4.0-preview.2 has been released which incorporates this pull request.:tada:

Handy links:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CL-General Indicates that a PR should be marked as a general cmdlet change in the Change Log Small WG-Cmdlets-Utility cmdlets in the Microsoft.PowerShell.Utility module

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Feature Request: create switch to persist HTTP method when following a redirect for Invoke-RestMethod or Invoke-WebRequest

4 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.