Skip to content

Strip credentials from cross-origin request clones (nextLink follow-up) #1551

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
Yabo Hu (VeryEarly) merged 5 commits into from
Aug 10, 2026
Merged

Strip credentials from cross-origin request clones (nextLink follow-up) #1551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a248ae2
Strip credentials from cross-origin request clones
YangAn-microsoft Aug 5, 2026
82e5d63
Require https same-origin before forwarding credentials on request clone
YangAn-microsoft Aug 5, 2026
e75a7d4
Update emitter test baselines for cross-origin credential strip
YangAn-microsoft Aug 5, 2026
441e95e
Remove runtime-header-forwarding guard test (redundant with emitter b…
YangAn-microsoft Aug 6, 2026
a87ff9c
Resolve relative nextLinks before same-origin check; strip only on re…
YangAn-microsoft Aug 6, 2026
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
18 changes: 18 additions & 0 deletions powershell/resources/runtime/csharp/pipeline/ISendAsync.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,20 @@ internal static Task<HttpRequestMessage> CloneWithContentAndDispose(this HttpReq
/// <returns>A clone of the HttpRequestMessage</returns>
internal static HttpRequestMessage Clone(this HttpRequestMessage original, System.Uri requestUri = null, System.Net.Http.HttpMethod method = null)
{
// Resolve a relative target against the original request so same-origin relative nextLinks are not misclassified as cross-origin.
var effectiveTargetUri = requestUri;
if (effectiveTargetUri != null && !effectiveTargetUri.IsAbsoluteUri && original.RequestUri != null && original.RequestUri.IsAbsoluteUri)
{
System.Uri.TryCreate(original.RequestUri, effectiveTargetUri, out effectiveTargetUri);
}
// Keep credentials only for a same-origin (scheme+host+port) https target. A null target (no retarget, e.g. retry)
// or an unresolved relative target preserves existing behavior and keeps the headers.
var isSameOrigin = effectiveTargetUri == null || !effectiveTargetUri.IsAbsoluteUri ||
(original.RequestUri != null && original.RequestUri.IsAbsoluteUri &&
original.RequestUri.Scheme.Equals(effectiveTargetUri.Scheme, System.StringComparison.OrdinalIgnoreCase) &&
original.RequestUri.Host.Equals(effectiveTargetUri.Host, System.StringComparison.OrdinalIgnoreCase) &&
original.RequestUri.Port == effectiveTargetUri.Port &&
effectiveTargetUri.Scheme.Equals(System.Uri.UriSchemeHttps, System.StringComparison.OrdinalIgnoreCase));
var clone = new HttpRequestMessage
{
Method = method ?? original.Method,
Expand All @@ -376,6 +390,10 @@ internal static HttpRequestMessage Clone(this HttpRequestMessage original, Syste
*/
if (!"x-ms-unique-id".Equals(header.Key) && !"x-ms-client-request-id".Equals(header.Key) && !"CommandName".Equals(header.Key) && !"FullCommandName".Equals(header.Key) && !"ParameterSetName".Equals(header.Key) && !"User-Agent".Equals(header.Key))
{
if (!isSameOrigin && ("Authorization".Equals(header.Key, System.StringComparison.OrdinalIgnoreCase) || "Proxy-Authorization".Equals(header.Key, System.StringComparison.OrdinalIgnoreCase) || "Cookie".Equals(header.Key, System.StringComparison.OrdinalIgnoreCase)))
{
continue;
}
clone.Headers.TryAddWithoutValidation(header.Key, header.Value);
}
}
Expand Down
18 changes: 18 additions & 0 deletions ...e/tests-emitter/AppComplianceAutomation.Management/target/generated/runtime/ISendAsync.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,20 @@ internal static Task<HttpRequestMessage> CloneWithContentAndDispose(this HttpReq
/// <returns>A clone of the HttpRequestMessage</returns>
internal static HttpRequestMessage Clone(this HttpRequestMessage original, System.Uri requestUri = null, System.Net.Http.HttpMethod method = null)
{
// Resolve a relative target against the original request so same-origin relative nextLinks are not misclassified as cross-origin.
var effectiveTargetUri = requestUri;
if (effectiveTargetUri != null && !effectiveTargetUri.IsAbsoluteUri && original.RequestUri != null && original.RequestUri.IsAbsoluteUri)
{
System.Uri.TryCreate(original.RequestUri, effectiveTargetUri, out effectiveTargetUri);
}
// Keep credentials only for a same-origin (scheme+host+port) https target. A null target (no retarget, e.g. retry)
// or an unresolved relative target preserves existing behavior and keeps the headers.
var isSameOrigin = effectiveTargetUri == null || !effectiveTargetUri.IsAbsoluteUri ||
(original.RequestUri != null && original.RequestUri.IsAbsoluteUri &&
original.RequestUri.Scheme.Equals(effectiveTargetUri.Scheme, System.StringComparison.OrdinalIgnoreCase) &&
original.RequestUri.Host.Equals(effectiveTargetUri.Host, System.StringComparison.OrdinalIgnoreCase) &&
original.RequestUri.Port == effectiveTargetUri.Port &&
effectiveTargetUri.Scheme.Equals(System.Uri.UriSchemeHttps, System.StringComparison.OrdinalIgnoreCase));
var clone = new HttpRequestMessage
{
Method = method ?? original.Method,
Expand All @@ -376,6 +390,10 @@ internal static HttpRequestMessage Clone(this HttpRequestMessage original, Syste
*/
if (!"x-ms-unique-id".Equals(header.Key) && !"x-ms-client-request-id".Equals(header.Key) && !"CommandName".Equals(header.Key) && !"FullCommandName".Equals(header.Key) && !"ParameterSetName".Equals(header.Key) && !"User-Agent".Equals(header.Key))
{
if (!isSameOrigin && ("Authorization".Equals(header.Key, System.StringComparison.OrdinalIgnoreCase) || "Proxy-Authorization".Equals(header.Key, System.StringComparison.OrdinalIgnoreCase) || "Cookie".Equals(header.Key, System.StringComparison.OrdinalIgnoreCase)))
{
continue;
}
clone.Headers.TryAddWithoutValidation(header.Key, header.Value);
}
}
Expand Down
18 changes: 18 additions & 0 deletions ...-upgrade/tests-emitter/Astronomer.Astro.Management/target/generated/runtime/ISendAsync.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,20 @@ internal static Task<HttpRequestMessage> CloneWithContentAndDispose(this HttpReq
/// <returns>A clone of the HttpRequestMessage</returns>
internal static HttpRequestMessage Clone(this HttpRequestMessage original, System.Uri requestUri = null, System.Net.Http.HttpMethod method = null)
{
// Resolve a relative target against the original request so same-origin relative nextLinks are not misclassified as cross-origin.
var effectiveTargetUri = requestUri;
if (effectiveTargetUri != null && !effectiveTargetUri.IsAbsoluteUri && original.RequestUri != null && original.RequestUri.IsAbsoluteUri)
{
System.Uri.TryCreate(original.RequestUri, effectiveTargetUri, out effectiveTargetUri);
}
// Keep credentials only for a same-origin (scheme+host+port) https target. A null target (no retarget, e.g. retry)
// or an unresolved relative target preserves existing behavior and keeps the headers.
var isSameOrigin = effectiveTargetUri == null || !effectiveTargetUri.IsAbsoluteUri ||
(original.RequestUri != null && original.RequestUri.IsAbsoluteUri &&
original.RequestUri.Scheme.Equals(effectiveTargetUri.Scheme, System.StringComparison.OrdinalIgnoreCase) &&
original.RequestUri.Host.Equals(effectiveTargetUri.Host, System.StringComparison.OrdinalIgnoreCase) &&
original.RequestUri.Port == effectiveTargetUri.Port &&
effectiveTargetUri.Scheme.Equals(System.Uri.UriSchemeHttps, System.StringComparison.OrdinalIgnoreCase));
var clone = new HttpRequestMessage
{
Method = method ?? original.Method,
Expand All @@ -376,6 +390,10 @@ internal static HttpRequestMessage Clone(this HttpRequestMessage original, Syste
*/
if (!"x-ms-unique-id".Equals(header.Key) && !"x-ms-client-request-id".Equals(header.Key) && !"CommandName".Equals(header.Key) && !"FullCommandName".Equals(header.Key) && !"ParameterSetName".Equals(header.Key) && !"User-Agent".Equals(header.Key))
{
if (!isSameOrigin && ("Authorization".Equals(header.Key, System.StringComparison.OrdinalIgnoreCase) || "Proxy-Authorization".Equals(header.Key, System.StringComparison.OrdinalIgnoreCase) || "Cookie".Equals(header.Key, System.StringComparison.OrdinalIgnoreCase)))
{
continue;
}
clone.Headers.TryAddWithoutValidation(header.Key, header.Value);
}
}
Expand Down
18 changes: 18 additions & 0 deletions tests-upgrade/tests-emitter/AzureAI.Assets/target/generated/runtime/ISendAsync.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,20 @@ internal static Task<HttpRequestMessage> CloneWithContentAndDispose(this HttpReq
/// <returns>A clone of the HttpRequestMessage</returns>
internal static HttpRequestMessage Clone(this HttpRequestMessage original, System.Uri requestUri = null, System.Net.Http.HttpMethod method = null)
{
// Resolve a relative target against the original request so same-origin relative nextLinks are not misclassified as cross-origin.
var effectiveTargetUri = requestUri;
if (effectiveTargetUri != null && !effectiveTargetUri.IsAbsoluteUri && original.RequestUri != null && original.RequestUri.IsAbsoluteUri)
{
System.Uri.TryCreate(original.RequestUri, effectiveTargetUri, out effectiveTargetUri);
}
// Keep credentials only for a same-origin (scheme+host+port) https target. A null target (no retarget, e.g. retry)
// or an unresolved relative target preserves existing behavior and keeps the headers.
var isSameOrigin = effectiveTargetUri == null || !effectiveTargetUri.IsAbsoluteUri ||
(original.RequestUri != null && original.RequestUri.IsAbsoluteUri &&
original.RequestUri.Scheme.Equals(effectiveTargetUri.Scheme, System.StringComparison.OrdinalIgnoreCase) &&
original.RequestUri.Host.Equals(effectiveTargetUri.Host, System.StringComparison.OrdinalIgnoreCase) &&
original.RequestUri.Port == effectiveTargetUri.Port &&
effectiveTargetUri.Scheme.Equals(System.Uri.UriSchemeHttps, System.StringComparison.OrdinalIgnoreCase));
var clone = new HttpRequestMessage
{
Method = method ?? original.Method,
Expand All @@ -376,6 +390,10 @@ internal static HttpRequestMessage Clone(this HttpRequestMessage original, Syste
*/
if (!"x-ms-unique-id".Equals(header.Key) && !"x-ms-client-request-id".Equals(header.Key) && !"CommandName".Equals(header.Key) && !"FullCommandName".Equals(header.Key) && !"ParameterSetName".Equals(header.Key) && !"User-Agent".Equals(header.Key))
{
if (!isSameOrigin && ("Authorization".Equals(header.Key, System.StringComparison.OrdinalIgnoreCase) || "Proxy-Authorization".Equals(header.Key, System.StringComparison.OrdinalIgnoreCase) || "Cookie".Equals(header.Key, System.StringComparison.OrdinalIgnoreCase)))
{
continue;
}
clone.Headers.TryAddWithoutValidation(header.Key, header.Value);
}
}
Expand Down
18 changes: 18 additions & 0 deletions tests-upgrade/tests-emitter/AzureFleet.Management/target/generated/runtime/ISendAsync.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,20 @@ internal static Task<HttpRequestMessage> CloneWithContentAndDispose(this HttpReq
/// <returns>A clone of the HttpRequestMessage</returns>
internal static HttpRequestMessage Clone(this HttpRequestMessage original, System.Uri requestUri = null, System.Net.Http.HttpMethod method = null)
{
// Resolve a relative target against the original request so same-origin relative nextLinks are not misclassified as cross-origin.
var effectiveTargetUri = requestUri;
if (effectiveTargetUri != null && !effectiveTargetUri.IsAbsoluteUri && original.RequestUri != null && original.RequestUri.IsAbsoluteUri)
{
System.Uri.TryCreate(original.RequestUri, effectiveTargetUri, out effectiveTargetUri);
}
// Keep credentials only for a same-origin (scheme+host+port) https target. A null target (no retarget, e.g. retry)
// or an unresolved relative target preserves existing behavior and keeps the headers.
var isSameOrigin = effectiveTargetUri == null || !effectiveTargetUri.IsAbsoluteUri ||
(original.RequestUri != null && original.RequestUri.IsAbsoluteUri &&
original.RequestUri.Scheme.Equals(effectiveTargetUri.Scheme, System.StringComparison.OrdinalIgnoreCase) &&
original.RequestUri.Host.Equals(effectiveTargetUri.Host, System.StringComparison.OrdinalIgnoreCase) &&
original.RequestUri.Port == effectiveTargetUri.Port &&
effectiveTargetUri.Scheme.Equals(System.Uri.UriSchemeHttps, System.StringComparison.OrdinalIgnoreCase));
var clone = new HttpRequestMessage
{
Method = method ?? original.Method,
Expand All @@ -376,6 +390,10 @@ internal static HttpRequestMessage Clone(this HttpRequestMessage original, Syste
*/
if (!"x-ms-unique-id".Equals(header.Key) && !"x-ms-client-request-id".Equals(header.Key) && !"CommandName".Equals(header.Key) && !"FullCommandName".Equals(header.Key) && !"ParameterSetName".Equals(header.Key) && !"User-Agent".Equals(header.Key))
{
if (!isSameOrigin && ("Authorization".Equals(header.Key, System.StringComparison.OrdinalIgnoreCase) || "Proxy-Authorization".Equals(header.Key, System.StringComparison.OrdinalIgnoreCase) || "Cookie".Equals(header.Key, System.StringComparison.OrdinalIgnoreCase)))
{
continue;
}
clone.Headers.TryAddWithoutValidation(header.Key, header.Value);
}
}
Expand Down
18 changes: 18 additions & 0 deletions ...pgrade/tests-emitter/AzureLargeInstance.Management/target/generated/runtime/ISendAsync.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,20 @@ internal static Task<HttpRequestMessage> CloneWithContentAndDispose(this HttpReq
/// <returns>A clone of the HttpRequestMessage</returns>
internal static HttpRequestMessage Clone(this HttpRequestMessage original, System.Uri requestUri = null, System.Net.Http.HttpMethod method = null)
{
// Resolve a relative target against the original request so same-origin relative nextLinks are not misclassified as cross-origin.
var effectiveTargetUri = requestUri;
if (effectiveTargetUri != null && !effectiveTargetUri.IsAbsoluteUri && original.RequestUri != null && original.RequestUri.IsAbsoluteUri)
{
System.Uri.TryCreate(original.RequestUri, effectiveTargetUri, out effectiveTargetUri);
}
// Keep credentials only for a same-origin (scheme+host+port) https target. A null target (no retarget, e.g. retry)
// or an unresolved relative target preserves existing behavior and keeps the headers.
var isSameOrigin = effectiveTargetUri == null || !effectiveTargetUri.IsAbsoluteUri ||
(original.RequestUri != null && original.RequestUri.IsAbsoluteUri &&
original.RequestUri.Scheme.Equals(effectiveTargetUri.Scheme, System.StringComparison.OrdinalIgnoreCase) &&
original.RequestUri.Host.Equals(effectiveTargetUri.Host, System.StringComparison.OrdinalIgnoreCase) &&
original.RequestUri.Port == effectiveTargetUri.Port &&
effectiveTargetUri.Scheme.Equals(System.Uri.UriSchemeHttps, System.StringComparison.OrdinalIgnoreCase));
var clone = new HttpRequestMessage
{
Method = method ?? original.Method,
Expand All @@ -376,6 +390,10 @@ internal static HttpRequestMessage Clone(this HttpRequestMessage original, Syste
*/
if (!"x-ms-unique-id".Equals(header.Key) && !"x-ms-client-request-id".Equals(header.Key) && !"CommandName".Equals(header.Key) && !"FullCommandName".Equals(header.Key) && !"ParameterSetName".Equals(header.Key) && !"User-Agent".Equals(header.Key))
{
if (!isSameOrigin && ("Authorization".Equals(header.Key, System.StringComparison.OrdinalIgnoreCase) || "Proxy-Authorization".Equals(header.Key, System.StringComparison.OrdinalIgnoreCase) || "Cookie".Equals(header.Key, System.StringComparison.OrdinalIgnoreCase)))
{
continue;
}
clone.Headers.TryAddWithoutValidation(header.Key, header.Value);
}
}
Expand Down
18 changes: 18 additions & 0 deletions tests-upgrade/tests-emitter/Chaos.Management.brown/target/generated/runtime/ISendAsync.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,20 @@ internal static Task<HttpRequestMessage> CloneWithContentAndDispose(this HttpReq
/// <returns>A clone of the HttpRequestMessage</returns>
internal static HttpRequestMessage Clone(this HttpRequestMessage original, System.Uri requestUri = null, System.Net.Http.HttpMethod method = null)
{
// Resolve a relative target against the original request so same-origin relative nextLinks are not misclassified as cross-origin.
var effectiveTargetUri = requestUri;
if (effectiveTargetUri != null && !effectiveTargetUri.IsAbsoluteUri && original.RequestUri != null && original.RequestUri.IsAbsoluteUri)
{
System.Uri.TryCreate(original.RequestUri, effectiveTargetUri, out effectiveTargetUri);
}
// Keep credentials only for a same-origin (scheme+host+port) https target. A null target (no retarget, e.g. retry)
// or an unresolved relative target preserves existing behavior and keeps the headers.
var isSameOrigin = effectiveTargetUri == null || !effectiveTargetUri.IsAbsoluteUri ||
(original.RequestUri != null && original.RequestUri.IsAbsoluteUri &&
original.RequestUri.Scheme.Equals(effectiveTargetUri.Scheme, System.StringComparison.OrdinalIgnoreCase) &&
original.RequestUri.Host.Equals(effectiveTargetUri.Host, System.StringComparison.OrdinalIgnoreCase) &&
original.RequestUri.Port == effectiveTargetUri.Port &&
effectiveTargetUri.Scheme.Equals(System.Uri.UriSchemeHttps, System.StringComparison.OrdinalIgnoreCase));
var clone = new HttpRequestMessage
{
Method = method ?? original.Method,
Expand All @@ -376,6 +390,10 @@ internal static HttpRequestMessage Clone(this HttpRequestMessage original, Syste
*/
if (!"x-ms-unique-id".Equals(header.Key) && !"x-ms-client-request-id".Equals(header.Key) && !"CommandName".Equals(header.Key) && !"FullCommandName".Equals(header.Key) && !"ParameterSetName".Equals(header.Key) && !"User-Agent".Equals(header.Key))
{
if (!isSameOrigin && ("Authorization".Equals(header.Key, System.StringComparison.OrdinalIgnoreCase) || "Proxy-Authorization".Equals(header.Key, System.StringComparison.OrdinalIgnoreCase) || "Cookie".Equals(header.Key, System.StringComparison.OrdinalIgnoreCase)))
{
continue;
}
clone.Headers.TryAddWithoutValidation(header.Key, header.Value);
}
}
Expand Down
Loading
Loading