Merge pull request #633 from Shopify/validate-client-id

Validate client ID

config.go

@@ -2,9 +2,12 @@ package sarama
 
 import (
 	"crypto/tls"
+	"regexp"
 	"time"
 )
 
+var validID *regexp.Regexp = regexp.MustCompile(`\A[A-Za-z0-9._-]*\z`)
+
 // Config is used to pass multiple configuration options to Sarama's constructors.
 type Config struct {
 	// Net is the namespace for network-level properties used by the Broker, and
@@ -353,6 +356,8 @@ func (c *Config) Validate() error {
 	switch {
 	case c.ChannelBufferSize < 0:
 		return ConfigurationError("ChannelBufferSize must be >= 0")
+	case !validID.MatchString(c.ClientID):
+		return ConfigurationError("ClientID is invalid")
 	}
 
 	return nil

config_test.go

@@ -8,3 +8,11 @@ func TestDefaultConfigValidates(t *testing.T) {
 		t.Error(err)
 	}
 }
+
+func TestClientIDValidates(t *testing.T) {
+	config := NewConfig()
+	config.ClientID = "foo:bar"
+	if err := config.Validate(); string(err.(ConfigurationError)) != "ClientID is invalid" {
+		t.Error("Expected invalid ClientID, got ", err)
+	}
+}