Skip to content

Commit

Permalink
New default certificates
Browse files Browse the repository at this point in the history
  • Loading branch information
akyoto committed Jun 23, 2018
1 parent eb84799 commit a87ba45
Show file tree
Hide file tree
Showing 11 changed files with 68 additions and 147 deletions.
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ func main() {
}

func configure(app *aero.Application) *aero.Application {
app.Security.Load("security/server.crt", "security/server.key")
configureHTTPS(app)

appCode := func(ctx *aero.Context) string {
return ctx.HTML(components.Layout(ctx))
Expand Down
41 changes: 41 additions & 0 deletions security.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package main

import (
"os"
"path"

"github.com/aerogo/aero"
"github.com/fatih/color"
)

func configureHTTPS(app *aero.Application) {
fullCertPath := path.Join("security", "server.crt")
fullKeyPath := path.Join("security", "server.key")

if _, err := os.Stat(fullCertPath); os.IsNotExist(err) {
defaultCertPath := path.Join("security", "default", "server.crt")
err := os.Link(defaultCertPath, fullCertPath)

if err != nil {
// Do not panic here, multiple tests could be running this in parallel.
// Therefore, races can occur (which test writes the link first).
// Simply log the error and continue as the file should be present.
color.Red(err.Error())
}
}

if _, err := os.Stat(fullKeyPath); os.IsNotExist(err) {
defaultKeyPath := path.Join("security", "default", "server.key")
err := os.Link(defaultKeyPath, fullKeyPath)

if err != nil {
// Do not panic here, multiple tests could be running this in parallel.
// Therefore, races can occur (which test writes the link first).
// Simply log the error and continue as the file should be present.
color.Red(err.Error())
}
}

// HTTPS
app.Security.Load(fullCertPath, fullKeyPath)
}
11 changes: 11 additions & 0 deletions security/default/root.crt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
-----BEGIN CERTIFICATE-----
MIIBfzCCASSgAwIBAgIQP+sEBqZLdNe8KLm5lGuSUjAKBggqhkjOPQQDAjAkMRAw
DgYDVQQKEwdBY21lIENvMRAwDgYDVQQDEwdSb290IENBMB4XDTE4MDYyMzA2MDYy
N1oXDTI4MDYyMDA2MDYyN1owJDEQMA4GA1UEChMHQWNtZSBDbzEQMA4GA1UEAxMH
Um9vdCBDQTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGr/aqdLEYl1JBqP/P8e
R078sS4W4WXvyfievpluBDDOOMljBCyH4vP6SFKTdi2tO/871PYHPqVWrHMKXLzE
SMKjODA2MA4GA1UdDwEB/wQEAwICBDATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNV
HRMBAf8EBTADAQH/MAoGCCqGSM49BAMCA0kAMEYCIQC2bAYBX0HIORmHLV5p89vb
t+aajGmjWXPiNBuKxWJZmQIhAJYmz+njI9jzR4oYfGVowLWPVoKP+D+xvhgGAyuG
fDy/
-----END CERTIFICATE-----
30 changes: 0 additions & 30 deletions security/default/rootCA.key

This file was deleted.

22 changes: 0 additions & 22 deletions security/default/rootCA.pem

This file was deleted.

1 change: 0 additions & 1 deletion security/default/rootCA.srl

This file was deleted.

30 changes: 10 additions & 20 deletions security/default/server.crt
Original file line number Diff line number Diff line change
@@ -1,22 +1,12 @@
-----BEGIN CERTIFICATE-----
MIIDpDCCAoygAwIBAgIJAMxsP0rnR8uJMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNV
BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
aWRnaXRzIFB0eSBMdGQxHDAaBgNVBAMME2JldGEua29ubmFrYW5qaS5hcHAwHhcN
MTgwNjA3MDk1ODE3WhcNMTkxMDIwMDk1ODE3WjBjMQswCQYDVQQGEwJBVTETMBEG
A1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkg
THRkMRwwGgYDVQQDDBNiZXRhLmtvbm5ha2FuamkuYXBwMIIBIjANBgkqhkiG9w0B
AQEFAAOCAQ8AMIIBCgKCAQEAtOkHqYkCxh6t0Gsx/VhnlYx8iwDbgbfSaSAAVwPZ
UUqHI3lbKSShCEcegy/FU+X8hd3j+wz+egcWLAQ1O3S1goITolAmEwiSEOGL1q7r
Dtmq7oLDDdcL+cP0qjbhTnp2VO0UJzThOhqWKAkYLh1WdQYtG0RjBBzwGqcVhRhL
pFvbq086YHXUBQQIfibBZ6CYlyzqBCZmjAB0zlPmtn06slfSIAr1EAkB0UO82fDP
RL5L62Ac00RppD92HL7fzgWVEFkPZUq89hI5qzlr2qeqD8lPfpaTtuNRCR1GhyrB
UnSxnVUZ1oqBvAG2PohlS0FX4dfFLK8t+66WuHhWOrje9QIDAQABo1swWTAfBgNV
HSMEGDAWgBQbfpICGlb+p136PATTBMSyGuKFszAJBgNVHRMEAjAAMAsGA1UdDwQE
AwIE8DAeBgNVHREEFzAVghNiZXRhLmtvbm5ha2FuamkuYXBwMA0GCSqGSIb3DQEB
CwUAA4IBAQB4yM9vByimHatIvscOAMuhUubs1CQ1Z58vXQmjqN9W67CpHSWeKLHv
w8RuHG5J6MRxGLe/cmK9vz6HqHrulrRQUGXhu0NZUwrI883HoWKHKxYxClaByypq
AM0CUlH0wflQoRLH5W1WkhS6nBoj2oIuK7a0IG74m5ePhKFEkXQpF3Ztze2Qd6Pi
8fNSDI75L8ejq4ZakOcRo+3nXdaq/lib8nGmHlwyVpehxBTqKlTQZVnYX5Bp4tyP
2JxXpEeCr1BzF2cXsalae7VUEq4HzVXXEENAUhi31Bz6oyCbBTzzEY17/ss0DrDt
+tVqWkWum8b3eWcsmnD6Nb3k2eaqz37b
MIIBuzCCAWCgAwIBAgIQUkIuqKImFnBDcBfarJ2SIDAKBggqhkjOPQQDAjAkMRAw
DgYDVQQKEwdBY21lIENvMRAwDgYDVQQDEwdSb290IENBMB4XDTE4MDYyMzA2MDYy
N1oXDTI4MDYyMDA2MDYyN1owMjEQMA4GA1UEChMHQWNtZSBDbzEeMBwGA1UEAxMV
TG9jYWxob3N0IENlcnRpZmljYXRlMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
O8I+jhU3KLIvtvpsxOoH70kP42kC+KyfszJ4j3QCiyRgg+pkKUv6p8G0d5AnIVVN
jL/91U+ffIQjRUs+X+K+C6NmMGQwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoG
CCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwLwYDVR0RBCgwJoITYmV0YS5rb25uYWth
bmppLmFwcIIJbG9jYWxob3N0hwR/AAABMAoGCCqGSM49BAMCA0kAMEYCIQCxJdPG
WtWMMrytTGFCK4M5f/SSSRSZ9AYtH8xDug7qTQIhALlD3+WV2i+Uh1VKasXjRKTM
35WXISubEy0W0auA/y4i
-----END CERTIFICATE-----
17 changes: 0 additions & 17 deletions security/default/server.csr

This file was deleted.

21 changes: 0 additions & 21 deletions security/default/server.csr.cnf

This file was deleted.

33 changes: 5 additions & 28 deletions security/default/server.key
Original file line number Diff line number Diff line change
@@ -1,28 +1,5 @@
-----BEGIN PRIVATE KEY-----
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC06QepiQLGHq3Q
azH9WGeVjHyLANuBt9JpIABXA9lRSocjeVspJKEIRx6DL8VT5fyF3eP7DP56BxYs
BDU7dLWCghOiUCYTCJIQ4YvWrusO2arugsMN1wv5w/SqNuFOenZU7RQnNOE6GpYo
CRguHVZ1Bi0bRGMEHPAapxWFGEukW9urTzpgddQFBAh+JsFnoJiXLOoEJmaMAHTO
U+a2fTqyV9IgCvUQCQHRQ7zZ8M9EvkvrYBzTRGmkP3Ycvt/OBZUQWQ9lSrz2Ejmr
OWvap6oPyU9+lpO241EJHUaHKsFSdLGdVRnWioG8AbY+iGVLQVfh18Usry37rpa4
eFY6uN71AgMBAAECggEAHL6N7h0L6MjFG0F8/uEGDFf3DesD9ZdsgjGIfErrQ6RQ
1o0Ys+/S+kq6iWOUueDn/6ki6SfGY0Mu/a1pe9nuYR8j2X1cn1eURcRggKroRELH
iwAR1+gcSgIdpNH1eI+yr4m/0v7u7ll9FD1lryYQL6XckuGJzgR/De0QWUZj9mgx
kg8+V2LBK3KGo/lga+c2tXhme5oL0zBsQJ9Ve++GaxKK+t+W5Jo8KIwS4SQ87sBZ
xwkf1H4PyZ1kTigDa3J6rkkE4GVnqKw2th2sNYuRg6KMnlbywKd6J917n7+b5dyE
XuMqU+wB86bNlUo8g1d/8JJRvh6OgFOSNpuTTKhUHQKBgQDeG+GY+CzgE/AFTOXr
ttpswJQ9kSOedb7khqsTSn4bfgdM/r9ryxjXuswCNHBxM14zJ2Y1iXFuVgsTFppV
PixaE1iXcP2lpp75btgSoXFJKWlPZpzOQYGDfPs8h0/DYGNXk/MQhChtneo7GgTb
UFN7+5MGMYiFHYkoJArR+yUyUwKBgQDQg9QwFMsKjfwje/181a9ElAS5bg5smgYV
HBS/+AGFwcBBiV9bcFOwX98ruwjiW7AVCzNJkApjeoa/U23WqigYR9H/5bDg+fKp
6syHlbSR8PgsUv1PKrzFU+Rkr8C+h7qcgOzJcuAzcl+6w/MiMbQT//pLxD8B/XDR
33DWenEQlwKBgQDByHuk9epZOqvwQ+5aILgjqEXuDWKRT1PUmLZL53NtUyDViXHD
f3hWSBDUX6I28cVfRiHD1f3UcVfKOK9AbjVOBZEG2DtFOsF7CL2WS6rGVU4fS3zF
65su+G1OmxP5d3BVKa0pHNUVBnElTYctPcEI7C6TecYNtf5DumaCW+dRJwKBgHwF
LPu8IlgQw1tHsCnD3w9nCrhP4Xxu0BdWMHFNzXoFF5jjYDg+w0gwfcjA4jPgXQbn
NoYWildI1USPFtGLO3XVoe4Wa/IkOFUgNq6eOFxlevbCFbA0tzqW/01zy6yHhlL3
y9612OxApveq/L3l2jnbEsBl5SQF3ki2IaMwCHfZAoGBAMviPev3uVjhQhBE9+76
qqaEaQnPkp+xBDnTo3CMxKuWlZum1Y97kRy4N3ooJGAnYu94UKyvOQd3OnPKeXSu
38SkolXF8SmIAWYavAIeW/cjFySAu8bFtosSfM/lsXy+C1X2Bn2fEayzzsa/tsPt
nd+gSjsPxBNUwZUoMc7k2bhG
-----END PRIVATE KEY-----
-----BEGIN EC PRIVATE KEY-----
MHcCAQEEIOcII2sCkqFtx1GmdKwu+d4rZAFwvrq/tbZKdTiWiQgIoAoGCCqGSM49
AwEHoUQDQgAEO8I+jhU3KLIvtvpsxOoH70kP42kC+KyfszJ4j3QCiyRgg+pkKUv6
p8G0d5AnIVVNjL/91U+ffIQjRUs+X+K+Cw==
-----END EC PRIVATE KEY-----
7 changes: 0 additions & 7 deletions security/default/v3.ext

This file was deleted.

0 comments on commit a87ba45

Please sign in to comment.