Skip to content

Fix Tomcat TLSv1.3 when TLSv1.2 ciphers configured #26

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
merged 4 commits into from
Oct 17, 2024
Merged

Fix Tomcat TLSv1.3 when TLSv1.2 ciphers configured #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57ebdd4
Bump tomcat version
janbrasna Jan 6, 2024
9347789
Explicitly set tls13 suites in Tomcat when tls12 ciphers defined
janbrasna Jan 6, 2024
aa81ef5
Update Tomcat v9.x version
janbrasna Oct 8, 2024
473670d
Lint config options and leave out defaults
janbrasna Oct 12, 2024
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
17 changes: 5 additions & 12 deletions src/js/configs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ module.exports = {
highlighter: 'nginx',
latestVersion: '1.4.67',
name: 'lighttpd',
tls13: '1.4.48'
tls13: '1.4.48',
},
mysql: {
highlighter: 'ini',
Expand All @@ -125,9 +125,8 @@ module.exports = {
highlighter: 'apache',
latestVersion: '12.2.1',
name: 'Oracle HTTP',
supportsHsts: true,
supportsOcspStapling: false, // TODO: fix this, but Oracle's documentation is terrible
tls13: noSupportedVersion,
supportsOcspStapling: false, // TODO: needs updating; docs only available to customers:/
tls13: noSupportedVersion, // TODO: needs updating; docs only available to customers:/
},
postfix: {
highlighter: 'nginx',
Expand All @@ -153,7 +152,6 @@ module.exports = {
name: 'ProFTPD',
showSupports: false,
supportsHsts: false,
supportsOcspStapling: true,
tls13: '1.3.7',
},
redis: {
Expand All @@ -164,7 +162,6 @@ module.exports = {
supportsHsts: false,
supportsOcspStapling: false,
tls13: '6.0',
usesOpenssl: true,
},
squid: {
highlighter: 'nginx', // TODO: find better
Expand All @@ -179,17 +176,14 @@ module.exports = {
highlighter: 'ini',
latestVersion: '5.71',
name: 'stunnel',
showSupports: false,
supportsHsts: false,
supportsOcspStapling: false,
tls13: '5.50',
usesOpenssl: true,
},
tomcat: {
tomcat: {
highlighter: 'xml',
latestVersion: '9.0.30',
latestVersion: '9.0.96',
name: 'Tomcat',
supportsHsts: true,
supportsOcspStapling: false,
tls13: '8.0.0',
usesOpenssl: false,
Expand All @@ -199,7 +193,6 @@ tomcat: {
highlighter: 'ini',
latestVersion: '2.1.2',
name: 'Traefik',
supportsHsts: true,
supportsOcspStapling: false, // https://github.com/containous/traefik/issues/212
tls13: '2.0.0',
usesOpenssl: false,
Expand Down
6 changes: 3 additions & 3 deletions src/templates/partials/tomcat.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
port="443"
SSLEnabled="true">

<!-- TLS 1.3 requires Java 11 or higher -->
{{#if (includes "TLSv1.3" output.protocols)}}<!-- TLSv1.3 requires Java 11 or higher -->{{/if}}
<SSLHostConfig
{{#if output.ciphers.length}}
ciphers="{{{join output.ciphers ":"}}}"
ciphers="{{#if (includes "TLSv1.3" output.protocols)}}{{{join output.cipherSuites ":"}}}:{{/if}}{{{join output.ciphers ":"}}}"
{{/if}}
disableSessionTickets="true"
honorCipherOrder="{{#if output.serverPreferredOrder}}true{{else}}false{{/if}}"
protocols="{{join output.protocols ", "}}">
protocols="{{join output.protocols ","}}">

<Certificate
certificateFile="/path/to/signed_certificate"
Expand Down