Skip to content

SSL with internal web server #492

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

Open
justADeni wants to merge 1 commit into
base: master
Choose a base branch
from
+35 −3
Open

SSL with internal web server #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions common/src/main/java/xyz/jpenilla/squaremap/common/config/Messages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,10 @@ public final class Messages {
public static String LOG_INTERNAL_WEB_DISABLED = "Internal webserver is disabled in config.yml";
@MessageKey("log.internal-web-started")
public static String LOG_INTERNAL_WEB_STARTED = "Internal webserver running on <bind>:<port>";
@MessageKey("log.internal-web-tls-enabled")
public static String LOG_INTERNAL_WEB_TLS_ENABLED = "SSL certificate detected, TLS enabled";
@MessageKey("log.internal-web-tls-disabled")
public static String LOG_INTERNAL_WEB_TLS_DISABLED = "SSL certificate not found, TLS disabled";
@MessageKey("log.internal-web-stopped")
public static String LOG_INTERNAL_WEB_STOPPED = "Internal webserver stopped";

Expand Down
34 changes: 31 additions & 3 deletions common/src/main/java/xyz/jpenilla/squaremap/common/httpd/IntegratedServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,27 @@
import io.undertow.server.handlers.resource.ResourceManager;
import io.undertow.util.ETag;
import io.undertow.util.Headers;

import java.io.FileInputStream;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.attribute.BasicFileAttributes;
import java.security.*;
import java.security.cert.CertificateException;
import java.util.concurrent.TimeUnit;

import xyz.jpenilla.squaremap.common.Logging;
import xyz.jpenilla.squaremap.common.config.Config;
import xyz.jpenilla.squaremap.common.config.Messages;
import xyz.jpenilla.squaremap.common.data.DirectoryProvider;
import xyz.jpenilla.squaremap.common.util.Util;

import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;

public final class IntegratedServer {
private static final boolean DEV_FRONTEND = Boolean.getBoolean("squaremap.devFrontend");
private static final String FRONTEND_PATH = System.getProperty("squaremap.frontendPath");
Expand All @@ -43,7 +51,7 @@ public static void startServer(final DirectoryProvider directoryProvider, final

CACHE = jsonCache;
try {
SERVER = buildUndertow(createResourceHandler(directoryProvider));
SERVER = buildUndertow(directoryProvider);
SERVER.start();

Logging.info(Messages.LOG_INTERNAL_WEB_STARTED, "bind", Config.HTTPD_BIND, "port", Config.HTTPD_PORT);
Expand All @@ -53,10 +61,30 @@ public static void startServer(final DirectoryProvider directoryProvider, final
}
}

private static Undertow buildUndertow(final ResourceHandler resourceHandler) {
private static Undertow buildUndertow(final DirectoryProvider directoryProvider) throws KeyStoreException, NoSuchAlgorithmException, UnrecoverableKeyException, KeyManagementException {
ResourceHandler resourceHandler = createResourceHandler(directoryProvider);
KeyStore ks = KeyStore.getInstance("PKCS12");

try (FileInputStream fis = new FileInputStream(directoryProvider.dataDirectory().resolve("keystore.p12").toFile())) {
ks.load(fis, new char[0]);
} catch (IOException | NoSuchAlgorithmException | CertificateException e) {
Logging.info(Messages.LOG_INTERNAL_WEB_TLS_DISABLED);
return Undertow.builder()
.setServerOption(UndertowOptions.ENABLE_HTTP2, true)
.addHttpListener(Config.HTTPD_PORT, Config.HTTPD_BIND)
.setHandler(createHttpHandler(resourceHandler))
.build();
}

KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
kmf.init(ks, new char[0]);
SSLContext ssl = SSLContext.getInstance("TLS");
ssl.init(kmf.getKeyManagers(), null, null);

Logging.info(Messages.LOG_INTERNAL_WEB_TLS_ENABLED);
return Undertow.builder()
.setServerOption(UndertowOptions.ENABLE_HTTP2, true)
.addHttpListener(Config.HTTPD_PORT, Config.HTTPD_BIND)
.addHttpsListener(Config.HTTPD_PORT, Config.HTTPD_BIND, ssl)
.setHandler(createHttpHandler(resourceHandler))
.build();
}
Expand Down