Mark.TwoFive/home-cert-assistant
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Wiki Activity Actions

🚧 Work on allowing the creation of OpenSSL certificates

Browse source
This commit is contained in:
Magnus Leßmann (@MarkL4YG) 2024-11-10 19:08:19 +01:00
parent ebfde75853
commit 8f198f944e
5 changed files with 197 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

122
src/main/java/de/mlessmann/certassist/ExecutableResolver.java
View file

@ -1,55 +1,67 @@
package de.mlessmann.certassist;
import de.mlessmann.certassist.except.UnresolvableCLIDependency;
import lombok.Setter;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Objects;
import java.util.Optional;
import static org.slf4j.LoggerFactory.getLogger;
@Service
public class ExecutableResolver {
private static final Logger LOGGER = getLogger(ExecutableResolver.class);
@Value("${openssl.path:#{null}}")
private String opensslPath;
public String getOpenSSLPath() throws UnresolvableCLIDependency {
if (opensslPath == null) {
LOGGER.atDebug().log("No openssl path configured, falling back to resolving by shell.");
var optSSLPath = searchCommandFromPath("openssl");
opensslPath = optSSLPath.orElseThrow(() -> new UnresolvableCLIDependency("openssl", "openssl.path"));
}
Path configuredPath = new File(opensslPath).toPath();
if (!Files.isRegularFile(configuredPath)) {
throw new UnresolvableCLIDependency("openssl", "openssl.path");
}
return opensslPath;
}
private Optional<String> searchCommandFromPath(String executableName) {
String envPath = System.getenv("PATH");
Objects.requireNonNull(envPath, "Environment variable 'PATH' is not set?!");
String[] pathEntries = envPath.split(File.pathSeparator);
for (String pathEntry : pathEntries) {
Path executablePath = Path.of(pathEntry, executableName);
if (Files.isRegularFile(executablePath) && Files.isExecutable(executablePath)) {
return Optional.of(executablePath.toString());
}
}
LOGGER.error("Could not find executable '{}' in PATH. Make sure that it exists on the of the directory and is executable.", executableName);
return Optional.empty();
}
}
package de.mlessmann.certassist;
import de.mlessmann.certassist.except.UnresolvableCLIDependency;
import lombok.Setter;
import org.apache.commons.lang3.SystemUtils;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import static org.slf4j.LoggerFactory.getLogger;
@Service
public class ExecutableResolver {
private static final Logger LOGGER = getLogger(ExecutableResolver.class);
@Value("${openssl.path:#{null}}")
private String opensslPath;
public String getOpenSSLPath() throws UnresolvableCLIDependency {
if (opensslPath == null) {
LOGGER.atDebug().log("No openssl path configured, falling back to resolving by shell.");
var optSSLPath = searchCommandFromPath("openssl");
opensslPath = optSSLPath.orElseThrow(() -> new UnresolvableCLIDependency("openssl", "openssl.path"));
}
Path configuredPath = new File(opensslPath).toPath();
if (!Files.isRegularFile(configuredPath)) {
throw new UnresolvableCLIDependency("openssl", "openssl.path");
}
return opensslPath;
}
private Optional<String> searchCommandFromPath(String executableName) {
String envPath = System.getenv("PATH");
Objects.requireNonNull(envPath, "Environment variable 'PATH' is not set?!");
String[] pathEntries = envPath.split(File.pathSeparator);
for (String pathEntry : pathEntries) {
for (String fileExtension : getAllowedExtensions()) {
Path executablePath = Path.of(pathEntry, executableName + fileExtension);
if (Files.isRegularFile(executablePath) && Files.isExecutable(executablePath)) {
return Optional.of(executablePath.toString());
}
}
}
LOGGER.error("Could not find executable '{}' in PATH. Make sure that it exists on the of the directory and is executable.", executableName);
return Optional.empty();
}
public List<String> getAllowedExtensions() {
if (SystemUtils.IS_OS_WINDOWS) {
return List.of(".exe", ".bat", ".cmd");
} else {
return List.of("", ".sh");
}
}
}