forked from helidon-io/helidon
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix subscription model, and add tests
- Loading branch information
Showing
8 changed files
with
217 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
webserver/webserver/src/test/java/io/helidon/webserver/spi/FakeReloadableTlsManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| * 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.spi; | ||
|
|
||
| import java.util.LinkedHashSet; | ||
| import java.util.Set; | ||
| import java.util.function.Consumer; | ||
|
|
||
| import javax.net.ssl.SSLContext; | ||
|
|
||
| import io.helidon.webserver.ConfiguredTlsManager; | ||
| import io.helidon.webserver.WebServerTls; | ||
|
|
||
| @SuppressWarnings("deprecation") | ||
| public class FakeReloadableTlsManager extends ConfiguredTlsManager { | ||
| private final Set<Consumer<SSLContext>> subscribers = new LinkedHashSet<>(); | ||
| private WebServerTls tlsConfig; | ||
|
|
||
| FakeReloadableTlsManager(String name) { | ||
| super(name, "fake-type"); | ||
| } | ||
|
|
||
| @Override // TlsManager | ||
| public void init(WebServerTls tlsConfig) { | ||
| super.init(tlsConfig); | ||
| } | ||
|
|
||
| @Override // TlsManager | ||
| public void subscribe(Consumer<SSLContext> sslContextConsumer) { | ||
| super.subscribe(sslContextConsumer); | ||
| subscribers.add(sslContextConsumer); | ||
| } | ||
|
|
||
| public Set<Consumer<SSLContext>> subscribers() { | ||
| return subscribers; | ||
| } | ||
|
|
||
| @Override | ||
| protected void configureAndSet(WebServerTls tlsConfig, | ||
| SSLContext sslContext) { | ||
| super.configureAndSet(tlsConfig, sslContext); | ||
|
|
||
| this.tlsConfig = tlsConfig; | ||
| } | ||
|
|
||
| public WebServerTls tlsConfig() { | ||
| return tlsConfig; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
webserver/webserver/src/test/resources/config-with-ssl-and-tls-manager.conf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| # | ||
| # 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. | ||
| # | ||
|
|
||
| webserver: { | ||
| sockets: { | ||
| secure: { | ||
| port: 8443, | ||
| bind-address: "127.0.0.1", | ||
| tls: { | ||
| trust-all: true | ||
| manager: { | ||
| fake: { | ||
| } | ||
| }, | ||
| protocols: [ | ||
| "TLSv1.2" | ||
| ], | ||
| private-key: { | ||
| keystore: { | ||
| resource { | ||
| resource-path: "certificate.p12" | ||
| } | ||
| passphrase: "helidon" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |