Imported Upstream version 6.12.0.139

Former-commit-id: 012695745aa696bdd1e642d63c8af2ed27331e5f
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2021-04-20 09:00:10 +00:00
parent 75112eb1f3
commit 611f410153
91 changed files with 847 additions and 975 deletions

View File

@ -1 +1 @@
3f2c61cfc8766c3410e8098bd786afd3f6379dda
67764cc0ce3a70e2f07aab4f0b3bf2cd541c3c61

View File

@ -1 +1 @@
5e1fd1413c33fce8bf0fe0f2bf13f2a0b43f5563
49e1188ef7077fd8d7bf98d055752a51007b6f57

File diff suppressed because it is too large Load Diff

View File

@ -10,11 +10,11 @@ generated by GNU Autoconf 2.69. Invocation command line was
## Platform. ##
## --------- ##
hostname = az-ubuntu-general146d70
hostname = az-ubuntu-general040dd0
uname -m = x86_64
uname -r = 4.15.0-1111-azure
uname -r = 4.15.0-1113-azure
uname -s = Linux
uname -v = #123~16.04.1-Ubuntu SMP Sat Mar 20 01:52:07 UTC 2021
uname -v = #126~16.04.1-Ubuntu SMP Tue Apr 13 16:55:24 UTC 2021
/usr/bin/uname -p = unknown
/bin/uname -X = unknown
@ -747,7 +747,7 @@ generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_COMMANDS =
$ ./config.status
on az-ubuntu-general146d70
on az-ubuntu-general040dd0
config.status:1238: creating Makefile
config.status:1238: creating bdw-gc.pc

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
136012360a10812030f2f26aba9424da2c43c904
4ab588d557b2783f3f3feba4c9218814214feecd

View File

@ -0,0 +1,11 @@
{
"tool": "Credential Scanner",
"suppressions": [
{
"_justification": "Certificate for SQL test server.",
"file": [
"src/System.Data.SqlClient/tests/Tools/TDS/TDS.Servers/TdsServerCertificate.pfx"
]
}
]
}

View File

@ -78,7 +78,7 @@
<Version>1.0.2-prerelease</Version>
</PackageReference>
<PackageReference Include="System.Net.TestData">
<Version>1.0.0-prerelease</Version>
<Version>1.0.7</Version>
</PackageReference>
<PackageReference Include="System.Drawing.Common.TestData">
<Version>1.0.7</Version>

View File

@ -130,9 +130,13 @@ internal partial class Interop
public const uint WINHTTP_AUTH_TARGET_SERVER = 0x00000000;
public const uint WINHTTP_AUTH_TARGET_PROXY = 0x00000001;
// [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="It is property descriptor, not secret value.")]
public const uint WINHTTP_OPTION_USERNAME = 0x1000;
// [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="It is property descriptor, not secret value.")]
public const uint WINHTTP_OPTION_PASSWORD = 0x1001;
// [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="It is property descriptor, not secret value.")]
public const uint WINHTTP_OPTION_PROXY_USERNAME = 0x1002;
// [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="It is property descriptor, not secret value.")]
public const uint WINHTTP_OPTION_PROXY_PASSWORD = 0x1003;
public const uint WINHTTP_OPTION_SERVER_SPN_USED = 106;

View File

