Merge pull request #7 from pieterlouw/issue5

Fix issue5 (request from upstream Caddy changes) as well as issue6 (TLS bug)

Author: pieterlouw

caddynet/netserver/plugin.go

@@ -32,11 +32,12 @@ func init() {
 	caddytls.RegisterConfigGetter(serverType, func(c *caddy.Controller) *caddytls.Config { return GetConfig(c).TLS })
 }
 
-func newContext() caddy.Context {
-	return &netContext{keysToConfigs: make(map[string]*Config)}
+func newContext(inst *caddy.Instance) caddy.Context {
+	return &netContext{instance: inst, keysToConfigs: make(map[string]*Config)}
 }
 
 type netContext struct {
+	instance *caddy.Instance
 	// keysToConfigs maps an address at the top of a
 	// server block (a "key") to its Config. Not all
 	// Configs will be represented here, only ones
@@ -109,9 +110,14 @@ func (n *netContext) InspectServerBlocks(sourceFile string, serverBlocks []caddy
 		if listenType == "proxy" && len(params) < 2 {
 			return serverBlocks, fmt.Errorf("invalid configuration: proxy server block expects a source and destination address")
 		}
+
+		// Make our caddytls.Config, which has a pointer to the
+		// instance's certificate cache
+		caddytlsConfig := caddytls.NewConfig(n.instance)
+
 		// Save the config to our master list, and key it for lookups
 		c := &Config{
-			TLS:        &caddytls.Config{},
+			TLS:        caddytlsConfig,
 			Type:       listenType,
 			ListenPort: params[0], // first element should always be the port
 			Parameters: params,
@@ -153,12 +159,12 @@ func (n *netContext) MakeServers() ([]caddy.Server, error) {
 // new, empty one will be created.
 func GetConfig(c *caddy.Controller) *Config {
 	ctx := c.Context().(*netContext)
-	key := strings.ToLower(c.Key)
+	key := strings.Join(c.ServerBlockKeys, "~")
 
 	//only check for config if the value is proxy or echo
 	//we need to do this because we specify the ports in the server block
 	//and those values need to be ignored as they are also sent from caddy main process.
-	if key == "echo" || key == "proxy" {
+	if strings.Contains(key, "echo") || strings.Contains(key, "proxy") {
 		if cfg, ok := ctx.keysToConfigs[key]; ok {
 			return cfg
 		}
@@ -168,5 +174,7 @@ func GetConfig(c *caddy.Controller) *Config {
 	// is not echo or proxy i.e port number :12017
 	// we can't return a nil because caddytls.RegisterConfigGetter will panic
 	// so we return a default (blank) config value
-	return &Config{TLS: new(caddytls.Config)}
+	caddytlsConfig := caddytls.NewConfig(ctx.instance)
+
+	return &Config{TLS: caddytlsConfig}
 }