Skip to content

Added support for version >= 8.0.0 #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 30, 2023
Merged

Added support for version >= 8.0.0 #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
185cefb
Added support for version >= 8.0.0
brendon1982 Aug 21, 2022
97aa93a
Skip generating CA for versions less than 8
brendon1982 Aug 22, 2022
58c6a52
Removed unnecessary variables from CA generation.
brendon1982 Aug 22, 2022
86a892b
Merge remote-tracking branch 'origin/master' into brendon1982/master
Mpdreamz Jun 30, 2023
00bd24c
update example to validate certificate generation
Mpdreamz Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions examples/Elastic.Ephemeral.Example/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,17 @@
// See the LICENSE file in the project root for more information

using Elastic.Elasticsearch.Ephemeral;
using static Elastic.Elasticsearch.Ephemeral.ClusterFeatures;

var config = new EphemeralClusterConfiguration("8.7.0");
var cluster = new EphemeralCluster(config);

var config = new EphemeralClusterConfiguration("8.7.0", XPack | Security | SSL);
using var cluster = new EphemeralCluster(config);

var exitEvent = new ManualResetEvent(false);
Console.CancelKeyPress += (sender, eventArgs) => {
cluster.Dispose();
eventArgs.Cancel = true;
exitEvent.Set();
};
using var started = cluster.Start();
exitEvent.WaitOne();
1 change: 1 addition & 0 deletions src/Elastic.Elasticsearch.Ephemeral/EphemeralFileSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public EphemeralFileSystem(ElasticVersion version, string clusterName) : base(ve
public string CertificatesPath => Path.Combine(ConfigPath, CertificateFolderName);

public string CaCertificate => Path.Combine(CertificatesPath, "ca", "ca") + ".crt";
public string CaPrivateKey => Path.Combine(CertificatesPath, "ca", "ca") + ".key";

public string NodePrivateKey =>
Path.Combine(CertificatesPath, CertificateNodeName, CertificateNodeName) + ".key";
Expand Down
64 changes: 47 additions & 17 deletions ...stic.Elasticsearch.Ephemeral/Tasks/BeforeStartNodeTasks/XPack/GenerateCertificatesTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
// See the LICENSE file in the project root for more information

using System;
using System.IO;
using System.IO.Compression;
using System.Linq;
Expand Down Expand Up @@ -39,6 +40,12 @@ public override void Run(IEphemeralCluster<EphemeralClusterConfiguration> cluste
if (!cluster.ClusterConfiguration.EnableSsl) return;

var config = cluster.ClusterConfiguration;

if (Directory.Exists(config.FileSystem.CertificatesPath))
{
cluster.Writer.WriteDiagnostic($"{{{nameof(GenerateCertificatesTask)}}} Skipping certificate generation as ${{{config.FileSystem.CertificatesPath}}} already exists");
return;
}

var fileSystem = cluster.FileSystem;
//due to a bug in certgen this file needs to live in two places
Expand Down Expand Up @@ -80,7 +87,12 @@ private static void GenerateCertificates(IEphemeralCluster<EphemeralClusterConfi
var config = cluster.ClusterConfiguration;
var name = config.FileSystem.CertificateFolderName;
var path = config.FileSystem.CertificatesPath;
NewOrCachedCertificates(cluster, name, path, silentModeConfigFile, writer);
NewOrCachedCertificates(cluster, "ca-certificates", path, writer,
zipLocation => GenerateCaCertificate(config, zipLocation, writer),
"8.0.0");
NewOrCachedCertificates(cluster, name, path, writer,
zipLocation => GenerateCertificate(config, name, path, zipLocation, silentModeConfigFile, writer)
);
}

private static void GenerateUnusedCertificates(IEphemeralCluster<EphemeralClusterConfiguration> cluster,
Expand All @@ -89,16 +101,23 @@ private static void GenerateUnusedCertificates(IEphemeralCluster<EphemeralCluste
var config = cluster.ClusterConfiguration;
var name = config.FileSystem.UnusedCertificateFolderName;
var path = config.FileSystem.UnusedCertificatesPath;
NewOrCachedCertificates(cluster, name, path, silentModeConfigFile, writer);
NewOrCachedCertificates(cluster, "unused-ca-certificates", path, writer,
zipLocation => GenerateCaCertificate(config, zipLocation, writer),
"8.0.0");
NewOrCachedCertificates(cluster, name, path, writer,
zipLocation => GenerateCertificate(config, name, path, zipLocation, silentModeConfigFile, writer)
);
}

private static void NewOrCachedCertificates(IEphemeralCluster<EphemeralClusterConfiguration> cluster,
string name, string path, string silentModeConfigFile, IConsoleLineHandler writer)
string name, string path, IConsoleLineHandler writer, Action<string> generateCertificateAction, string minVersion = null)
{
var config = cluster.ClusterConfiguration;
var cachedEsHomeFolder = Path.Combine(config.FileSystem.LocalFolder, cluster.GetCacheFolderName());
var zipLocationCache = Path.Combine(cachedEsHomeFolder, name) + ".zip";

if (minVersion != null && config.Version < minVersion) return;

if (File.Exists(zipLocationCache))
{
writer.WriteDiagnostic(
Expand All @@ -110,7 +129,7 @@ private static void NewOrCachedCertificates(IEphemeralCluster<EphemeralClusterCo
var zipLocation = config.Version >= "6.3.0"
? Path.Combine(config.FileSystem.ConfigPath, name) + ".zip"
: Path.Combine(config.FileSystem.ConfigPath, "x-pack", name) + ".zip";
GenerateCertificate(config, name, path, zipLocation, silentModeConfigFile, writer);
generateCertificateAction(zipLocation);

if (!File.Exists(zipLocationCache))
{
Expand All @@ -133,17 +152,17 @@ private static void GenerateCertificate(EphemeralClusterConfiguration config, st
: Path.Combine(fs.ElasticsearchHome, "bin", "elasticsearch-certutil") + BinarySuffix
: Path.Combine(fs.ElasticsearchHome, "bin", "x-pack", "certgen") + BinarySuffix;


if (!Directory.Exists(path))
{
if (config.Version < "7.0.0")
ExecuteBinary(config, writer, binary, "generating ssl certificates for this session",
"-in", silentModeConfigFile, "-out", @out);
else
ExecuteBinary(config, writer, binary, "generating ssl certificates for this session",
"cert",
"-in", silentModeConfigFile, "-out", @out);
}
if (config.Version < "7.0.0")
ExecuteBinary(config, writer, binary, "generating ssl certificates for this session",
"-in", silentModeConfigFile, "-out", @out);
else if (config.Version < "8.0.0")
ExecuteBinary(config, writer, binary, "generating ssl certificates for this session",
"cert",
"--in", silentModeConfigFile, "--out", @out);
else
ExecuteBinary(config, writer, binary, "generating ssl certificates for this session",
"cert", "--pem",
"--in", silentModeConfigFile, "--out", @out, "--ca-cert", fs.CaCertificate, "--ca-key", fs.CaPrivateKey);

var badLocation = Path.Combine(config.FileSystem.ElasticsearchHome, "config", "x-pack", @out);
//not necessary anymore now that we patch .in.bat i think
Expand All @@ -154,14 +173,25 @@ private static void GenerateCertificate(EphemeralClusterConfiguration config, st
}
}

private static void GenerateCaCertificate(EphemeralClusterConfiguration config,
string zipLocation, IConsoleLineHandler writer)
{
if (config.Version < "8.0.0") return;

var binary = Path.Combine(config.FileSystem.ElasticsearchHome, "bin", "elasticsearch-certutil") + BinarySuffix;

ExecuteBinary(config, writer, binary, "generating CA certificate for this session",
"ca", "--pem", "--out", zipLocation);
}


private static void UnpackCertificatesZip(string zipLocation, string outFolder, IConsoleLineHandler writer)
{
if (Directory.Exists(outFolder)) return;

writer.WriteDiagnostic($"{{{nameof(GenerateCertificatesTask)}}} unzipping certificates to {outFolder}");
Directory.CreateDirectory(outFolder);

ZipFile.ExtractToDirectory(zipLocation, outFolder);

}
}
}
1 change: 1 addition & 0 deletions src/Elastic.Elasticsearch.Ephemeral/Tasks/IClusterComposeTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ private static void ExecuteBinaryInternal(EphemeralClusterConfiguration config,
errorOut = errorOut
.Where(e => !string.IsNullOrWhiteSpace(e.Line))
.Where(e => !e.Line.Contains("usage of JAVA_HOME is deprecated"))
.Where(e => !e.Line.Contains("using ES_JAVA_HOME"))
.Where(e => !e.Line.Trim().StartsWith("warning:"))
.ToList();

Expand Down