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.

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

Jump to bottom

URL redirect and ValidateIssuer CodeQL bugs #9398

Merged
merged 7 commits into from
Mar 3, 2023
Merged

URL redirect and ValidateIssuer CodeQL bugs #9398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c9f3378
added Url redirect codeql suppressions
advay26 Feb 9, 2023
301f451
codeQL bug = suppression :)
advay26 Feb 22, 2023
f822a7e
moved suppression comment closer to the relevant line of code
advay26 Feb 22, 2023
e0d8a26
We are restricting the reCAPTCHA request to a specific host. Changed …
advay26 Feb 23, 2023
32491b6
Only allow relative Urls as a return Url. Add/adapt tests.
advay26 Feb 28, 2023
c0ed1e1
removed unnecessary usings
advay26 Feb 28, 2023
fc25f2c
modified suppression comment for recaptcha redirection
advay26 Mar 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions ...es/Authentication/Providers/AzureActiveDirectoryV2/AzureActiveDirectoryV2Authenticator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ protected override void AttachToOwinApp(IGalleryConfigurationService config, IAp
PostLogoutRedirectUri = siteRoot,
Scope = OpenIdConnectScope.OpenIdProfile + " email",
ResponseType = OpenIdConnectResponseType.IdToken,
// CodeQL [SM03926] We do not restrict issuers to a limited set of tenants for our multi-tenant app
TokenValidationParameters = new Microsoft.IdentityModel.Tokens.TokenValidationParameters() { ValidateIssuer = false },
Notifications = new OpenIdConnectAuthenticationNotifications
{
Expand Down
6 changes: 6 additions & 0 deletions src/NuGetGallery/Controllers/AuthenticationController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,12 @@ public virtual ActionResult AuthenticateExternal(string returnUrl)
.SecurityPolicies
.Any(policy => policy.Name == nameof(RequireOrganizationTenantPolicy)));

// Validate that the returnUrl is a relative URL to prevent untrusted URL redirection
if (!Url.IsLocalUrl(returnUrl))
{
returnUrl = "/";
}

if (userOrganizationsWithTenantPolicy != null && userOrganizationsWithTenantPolicy.Any())
{
var aadCredential = user?.Credentials.GetAzureActiveDirectoryCredential();
Expand Down
1 change: 1 addition & 0 deletions src/NuGetGallery/Filters/ValidateRecaptchaResponseAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ private async Task<bool> RecaptchaIsValid(string privateKey, string response)

try
{
// CodeQL [SM03781] The validation Url is restricted to a specific host, which mitigates the risk of unwanted redirection
var reply = await Client.Value.GetStringAsync(validationUrl);
var state = JsonConvert.DeserializeObject<RecaptchaState>(reply);
return state.Success;
Expand Down
61 changes: 49 additions & 12 deletions tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1576,23 +1576,27 @@ public async Task GivenEnableMultiFactorAuthenticationInUserIsFalseAndLoginUsedM

public class TheAuthenticateExternalAction : TestContainer
{
[Fact]
public void ForMissingExternalProvider_ErrorIsReturned()
[Theory]
[InlineData("/theReturnUrl")]
[InlineData("/")]
public void ForMissingExternalProvider_ErrorIsReturned(string returnUrl)
{
// Arrange
var controller = GetController<AuthenticationController>();
controller.SetCurrentUser(TestUtility.FakeUser);

// Act
var result = controller.AuthenticateExternal("theReturnUrl");
var result = controller.AuthenticateExternal(returnUrl);

// Assert
ResultAssert.IsRedirectTo(result, "theReturnUrl");
ResultAssert.IsRedirectTo(result, returnUrl);
Assert.Equal(Strings.ChangeCredential_ProviderNotFound, controller.TempData["Message"]);
}

[Fact]
public void ForAADLinkedAccount_ErrorIsReturnedDueToOrgPolicy()
[Theory]
[InlineData("/theReturnUrl")]
[InlineData("/")]
public void ForAADLinkedAccount_ErrorIsReturnedDueToOrgPolicy(string returnUrl)
{
// Arrange
var fakes = Get<Fakes>();
Expand All @@ -1612,15 +1616,17 @@ public void ForAADLinkedAccount_ErrorIsReturnedDueToOrgPolicy()
controller.SetCurrentUser(user);

// Act
var result = controller.AuthenticateExternal("theReturnUrl");
var result = controller.AuthenticateExternal(returnUrl);

// Assert
ResultAssert.IsRedirectTo(result, "theReturnUrl");
ResultAssert.IsRedirectTo(result, returnUrl);
Assert.NotNull(controller.TempData["WarningMessage"]);
}

[Fact]
public void ForNonAADLinkedAccount_WithOrgPolicyCompletesSuccessfully()
[Theory]
[InlineData("/theReturnUrl")]
[InlineData("/")]
public void ForNonAADLinkedAccount_WithOrgPolicyCompletesSuccessfully(string returnUrl)
{
// Arrange
var fakes = Get<Fakes>();
Expand All @@ -1640,11 +1646,11 @@ public void ForNonAADLinkedAccount_WithOrgPolicyCompletesSuccessfully()
controller.SetCurrentUser(user);

// Act
var result = controller.AuthenticateExternal("theReturnUrl");
var result = controller.AuthenticateExternal(returnUrl);

// Assert
Assert.Null(controller.TempData["WarningMessage"]);
ResultAssert.IsChallengeResult(result, "AzureActiveDirectoryV2", controller.Url.LinkOrChangeExternalCredential("theReturnUrl"));
ResultAssert.IsChallengeResult(result, "AzureActiveDirectoryV2", controller.Url.LinkOrChangeExternalCredential(returnUrl));
}

[Theory]
Expand Down Expand Up @@ -1685,6 +1691,37 @@ public void WillCallChallengeAuthenticationForAADv2Provider()
// Assert
ResultAssert.IsChallengeResult(result, "AzureActiveDirectoryV2", controller.Url.LinkOrChangeExternalCredential(returnUrl));
}

[Fact]
public void WillRedirectToHomePageOnFailureForAbsoluteUrls()
{
// Arrange
var controller = GetController<AuthenticationController>();
controller.SetCurrentUser(TestUtility.FakeUser);

// Act
var result = controller.AuthenticateExternal("theReturnUrl"); // not a relative URL

// Assert
ResultAssert.IsRedirectTo(result, "/");
Assert.Equal(Strings.ChangeCredential_ProviderNotFound, controller.TempData["Message"]);
}

[Fact]
public void WillRedirectToHomePageOnSuccessForAbsoluteUrls()
{
// Arrange
const string returnUrl = "theReturnUrl"; // not a relative URL
EnableAllAuthenticators(Get<AuthenticationService>());
var controller = GetController<AuthenticationController>();
controller.SetCurrentUser(TestUtility.FakeUser);

// Act
var result = controller.AuthenticateExternal(returnUrl);

// Assert
ResultAssert.IsChallengeResult(result, "AzureActiveDirectoryV2", controller.Url.LinkOrChangeExternalCredential("/"));
}
}

public class TheLinkExternalAccountAction : TestContainer
Expand Down