Skip to content

Commit

Permalink
fix: incorrect validation if all required certificates for C# client …
Browse files Browse the repository at this point in the history
…does exists when using generated ones from the server
  • Loading branch information
tpz committed Dec 7, 2023
1 parent b42a0c4 commit 0f4f491
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
8 changes: 4 additions & 4 deletions EvitaDB.Client/Certificate/ClientCertificateManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,11 @@ private async Task<string> GetCertificatesFromServer(string host, int systemApiP
}
else
{
string rootCaCert =
Path.Combine(serverSpecificDirectory, CertificateUtils.GeneratedRootCaCertificateFileName);
string serverCert =
Path.Combine(serverSpecificDirectory, CertificateUtils.GeneratedCertificateFileName);
string cert = Path.Combine(serverSpecificDirectory, CertificateUtils.GeneratedClientCertificateFileName);
string key = Path.Combine(serverSpecificDirectory, CertificateUtils.GeneratedClientCertificateKeyFileName);
if (Path.Exists(rootCaCert) && Path.Exists(cert) && Path.Exists(key))
if (Path.Exists(serverCert) && Path.Exists(cert) && Path.Exists(key))
{
return serverSpecificDirectory;
}
Expand Down Expand Up @@ -192,4 +192,4 @@ private bool RemoteCertificateValidationCallback(
return false;
return cert.Thumbprint == usedCert.Thumbprint;
}
}
}
5 changes: 2 additions & 3 deletions EvitaDB.Client/Utils/CertificateUtils.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
namespace EvitaDB.Client.Utils;

public class CertificateUtils
internal static class CertificateUtils
{
private const string GeneratedCertificateExtension = ".crt";
private const string GeneratedCertificateKeyExtension = ".key";
public const string GeneratedRootCaCertificateFileName = $"evitaDB-CA-selfSigned{GeneratedCertificateExtension}";
public const string GeneratedCertificateFileName = $"server{GeneratedCertificateExtension}";
public const string GeneratedClientCertificateFileName = $"client{GeneratedCertificateExtension}";
public const string GeneratedClientCertificateKeyFileName = $"client{GeneratedCertificateKeyExtension}";
}
}

0 comments on commit 0f4f491

Please sign in to comment.