Skip to content

Make ssl.conf a Go template with overridable cipher suite and protocol #697

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
fmount wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −5
Open

Make ssl.conf a Go template with overridable cipher suite and protocol #697

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
21 changes: 18 additions & 3 deletions modules/common/util/template_util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,14 +680,29 @@ baz=1
}

func TestGetCommonTemplates(t *testing.T) {
t.Run("Returns ssl.conf", func(t *testing.T) {
t.Run("Returns ssl.conf with defaults", func(t *testing.T) {
g := NewWithT(t)

result, err := GetCommonTemplates(map[string]interface{}{})
g.Expect(err).NotTo(HaveOccurred())
g.Expect(result).To(HaveKey("ssl.conf"))
g.Expect(result["ssl.conf"]).To(ContainSubstring("mod_ssl"))
g.Expect(result["ssl.conf"]).To(ContainSubstring("SSLProtocol"))
g.Expect(result["ssl.conf"]).To(ContainSubstring("SSLCipherSuite"))
g.Expect(result["ssl.conf"]).To(ContainSubstring("SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES"))
g.Expect(result["ssl.conf"]).To(ContainSubstring("SSLProtocol all -SSLv2 -SSLv3 -TLSv1"))
})

t.Run("SSLCipherSuite and SSLProtocol can be overridden", func(t *testing.T) {
g := NewWithT(t)

result, err := GetCommonTemplates(map[string]interface{}{
"SSLCipherSuite": "ECDHE+AESGCM:ECDHE+CHACHA20",
"SSLProtocol": "-all +TLSv1.3",
})
g.Expect(err).NotTo(HaveOccurred())
g.Expect(result).To(HaveKey("ssl.conf"))
g.Expect(result["ssl.conf"]).To(ContainSubstring("SSLCipherSuite ECDHE+AESGCM:ECDHE+CHACHA20"))
g.Expect(result["ssl.conf"]).To(ContainSubstring("SSLProtocol -all +TLSv1.3"))
g.Expect(result["ssl.conf"]).NotTo(ContainSubstring("HIGH:MEDIUM"))
g.Expect(result["ssl.conf"]).NotTo(ContainSubstring("all -SSLv2"))
})
}
4 changes: 2 additions & 2 deletions modules/common/util/templates/common/config/ssl.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
SSLHonorCipherOrder On
SSLUseStapling Off
SSLStaplingCache "shmcb:/run/httpd/ssl_stapling(32768)"
SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES
SSLProtocol all -SSLv2 -SSLv3 -TLSv1
SSLCipherSuite {{ or (index . "SSLCipherSuite") "HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES" }}
SSLProtocol {{ or (index . "SSLProtocol") "all -SSLv2 -SSLv3 -TLSv1" }}
SSLOptions StdEnvVars
</IfModule>
Loading