Skip to content
Merged
Changes from all commits
Commits
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
19 changes: 12 additions & 7 deletions src/NuGet.Core/NuGet.Protocol/Utility/PackageIdValidator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ namespace NuGet.Protocol
{
internal static class PackageIdValidator
{
private const string DisableValidationEnvVar = "NUGET_DISABLE_PACKAGEID_VALIDATION";

private static readonly Lazy<bool> IsValidationDisabled = new Lazy<bool>(() =>
IsPackageIdValidationDisabled(EnvironmentVariableWrapper.Instance));

/// <summary>
/// Validates the package ID content.
/// </summary>
Expand All @@ -21,20 +26,20 @@ internal static class PackageIdValidator
/// </exception>
internal static void Validate(string packageId, IEnvironmentVariableReader env = null)
{
if (env == null)
{
env = EnvironmentVariableWrapper.Instance;
}

string disableValidationEnvVarValue = env.GetEnvironmentVariable("NUGET_DISABLE_PACKAGEID_VALIDATION");
bool isDisabled = env == null
? IsValidationDisabled.Value
: IsPackageIdValidationDisabled(env);

if (!string.Equals(disableValidationEnvVarValue, "true", StringComparison.OrdinalIgnoreCase))
if (!isDisabled)
{
if (!Packaging.PackageIdValidator.IsValidPackageId(packageId))
{
throw new InvalidPackageIdException(string.Format(CultureInfo.CurrentCulture, Strings.Error_Invalid_package_id, packageId));
}
}
}

private static bool IsPackageIdValidationDisabled(IEnvironmentVariableReader env) =>
string.Equals(env.GetEnvironmentVariable(DisableValidationEnvVar), bool.TrueString, StringComparison.OrdinalIgnoreCase);
}
}
Loading