Skip to content

fix: http(s) scheme validation for webhook URLs + cross-platform BuildingBlocks tests #1244

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
iammukeshm merged 2 commits into from
May 24, 2026
+12 −3
Merged

fix: http(s) scheme validation for webhook URLs + cross-platform BuildingBlocks tests #1244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46a3d82
fix(tests): make BuildingBlocks dependency checks cross-platform
iammukeshm May 23, 2026
8d98981
fix(webhooks): require http(s) scheme for subscription URL
iammukeshm May 23, 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
4 changes: 3 additions & 1 deletion ...bhooks/Features/v1/CreateWebhookSubscription/CreateWebhookSubscriptionCommandValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ public sealed class CreateWebhookSubscriptionCommandValidator : AbstractValidato
{
public CreateWebhookSubscriptionCommandValidator()
{
RuleFor(x => x.Url).NotEmpty().Must(url => Uri.TryCreate(url, UriKind.Absolute, out _))
RuleFor(x => x.Url).NotEmpty()
.Must(url => Uri.TryCreate(url, UriKind.Absolute, out var uri)
&& (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps))
.WithMessage("A valid absolute URL is required.");
RuleFor(x => x.Events).NotEmpty().WithMessage("At least one event type is required.");
}
Expand Down
11 changes: 9 additions & 2 deletions src/Tests/Architecture.Tests/BuildingBlocksIndependenceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public void BuildingBlocks_Projects_Should_Not_Reference_Modules_Directly()

foreach (string include in references)
{
string referencedName = Path.GetFileNameWithoutExtension(include);
string referencedName = GetReferencedProjectName(include);

// Check if it references a Modules project
if (referencedName.StartsWith("Modules.", StringComparison.OrdinalIgnoreCase))
Expand Down Expand Up @@ -224,7 +224,7 @@ private static void CheckBuildingBlockDependencies(
var projectReferences = document
.Descendants("ProjectReference")
.Select(x => (string?)x.Attribute("Include") ?? string.Empty)
.Select(p => Path.GetFileNameWithoutExtension(p))
.Select(GetReferencedProjectName)
.Where(p => !string.IsNullOrEmpty(p))
.ToArray();

Expand All @@ -236,4 +236,11 @@ private static void CheckBuildingBlockDependencies(
}
}
}

// ProjectReference Include paths are authored with Windows separators (e.g. ..\Core\Core.csproj).
// Path.GetFileNameWithoutExtension only treats '\' as a separator on Windows, so on Linux CI it
// returns the whole path minus the extension. Normalize to '/' first to get the bare project name
// on every platform.
private static string GetReferencedProjectName(string includePath) =>
Path.GetFileNameWithoutExtension(includePath.Replace('\\', '/'));
}
Loading