Security 277 B

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. commit 5d5438a7f0842019e852b2bb911ed86dc0360cf7
  2. Author: Chris Ross (ASP.NET) <[email protected]>
  3. Date: Thu Oct 11 15:27:24 2018 -0700
  4. Relax test SkuTelemetry strictness #1875
  5. diff --git a/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/TestSettings.cs b/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/TestSettings.cs
  6. index b32e0723f37..eb045b43812 100644
  7. --- a/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/TestSettings.cs
  8. +++ b/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/TestSettings.cs
  9. @@ -195,7 +195,7 @@ namespace Microsoft.AspNetCore.Authentication.Test.OpenIdConnect
  10. ValidateState(actualValues, errors, htmlEncoded);
  11. break;
  12. case OpenIdConnectParameterNames.SkuTelemetry:
  13. - ValidateSkuTelemetry(actualValues, errors, htmlEncoded);
  14. + ValidateSkuTelemetry(actualValues, errors);
  15. break;
  16. case OpenIdConnectParameterNames.VersionTelemetry:
  17. ValidateVersionTelemetry(actualValues, errors, htmlEncoded);
  18. @@ -258,14 +258,13 @@ namespace Microsoft.AspNetCore.Authentication.Test.OpenIdConnect
  19. private void ValidateState(IDictionary<string, string> actualParams, ICollection<string> errors, bool htmlEncoded) =>
  20. ValidateParameter(OpenIdConnectParameterNames.State, ExpectedState, actualParams, errors, htmlEncoded);
  21. - private void ValidateSkuTelemetry(IDictionary<string, string> actualParams, ICollection<string> errors, bool htmlEncoded) =>
  22. -#if NETCOREAPP2_2
  23. - ValidateParameter(OpenIdConnectParameterNames.SkuTelemetry, "ID_NETSTANDARD1_4", actualParams, errors, htmlEncoded);
  24. -#elif NET461
  25. - ValidateParameter(OpenIdConnectParameterNames.SkuTelemetry, "ID_NET451", actualParams, errors, htmlEncoded);
  26. -#else
  27. -#error Invalid target framework.
  28. -#endif
  29. + private static void ValidateSkuTelemetry(IDictionary<string, string> actualParams, ICollection<string> errors)
  30. + {
  31. + if (!actualParams.ContainsKey(OpenIdConnectParameterNames.SkuTelemetry))
  32. + {
  33. + errors.Add($"Parameter {OpenIdConnectParameterNames.SkuTelemetry} is missing");
  34. + }
  35. + }
  36. private void ValidateVersionTelemetry(IDictionary<string, string> actualParams, ICollection<string> errors, bool htmlEncoded) =>
  37. ValidateParameter(OpenIdConnectParameterNames.VersionTelemetry, typeof(OpenIdConnectMessage).GetTypeInfo().Assembly.GetName().Version.ToString(), actualParams, errors, htmlEncoded);