@ -16,8 +16,8 @@ namespace System.Net.Test.Common
{
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 static readonly Mutex m;
private const int MutexTimeout = 120 * 1000;

View File

@ -1,129 +0,0 @@
# Licensed to the .NET Foundation under one or more agreements.
# The .NET Foundation licenses this file to you under the MIT license.
# See the LICENSE file in the project root for more information.
#Requires -RunAsAdministrator
# Certificate configuration
$script:testDataUri = "https://github.com/dotnet/corefx-testdata/archive/master.zip"
$script:testData = "corefx-testdata"
$script:certificatePath = "$($script:testData)\corefx-testdata-master\System.Net.TestData"
$script:clientPrivateKeyPath = Join-Path $script:certificatePath "testclient1_at_contoso.com.pfx"
$script:clientPrivateKeyPassword = "testcertificate"
$script:serverPrivateKeyPath = Join-Path $script:certificatePath "contoso.com.pfx"
$script:serverPrivateKeyPassword = "testcertificate"
Function GetFullPath($relativePath)
{
return (Get-Item $relativePath).FullName
}
Function DeleteTestData
{
if (Test-Path $script:testData)
{
rmdir $script:testData -Recurse -Force
}
del ($testData + ".zip") -ErrorAction SilentlyContinue
}
Function DownloadTestData
{
DeleteTestData
DownloadFile $script:testDataUri ($testData + ".zip")
Expand-Archive ($testData + ".zip")
}
Function LoadCertificateAndRoot($fileName, $password)
{
$privateCerts = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2Collection
$fullPath = GetFullPath $fileName
$privateCerts.Import($fullPath, $password, ("MachineKeySet", "PersistKeySet", "Exportable"))
$privateKeyCert = $null
foreach ($cert in $privateCerts)
{
if ($privateKeyCert -eq $null -and $cert.HasPrivateKey)
{
$privateKeyCert = $cert
}
}
$rootCACert = $privateCerts | where {$_.Subject -eq $privateKeyCert.Issuer}
return ($privateKeyCert, $rootCACert)
}
Function AddCertificateToStore($certificate, $storeName, $storeLocation)
{
$rootStore = New-Object System.Security.Cryptography.X509Certificates.X509Store($storeName, $storeLocation)
$rootStore.Open("ReadWrite")
$rootStore.Add($certificate)
$rootStore.Close()
}
Function InstallCertificates($fileName, $password)
{
Write-Host "Acquiring test data."
DownloadTestData
Write-Host "Adding certificates"
($private, $root) = LoadCertificateAndRoot $fileName $password
Write-Host -ForegroundColor DarkGray "`tAdding root certificate: $($root.Subject)"
AddCertificateToStore $root "Root" "LocalMachine"
Write-Host -ForegroundColor DarkGray "`tAdding private key certificate: $($private.Subject)"
AddCertificateToStore $private "My" "LocalMachine"
Write-Host "Removing temporary files"
DeleteTestData
}
Function InstallClientCertificates
{
Write-Host -ForegroundColor Cyan "Installing Client Certificates"
InstallCertificates $script:clientPrivateKeyPath $script:clientPrivateKeyPassword
}
Function InstallServerCertificates
{
Write-Host -ForegroundColor Cyan "Installing Server Certificates"
InstallCertificates $script:serverPrivateKeyPath $script:serverPrivateKeyPassword
}
Function GetServerCertificate
{
return dir Cert:\LocalMachine\My | where { $_.DnsNameList | where{$_.Punycode -eq $script:iisServerFQDN} }
}
Function RemoveCertificates($filename, $password)
{
Write-Host "Acquiring test data."
DownloadTestData
($private, $root) = LoadCertificateAndRoot $fileName $password
Write-Host -ForegroundColor DarkGray "`tRemoving root certificate: $($root.Subject)"
dir Cert:\LocalMachine\Root | where {$_.Subject -eq $root.Subject} | foreach { rm (Join-Path Cert:\LocalMachine\Root $_.Thumbprint) }
Write-Host -ForegroundColor DarkGray "`tRemoving private key certificate: $($private.Subject)"
dir Cert:\LocalMachine\My | where {$_.Subject -eq $private.Subject} | foreach { rm (Join-Path Cert:\LocalMachine\My $_.Thumbprint) -DeleteKey }
DeleteTestData
}
Function RemoveClientCertificates
{
Write-Host -ForegroundColor Cyan "Removing Client Certificates"
RemoveCertificates $script:clientPrivateKeyPath $script:clientPrivateKeyPassword
}
Function RemoveServerCertificates
{
Write-Host -ForegroundColor Cyan "Removing Server Certificates"
RemoveCertificates $script:serverPrivateKeyPath $script:serverPrivateKeyPassword
}

View File

@ -1 +1 @@
a703b498eb5617718ace91d381b3eccdeeec2c21
9688ed395212ca09280b74cdd356a382f8a38604

View File

@ -567,6 +567,7 @@ namespace System.Data.SqlClient
// Login data validation Rules
//
internal const ushort MAXLEN_HOSTNAME = 128; // the client machine name
// [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Not a username.")]
internal const ushort MAXLEN_USERNAME = 128; // the client user id
internal const ushort MAXLEN_PASSWORD = 128; // the password supplied by the client
internal const ushort MAXLEN_APPNAME = 128; // the client application name

View File

@ -20,9 +20,9 @@ namespace System.Data.SqlClient.Tests
{
public class DiagnosticTest : RemoteExecutorTestBase
{
private const string BadConnectionString = "data source = bad; initial catalog = bad; uid = bad; password = bad; connection timeout = 1;";
private const string BadConnectionString = "data source = bad; initial catalog = bad; uid = bad; password = PLACEHOLDER; connection timeout = 1;";
private static readonly string s_tcpConnStr = Environment.GetEnvironmentVariable("TEST_TCP_CONN_STR") ?? string.Empty;
public static bool IsConnectionStringConfigured() => s_tcpConnStr != string.Empty;
[Fact]

View File

@ -11,7 +11,7 @@ namespace System.Data.SqlClient.Tests
public class ExceptionTest
{
// test connection string
private string connectionString = "server=tcp:server,1432;database=test;uid=admin;pwd=SQLDB;connect timeout=60;";
private string connectionString = "server=tcp:server,1432;database=test;uid=admin;pwd=PLACEHOLDER;connect timeout=60;";
// data value and server consts
private const string badServer = "NotAServer";

View File

@ -108,7 +108,7 @@ namespace System.Data.SqlClient.Tests
[Fact]
public void ExceptionsWithMinPoolSizeCanBeHandled()
{
string connectionString = $"Data Source={Guid.NewGuid().ToString()};uid=random;pwd=asd;Connect Timeout=2; Min Pool Size=3";
string connectionString = $"Data Source={Guid.NewGuid().ToString()};uid=random;pwd=PLACEHOLDER;Connect Timeout=2; Min Pool Size=3";
for (int i = 0; i < 2; i++)
{
using (SqlConnection connection = new SqlConnection(connectionString))
@ -122,7 +122,7 @@ namespace System.Data.SqlClient.Tests
[Fact]
public void ConnectionTestInvalidCredentialCombination()
{
var cleartextCredsConnStr = "User=test;Password=test;";
var cleartextCredsConnStr = "User=test;Password=PLACEHOLDER;";
var sspiConnStr = "Integrated Security=true;";
var testPassword = new SecureString();
testPassword.MakeReadOnly();

View File

@ -88,7 +88,7 @@ namespace Microsoft.SqlServer.TDS.Servers
// By Default SQL authentication will be used.
FedAuthRequiredPreLoginOption = TdsPreLoginFedAuthRequiredOption.FedAuthNotRequired;
EncryptionCertificate = new X509Certificate2("TdsServerCertificate.pfx", "SecretPassword123456");
EncryptionCertificate = new X509Certificate2("TdsServerCertificate.pfx", "PLACEHOLDER");
ServerPrincipalName = AzureADServicePrincipalName;
StsUrl = AzureADProductionTokenEndpoint;

View File

@ -364,7 +364,7 @@ namespace System.Diagnostics.Tests
[Fact, PlatformSpecific(TestPlatforms.Windows), OuterLoop] // Uses P/Invokes, Requires admin privileges
public void TestUserCredentialsPropertiesOnWindows()
{
string username = "test", password = "PassWord123!!";
string username = "test", password = "PLACEHOLDER";
try
{
Interop.NetUserAdd(username, password);

View File

@ -96,6 +96,7 @@ namespace System.DirectoryServices.AccountManagement
// 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.")]
internal const string PwdInfoPassword = "AuthenticablePrincipal.PasswordInfo.Password";
internal const string PwdInfoExpireImmediately = "AuthenticablePrincipal.PasswordInfo.ExpireImmediately";
}

Some files were not shown because too many files have changed in this diff Show More