Skip to content

fix: use all hosts in array as cache key #4

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
mvanholsteijn wants to merge 1 commit into
base: host-signing-cache
Choose a base branch
from
Open

fix: use all hosts in array as cache key #4

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
15 changes: 5 additions & 10 deletions signer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ import (
"net"
"runtime"
"sort"
"time"
"strings"
"sync"
"time"
)

func hashSorted(lst []string) []byte {
Expand All @@ -41,12 +42,8 @@ var hostMap sync.Map //map[string]*tls.Certificate
func signHost(ca tls.Certificate, hosts []string) (cert *tls.Certificate, err error) {
var x509ca *x509.Certificate

// FIXME: There is a bug here. If hosts[] is ever more than one element long, there will be potential for host mismatches.
if len(hosts) == 0 {
return
}

cachedCert, ok := hostMap.Load(hosts[0])
cacheKey := strings.Join(hosts, ":")
cachedCert, ok := hostMap.Load(cacheKey)

if ok {
cert = cachedCert.(*tls.Certificate)
Expand Down Expand Up @@ -117,9 +114,7 @@ func signHost(ca tls.Certificate, hosts []string) (cert *tls.Certificate, err er
}

// Cache the certificate for later.
for _, h := range hosts {
hostMap.Store(h, tlsCert)
}
hostMap.Store(cacheKey, tlsCert)

return tlsCert, nil
}