From 48d07366c1663d922308ecbe4955f8ef5d3279c8 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Wed, 23 Mar 2016 16:51:17 +0100 Subject: Fix volume --- Dockerfile | 2 +- certs/wahlplan/cert.pem | 32 +++++++++++++++---------------- certs/wahlplan/key.pem | 50 ++++++++++++++++++++++++------------------------- main.go | 2 ++ 4 files changed, 44 insertions(+), 42 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5b1a2b1..f0733ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM golang RUN go get dim13.org/goxy -VOLUME /go/src/dim13.org/goxy/certs +VOLUME /go/src/dim13.org/goxy/data WORKDIR /go/src/dim13.org/goxy ENTRYPOINT /go/bin/goxy EXPOSE 80 443 8080 diff --git a/certs/wahlplan/cert.pem b/certs/wahlplan/cert.pem index 5ceb798..ab0b271 100644 --- a/certs/wahlplan/cert.pem +++ b/certs/wahlplan/cert.pem @@ -1,19 +1,19 @@ -----BEGIN CERTIFICATE----- -MIIDBDCCAeygAwIBAgIRAPBTKmUxvw22m9/YpVtm+JkwDQYJKoZIhvcNAQELBQAw -EjEQMA4GA1UEChMHQWNtZSBDbzAeFw0xNjAzMjIxNzQ1MjBaFw0xNzAzMjIxNzQ1 -MjBaMBIxEDAOBgNVBAoTB0FjbWUgQ28wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw -ggEKAoIBAQDHVyuC13yrDwJaEjt/x6FKvv6eHc4los4qgFIdcndalA1YPFXoi0N2 -hnYRRxYozNNU00Ws53asDoJTYKs5jdHC+ZcFOkQUNmIKscVow2n2+jLqTQLJJr4S -ei+3ldZ+oeCYb60bTqCkiifG8BKlBX5/oYaSbM2R6Hkj9EODks83eXv0GgC41hBU -EGZahSut5MFmmO6p9DWGDpfOR26bm2CjxCciNw7QO4FnZv4O1GCJw7NHIzy0fS2I -BAshPL6TS2/qGJVW6+/2YHcyDur7Wn4FKB77uxvcx19HbX46QPnDFNHV2jUHBFnf -XuBklWRg8T/VEmYJW0dd0GN63RPqpCOvAgMBAAGjVTBTMA4GA1UdDwEB/wQEAwIF +MIIDBDCCAeygAwIBAgIRAM2nDIicqfiJ8JYgLlwADYMwDQYJKoZIhvcNAQELBQAw +EjEQMA4GA1UEChMHQWNtZSBDbzAeFw0xNjAzMjMxNTM1MTlaFw0xNzAzMjMxNTM1 +MTlaMBIxEDAOBgNVBAoTB0FjbWUgQ28wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw +ggEKAoIBAQCecMTeqAgZ33BJrPnRJED5XtmfZ+QHhfFueNoddlYqqo2t6f8AWQOC +ra+cHDrX3fg/iAY/B5j8Kgg72cyirs/8iIDfceLkve7jE1BjkE/Lbmnkikf0rDj5 +hFA6czrRG5I36tYoKjpp1ayLyVP4wi6dq74FdV36JQuJIrIIKGO/zn67HzoB3pud +nPRSXSdMQthTBk9YQM0XvO6V6uvhuwlqZRungNI3ggCakY2AtjabTIxTLPNdOy/w +wB6sf4duaBUJE4g47HObDGuWgPMwGBJ0GAKVKU5M2qk3K4NkkpgJgjvS67VjHLYA +expY8a9DN7QLSP+tmDWvNu/L4NJoaSYlAgMBAAGjVTBTMA4GA1UdDwEB/wQEAwIF oDATBgNVHSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMB4GA1UdEQQXMBWC -E3dhaGxwbGFuLmdveHkubW9jY3UwDQYJKoZIhvcNAQELBQADggEBAEq4SOjmszxm -z5XkEI7gre8f4gTxyi2rTVFbnghZK9yfdwPAX3dA/JxvF4g5TlLarbMpxyNERPF5 -yNSqA4YkqBFKVnDJ7EUXjbDDAAoIH+WF09EB4ZtJmgsnQ9jl3bjej14FKbfhbePG -uOfz9SSa398yzHnaX0W406w6fNodZUjf3i7f+2NA/oveIxaSn16MsVE3WRMQ6eQ4 -uRV6qDLvxuMJ3St8zmUvZ6UQs5gVQl7TwfLnjwDG00SanIdHyuZd8CbCq45enDRS -UVSwh7YKWaoFoDu8Lx2O6NzOxA1AAfdTD6tOEYBp03UxGF5Oydt+Ib/xpcYKW/x1 -uDQOMywqmuw= +E3dhaGxwbGFuLmdveHkubW9jY3UwDQYJKoZIhvcNAQELBQADggEBAFqvFFNSLfrg +60P+Wc0Mb1d7EGJ/k3PMCFUT7JwoX5OoVogWLfdz13X4heoku/puDGMb/qdR2C+o +jcMt1W3PgYKvear1B96lezEYUeVAE3R+DXVoCPuG0+iSXxMlaoQDxIvKYM6dM0Q+ +JRPL6odw8a9BRzwevAIhTNNIyg9To4DKRBOA7DIVd6QtrbOvy/BYs2xzILXhHMFM +8EkVL0HTxaKMSqBVaaL4yASQjFFxVVZrfZ3ldnOkCPMx0yKnrud0Wjlig/PdlduA +7SaSGryAkXlfVVGBZSinNHCkrqSvb5oqcZzP4hgI3B3TFTWK+wkUsxLdzMymZRi+ +R8iUn8XUyNM= -----END CERTIFICATE----- diff --git a/certs/wahlplan/key.pem b/certs/wahlplan/key.pem index 7dca517..112118e 100644 --- a/certs/wahlplan/key.pem +++ b/certs/wahlplan/key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/main.go b/main.go index e54cd96..63df66e 100644 --- a/main.go +++ b/main.go @@ -30,6 +30,7 @@ type Entry struct { } func (r Route) SNI(h *tls.ClientHelloInfo) (*tls.Certificate, error) { + log.Println("request cert for", h.ServerName) if e, ok := r[h.ServerName]; ok && e.Cert != nil { return e.Cert, nil } @@ -37,6 +38,7 @@ func (r Route) SNI(h *tls.ClientHelloInfo) (*tls.Certificate, error) { } func (r Route) Restore() { + // FIXME assignment copies lock value to *mux: net/http.ServeMux contains sync.RWMutex *mux = *http.NewServeMux() for _, e := range route { e.NewHandle() -- cgit v1.2.3