From a78f1c97531d562c8b883343307af46a055a26dd Mon Sep 17 00:00:00 2001 From: Santiago Pericasgeertsen Date: Thu, 7 Dec 2023 09:55:56 -0500 Subject: [PATCH] Update server's internal state if a listener fails to start for some reason. --- .../tests/WebServerIsRunningTest.java | 54 +++++++++++++++++++ .../java/io/helidon/webserver/LoomServer.java | 1 + 2 files changed, 55 insertions(+) create mode 100644 webserver/tests/webserver/src/test/java/io/helidon/webserver/tests/WebServerIsRunningTest.java diff --git a/webserver/tests/webserver/src/test/java/io/helidon/webserver/tests/WebServerIsRunningTest.java b/webserver/tests/webserver/src/test/java/io/helidon/webserver/tests/WebServerIsRunningTest.java new file mode 100644 index 00000000000..21ad7c18bda --- /dev/null +++ b/webserver/tests/webserver/src/test/java/io/helidon/webserver/tests/WebServerIsRunningTest.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2023 Oracle and/or its affiliates. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.helidon.webserver.tests; + +import java.util.List; + +import io.helidon.common.configurable.Resource; +import io.helidon.common.pki.Keys; +import io.helidon.common.tls.Tls; +import io.helidon.webserver.WebServer; +import io.helidon.webserver.WebServerConfig; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; + +class WebServerIsRunningTest { + + /** + * The invalid cipher name should cause the server's listener to + * fail; the server should reflect its internal state correctly. + */ + @Test + void notRunningTest() { + Keys keys = Keys.builder() + .keystore(store -> store + .passphrase("helidon") + .keystore(Resource.create("certificate.p12"))) + .build(); + Tls tls = Tls.builder() + .privateKey(keys) + .privateKeyCertChain(keys) + .addEnabledCipherSuites(List.of("INVALID_CIPHER_NAME")) // fails listener + .build(); + WebServerConfig.Builder builder = WebServer.builder() + .routing(rb -> rb.get("/", (req, res) -> { })); + builder.tls(tls); + WebServer server = builder.build().start(); + assertThat(server.isRunning(), is(false)); + } +} diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/LoomServer.java b/webserver/webserver/src/main/java/io/helidon/webserver/LoomServer.java index 83cdc761773..2ad1b8efe88 100644 --- a/webserver/webserver/src/main/java/io/helidon/webserver/LoomServer.java +++ b/webserver/webserver/src/main/java/io/helidon/webserver/LoomServer.java @@ -210,6 +210,7 @@ private void startIt() { if (startFutures != null) { startFutures.forEach(future -> future.future().cancel(true)); } + running.set(false); return; } if (registerShutdownHook) {