diff --git a/.config/CredScanSuppressions.json b/.config/CredScanSuppressions.json
index 984a86f68e69e6..2f274268f63fe8 100644
--- a/.config/CredScanSuppressions.json
+++ b/.config/CredScanSuppressions.json
@@ -2,13 +2,7 @@
"tool": "Credential Scanner",
"suppressions": [
{
- "_justification": "Unit test containing connection strings under the test.",
- "file": [
- "src/libraries/System.Data.Common/tests/System/Data/Common/DbConnectionStringBuilderTest.cs"
- ]
- },
- {
- "_justification": "Private key for testing purpose.",
+ "_justification": "Suppression approved. Private key for testing purpose.",
"file": [
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/DSA/DSAKeyPemTests.cs",
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/ECKeyPemTests.cs",
@@ -19,52 +13,6 @@
"-----BEGIN PRIVATE KEY-----",
"-----BEGIN * PRIVATE KEY-----"
]
- },
- {
- "_justification": "Test credential for Uri testing",
- "file": [
- "src/libraries/System.Net.Http/tests/UnitTests/HttpEnvironmentProxyTest.cs",
- "src/libraries/System.Private.Uri/tests/ExtendedFunctionalTests/UriRelativeResolutionTest.cs",
- "src/libraries/System.Private.Uri/tests/FunctionalTests/UriBuilderRefreshTest.cs",
- "src/libraries/System.Private.Uri/tests/FunctionalTests/UriBuilderTests.cs",
- "src/libraries/System.Private.Uri/tests/FunctionalTests/UriRelativeResolutionTest.cs",
- "src/libraries/System.Runtime/tests/System/Uri.CreateStringTests.cs"
- ],
- "placeholder": [
- "//*:;&$=123USERINFO@",
- "//*:bar@",
- "//*:bar1@",
- "//*:password1@",
- "//*:psw@",
- "//*:userinfo2@"
- ]
- },
- {
- "_justification": "Generic test password.",
- "file": [
- "src/libraries/Common/tests/System/Net/Configuration.Certificates.cs",
- "src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Authentication.cs",
- "src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs",
- "src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.DefaultProxyCredentials.cs",
- "src/libraries/Common/tests/System/Net/Http/PostScenarioTest.cs",
- "src/libraries/Common/tests/System/Net/Prerequisites/Deployment/setup_certificates.ps1",
- "src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs",
- "src/libraries/System.Net.Http/tests/UnitTests/DigestAuthenticationTests.cs",
- "src/libraries/System.Net.Http/tests/UnitTests/HttpEnvironmentProxyTest.cs",
- "src/libraries/System.Net.Mail/tests/Functional/SmtpClientTest.cs",
- "src/libraries/System.Security.Cryptography.Xml/tests/SignedXmlTest.cs",
- "src/libraries/System.Security.Cryptography.Xml/tests/TestHelpers.cs"
- ],
- "placeholder": [
- "\"anotherpassword\"",
- "\"bar\"",
- "\"mono\"",
- "\"password1\"",
- "\"rightpassword\"",
- "\"testcertificate\"",
- "\"unused\"",
- "\"wrongpassword\""
- ]
}
]
}
diff --git a/eng/Versions.props b/eng/Versions.props
index f661a1e89ed7a5..5ee0bae7673254 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -104,7 +104,7 @@
5.0.0-beta.20377.1
5.0.0-beta.20377.1
5.0.0-beta.20377.1
- 5.0.0-beta.20377.1
+ 5.0.0-beta.21174.1
5.0.0-beta.20377.1
5.0.0-beta.20377.1
5.0.0-beta.20377.1
diff --git a/src/libraries/Common/src/Interop/Windows/WinHttp/Interop.winhttp_types.cs b/src/libraries/Common/src/Interop/Windows/WinHttp/Interop.winhttp_types.cs
index 0ab94178f5d5c3..a948cf8bb44bc1 100644
--- a/src/libraries/Common/src/Interop/Windows/WinHttp/Interop.winhttp_types.cs
+++ b/src/libraries/Common/src/Interop/Windows/WinHttp/Interop.winhttp_types.cs
@@ -129,10 +129,10 @@ internal partial class WinHttp
public const uint WINHTTP_AUTH_TARGET_PROXY = 0x00000001;
public const uint WINHTTP_OPTION_USERNAME = 0x1000;
- // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="It is property descriptor, not secret value.")]
+ // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Suppression approved. It is property descriptor, not secret value.")]
public const uint WINHTTP_OPTION_PASSWORD = 0x1001;
public const uint WINHTTP_OPTION_PROXY_USERNAME = 0x1002;
- // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="It is property descriptor, not secret value.")]
+ // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Suppression approved. It is property descriptor, not secret value.")]
public const uint WINHTTP_OPTION_PROXY_PASSWORD = 0x1003;
public const uint WINHTTP_OPTION_SERVER_SPN_USED = 106;
diff --git a/src/libraries/Common/tests/System/Net/Configuration.Certificates.cs b/src/libraries/Common/tests/System/Net/Configuration.Certificates.cs
index c0f114a82d35b7..00d04a53be3e12 100644
--- a/src/libraries/Common/tests/System/Net/Configuration.Certificates.cs
+++ b/src/libraries/Common/tests/System/Net/Configuration.Certificates.cs
@@ -15,8 +15,8 @@ public static partial class Configuration
{
public static partial class Certificates
{
- private const string CertificatePassword = "testcertificate";
- private const string TestDataFolder = "TestData";
+ private const string CertificatePassword = "PLACEHOLDER";
+ private const string TestDataFolder = "TestDataCertificates";
private const int MutexTimeoutMs = 120_000;
private static readonly X509Certificate2 s_serverCertificate;
diff --git a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs
index e889a86a8ea243..8a1afbcbc72929 100644
--- a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs
+++ b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs
@@ -585,7 +585,7 @@ public async Task GetAsync_ServerNeedsNonStandardAuthAndSetCredential_StatusCode
await LoopbackServerFactory.CreateServerAsync(async (server, url) =>
{
HttpClientHandler handler = CreateHttpClientHandler();
- handler.Credentials = new NetworkCredential("unused", "unused");
+ handler.Credentials = new NetworkCredential("unused", "PLACEHOLDER");
using (HttpClient client = CreateHttpClient(handler))
{
Task getResponseTask = client.GetAsync(url);
@@ -1010,7 +1010,7 @@ await LoopbackServer.CreateClientAndServerAsync(async uri =>
$"Accept-Patch:{fold} text/example;charset=utf-8{newline}" +
$"Accept-Ranges:{fold} bytes{newline}" +
$"Age: {fold}12{newline}" +
- // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Unit test dummy authorization.")]
+ // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Suppression approved. Unit test dummy authorization.")]
$"Authorization: Bearer 63123a47139a49829bcd8d03005ca9d7{newline}" +
$"Allow: {fold}GET, HEAD{newline}" +
$"Alt-Svc:{fold} http/1.1=\"http2.example.com:8001\"; ma=7200{newline}" +
diff --git a/src/libraries/Common/tests/System/Net/Http/PostScenarioTest.cs b/src/libraries/Common/tests/System/Net/Http/PostScenarioTest.cs
index f547766ed5d208..6fc23e8f27d5e8 100644
--- a/src/libraries/Common/tests/System/Net/Http/PostScenarioTest.cs
+++ b/src/libraries/Common/tests/System/Net/Http/PostScenarioTest.cs
@@ -23,7 +23,7 @@ public abstract class PostScenarioTest : HttpClientHandlerTestBase
{
private const string ExpectedContent = "Test contest";
private const string UserName = "user1";
- private const string Password = "password1";
+ private const string Password = "PLACEHOLDER";
public PostScenarioTest(ITestOutputHelper output) : base(output) { }
diff --git a/src/libraries/Common/tests/System/Net/Prerequisites/Deployment/setup_certificates.ps1 b/src/libraries/Common/tests/System/Net/Prerequisites/Deployment/setup_certificates.ps1
index a41139dff18a15..3edb4a37040f9e 100644
--- a/src/libraries/Common/tests/System/Net/Prerequisites/Deployment/setup_certificates.ps1
+++ b/src/libraries/Common/tests/System/Net/Prerequisites/Deployment/setup_certificates.ps1
@@ -5,15 +5,15 @@
# Certificate configuration
-$script:testDataUri = "https://github.com/dotnet/runtime-assets/archive/master.zip"
+$script:testDataUri = "https://github.com/dotnet/runtime-assets/archive/release/5.0.zip"
$script:testData = "runtime-assets"
-$script:certificatePath = "$($script:testData)\runtime-assets-master\System.Net.TestData"
+$script:certificatePath = "$($script:testData)\src\System.Net.TestData\TestDataCertificates"
$script:clientPrivateKeyPath = Join-Path $script:certificatePath "testclient1_at_contoso.com.pfx"
-$script:clientPrivateKeyPassword = "testcertificate"
+$script:clientPrivateKeyPassword = "PLACEHOLDER"
$script:serverPrivateKeyPath = Join-Path $script:certificatePath "contoso.com.pfx"
-$script:serverPrivateKeyPassword = "testcertificate"
+$script:serverPrivateKeyPassword = "PLACEHOLDER"
Function GetFullPath($relativePath)
{
diff --git a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/ECKeyFileTests.cs b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/ECKeyFileTests.cs
index 1c3a0c2aaccff2..eb6b8e2e35f49b 100644
--- a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/ECKeyFileTests.cs
+++ b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/ECKeyFileTests.cs
@@ -177,7 +177,7 @@ public void ReadNistP521EncryptedPkcs8_Pbes2_Aes128_Sha384()
public void ReadNistP521EncryptedPkcs8_Pbes2_Aes128_Sha384_PasswordBytes()
{
// PBES2, PBKDF2 (SHA384), AES128
- // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Unit test key.")]
+ // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Suppression approved. Unit test key.")]
const string base64 = @"
MIIBXTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQI/JyXWyp/t3kCAggA
MAwGCCqGSIb3DQIKBQAwHQYJYIZIAWUDBAECBBA3H8mbFK5afB5GzIemCCQkBIIB
diff --git a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyFileTests.cs b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyFileTests.cs
index b222861c56ab23..0c096b20fb7b85 100644
--- a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyFileTests.cs
+++ b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyFileTests.cs
@@ -764,7 +764,7 @@ public static void ReadPbes2Rc2EncryptedDiminishedDP()
public static void ReadPbes2Rc2EncryptedDiminishedDP_PasswordBytes()
{
// PBES2: PBKDF2 + RC2-128
- // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Unit test key.")]
+ // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Suppression approved. Unit test key.")]
const string base64 = @"
MIIBrjBIBgkqhkiG9w0BBQ0wOzAeBgkqhkiG9w0BBQwwEQQIKZEFT76zCFECAggA
AgEQMBkGCCqGSIb3DQMCMA0CAToECE1Yyzk6++IPBIIBYDDvaYLkET8eudcYLQMf
@@ -790,7 +790,7 @@ public static void ReadPbes2Rc2EncryptedDiminishedDP_PasswordBytes()
[Fact]
public static void ReadEncryptedDiminishedDP_EmptyPassword()
{
- // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Unit test key.")]
+ // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Suppression approved. Unit test key.")]
const string base64 = @"
MIIBgTAbBgkqhkiG9w0BBQMwDgQIJtjMez/9Gg4CAggABIIBYElq9UOOphEPU3b7
G/mV8M1uEdjigidMPih3b9IIJhrjMAEix2IjS+brFL7KRQgucpZZoaFU1utvkUHg
@@ -815,7 +815,7 @@ public static void ReadEncryptedDiminishedDP_EmptyPassword()
[Fact]
public static void ReadEncryptedDiminishedDP_EmptyPasswordBytes()
{
- // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Unit test key.")]
+ // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Suppression approved. Unit test key.")]
const string base64 = @"
MIIBgTAbBgkqhkiG9w0BBQMwDgQIJtjMez/9Gg4CAggABIIBYElq9UOOphEPU3b7
G/mV8M1uEdjigidMPih3b9IIJhrjMAEix2IjS+brFL7KRQgucpZZoaFU1utvkUHg
diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/ConfigurationExtensionTest.cs b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/ConfigurationExtensionTest.cs
index 6f59604a79e19d..bdeebae4dca3bb 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/ConfigurationExtensionTest.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/ConfigurationExtensionTest.cs
@@ -112,12 +112,12 @@ public void AddUserSecrets_DoesNotThrowsIfOptional()
public void AddUserSecrets_With_SecretsId_Passed_Explicitly()
{
var userSecretsId = Guid.NewGuid().ToString();
- SetSecret(userSecretsId, "Facebook:AppSecret", "value1");
+ SetSecret(userSecretsId, "Facebook:PLACEHOLDER", "value1");
var builder = new ConfigurationBuilder().AddUserSecrets(userSecretsId);
var configuration = builder.Build();
- Assert.Equal("value1", configuration["Facebook:AppSecret"]);
+ Assert.Equal("value1", configuration["Facebook:PLACEHOLDER"]);
}
[Fact]
@@ -128,7 +128,7 @@ public void AddUserSecrets_Does_Not_Fail_On_Non_Existing_File()
var builder = new ConfigurationBuilder().AddUserSecrets(userSecretsId);
var configuration = builder.Build();
- Assert.Null(configuration["Facebook:AppSecret"]);
+ Assert.Null(configuration["Facebook:PLACEHOLDER"]);
Assert.False(File.Exists(secretFilePath));
}
diff --git a/src/libraries/System.Data.Common/tests/System/Data/Common/DbConnectionStringBuilderTest.cs b/src/libraries/System.Data.Common/tests/System/Data/Common/DbConnectionStringBuilderTest.cs
index d41afadd52a059..6c179537b64c96 100644
--- a/src/libraries/System.Data.Common/tests/System/Data/Common/DbConnectionStringBuilderTest.cs
+++ b/src/libraries/System.Data.Common/tests/System/Data/Common/DbConnectionStringBuilderTest.cs
@@ -1691,17 +1691,17 @@ public void EmbeddedCharTest1()
sb["Data Source"] = "testdb";
sb["User ID"] = "someuser";
- sb["Password"] = "abcdef";
- Assert.Equal("Data Source=testdb;User ID=someuser;Password=abcdef",
+ sb["Password"] = "PLACEHOLDER";
+ Assert.Equal("Data Source=testdb;User ID=someuser;Password=PLACEHOLDER",
sb.ConnectionString);
- sb["Password"] = "abcdef#";
- Assert.Equal("Data Source=testdb;User ID=someuser;Password=abcdef#",
+ sb["Password"] = "PLACEHOLDER#";
+ Assert.Equal("Data Source=testdb;User ID=someuser;Password=PLACEHOLDER#",
sb.ConnectionString);
// an embedded single-quote value will result in the value being delimieted with double quotes
- sb["Password"] = "abc\'def";
- Assert.Equal("Data Source=testdb;User ID=someuser;Password=\"abc\'def\"",
+ sb["Password"] = "PLACEHOLDER\'def";
+ Assert.Equal("Data Source=testdb;User ID=someuser;Password=\"PLACEHOLDER\'def\"",
sb.ConnectionString);
// an embedded double-quote value will result in the value being delimieted with single quotes
@@ -1717,39 +1717,39 @@ public void EmbeddedCharTest1()
sb.ConnectionString);
sb = new DbConnectionStringBuilder();
- sb["PASSWORD"] = "abcdef1";
+ sb["PASSWORD"] = "PLACEHOLDERabcdef1";
sb["user id"] = "someuser";
sb["Data Source"] = "testdb";
- Assert.Equal("PASSWORD=abcdef1;user id=someuser;Data Source=testdb",
+ Assert.Equal("PASSWORD=PLACEHOLDERabcdef1;user id=someuser;Data Source=testdb",
sb.ConnectionString);
// case is preserved for a keyword that was added the first time
sb = new DbConnectionStringBuilder();
- sb["PassWord"] = "abcdef2";
+ sb["PassWord"] = "PLACEHOLDERabcdef2";
sb["uSER iD"] = "someuser";
sb["DaTa SoUrCe"] = "testdb";
- Assert.Equal("PassWord=abcdef2;uSER iD=someuser;DaTa SoUrCe=testdb",
+ Assert.Equal("PassWord=PLACEHOLDERabcdef2;uSER iD=someuser;DaTa SoUrCe=testdb",
sb.ConnectionString);
- sb["passWORD"] = "abc123";
- Assert.Equal("PassWord=abc123;uSER iD=someuser;DaTa SoUrCe=testdb",
+ sb["passWORD"] = "PLACEHOLDERabc123";
+ Assert.Equal("PassWord=PLACEHOLDERabc123;uSER iD=someuser;DaTa SoUrCe=testdb",
sb.ConnectionString);
// embedded equal sign in the value will cause the value to be
// delimited with double-quotes
sb = new DbConnectionStringBuilder();
- sb["Password"] = "abc=def";
+ sb["Password"] = "PLACEHOLDER=def";
sb["Data Source"] = "testdb";
sb["User ID"] = "someuser";
- Assert.Equal("Password=\"abc=def\";Data Source=testdb;User ID=someuser",
+ Assert.Equal("Password=\"PLACEHOLDER=def\";Data Source=testdb;User ID=someuser",
sb.ConnectionString);
// embedded semicolon in the value will cause the value to be
// delimited with double-quotes
sb = new DbConnectionStringBuilder();
- sb["Password"] = "abc;def";
+ sb["Password"] = "PLACEHOLDER;def";
sb["Data Source"] = "testdb";
sb["User ID"] = "someuser";
- Assert.Equal("Password=\"abc;def\";Data Source=testdb;User ID=someuser",
+ Assert.Equal("Password=\"PLACEHOLDER;def\";Data Source=testdb;User ID=someuser",
sb.ConnectionString);
// more right parentheses then left parentheses - happily takes it
@@ -1866,32 +1866,32 @@ public void EmbeddedCharTest3()
DbConnectionStringBuilder sb;
sb = new DbConnectionStringBuilder();
- sb.ConnectionString = "User ID=SCOTT;Password=TiGeR;Data Source=" + dataSource;
+ sb.ConnectionString = "User ID=SCOTT;Password=PLACEHOLDER;Data Source=" + dataSource;
Assert.Equal(dataSource, sb["Data Source"]);
Assert.Equal("SCOTT", sb["User ID"]);
- Assert.Equal("TiGeR", sb["Password"]);
+ Assert.Equal("PLACEHOLDER", sb["Password"]);
Assert.Equal(
- "user id=SCOTT;password=TiGeR;data source=\"(DESCRIPTION=(ADDRESS=(PROTOCOL=" +
+ "user id=SCOTT;password=PLACEHOLDER;data source=\"(DESCRIPTION=(ADDRESS=(PROTOCOL=" +
"TCP)(HOST=192.168.1.101)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)" +
"(SERVICE_NAME=TESTDB)))\"", sb.ConnectionString);
sb = new DbConnectionStringBuilder(false);
- sb.ConnectionString = "User ID=SCOTT;Password=TiGeR;Data Source=" + dataSource;
+ sb.ConnectionString = "User ID=SCOTT;Password=PLACEHOLDER;Data Source=" + dataSource;
Assert.Equal(dataSource, sb["Data Source"]);
Assert.Equal("SCOTT", sb["User ID"]);
- Assert.Equal("TiGeR", sb["Password"]);
+ Assert.Equal("PLACEHOLDER", sb["Password"]);
Assert.Equal(
- "user id=SCOTT;password=TiGeR;data source=\"(DESCRIPTION=(ADDRESS=(PROTOCOL=" +
+ "user id=SCOTT;password=PLACEHOLDER;data source=\"(DESCRIPTION=(ADDRESS=(PROTOCOL=" +
"TCP)(HOST=192.168.1.101)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)" +
"(SERVICE_NAME=TESTDB)))\"", sb.ConnectionString);
sb = new DbConnectionStringBuilder(true);
- sb.ConnectionString = "User ID=SCOTT;Password=TiGeR;Data Source=" + dataSource;
+ sb.ConnectionString = "User ID=SCOTT;Password=PLACEHOLDER;Data Source=" + dataSource;
Assert.Equal(dataSource, sb["Data Source"]);
Assert.Equal("SCOTT", sb["User ID"]);
- Assert.Equal("TiGeR", sb["Password"]);
+ Assert.Equal("PLACEHOLDER", sb["Password"]);
Assert.Equal(
- "user id=SCOTT;password=TiGeR;data source=(DESCRIPTION=(ADDRESS=(PROTOCOL=" +
+ "user id=SCOTT;password=PLACEHOLDER;data source=(DESCRIPTION=(ADDRESS=(PROTOCOL=" +
"TCP)(HOST=192.168.1.101)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)" +
"(SERVICE_NAME=TESTDB)))", sb.ConnectionString);
}
@@ -1902,24 +1902,24 @@ public void EmbeddedCharTest4()
DbConnectionStringBuilder sb;
sb = new DbConnectionStringBuilder();
- sb.ConnectionString = "PassWord=abcdef2;uSER iD=someuser;DaTa SoUrCe=testdb";
+ sb.ConnectionString = "PassWord=PLACEHOLDER;user iD=someuser;DaTa SoUrCe=testdb";
sb["Integrated Security"] = "False";
Assert.Equal(
- "password=abcdef2;user id=someuser;data source=testdb;Integrated Security=False",
+ "password=PLACEHOLDER;user id=someuser;data source=testdb;Integrated Security=False",
sb.ConnectionString);
sb = new DbConnectionStringBuilder(false);
- sb.ConnectionString = "PassWord=abcdef2;uSER iD=someuser;DaTa SoUrCe=testdb";
+ sb.ConnectionString = "PassWord=PLACEHOLDER;uSER iD=someuser;DaTa SoUrCe=testdb";
sb["Integrated Security"] = "False";
Assert.Equal(
- "password=abcdef2;user id=someuser;data source=testdb;Integrated Security=False",
+ "password=PLACEHOLDER;user id=someuser;data source=testdb;Integrated Security=False",
sb.ConnectionString);
sb = new DbConnectionStringBuilder(true);
- sb.ConnectionString = "PassWord=abcdef2;uSER iD=someuser;DaTa SoUrCe=testdb";
+ sb.ConnectionString = "PassWord=PLACEHOLDER;uSER iD=someuser;DaTa SoUrCe=testdb";
sb["Integrated Security"] = "False";
Assert.Equal(
- "password=abcdef2;user id=someuser;data source=testdb;Integrated Security=False",
+ "password=PLACEHOLDER;user id=someuser;data source=testdb;Integrated Security=False",
sb.ConnectionString);
}
diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/constants.cs b/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/constants.cs
index 93c5e6f23c771d..ea17fc4b3f2c44 100644
--- a/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/constants.cs
+++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/constants.cs
@@ -95,7 +95,7 @@ private PropertyNames() { }
// these two are not publicly exposed properties, but are used internally to track ResetPassword/ExpirePasswordNow
// operations against unpersisted principals, so that they can be performed once the principal has been Saved
- // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Not a password.")]
+ // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Suppression approved. Not a password.")]
internal const string PwdInfoPassword = "AuthenticablePrincipal.PasswordInfo.Password";
internal const string PwdInfoExpireImmediately = "AuthenticablePrincipal.PasswordInfo.ExpireImmediately";
}
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/ClientCertificateHelper.cs b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/ClientCertificateHelper.cs
index c284d2be592538..b0e144992937c4 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/ClientCertificateHelper.cs
+++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/ClientCertificateHelper.cs
@@ -13,7 +13,6 @@ public class ClientCertificateHelper
private readonly X509Certificate2 _cert_KeyUsageIncludesDigitalSignature_EKUIncludesClientAuth_PrivateKey =
new X509Certificate2(
Convert.FromBase64String(
- // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Dummy certificate for testing.")]
@"MIIKTgIBAzCCCgoGCSqGSIb3DQEHAaCCCfsEggn3MIIJ8zCCBgwGCSqGSIb3DQEHAaCCBf0EggX5
MIIF9TCCBfEGCyqGSIb3DQEMCgECoIIE/jCCBPowHAYKKoZIhvcNAQwBAzAOBAiHDatvDr8QBQIC
B9AEggTYv1r4ckwt7o6f6DCMHlb/zv4t7rPju+PP0PjoJ8kzPfj419aSeyPuE+65YH9WFDqafJed
@@ -66,7 +65,6 @@ public class ClientCertificateHelper
private readonly X509Certificate2 _cert_KeyUsageMissingDigitalSignature_EKUIncludesClientAuth_PrivateKey =
new X509Certificate2(
Convert.FromBase64String(
- // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Dummy certificate for testing.")]
@"MIIKTgIBAzCCCgoGCSqGSIb3DQEHAaCCCfsEggn3MIIJ8zCCBgwGCSqGSIb3DQEHAaCCBf0EggX5
MIIF9TCCBfEGCyqGSIb3DQEMCgECoIIE/jCCBPowHAYKKoZIhvcNAQwBAzAOBAiSNi65ZF5ZTQIC
B9AEggTYRTivDtzHOWRR+MobtGFEUu6d1PiIlF1Ic84FWvmFCcJShkBmg3cBqDilqtamAkDkga4h
@@ -119,7 +117,6 @@ public class ClientCertificateHelper
private readonly X509Certificate2 _cert_KeyUsageIncludesDigitalSignature_EKUMissingClientAuth_PrivateKey =
new X509Certificate2(
Convert.FromBase64String(
- // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Dummy certificate for testing.")]
@"MIIKRgIBAzCCCgIGCSqGSIb3DQEHAaCCCfMEggnvMIIJ6zCCBgQGCSqGSIb3DQEHAaCCBfUEggXx
MIIF7TCCBekGCyqGSIb3DQEMCgECoIIE9jCCBPIwHAYKKoZIhvcNAQwBAzAOBAhCUuNQ0RqfZQIC
B9AEggTQHCQRSiCiNI7egTvUaI1Z3tfeLwFWvG7B/za5v9fb97MExoyVQSDmUyUDTlVEcg3gVqJZ
@@ -172,7 +169,6 @@ public class ClientCertificateHelper
private readonly X509Certificate2 _cert_KeyUsageIncludesDigitalSignature_NoEKU_PrivateKey =
new X509Certificate2(
Convert.FromBase64String(
- // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Dummy certificate for testing.")]
@"MIIKPgIBAzCCCfoGCSqGSIb3DQEHAaCCCesEggnnMIIJ4zCCBgwGCSqGSIb3DQEHAaCCBf0EggX5
MIIF9TCCBfEGCyqGSIb3DQEMCgECoIIE/jCCBPowHAYKKoZIhvcNAQwBAzAOBAijQh1kbOZOYQIC
B9AEggTY+wDp3V31Lh7f8YrsqEsyGZ+GlYvFhLWvDASjisYJi5NlQ0ONbf0KOXHVSvBj3tVyuHm4
@@ -225,7 +221,6 @@ public class ClientCertificateHelper
private readonly X509Certificate2 _cert_KeyUsageIncludesDigitalSignature_EKUIncludesClientAuth_NoPrivateKey =
new X509Certificate2(
Convert.FromBase64String(
- // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Dummy certificate for testing.")]
@"MIIDFjCCAf6gAwIBAgIQTm8+EF94L4FJ0nBFl5LICzANBgkqhkiG9w0BAQsFADAb
MRkwFwYDVQQDDBB1c2VyQGV4YW1wbGUuY29tMCAXDTE1MTAwNTEwMDMwMFoYDzIx
MTUxMDA1MTAwMzAwWjAbMRkwFwYDVQQDDBB1c2VyQGV4YW1wbGUuY29tMIIBIjAN
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs
index 4af15c6beef2d6..02e18e9109063b 100644
--- a/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs
+++ b/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs
@@ -664,7 +664,7 @@ await TestHelper.WhenAllCompletedOrAnyFailed(
[Theory]
[InlineData("Age", "1")]
- // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Unit test dummy authorisation header.")]
+ // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Suppression approved. Unit test dummy authorisation header.")]
[InlineData("Authorization", "Basic YWxhZGRpbjpvcGVuc2VzYW1l")]
[InlineData("Cache-Control", "no-cache")]
[InlineData("Content-Encoding", "gzip")]
diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Headers/CacheControlHeaderValueTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/Headers/CacheControlHeaderValueTest.cs
index 4a9588cadc46a6..9af55fed4cbb9f 100644
--- a/src/libraries/System.Net.Http/tests/UnitTests/Headers/CacheControlHeaderValueTest.cs
+++ b/src/libraries/System.Net.Http/tests/UnitTests/Headers/CacheControlHeaderValueTest.cs
@@ -457,13 +457,13 @@ public void GetCacheControlLength_DifferentValidScenariosAndNoExistingCacheContr
expected = new CacheControlHeaderValue();
expected.Public = true;
expected.Private = true;
- expected.PrivateHeaders.Add("token1");
+ expected.PrivateHeaders.Add("PLACEHOLDER");
expected.MustRevalidate = true;
expected.ProxyRevalidate = true;
expected.Extensions.Add(new NameValueHeaderValue("c", "d"));
expected.Extensions.Add(new NameValueHeaderValue("a", "b"));
- CheckGetCacheControlLength(",public, , private=\"token1\", must-revalidate, c=d, proxy-revalidate, a=b", 0,
- null, 72, expected);
+ CheckGetCacheControlLength(",public, , private=\"PLACEHOLDER\", must-revalidate, c=d, proxy-revalidate, a=b", 0,
+ null, 77, expected);
expected = new CacheControlHeaderValue();
expected.Private = true;
@@ -491,11 +491,11 @@ public void GetCacheControlLength_DifferentValidScenariosAndExistingCacheControl
expected = new CacheControlHeaderValue();
expected.Private = true;
expected.PrivateHeaders.Add("token1");
- expected.PrivateHeaders.Add("token2");
+ expected.PrivateHeaders.Add("PLACEHOLDER");
expected.NoCache = true;
expected.NoCacheHeaders.Add("token1");
expected.NoCacheHeaders.Add("token2");
- CheckGetCacheControlLength("private=\"token2\", no-cache=\"token1, , token2,\"", 0, storeValue, 46,
+ CheckGetCacheControlLength("private=\"PLACEHOLDER\", no-cache=\"token1, , token2,\"", 0, storeValue, 51,
expected);
storeValue = new CacheControlHeaderValue();
@@ -505,7 +505,7 @@ public void GetCacheControlLength_DifferentValidScenariosAndExistingCacheControl
expected = new CacheControlHeaderValue();
expected.Public = true;
expected.Private = true;
- expected.PrivateHeaders.Add("token1");
+ expected.PrivateHeaders.Add("PLACEHOLDER");
expected.MustRevalidate = true;
expected.ProxyRevalidate = true;
expected.NoTransform = true;
@@ -513,8 +513,8 @@ public void GetCacheControlLength_DifferentValidScenariosAndExistingCacheControl
expected.Extensions.Add(new NameValueHeaderValue("a", "\"b\""));
expected.Extensions.Add(new NameValueHeaderValue("c", "d"));
expected.Extensions.Add(new NameValueHeaderValue("x", "y")); // from store result
- CheckGetCacheControlLength(",public, , private=\"token1\", must-revalidate, c=d, proxy-revalidate, a=\"b\"",
- 0, storeValue, 74, expected);
+ CheckGetCacheControlLength(",public, , private=\"PLACEHOLDER\", must-revalidate, c=d, proxy-revalidate, a=\"b\"",
+ 0, storeValue, 79, expected);
storeValue = new CacheControlHeaderValue();
storeValue.MaxStale = true;
diff --git a/src/libraries/System.Net.Http/tests/UnitTests/HttpEnvironmentProxyTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/HttpEnvironmentProxyTest.cs
index c0ddb1e504b5a0..8c0669f6e62baa 100644
--- a/src/libraries/System.Net.Http/tests/UnitTests/HttpEnvironmentProxyTest.cs
+++ b/src/libraries/System.Net.Http/tests/UnitTests/HttpEnvironmentProxyTest.cs
@@ -132,11 +132,11 @@ public void HttpProxy_EnvironmentProxy_Loaded()
[InlineData("http://1.1.1.5:3005", "1.1.1.5", "3005", null, null)]
[InlineData("http://foo@1.1.1.5", "1.1.1.5", "80", "foo", "")]
[InlineData("http://[::1]:80", "[::1]", "80", null, null)]
- [InlineData("foo:bar@[::1]:3128", "[::1]", "3128", "foo", "bar")]
+ [InlineData("foo:PLACEHOLDER@[::1]:3128", "[::1]", "3128", "foo", "PLACEHOLDER")]
[InlineData("foo:Pass$!#\\.$@127.0.0.1:3128", "127.0.0.1", "3128", "foo", "Pass$!#\\.$")]
[InlineData("[::1]", "[::1]", "80", null, null)]
- [InlineData("domain\\foo:bar@1.1.1.1", "1.1.1.1", "80", "foo", "bar")]
- [InlineData("domain%5Cfoo:bar@1.1.1.1", "1.1.1.1", "80", "foo", "bar")]
+ [InlineData("domain\\foo:PLACEHOLDER@1.1.1.1", "1.1.1.1", "80", "foo", "PLACEHOLDER")]
+ [InlineData("domain%5Cfoo:PLACEHOLDER@1.1.1.1", "1.1.1.1", "80", "foo", "PLACEHOLDER")]
[InlineData("HTTP://ABC.COM/", "abc.com", "80", null, null)]
[InlineData("http://10.30.62.64:7890/", "10.30.62.64", "7890", null, null)]
[InlineData("http://1.2.3.4:8888/foo", "1.2.3.4", "8888", null, null)]
@@ -184,7 +184,7 @@ public void HttpProxy_CredentialParsing_Basic()
{
IWebProxy p;
- Environment.SetEnvironmentVariable("all_proxy", "http://foo:bar@1.1.1.1:3000");
+ Environment.SetEnvironmentVariable("all_proxy", "http://foo:PLACEHOLDER@1.1.1.1:3000");
Assert.True(HttpEnvironmentProxy.TryCreate(out p));
Assert.NotNull(p);
Assert.NotNull(p.Credentials);
@@ -196,7 +196,7 @@ public void HttpProxy_CredentialParsing_Basic()
Assert.NotNull(p.Credentials);
// Use different user for http and https
- Environment.SetEnvironmentVariable("https_proxy", "http://foo1:bar1@1.1.1.1:3000");
+ Environment.SetEnvironmentVariable("https_proxy", "http://foo1:PLACEHOLDER1@1.1.1.1:3000");
Assert.True(HttpEnvironmentProxy.TryCreate(out p));
Assert.NotNull(p);
Uri u = p.GetProxy(fooHttp);
@@ -217,7 +217,7 @@ public void HttpProxy_Exceptions_Match()
IWebProxy p;
Environment.SetEnvironmentVariable("no_proxy", ".test.com,, foo.com");
- Environment.SetEnvironmentVariable("all_proxy", "http://foo:bar@1.1.1.1:3000");
+ Environment.SetEnvironmentVariable("all_proxy", "http://foo:PLACEHOLDER@1.1.1.1:3000");
Assert.True(HttpEnvironmentProxy.TryCreate(out p));
Assert.NotNull(p);
@@ -241,7 +241,7 @@ public static IEnumerable