1444-thread safe s_enclaveProviders

dna495 · Dec 28, 2021 · 106e80b · 106e80b
1 parent f492b71
commit 106e80b
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/EnclaveDelegate.Crypto.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/EnclaveDelegate.Crypto.cs
@@ -87,19 +87,23 @@ private SqlColumnEncryptionEnclaveProvider GetEnclaveProvider(SqlConnectionAttes
         {
             if (!s_enclaveProviders.TryGetValue(attestationProtocol, out SqlColumnEncryptionEnclaveProvider sqlColumnEncryptionEnclaveProvider))
             {
-                switch (attestationProtocol)
+                lock (_lock)
                 {
-                    case SqlConnectionAttestationProtocol.AAS:
-                        AzureAttestationEnclaveProvider azureAttestationEnclaveProvider = new AzureAttestationEnclaveProvider();
-                        s_enclaveProviders[attestationProtocol] = azureAttestationEnclaveProvider;
-                        sqlColumnEncryptionEnclaveProvider = s_enclaveProviders[attestationProtocol];
-                        break;
-
-                    case SqlConnectionAttestationProtocol.HGS:
-                        HostGuardianServiceEnclaveProvider hostGuardianServiceEnclaveProvider = new HostGuardianServiceEnclaveProvider();
-                        s_enclaveProviders[attestationProtocol] = hostGuardianServiceEnclaveProvider;
-                        sqlColumnEncryptionEnclaveProvider = s_enclaveProviders[attestationProtocol];
-                        break;
+                    if (!s_enclaveProviders.TryGetValue(attestationProtocol, out sqlColumnEncryptionEnclaveProvider))
+                    {
+                        switch (attestationProtocol)
+                        {
+                            case SqlConnectionAttestationProtocol.AAS:
+                                AzureAttestationEnclaveProvider azureAttestationEnclaveProvider = new AzureAttestationEnclaveProvider();
+                                s_enclaveProviders[attestationProtocol] = azureAttestationEnclaveProvider;
+                                sqlColumnEncryptionEnclaveProvider = s_enclaveProviders[attestationProtocol];
+                                break;
+
+                            case SqlConnectionAttestationProtocol.HGS:
+                                HostGuardianServiceEnclaveProvider hostGuardianServiceEnclaveProvider = new HostGuardianServiceEnclaveProvider();
+                                s_enclaveProviders[attestationProtocol] = hostGuardianServiceEnclaveProvider;
+                                sqlColumnEncryptionEnclaveProvider = s_enclaveProviders[attestationProtocol];
+                                break;
 
 #if ENCLAVE_SIMULATOR
                     case SqlConnectionAttestationProtocol.SIM:
@@ -109,8 +113,10 @@ private SqlColumnEncryptionEnclaveProvider GetEnclaveProvider(SqlConnectionAttes
                         break;
 #endif
 
-                    default:
-                        break;
+                            default:
+                                break;
+                        }
+                    }
                 }
             }