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

Introduce PropertyFormat to avoid validation errors that can lead to internal exceptions #248

Merged
merged 12 commits into from
Aug 26, 2024
Merged

Introduce PropertyFormat to avoid validation errors that can lead to internal exceptions #248

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
253ba28
Add field format to integration property
Arciiix Jul 3, 2024
6aa5cfe
Remove global predefined patterns
Arciiix Jul 3, 2024
2b912f2
Remove a useless value
Arciiix Jul 4, 2024
1b1188d
Avoid checking for format if it's None
Arciiix Jul 4, 2024
1ca53fd
Apply code review changes, add server-side validation
Arciiix Jul 17, 2024
8a9dbcf
Add some tests for the PropertyFormat
Arciiix Jul 17, 2024
b1d331f
Remove unnecessary dependency between domain layer and utilities, add…
Arciiix Jul 17, 2024
47bb6e6
Add some explanation comments
Arciiix Jul 18, 2024
6149d80
Rename Url PropertyFormat to HttpUrl
Arciiix Aug 26, 2024
6a36893
Refactor the URL schema checking code to avoid unnecessary allocation
Arciiix Aug 26, 2024
29f36c1
Move down the using statements for consistency
Arciiix Aug 26, 2024
0a5c431
Add a missing file header
Arciiix Aug 26, 2024
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
10 changes: 6 additions & 4 deletions backend/src/Notifo.Domain.Integrations.Abstractions/IntegrationProperty.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
// All rights reserved. Licensed under the MIT license.
// ==========================================================================

using Notifo.Domain.Integrations.Resources;
using Notifo.Infrastructure.Validation;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.Text.RegularExpressions;
using Notifo.Domain.Integrations.Resources;
using Notifo.Infrastructure.Validation;

#pragma warning disable SA1313 // Parameter names should begin with lower-case letter

Expand Down Expand Up @@ -185,8 +185,10 @@ private bool TryGetString(string? input, [MaybeNullWhen(true)] out string error,

break;
case PropertyFormat.HttpUrl:
// We only allow http and https to enable the usage of URL field for HttpClient requests.
if (!Uri.TryCreate(input, UriKind.Absolute, out var uri) || !((string[])["http", "https"]).Contains(uri.Scheme, StringComparer.OrdinalIgnoreCase))
// We only allow "http" and "https" schemas to enable the usage of URL field for HttpClient requests.
if (!Uri.TryCreate(input, UriKind.Absolute, out var uri)
|| (!string.Equals(uri.Scheme, "http", StringComparison.OrdinalIgnoreCase) && !string.Equals(uri.Scheme, "https", StringComparison.OrdinalIgnoreCase))
Copy link
Collaborator

Choose a reason for hiding this comment

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

You can just create a static readonly field with HttpSchemes, would have been shorter ;)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should I do it in another pull request? I see you already merged this one :)

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yes, plz :)

)
{
error = Texts.IntegrationPropertyFormatHttpUrl;
return false;
Expand Down