Fixed ImageDomainValidator for GitHub URLs #8646
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lyndaidaii
reviewed
Jun 24, 2021
| @@ -13,7 +13,7 @@ namespace NuGetGallery | |||
| public class ImageDomainValidator: IImageDomainValidator | |||
| { | |||
| private static readonly TimeSpan RegexTimeout = TimeSpan.FromMinutes(1); | |||
| private static readonly Regex GithubBadgeUrlRegEx = new Regex("^(https|http):\\/\\/github\\.com\\/[^/]+\\/[^/]+\\/workflows\\/.*badge\\.svg", RegexOptions.IgnoreCase, RegexTimeout); | |||
| private static readonly Regex GithubBadgeUrlRegEx = new Regex("^(https|http):\\/\\/github\\.com\\/[^/]+\\/[^/]+\\/actions\\/workflows\\/.*badge\\.svg", RegexOptions.IgnoreCase, RegexTimeout); | |||
There was a problem hiding this comment.
Can we change to actions to be optional, like (/actions/)?
Suggested change
| private static readonly Regex GithubBadgeUrlRegEx = new Regex("^(https|http):\\/\\/github\\.com\\/[^/]+\\/[^/]+\\/actions\\/workflows\\/.*badge\\.svg", RegexOptions.IgnoreCase, RegexTimeout); | |
| private static readonly Regex GithubBadgeUrlRegEx = new Regex("^(https|http):\/\/github\.com\/[^/]+\/[^/]+\/(actions\/)?workflows\/.*badge\.svg", RegexOptions.IgnoreCase, RegexTimeout); |
by adding the missing `/actions/` segment into the URL regex `GithubBadgeUrlRegEx`.
|
@lyndaidaii I modified the expression accordingly. |
|
@nils-a, thank you for great contribution. awesome work, all look good to me. |
lyndaidaii
approved these changes
Jun 24, 2021
agr
approved these changes
Jun 24, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
by adding the missing
/actions/segment into the URL regexGithubBadgeUrlRegEx.Addresses #8645