0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-23 22:27:38 -05:00
caddy/caddytls/crypto_test.go

136 lines
3.1 KiB
Go
Raw Normal View History

Rewrote Caddy from the ground up; initial commit of 0.9 branch These changes span work from the last ~4 months in an effort to make Caddy more extensible, reduce the coupling between its components, and lay a more robust foundation of code going forward into 1.0. A bunch of new features have been added, too, with even higher future potential. The most significant design change is an overall inversion of dependencies. Instead of the caddy package knowing about the server and the notion of middleware and config, the caddy package exposes an interface that other components plug into. This does introduce more indirection when reading the code, but every piece is very modular and pluggable. Even the HTTP server is pluggable. The caddy package has been moved to the top level, and main has been pushed into a subfolder called caddy. The actual logic of the main file has been pushed even further into caddy/caddymain/run.go so that custom builds of Caddy can be 'go get'able. The HTTPS logic was surgically separated into two parts to divide the TLS-specific code and the HTTPS-specific code. The caddytls package can now be used by any type of server that needs TLS, not just HTTP. I also added the ability to customize nearly every aspect of TLS at the site level rather than all sites sharing the same TLS configuration. Not all of this flexibility is exposed in the Caddyfile yet, but it may be in the future. Caddy can also generate self-signed certificates in memory for the convenience of a developer working on localhost who wants HTTPS. And Caddy now supports the DNS challenge, assuming at least one DNS provider is plugged in. Dozens, if not hundreds, of other minor changes swept through the code base as I literally started from an empty main function, copying over functions or files as needed, then adjusting them to fit in the new design. Most tests have been restored and adapted to the new API, but more work is needed there. A lot of what was "impossible" before is now possible, or can be made possible with minimal disruption of the code. For example, it's fairly easy to make plugins hook into another part of the code via callbacks. Plugins can do more than just be directives; we now have plugins that customize how the Caddyfile is loaded (useful when you need to get your configuration from a remote store). Site addresses no longer need be just a host and port. They can have a path, allowing you to scope a configuration to a specific path. There is no inheretance, however; each site configuration is distinct. Thanks to amazing work by Lucas Clemente, this commit adds experimental QUIC support. Turn it on using the -quic flag; your browser may have to be configured to enable it. Almost everything is here, but you will notice that most of the middle- ware are missing. After those are transferred over, we'll be ready for beta tests. I'm very excited to get this out. Thanks for everyone's help and patience these last few months. I hope you like it!!
2016-06-04 18:00:29 -05:00
package caddytls
import (
"bytes"
2016-03-02 08:34:33 -05:00
"crypto"
"crypto/ecdsa"
"crypto/elliptic"
"crypto/rand"
"crypto/rsa"
Rewrote Caddy from the ground up; initial commit of 0.9 branch These changes span work from the last ~4 months in an effort to make Caddy more extensible, reduce the coupling between its components, and lay a more robust foundation of code going forward into 1.0. A bunch of new features have been added, too, with even higher future potential. The most significant design change is an overall inversion of dependencies. Instead of the caddy package knowing about the server and the notion of middleware and config, the caddy package exposes an interface that other components plug into. This does introduce more indirection when reading the code, but every piece is very modular and pluggable. Even the HTTP server is pluggable. The caddy package has been moved to the top level, and main has been pushed into a subfolder called caddy. The actual logic of the main file has been pushed even further into caddy/caddymain/run.go so that custom builds of Caddy can be 'go get'able. The HTTPS logic was surgically separated into two parts to divide the TLS-specific code and the HTTPS-specific code. The caddytls package can now be used by any type of server that needs TLS, not just HTTP. I also added the ability to customize nearly every aspect of TLS at the site level rather than all sites sharing the same TLS configuration. Not all of this flexibility is exposed in the Caddyfile yet, but it may be in the future. Caddy can also generate self-signed certificates in memory for the convenience of a developer working on localhost who wants HTTPS. And Caddy now supports the DNS challenge, assuming at least one DNS provider is plugged in. Dozens, if not hundreds, of other minor changes swept through the code base as I literally started from an empty main function, copying over functions or files as needed, then adjusting them to fit in the new design. Most tests have been restored and adapted to the new API, but more work is needed there. A lot of what was "impossible" before is now possible, or can be made possible with minimal disruption of the code. For example, it's fairly easy to make plugins hook into another part of the code via callbacks. Plugins can do more than just be directives; we now have plugins that customize how the Caddyfile is loaded (useful when you need to get your configuration from a remote store). Site addresses no longer need be just a host and port. They can have a path, allowing you to scope a configuration to a specific path. There is no inheretance, however; each site configuration is distinct. Thanks to amazing work by Lucas Clemente, this commit adds experimental QUIC support. Turn it on using the -quic flag; your browser may have to be configured to enable it. Almost everything is here, but you will notice that most of the middle- ware are missing. After those are transferred over, we'll be ready for beta tests. I'm very excited to get this out. Thanks for everyone's help and patience these last few months. I hope you like it!!
2016-06-04 18:00:29 -05:00
"crypto/tls"
"crypto/x509"
"testing"
Rewrote Caddy from the ground up; initial commit of 0.9 branch These changes span work from the last ~4 months in an effort to make Caddy more extensible, reduce the coupling between its components, and lay a more robust foundation of code going forward into 1.0. A bunch of new features have been added, too, with even higher future potential. The most significant design change is an overall inversion of dependencies. Instead of the caddy package knowing about the server and the notion of middleware and config, the caddy package exposes an interface that other components plug into. This does introduce more indirection when reading the code, but every piece is very modular and pluggable. Even the HTTP server is pluggable. The caddy package has been moved to the top level, and main has been pushed into a subfolder called caddy. The actual logic of the main file has been pushed even further into caddy/caddymain/run.go so that custom builds of Caddy can be 'go get'able. The HTTPS logic was surgically separated into two parts to divide the TLS-specific code and the HTTPS-specific code. The caddytls package can now be used by any type of server that needs TLS, not just HTTP. I also added the ability to customize nearly every aspect of TLS at the site level rather than all sites sharing the same TLS configuration. Not all of this flexibility is exposed in the Caddyfile yet, but it may be in the future. Caddy can also generate self-signed certificates in memory for the convenience of a developer working on localhost who wants HTTPS. And Caddy now supports the DNS challenge, assuming at least one DNS provider is plugged in. Dozens, if not hundreds, of other minor changes swept through the code base as I literally started from an empty main function, copying over functions or files as needed, then adjusting them to fit in the new design. Most tests have been restored and adapted to the new API, but more work is needed there. A lot of what was "impossible" before is now possible, or can be made possible with minimal disruption of the code. For example, it's fairly easy to make plugins hook into another part of the code via callbacks. Plugins can do more than just be directives; we now have plugins that customize how the Caddyfile is loaded (useful when you need to get your configuration from a remote store). Site addresses no longer need be just a host and port. They can have a path, allowing you to scope a configuration to a specific path. There is no inheretance, however; each site configuration is distinct. Thanks to amazing work by Lucas Clemente, this commit adds experimental QUIC support. Turn it on using the -quic flag; your browser may have to be configured to enable it. Almost everything is here, but you will notice that most of the middle- ware are missing. After those are transferred over, we'll be ready for beta tests. I'm very excited to get this out. Thanks for everyone's help and patience these last few months. I hope you like it!!
2016-06-04 18:00:29 -05:00
"time"
)
func TestSaveAndLoadRSAPrivateKey(t *testing.T) {
2016-04-03 13:06:21 -05:00
privateKey, err := rsa.GenerateKey(rand.Reader, 128) // make tests faster; small key size OK for testing
if err != nil {
t.Fatal(err)
}
// test save
savedBytes, err := savePrivateKey(privateKey)
if err != nil {
t.Fatal("error saving private key:", err)
}
// test load
loadedKey, err := loadPrivateKey(savedBytes)
if err != nil {
t.Error("error loading private key:", err)
}
2016-01-15 20:36:40 -05:00
// verify loaded key is correct
2016-03-02 08:34:33 -05:00
if !PrivateKeysSame(privateKey, loadedKey) {
t.Error("Expected key bytes to be the same, but they weren't")
}
}
2016-03-02 08:34:33 -05:00
func TestSaveAndLoadECCPrivateKey(t *testing.T) {
privateKey, err := ecdsa.GenerateKey(elliptic.P384(), rand.Reader)
if err != nil {
t.Fatal(err)
}
// test save
savedBytes, err := savePrivateKey(privateKey)
2016-03-02 08:34:33 -05:00
if err != nil {
t.Fatal("error saving private key:", err)
}
// test load
loadedKey, err := loadPrivateKey(savedBytes)
2016-03-02 08:34:33 -05:00
if err != nil {
t.Error("error loading private key:", err)
}
// verify loaded key is correct
2016-03-17 17:43:50 -05:00
if !PrivateKeysSame(privateKey, loadedKey) {
t.Error("Expected key bytes to be the same, but they weren't")
}
2016-03-02 08:34:33 -05:00
}
// PrivateKeysSame compares the bytes of a and b and returns true if they are the same.
func PrivateKeysSame(a, b crypto.PrivateKey) bool {
Rewrote Caddy from the ground up; initial commit of 0.9 branch These changes span work from the last ~4 months in an effort to make Caddy more extensible, reduce the coupling between its components, and lay a more robust foundation of code going forward into 1.0. A bunch of new features have been added, too, with even higher future potential. The most significant design change is an overall inversion of dependencies. Instead of the caddy package knowing about the server and the notion of middleware and config, the caddy package exposes an interface that other components plug into. This does introduce more indirection when reading the code, but every piece is very modular and pluggable. Even the HTTP server is pluggable. The caddy package has been moved to the top level, and main has been pushed into a subfolder called caddy. The actual logic of the main file has been pushed even further into caddy/caddymain/run.go so that custom builds of Caddy can be 'go get'able. The HTTPS logic was surgically separated into two parts to divide the TLS-specific code and the HTTPS-specific code. The caddytls package can now be used by any type of server that needs TLS, not just HTTP. I also added the ability to customize nearly every aspect of TLS at the site level rather than all sites sharing the same TLS configuration. Not all of this flexibility is exposed in the Caddyfile yet, but it may be in the future. Caddy can also generate self-signed certificates in memory for the convenience of a developer working on localhost who wants HTTPS. And Caddy now supports the DNS challenge, assuming at least one DNS provider is plugged in. Dozens, if not hundreds, of other minor changes swept through the code base as I literally started from an empty main function, copying over functions or files as needed, then adjusting them to fit in the new design. Most tests have been restored and adapted to the new API, but more work is needed there. A lot of what was "impossible" before is now possible, or can be made possible with minimal disruption of the code. For example, it's fairly easy to make plugins hook into another part of the code via callbacks. Plugins can do more than just be directives; we now have plugins that customize how the Caddyfile is loaded (useful when you need to get your configuration from a remote store). Site addresses no longer need be just a host and port. They can have a path, allowing you to scope a configuration to a specific path. There is no inheretance, however; each site configuration is distinct. Thanks to amazing work by Lucas Clemente, this commit adds experimental QUIC support. Turn it on using the -quic flag; your browser may have to be configured to enable it. Almost everything is here, but you will notice that most of the middle- ware are missing. After those are transferred over, we'll be ready for beta tests. I'm very excited to get this out. Thanks for everyone's help and patience these last few months. I hope you like it!!
2016-06-04 18:00:29 -05:00
return bytes.Equal(PrivateKeyBytes(a), PrivateKeyBytes(b))
}
2016-03-02 08:34:33 -05:00
// PrivateKeyBytes returns the bytes of DER-encoded key.
Rewrote Caddy from the ground up; initial commit of 0.9 branch These changes span work from the last ~4 months in an effort to make Caddy more extensible, reduce the coupling between its components, and lay a more robust foundation of code going forward into 1.0. A bunch of new features have been added, too, with even higher future potential. The most significant design change is an overall inversion of dependencies. Instead of the caddy package knowing about the server and the notion of middleware and config, the caddy package exposes an interface that other components plug into. This does introduce more indirection when reading the code, but every piece is very modular and pluggable. Even the HTTP server is pluggable. The caddy package has been moved to the top level, and main has been pushed into a subfolder called caddy. The actual logic of the main file has been pushed even further into caddy/caddymain/run.go so that custom builds of Caddy can be 'go get'able. The HTTPS logic was surgically separated into two parts to divide the TLS-specific code and the HTTPS-specific code. The caddytls package can now be used by any type of server that needs TLS, not just HTTP. I also added the ability to customize nearly every aspect of TLS at the site level rather than all sites sharing the same TLS configuration. Not all of this flexibility is exposed in the Caddyfile yet, but it may be in the future. Caddy can also generate self-signed certificates in memory for the convenience of a developer working on localhost who wants HTTPS. And Caddy now supports the DNS challenge, assuming at least one DNS provider is plugged in. Dozens, if not hundreds, of other minor changes swept through the code base as I literally started from an empty main function, copying over functions or files as needed, then adjusting them to fit in the new design. Most tests have been restored and adapted to the new API, but more work is needed there. A lot of what was "impossible" before is now possible, or can be made possible with minimal disruption of the code. For example, it's fairly easy to make plugins hook into another part of the code via callbacks. Plugins can do more than just be directives; we now have plugins that customize how the Caddyfile is loaded (useful when you need to get your configuration from a remote store). Site addresses no longer need be just a host and port. They can have a path, allowing you to scope a configuration to a specific path. There is no inheretance, however; each site configuration is distinct. Thanks to amazing work by Lucas Clemente, this commit adds experimental QUIC support. Turn it on using the -quic flag; your browser may have to be configured to enable it. Almost everything is here, but you will notice that most of the middle- ware are missing. After those are transferred over, we'll be ready for beta tests. I'm very excited to get this out. Thanks for everyone's help and patience these last few months. I hope you like it!!
2016-06-04 18:00:29 -05:00
func PrivateKeyBytes(key crypto.PrivateKey) []byte {
var keyBytes []byte
2016-03-02 08:34:33 -05:00
switch key := key.(type) {
case *rsa.PrivateKey:
Rewrote Caddy from the ground up; initial commit of 0.9 branch These changes span work from the last ~4 months in an effort to make Caddy more extensible, reduce the coupling between its components, and lay a more robust foundation of code going forward into 1.0. A bunch of new features have been added, too, with even higher future potential. The most significant design change is an overall inversion of dependencies. Instead of the caddy package knowing about the server and the notion of middleware and config, the caddy package exposes an interface that other components plug into. This does introduce more indirection when reading the code, but every piece is very modular and pluggable. Even the HTTP server is pluggable. The caddy package has been moved to the top level, and main has been pushed into a subfolder called caddy. The actual logic of the main file has been pushed even further into caddy/caddymain/run.go so that custom builds of Caddy can be 'go get'able. The HTTPS logic was surgically separated into two parts to divide the TLS-specific code and the HTTPS-specific code. The caddytls package can now be used by any type of server that needs TLS, not just HTTP. I also added the ability to customize nearly every aspect of TLS at the site level rather than all sites sharing the same TLS configuration. Not all of this flexibility is exposed in the Caddyfile yet, but it may be in the future. Caddy can also generate self-signed certificates in memory for the convenience of a developer working on localhost who wants HTTPS. And Caddy now supports the DNS challenge, assuming at least one DNS provider is plugged in. Dozens, if not hundreds, of other minor changes swept through the code base as I literally started from an empty main function, copying over functions or files as needed, then adjusting them to fit in the new design. Most tests have been restored and adapted to the new API, but more work is needed there. A lot of what was "impossible" before is now possible, or can be made possible with minimal disruption of the code. For example, it's fairly easy to make plugins hook into another part of the code via callbacks. Plugins can do more than just be directives; we now have plugins that customize how the Caddyfile is loaded (useful when you need to get your configuration from a remote store). Site addresses no longer need be just a host and port. They can have a path, allowing you to scope a configuration to a specific path. There is no inheretance, however; each site configuration is distinct. Thanks to amazing work by Lucas Clemente, this commit adds experimental QUIC support. Turn it on using the -quic flag; your browser may have to be configured to enable it. Almost everything is here, but you will notice that most of the middle- ware are missing. After those are transferred over, we'll be ready for beta tests. I'm very excited to get this out. Thanks for everyone's help and patience these last few months. I hope you like it!!
2016-06-04 18:00:29 -05:00
keyBytes = x509.MarshalPKCS1PrivateKey(key)
2016-03-02 08:34:33 -05:00
case *ecdsa.PrivateKey:
Rewrote Caddy from the ground up; initial commit of 0.9 branch These changes span work from the last ~4 months in an effort to make Caddy more extensible, reduce the coupling between its components, and lay a more robust foundation of code going forward into 1.0. A bunch of new features have been added, too, with even higher future potential. The most significant design change is an overall inversion of dependencies. Instead of the caddy package knowing about the server and the notion of middleware and config, the caddy package exposes an interface that other components plug into. This does introduce more indirection when reading the code, but every piece is very modular and pluggable. Even the HTTP server is pluggable. The caddy package has been moved to the top level, and main has been pushed into a subfolder called caddy. The actual logic of the main file has been pushed even further into caddy/caddymain/run.go so that custom builds of Caddy can be 'go get'able. The HTTPS logic was surgically separated into two parts to divide the TLS-specific code and the HTTPS-specific code. The caddytls package can now be used by any type of server that needs TLS, not just HTTP. I also added the ability to customize nearly every aspect of TLS at the site level rather than all sites sharing the same TLS configuration. Not all of this flexibility is exposed in the Caddyfile yet, but it may be in the future. Caddy can also generate self-signed certificates in memory for the convenience of a developer working on localhost who wants HTTPS. And Caddy now supports the DNS challenge, assuming at least one DNS provider is plugged in. Dozens, if not hundreds, of other minor changes swept through the code base as I literally started from an empty main function, copying over functions or files as needed, then adjusting them to fit in the new design. Most tests have been restored and adapted to the new API, but more work is needed there. A lot of what was "impossible" before is now possible, or can be made possible with minimal disruption of the code. For example, it's fairly easy to make plugins hook into another part of the code via callbacks. Plugins can do more than just be directives; we now have plugins that customize how the Caddyfile is loaded (useful when you need to get your configuration from a remote store). Site addresses no longer need be just a host and port. They can have a path, allowing you to scope a configuration to a specific path. There is no inheretance, however; each site configuration is distinct. Thanks to amazing work by Lucas Clemente, this commit adds experimental QUIC support. Turn it on using the -quic flag; your browser may have to be configured to enable it. Almost everything is here, but you will notice that most of the middle- ware are missing. After those are transferred over, we'll be ready for beta tests. I'm very excited to get this out. Thanks for everyone's help and patience these last few months. I hope you like it!!
2016-06-04 18:00:29 -05:00
keyBytes, _ = x509.MarshalECPrivateKey(key)
}
return keyBytes
}
func TestStandaloneTLSTicketKeyRotation(t *testing.T) {
tls: fix TestStandaloneTLSTicketKeyRotation data race ================== WARNING: DATA RACE Write at 0x00c42049d300 by goroutine 26: github.com/mholt/caddy/caddytls.standaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto.go:230 +0x698 Previous read at 0x00c42049d300 by goroutine 25: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:113 +0x413 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 26 (running) created at: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:101 +0x2a4 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 25 (running) created at: testing.(*T).Run() /home/tw/goroot/src/testing/testing.go:646 +0x52f testing.RunTests.func1() /home/tw/goroot/src/testing/testing.go:793 +0xb9 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 testing.RunTests() /home/tw/goroot/src/testing/testing.go:799 +0x4b5 testing.(*M).Run() /home/tw/goroot/src/testing/testing.go:743 +0x12f github.com/mholt/caddy/caddytls.TestMain() /home/tw/golib/src/github.com/mholt/caddy/caddytls/setup_test.go:27 +0x133 main.main() github.com/mholt/caddy/caddytls/_test/_testmain.go:116 +0x1b1 ================== ================== WARNING: DATA RACE Write at 0x00c4204aa6c0 by goroutine 26: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation.func2() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:93 +0x56 github.com/mholt/caddy/caddytls.standaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto.go:233 +0x638 Previous read at 0x00c4204aa6c0 by goroutine 25: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:108 +0x391 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 26 (running) created at: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:101 +0x2a4 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 25 (running) created at: testing.(*T).Run() /home/tw/goroot/src/testing/testing.go:646 +0x52f testing.RunTests.func1() /home/tw/goroot/src/testing/testing.go:793 +0xb9 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 testing.RunTests() /home/tw/goroot/src/testing/testing.go:799 +0x4b5 testing.(*M).Run() /home/tw/goroot/src/testing/testing.go:743 +0x12f github.com/mholt/caddy/caddytls.TestMain() /home/tw/golib/src/github.com/mholt/caddy/caddytls/setup_test.go:27 +0x133 main.main() github.com/mholt/caddy/caddytls/_test/_testmain.go:116 +0x1b1 ================== Signed-off-by: Tw <tw19881113@gmail.com>
2016-08-02 02:28:12 -05:00
type syncPkt struct {
ticketKey [32]byte
keysInUse int
}
Rewrote Caddy from the ground up; initial commit of 0.9 branch These changes span work from the last ~4 months in an effort to make Caddy more extensible, reduce the coupling between its components, and lay a more robust foundation of code going forward into 1.0. A bunch of new features have been added, too, with even higher future potential. The most significant design change is an overall inversion of dependencies. Instead of the caddy package knowing about the server and the notion of middleware and config, the caddy package exposes an interface that other components plug into. This does introduce more indirection when reading the code, but every piece is very modular and pluggable. Even the HTTP server is pluggable. The caddy package has been moved to the top level, and main has been pushed into a subfolder called caddy. The actual logic of the main file has been pushed even further into caddy/caddymain/run.go so that custom builds of Caddy can be 'go get'able. The HTTPS logic was surgically separated into two parts to divide the TLS-specific code and the HTTPS-specific code. The caddytls package can now be used by any type of server that needs TLS, not just HTTP. I also added the ability to customize nearly every aspect of TLS at the site level rather than all sites sharing the same TLS configuration. Not all of this flexibility is exposed in the Caddyfile yet, but it may be in the future. Caddy can also generate self-signed certificates in memory for the convenience of a developer working on localhost who wants HTTPS. And Caddy now supports the DNS challenge, assuming at least one DNS provider is plugged in. Dozens, if not hundreds, of other minor changes swept through the code base as I literally started from an empty main function, copying over functions or files as needed, then adjusting them to fit in the new design. Most tests have been restored and adapted to the new API, but more work is needed there. A lot of what was "impossible" before is now possible, or can be made possible with minimal disruption of the code. For example, it's fairly easy to make plugins hook into another part of the code via callbacks. Plugins can do more than just be directives; we now have plugins that customize how the Caddyfile is loaded (useful when you need to get your configuration from a remote store). Site addresses no longer need be just a host and port. They can have a path, allowing you to scope a configuration to a specific path. There is no inheretance, however; each site configuration is distinct. Thanks to amazing work by Lucas Clemente, this commit adds experimental QUIC support. Turn it on using the -quic flag; your browser may have to be configured to enable it. Almost everything is here, but you will notice that most of the middle- ware are missing. After those are transferred over, we'll be ready for beta tests. I'm very excited to get this out. Thanks for everyone's help and patience these last few months. I hope you like it!!
2016-06-04 18:00:29 -05:00
tlsGovChan := make(chan struct{})
defer close(tlsGovChan)
tls: fix TestStandaloneTLSTicketKeyRotation data race ================== WARNING: DATA RACE Write at 0x00c42049d300 by goroutine 26: github.com/mholt/caddy/caddytls.standaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto.go:230 +0x698 Previous read at 0x00c42049d300 by goroutine 25: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:113 +0x413 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 26 (running) created at: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:101 +0x2a4 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 25 (running) created at: testing.(*T).Run() /home/tw/goroot/src/testing/testing.go:646 +0x52f testing.RunTests.func1() /home/tw/goroot/src/testing/testing.go:793 +0xb9 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 testing.RunTests() /home/tw/goroot/src/testing/testing.go:799 +0x4b5 testing.(*M).Run() /home/tw/goroot/src/testing/testing.go:743 +0x12f github.com/mholt/caddy/caddytls.TestMain() /home/tw/golib/src/github.com/mholt/caddy/caddytls/setup_test.go:27 +0x133 main.main() github.com/mholt/caddy/caddytls/_test/_testmain.go:116 +0x1b1 ================== ================== WARNING: DATA RACE Write at 0x00c4204aa6c0 by goroutine 26: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation.func2() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:93 +0x56 github.com/mholt/caddy/caddytls.standaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto.go:233 +0x638 Previous read at 0x00c4204aa6c0 by goroutine 25: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:108 +0x391 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 26 (running) created at: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:101 +0x2a4 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 25 (running) created at: testing.(*T).Run() /home/tw/goroot/src/testing/testing.go:646 +0x52f testing.RunTests.func1() /home/tw/goroot/src/testing/testing.go:793 +0xb9 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 testing.RunTests() /home/tw/goroot/src/testing/testing.go:799 +0x4b5 testing.(*M).Run() /home/tw/goroot/src/testing/testing.go:743 +0x12f github.com/mholt/caddy/caddytls.TestMain() /home/tw/golib/src/github.com/mholt/caddy/caddytls/setup_test.go:27 +0x133 main.main() github.com/mholt/caddy/caddytls/_test/_testmain.go:116 +0x1b1 ================== Signed-off-by: Tw <tw19881113@gmail.com>
2016-08-02 02:28:12 -05:00
callSync := make(chan *syncPkt, 1)
Rewrote Caddy from the ground up; initial commit of 0.9 branch These changes span work from the last ~4 months in an effort to make Caddy more extensible, reduce the coupling between its components, and lay a more robust foundation of code going forward into 1.0. A bunch of new features have been added, too, with even higher future potential. The most significant design change is an overall inversion of dependencies. Instead of the caddy package knowing about the server and the notion of middleware and config, the caddy package exposes an interface that other components plug into. This does introduce more indirection when reading the code, but every piece is very modular and pluggable. Even the HTTP server is pluggable. The caddy package has been moved to the top level, and main has been pushed into a subfolder called caddy. The actual logic of the main file has been pushed even further into caddy/caddymain/run.go so that custom builds of Caddy can be 'go get'able. The HTTPS logic was surgically separated into two parts to divide the TLS-specific code and the HTTPS-specific code. The caddytls package can now be used by any type of server that needs TLS, not just HTTP. I also added the ability to customize nearly every aspect of TLS at the site level rather than all sites sharing the same TLS configuration. Not all of this flexibility is exposed in the Caddyfile yet, but it may be in the future. Caddy can also generate self-signed certificates in memory for the convenience of a developer working on localhost who wants HTTPS. And Caddy now supports the DNS challenge, assuming at least one DNS provider is plugged in. Dozens, if not hundreds, of other minor changes swept through the code base as I literally started from an empty main function, copying over functions or files as needed, then adjusting them to fit in the new design. Most tests have been restored and adapted to the new API, but more work is needed there. A lot of what was "impossible" before is now possible, or can be made possible with minimal disruption of the code. For example, it's fairly easy to make plugins hook into another part of the code via callbacks. Plugins can do more than just be directives; we now have plugins that customize how the Caddyfile is loaded (useful when you need to get your configuration from a remote store). Site addresses no longer need be just a host and port. They can have a path, allowing you to scope a configuration to a specific path. There is no inheretance, however; each site configuration is distinct. Thanks to amazing work by Lucas Clemente, this commit adds experimental QUIC support. Turn it on using the -quic flag; your browser may have to be configured to enable it. Almost everything is here, but you will notice that most of the middle- ware are missing. After those are transferred over, we'll be ready for beta tests. I'm very excited to get this out. Thanks for everyone's help and patience these last few months. I hope you like it!!
2016-06-04 18:00:29 -05:00
defer close(callSync)
oldHook := setSessionTicketKeysTestHook
defer func() {
setSessionTicketKeysTestHook = oldHook
}()
setSessionTicketKeysTestHook = func(keys [][32]byte) [][32]byte {
tls: fix TestStandaloneTLSTicketKeyRotation data race ================== WARNING: DATA RACE Write at 0x00c42049d300 by goroutine 26: github.com/mholt/caddy/caddytls.standaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto.go:230 +0x698 Previous read at 0x00c42049d300 by goroutine 25: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:113 +0x413 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 26 (running) created at: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:101 +0x2a4 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 25 (running) created at: testing.(*T).Run() /home/tw/goroot/src/testing/testing.go:646 +0x52f testing.RunTests.func1() /home/tw/goroot/src/testing/testing.go:793 +0xb9 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 testing.RunTests() /home/tw/goroot/src/testing/testing.go:799 +0x4b5 testing.(*M).Run() /home/tw/goroot/src/testing/testing.go:743 +0x12f github.com/mholt/caddy/caddytls.TestMain() /home/tw/golib/src/github.com/mholt/caddy/caddytls/setup_test.go:27 +0x133 main.main() github.com/mholt/caddy/caddytls/_test/_testmain.go:116 +0x1b1 ================== ================== WARNING: DATA RACE Write at 0x00c4204aa6c0 by goroutine 26: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation.func2() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:93 +0x56 github.com/mholt/caddy/caddytls.standaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto.go:233 +0x638 Previous read at 0x00c4204aa6c0 by goroutine 25: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:108 +0x391 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 26 (running) created at: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:101 +0x2a4 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 25 (running) created at: testing.(*T).Run() /home/tw/goroot/src/testing/testing.go:646 +0x52f testing.RunTests.func1() /home/tw/goroot/src/testing/testing.go:793 +0xb9 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 testing.RunTests() /home/tw/goroot/src/testing/testing.go:799 +0x4b5 testing.(*M).Run() /home/tw/goroot/src/testing/testing.go:743 +0x12f github.com/mholt/caddy/caddytls.TestMain() /home/tw/golib/src/github.com/mholt/caddy/caddytls/setup_test.go:27 +0x133 main.main() github.com/mholt/caddy/caddytls/_test/_testmain.go:116 +0x1b1 ================== Signed-off-by: Tw <tw19881113@gmail.com>
2016-08-02 02:28:12 -05:00
callSync <- &syncPkt{keys[0], len(keys)}
Rewrote Caddy from the ground up; initial commit of 0.9 branch These changes span work from the last ~4 months in an effort to make Caddy more extensible, reduce the coupling between its components, and lay a more robust foundation of code going forward into 1.0. A bunch of new features have been added, too, with even higher future potential. The most significant design change is an overall inversion of dependencies. Instead of the caddy package knowing about the server and the notion of middleware and config, the caddy package exposes an interface that other components plug into. This does introduce more indirection when reading the code, but every piece is very modular and pluggable. Even the HTTP server is pluggable. The caddy package has been moved to the top level, and main has been pushed into a subfolder called caddy. The actual logic of the main file has been pushed even further into caddy/caddymain/run.go so that custom builds of Caddy can be 'go get'able. The HTTPS logic was surgically separated into two parts to divide the TLS-specific code and the HTTPS-specific code. The caddytls package can now be used by any type of server that needs TLS, not just HTTP. I also added the ability to customize nearly every aspect of TLS at the site level rather than all sites sharing the same TLS configuration. Not all of this flexibility is exposed in the Caddyfile yet, but it may be in the future. Caddy can also generate self-signed certificates in memory for the convenience of a developer working on localhost who wants HTTPS. And Caddy now supports the DNS challenge, assuming at least one DNS provider is plugged in. Dozens, if not hundreds, of other minor changes swept through the code base as I literally started from an empty main function, copying over functions or files as needed, then adjusting them to fit in the new design. Most tests have been restored and adapted to the new API, but more work is needed there. A lot of what was "impossible" before is now possible, or can be made possible with minimal disruption of the code. For example, it's fairly easy to make plugins hook into another part of the code via callbacks. Plugins can do more than just be directives; we now have plugins that customize how the Caddyfile is loaded (useful when you need to get your configuration from a remote store). Site addresses no longer need be just a host and port. They can have a path, allowing you to scope a configuration to a specific path. There is no inheretance, however; each site configuration is distinct. Thanks to amazing work by Lucas Clemente, this commit adds experimental QUIC support. Turn it on using the -quic flag; your browser may have to be configured to enable it. Almost everything is here, but you will notice that most of the middle- ware are missing. After those are transferred over, we'll be ready for beta tests. I'm very excited to get this out. Thanks for everyone's help and patience these last few months. I hope you like it!!
2016-06-04 18:00:29 -05:00
return keys
}
c := new(tls.Config)
timer := time.NewTicker(time.Millisecond * 1)
go standaloneTLSTicketKeyRotation(c, timer, tlsGovChan)
rounds := 0
var lastTicketKey [32]byte
for {
select {
tls: fix TestStandaloneTLSTicketKeyRotation data race ================== WARNING: DATA RACE Write at 0x00c42049d300 by goroutine 26: github.com/mholt/caddy/caddytls.standaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto.go:230 +0x698 Previous read at 0x00c42049d300 by goroutine 25: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:113 +0x413 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 26 (running) created at: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:101 +0x2a4 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 25 (running) created at: testing.(*T).Run() /home/tw/goroot/src/testing/testing.go:646 +0x52f testing.RunTests.func1() /home/tw/goroot/src/testing/testing.go:793 +0xb9 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 testing.RunTests() /home/tw/goroot/src/testing/testing.go:799 +0x4b5 testing.(*M).Run() /home/tw/goroot/src/testing/testing.go:743 +0x12f github.com/mholt/caddy/caddytls.TestMain() /home/tw/golib/src/github.com/mholt/caddy/caddytls/setup_test.go:27 +0x133 main.main() github.com/mholt/caddy/caddytls/_test/_testmain.go:116 +0x1b1 ================== ================== WARNING: DATA RACE Write at 0x00c4204aa6c0 by goroutine 26: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation.func2() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:93 +0x56 github.com/mholt/caddy/caddytls.standaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto.go:233 +0x638 Previous read at 0x00c4204aa6c0 by goroutine 25: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:108 +0x391 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 26 (running) created at: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:101 +0x2a4 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 25 (running) created at: testing.(*T).Run() /home/tw/goroot/src/testing/testing.go:646 +0x52f testing.RunTests.func1() /home/tw/goroot/src/testing/testing.go:793 +0xb9 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 testing.RunTests() /home/tw/goroot/src/testing/testing.go:799 +0x4b5 testing.(*M).Run() /home/tw/goroot/src/testing/testing.go:743 +0x12f github.com/mholt/caddy/caddytls.TestMain() /home/tw/golib/src/github.com/mholt/caddy/caddytls/setup_test.go:27 +0x133 main.main() github.com/mholt/caddy/caddytls/_test/_testmain.go:116 +0x1b1 ================== Signed-off-by: Tw <tw19881113@gmail.com>
2016-08-02 02:28:12 -05:00
case pkt := <-callSync:
if lastTicketKey == pkt.ticketKey {
Rewrote Caddy from the ground up; initial commit of 0.9 branch These changes span work from the last ~4 months in an effort to make Caddy more extensible, reduce the coupling between its components, and lay a more robust foundation of code going forward into 1.0. A bunch of new features have been added, too, with even higher future potential. The most significant design change is an overall inversion of dependencies. Instead of the caddy package knowing about the server and the notion of middleware and config, the caddy package exposes an interface that other components plug into. This does introduce more indirection when reading the code, but every piece is very modular and pluggable. Even the HTTP server is pluggable. The caddy package has been moved to the top level, and main has been pushed into a subfolder called caddy. The actual logic of the main file has been pushed even further into caddy/caddymain/run.go so that custom builds of Caddy can be 'go get'able. The HTTPS logic was surgically separated into two parts to divide the TLS-specific code and the HTTPS-specific code. The caddytls package can now be used by any type of server that needs TLS, not just HTTP. I also added the ability to customize nearly every aspect of TLS at the site level rather than all sites sharing the same TLS configuration. Not all of this flexibility is exposed in the Caddyfile yet, but it may be in the future. Caddy can also generate self-signed certificates in memory for the convenience of a developer working on localhost who wants HTTPS. And Caddy now supports the DNS challenge, assuming at least one DNS provider is plugged in. Dozens, if not hundreds, of other minor changes swept through the code base as I literally started from an empty main function, copying over functions or files as needed, then adjusting them to fit in the new design. Most tests have been restored and adapted to the new API, but more work is needed there. A lot of what was "impossible" before is now possible, or can be made possible with minimal disruption of the code. For example, it's fairly easy to make plugins hook into another part of the code via callbacks. Plugins can do more than just be directives; we now have plugins that customize how the Caddyfile is loaded (useful when you need to get your configuration from a remote store). Site addresses no longer need be just a host and port. They can have a path, allowing you to scope a configuration to a specific path. There is no inheretance, however; each site configuration is distinct. Thanks to amazing work by Lucas Clemente, this commit adds experimental QUIC support. Turn it on using the -quic flag; your browser may have to be configured to enable it. Almost everything is here, but you will notice that most of the middle- ware are missing. After those are transferred over, we'll be ready for beta tests. I'm very excited to get this out. Thanks for everyone's help and patience these last few months. I hope you like it!!
2016-06-04 18:00:29 -05:00
close(tlsGovChan)
t.Errorf("The same TLS ticket key has been used again (not rotated): %x.", lastTicketKey)
return
}
tls: fix TestStandaloneTLSTicketKeyRotation data race ================== WARNING: DATA RACE Write at 0x00c42049d300 by goroutine 26: github.com/mholt/caddy/caddytls.standaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto.go:230 +0x698 Previous read at 0x00c42049d300 by goroutine 25: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:113 +0x413 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 26 (running) created at: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:101 +0x2a4 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 25 (running) created at: testing.(*T).Run() /home/tw/goroot/src/testing/testing.go:646 +0x52f testing.RunTests.func1() /home/tw/goroot/src/testing/testing.go:793 +0xb9 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 testing.RunTests() /home/tw/goroot/src/testing/testing.go:799 +0x4b5 testing.(*M).Run() /home/tw/goroot/src/testing/testing.go:743 +0x12f github.com/mholt/caddy/caddytls.TestMain() /home/tw/golib/src/github.com/mholt/caddy/caddytls/setup_test.go:27 +0x133 main.main() github.com/mholt/caddy/caddytls/_test/_testmain.go:116 +0x1b1 ================== ================== WARNING: DATA RACE Write at 0x00c4204aa6c0 by goroutine 26: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation.func2() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:93 +0x56 github.com/mholt/caddy/caddytls.standaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto.go:233 +0x638 Previous read at 0x00c4204aa6c0 by goroutine 25: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:108 +0x391 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 26 (running) created at: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:101 +0x2a4 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 25 (running) created at: testing.(*T).Run() /home/tw/goroot/src/testing/testing.go:646 +0x52f testing.RunTests.func1() /home/tw/goroot/src/testing/testing.go:793 +0xb9 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 testing.RunTests() /home/tw/goroot/src/testing/testing.go:799 +0x4b5 testing.(*M).Run() /home/tw/goroot/src/testing/testing.go:743 +0x12f github.com/mholt/caddy/caddytls.TestMain() /home/tw/golib/src/github.com/mholt/caddy/caddytls/setup_test.go:27 +0x133 main.main() github.com/mholt/caddy/caddytls/_test/_testmain.go:116 +0x1b1 ================== Signed-off-by: Tw <tw19881113@gmail.com>
2016-08-02 02:28:12 -05:00
lastTicketKey = pkt.ticketKey
Rewrote Caddy from the ground up; initial commit of 0.9 branch These changes span work from the last ~4 months in an effort to make Caddy more extensible, reduce the coupling between its components, and lay a more robust foundation of code going forward into 1.0. A bunch of new features have been added, too, with even higher future potential. The most significant design change is an overall inversion of dependencies. Instead of the caddy package knowing about the server and the notion of middleware and config, the caddy package exposes an interface that other components plug into. This does introduce more indirection when reading the code, but every piece is very modular and pluggable. Even the HTTP server is pluggable. The caddy package has been moved to the top level, and main has been pushed into a subfolder called caddy. The actual logic of the main file has been pushed even further into caddy/caddymain/run.go so that custom builds of Caddy can be 'go get'able. The HTTPS logic was surgically separated into two parts to divide the TLS-specific code and the HTTPS-specific code. The caddytls package can now be used by any type of server that needs TLS, not just HTTP. I also added the ability to customize nearly every aspect of TLS at the site level rather than all sites sharing the same TLS configuration. Not all of this flexibility is exposed in the Caddyfile yet, but it may be in the future. Caddy can also generate self-signed certificates in memory for the convenience of a developer working on localhost who wants HTTPS. And Caddy now supports the DNS challenge, assuming at least one DNS provider is plugged in. Dozens, if not hundreds, of other minor changes swept through the code base as I literally started from an empty main function, copying over functions or files as needed, then adjusting them to fit in the new design. Most tests have been restored and adapted to the new API, but more work is needed there. A lot of what was "impossible" before is now possible, or can be made possible with minimal disruption of the code. For example, it's fairly easy to make plugins hook into another part of the code via callbacks. Plugins can do more than just be directives; we now have plugins that customize how the Caddyfile is loaded (useful when you need to get your configuration from a remote store). Site addresses no longer need be just a host and port. They can have a path, allowing you to scope a configuration to a specific path. There is no inheretance, however; each site configuration is distinct. Thanks to amazing work by Lucas Clemente, this commit adds experimental QUIC support. Turn it on using the -quic flag; your browser may have to be configured to enable it. Almost everything is here, but you will notice that most of the middle- ware are missing. After those are transferred over, we'll be ready for beta tests. I'm very excited to get this out. Thanks for everyone's help and patience these last few months. I hope you like it!!
2016-06-04 18:00:29 -05:00
rounds++
tls: fix TestStandaloneTLSTicketKeyRotation data race ================== WARNING: DATA RACE Write at 0x00c42049d300 by goroutine 26: github.com/mholt/caddy/caddytls.standaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto.go:230 +0x698 Previous read at 0x00c42049d300 by goroutine 25: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:113 +0x413 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 26 (running) created at: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:101 +0x2a4 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 25 (running) created at: testing.(*T).Run() /home/tw/goroot/src/testing/testing.go:646 +0x52f testing.RunTests.func1() /home/tw/goroot/src/testing/testing.go:793 +0xb9 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 testing.RunTests() /home/tw/goroot/src/testing/testing.go:799 +0x4b5 testing.(*M).Run() /home/tw/goroot/src/testing/testing.go:743 +0x12f github.com/mholt/caddy/caddytls.TestMain() /home/tw/golib/src/github.com/mholt/caddy/caddytls/setup_test.go:27 +0x133 main.main() github.com/mholt/caddy/caddytls/_test/_testmain.go:116 +0x1b1 ================== ================== WARNING: DATA RACE Write at 0x00c4204aa6c0 by goroutine 26: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation.func2() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:93 +0x56 github.com/mholt/caddy/caddytls.standaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto.go:233 +0x638 Previous read at 0x00c4204aa6c0 by goroutine 25: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:108 +0x391 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 26 (running) created at: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:101 +0x2a4 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 25 (running) created at: testing.(*T).Run() /home/tw/goroot/src/testing/testing.go:646 +0x52f testing.RunTests.func1() /home/tw/goroot/src/testing/testing.go:793 +0xb9 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 testing.RunTests() /home/tw/goroot/src/testing/testing.go:799 +0x4b5 testing.(*M).Run() /home/tw/goroot/src/testing/testing.go:743 +0x12f github.com/mholt/caddy/caddytls.TestMain() /home/tw/golib/src/github.com/mholt/caddy/caddytls/setup_test.go:27 +0x133 main.main() github.com/mholt/caddy/caddytls/_test/_testmain.go:116 +0x1b1 ================== Signed-off-by: Tw <tw19881113@gmail.com>
2016-08-02 02:28:12 -05:00
if rounds <= NumTickets && pkt.keysInUse != rounds {
Rewrote Caddy from the ground up; initial commit of 0.9 branch These changes span work from the last ~4 months in an effort to make Caddy more extensible, reduce the coupling between its components, and lay a more robust foundation of code going forward into 1.0. A bunch of new features have been added, too, with even higher future potential. The most significant design change is an overall inversion of dependencies. Instead of the caddy package knowing about the server and the notion of middleware and config, the caddy package exposes an interface that other components plug into. This does introduce more indirection when reading the code, but every piece is very modular and pluggable. Even the HTTP server is pluggable. The caddy package has been moved to the top level, and main has been pushed into a subfolder called caddy. The actual logic of the main file has been pushed even further into caddy/caddymain/run.go so that custom builds of Caddy can be 'go get'able. The HTTPS logic was surgically separated into two parts to divide the TLS-specific code and the HTTPS-specific code. The caddytls package can now be used by any type of server that needs TLS, not just HTTP. I also added the ability to customize nearly every aspect of TLS at the site level rather than all sites sharing the same TLS configuration. Not all of this flexibility is exposed in the Caddyfile yet, but it may be in the future. Caddy can also generate self-signed certificates in memory for the convenience of a developer working on localhost who wants HTTPS. And Caddy now supports the DNS challenge, assuming at least one DNS provider is plugged in. Dozens, if not hundreds, of other minor changes swept through the code base as I literally started from an empty main function, copying over functions or files as needed, then adjusting them to fit in the new design. Most tests have been restored and adapted to the new API, but more work is needed there. A lot of what was "impossible" before is now possible, or can be made possible with minimal disruption of the code. For example, it's fairly easy to make plugins hook into another part of the code via callbacks. Plugins can do more than just be directives; we now have plugins that customize how the Caddyfile is loaded (useful when you need to get your configuration from a remote store). Site addresses no longer need be just a host and port. They can have a path, allowing you to scope a configuration to a specific path. There is no inheretance, however; each site configuration is distinct. Thanks to amazing work by Lucas Clemente, this commit adds experimental QUIC support. Turn it on using the -quic flag; your browser may have to be configured to enable it. Almost everything is here, but you will notice that most of the middle- ware are missing. After those are transferred over, we'll be ready for beta tests. I'm very excited to get this out. Thanks for everyone's help and patience these last few months. I hope you like it!!
2016-06-04 18:00:29 -05:00
close(tlsGovChan)
tls: fix TestStandaloneTLSTicketKeyRotation data race ================== WARNING: DATA RACE Write at 0x00c42049d300 by goroutine 26: github.com/mholt/caddy/caddytls.standaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto.go:230 +0x698 Previous read at 0x00c42049d300 by goroutine 25: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:113 +0x413 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 26 (running) created at: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:101 +0x2a4 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 25 (running) created at: testing.(*T).Run() /home/tw/goroot/src/testing/testing.go:646 +0x52f testing.RunTests.func1() /home/tw/goroot/src/testing/testing.go:793 +0xb9 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 testing.RunTests() /home/tw/goroot/src/testing/testing.go:799 +0x4b5 testing.(*M).Run() /home/tw/goroot/src/testing/testing.go:743 +0x12f github.com/mholt/caddy/caddytls.TestMain() /home/tw/golib/src/github.com/mholt/caddy/caddytls/setup_test.go:27 +0x133 main.main() github.com/mholt/caddy/caddytls/_test/_testmain.go:116 +0x1b1 ================== ================== WARNING: DATA RACE Write at 0x00c4204aa6c0 by goroutine 26: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation.func2() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:93 +0x56 github.com/mholt/caddy/caddytls.standaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto.go:233 +0x638 Previous read at 0x00c4204aa6c0 by goroutine 25: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:108 +0x391 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 26 (running) created at: github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation() /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:101 +0x2a4 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 Goroutine 25 (running) created at: testing.(*T).Run() /home/tw/goroot/src/testing/testing.go:646 +0x52f testing.RunTests.func1() /home/tw/goroot/src/testing/testing.go:793 +0xb9 testing.tRunner() /home/tw/goroot/src/testing/testing.go:610 +0xc9 testing.RunTests() /home/tw/goroot/src/testing/testing.go:799 +0x4b5 testing.(*M).Run() /home/tw/goroot/src/testing/testing.go:743 +0x12f github.com/mholt/caddy/caddytls.TestMain() /home/tw/golib/src/github.com/mholt/caddy/caddytls/setup_test.go:27 +0x133 main.main() github.com/mholt/caddy/caddytls/_test/_testmain.go:116 +0x1b1 ================== Signed-off-by: Tw <tw19881113@gmail.com>
2016-08-02 02:28:12 -05:00
t.Errorf("Expected TLS ticket keys in use: %d; Got instead: %d.", rounds, pkt.keysInUse)
Rewrote Caddy from the ground up; initial commit of 0.9 branch These changes span work from the last ~4 months in an effort to make Caddy more extensible, reduce the coupling between its components, and lay a more robust foundation of code going forward into 1.0. A bunch of new features have been added, too, with even higher future potential. The most significant design change is an overall inversion of dependencies. Instead of the caddy package knowing about the server and the notion of middleware and config, the caddy package exposes an interface that other components plug into. This does introduce more indirection when reading the code, but every piece is very modular and pluggable. Even the HTTP server is pluggable. The caddy package has been moved to the top level, and main has been pushed into a subfolder called caddy. The actual logic of the main file has been pushed even further into caddy/caddymain/run.go so that custom builds of Caddy can be 'go get'able. The HTTPS logic was surgically separated into two parts to divide the TLS-specific code and the HTTPS-specific code. The caddytls package can now be used by any type of server that needs TLS, not just HTTP. I also added the ability to customize nearly every aspect of TLS at the site level rather than all sites sharing the same TLS configuration. Not all of this flexibility is exposed in the Caddyfile yet, but it may be in the future. Caddy can also generate self-signed certificates in memory for the convenience of a developer working on localhost who wants HTTPS. And Caddy now supports the DNS challenge, assuming at least one DNS provider is plugged in. Dozens, if not hundreds, of other minor changes swept through the code base as I literally started from an empty main function, copying over functions or files as needed, then adjusting them to fit in the new design. Most tests have been restored and adapted to the new API, but more work is needed there. A lot of what was "impossible" before is now possible, or can be made possible with minimal disruption of the code. For example, it's fairly easy to make plugins hook into another part of the code via callbacks. Plugins can do more than just be directives; we now have plugins that customize how the Caddyfile is loaded (useful when you need to get your configuration from a remote store). Site addresses no longer need be just a host and port. They can have a path, allowing you to scope a configuration to a specific path. There is no inheretance, however; each site configuration is distinct. Thanks to amazing work by Lucas Clemente, this commit adds experimental QUIC support. Turn it on using the -quic flag; your browser may have to be configured to enable it. Almost everything is here, but you will notice that most of the middle- ware are missing. After those are transferred over, we'll be ready for beta tests. I'm very excited to get this out. Thanks for everyone's help and patience these last few months. I hope you like it!!
2016-06-04 18:00:29 -05:00
return
}
if c.SessionTicketsDisabled == true {
t.Error("Session tickets have been disabled unexpectedly.")
return
}
if rounds >= NumTickets+1 {
return
}
case <-time.After(time.Second * 1):
t.Errorf("Timeout after %d rounds.", rounds)
return
}
2016-03-02 08:34:33 -05:00
}
}