Skip to content

Build the relative URI for links from the response in Invoke-WebRequest #19092

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.

Sign up for GitHub

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

Merged
iSazonov merged 9 commits into from
Feb 10, 2023
Merged

Build the relative URI for links from the response in Invoke-WebRequest #19092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
844a44b
fix #8935
CarloToso Feb 2, 2023
bc99836
fix CodeFactor
CarloToso Feb 2, 2023
0badf24
Add tests
CarloToso Feb 3, 2023
3982f81
fix
CarloToso Feb 3, 2023
98c4d83
remove $maxLinks
CarloToso Feb 3, 2023
021eab6
revert, add suggestions
CarloToso Feb 3, 2023
6fb5075
Merge branch 'master' into FollowRelLink-use-the-URI-resolved-in-resp…
CarloToso Feb 10, 2023
8d6b1a0
fix
CarloToso Feb 10, 2023
1811894
Merge branch 'PowerShell:master' into FollowRelLink-use-the-URI-resol…
CarloToso Feb 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ...owerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ protected override void ProcessRecord()

if (_parseRelLink || _followRelLink)
{
ParseLinkHeader(response, uri);
ParseLinkHeader(response);
}

ProcessResponse(response);
Expand Down Expand Up @@ -1596,8 +1596,9 @@ internal void SetRequestContent(HttpRequestMessage request, IDictionary content)
SetRequestContent(request, body);
}

internal void ParseLinkHeader(HttpResponseMessage response, System.Uri requestUri)
internal void ParseLinkHeader(HttpResponseMessage response)
{
Uri requestUri = response.RequestMessage.RequestUri;
if (_relationLink is null)
{
// Must ignore the case of relation links. See RFC 8288 (https://tools.ietf.org/html/rfc8288)
Expand All @@ -1610,12 +1611,12 @@ internal void ParseLinkHeader(HttpResponseMessage response, System.Uri requestUr

// We only support the URL in angle brackets and `rel`, other attributes are ignored
// user can still parse it themselves via the Headers property
const string pattern = "<(?<url>.*?)>;\\s*rel=(?<quoted>\")?(?<rel>(?(quoted).*?|[^,;]*))(?(quoted)\")";
const string Pattern = "<(?<url>.*?)>;\\s*rel=(?<quoted>\")?(?<rel>(?(quoted).*?|[^,;]*))(?(quoted)\")";
if (response.Headers.TryGetValues("Link", out IEnumerable<string> links))
{
foreach (string linkHeader in links)
{
MatchCollection matchCollection = Regex.Matches(linkHeader, pattern);
MatchCollection matchCollection = Regex.Matches(linkHeader, Pattern);
foreach (Match match in matchCollection)
{
if (match.Success)
Expand Down
16 changes: 12 additions & 4 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,8 +834,12 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
$result.Output.RelationLink.Count | Should -Be 0
}

It "Validate Invoke-WebRequest returns valid RelationLink property with absolute uris if Link Header is present" {
$uri = Get-WebListenerUrl -Test 'Link' -Query @{maxlinks = 5; linknumber = 2}
It "Validate Invoke-WebRequest returns valid RelationLink property with absolute uris if Link Header is present <name>" -TestCases @(
$originalUri = Get-WebListenerUrl -Test 'Link' -Query @{maxlinks = 5; linknumber = 2}
@{name = '(URI with scheme)'; uri = $originalUri}
@{name = '(URI without scheme)'; uri = $originalUri.OriginalString.Split("//")[1]}
) {
param($uri)
$command = "Invoke-WebRequest -Uri '$uri'"
$result = ExecuteWebCommand -command $command

Expand Down Expand Up @@ -2547,9 +2551,13 @@ Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {
$result.Output | Should -BeExactly "foo"
}

It "Validate Invoke-RestMethod -FollowRelLink correctly follows all the available relation links" {
It "Validate Invoke-RestMethod -FollowRelLink correctly follows all the available relation links <name>" -TestCases @(
$maxLinks = 5
$uri = Get-WebListenerUrl -Test 'Link' -Query @{maxlinks = $maxLinks}
$originalUri = Get-WebListenerUrl -Test 'Link' -Query @{maxlinks = $maxLinks}
@{name = '(URI with scheme)'; uri = $originalUri}
@{name = '(URI without scheme)'; uri = $originalUri.OriginalString.Split("//")[1]}
) {
param($uri)
$command = "Invoke-RestMethod -Uri '$uri' -FollowRelLink"
$result = ExecuteWebCommand -command $command

Expand Down