Skip to content

Fix WebSocket connection not working for HTTPS #1738

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
wborn merged 2 commits into from
Apr 9, 2025
Merged

Fix WebSocket connection not working for HTTPS #1738

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f85d3a6
Add JavaDoc links
florian-h05 Apr 8, 2025
9efdc99
Fix WebSocket over HTTPS not working
florian-h05 Apr 8, 2025
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
44 changes: 33 additions & 11 deletions distributions/openhab/src/main/resources/runtime/etc/jetty.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

<Configure id="Server" class="org.eclipse.jetty.server.Server">

<!-- =========================================================== -->
<!-- =========================================================================================================== -->
<!-- Set handler Collection Structure -->
<!-- =========================================================== -->
<!-- =========================================================================================================== -->

<Get name="handler">
<Call name="addHandler">
Expand Down Expand Up @@ -98,14 +98,20 @@
</Call>
</New>

<!-- =========================================================== -->
<!-- =========================================================================================================== -->
<!-- extra options -->
<!-- =========================================================== -->
<!-- =========================================================================================================== -->
<Set name="stopAtShutdown">true</Set>
<Set name="stopTimeout">1000</Set>
<Set name="dumpAfterStart">false</Set>
<Set name="dumpBeforeStop">false</Set>

<!-- =========================================================================================================== -->
<!-- Configure the SSL parameters of the server -->
<!-- -->
<!-- JavaDoc of o.e.j.u.s.SslContextFactory.Server can be found at: -->
<!-- https://javadoc.jetty.org/jetty-9/org/eclipse/jetty/util/ssl/SslContextFactory.Server.html -->
<!-- =========================================================================================================== -->
<New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory$Server">
<Set name="KeyStorePath"><SystemProperty name="jetty.keystore.path" default="/etc/myKeystore" /></Set>
<Set name="KeyStorePassword"><SystemProperty name="jetty.ssl.password" default="OBF:1uh81uha1toc1wn31toi1ugg1ugi" /></Set>
Expand All @@ -118,17 +124,24 @@
</New>


<!-- =========================================================== -->
<!-- =========================================================================================================== -->
<!-- Add a HTTPS Connector. -->
<!-- Configure an o.e.j.server.ServerConnector with connection -->
<!-- factories for TLS (aka SSL) and HTTP to provide HTTPS. -->
<!-- All accepted TLS connections are wired to a HTTP connection. -->
<!-- -->
<!-- Consult the javadoc of o.e.j.server.ServerConnector, -->
<!-- o.e.j.server.SslConnectionFactory and -->
<!-- o.e.j.server.HttpConnectionFactory for all configuration -->
<!-- that may be set here. -->
<!-- =========================================================== -->
<!-- Consult the JavaDoc of o.e.j.server.ServerConnector at -->
<!-- https://javadoc.jetty.org/jetty-9/org/eclipse/jetty/server/ServerConnector.html, -->
<!-- o.e.j.server.SslConnectionFactory at -->
<!-- https://javadoc.jetty.org/jetty-9/org/eclipse/jetty/server/SslConnectionFactory.html, -->
<!-- o.e.j.a.s.ALPNServerConnectionFactory at -->
<!-- https://javadoc.jetty.org/jetty-9/org/eclipse/jetty/alpn/server/ALPNServerConnectionFactory.html, -->
<!-- o.e.j.h2.s.HTTP2ServerConnectionFactory at -->
<!-- https://javadoc.jetty.org/jetty-9/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.html and -->
<!-- o.e.j.s.HttpConnectionFactory at -->
<!-- https://javadoc.jetty.org/jetty-9/org/eclipse/jetty/server/HttpConnectionFactory.html -->
<!-- for all configuration that may be set here. -->
<!-- =========================================================================================================== -->
<Call name="addConnector">
<Arg>
<New class="org.eclipse.jetty.server.ServerConnector" id="sslConnectorId">
Expand All @@ -147,16 +160,25 @@
</Item>
<Item>
<New class="org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory">
<Arg>h2</Arg>
<Arg>h2,http/1.1</Arg>
</New>
</Item>
<!-- HTTP/2 over TLS -->
<Item>
<New class="org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory">
<Arg name="config">
<Ref refid="httpConfig" />
</Arg>
</New>
</Item>
<!-- WebSockets (HTTP/1.1) -->
<Item>
<New class="org.eclipse.jetty.server.HttpConnectionFactory">
<Arg name="config">
<Ref refid="httpConfig" />
</Arg>
</New>
</Item>
</Array>
</Arg>
<Set name="name">
Expand Down