From a426c01859dccbced01bb337fd21b6e75b36201c Mon Sep 17 00:00:00 2001
From: Alessandro Boch <aboch@docker.com>
Date: Fri, 11 Sep 2015 11:02:16 -0700
Subject: [PATCH] Limit valid object names

Signed-off-by: Alessandro Boch <aboch@docker.com>
---
 config/config.go      | 2 +-
 config/config_test.go | 3 +++
 controller.go         | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/config/config.go b/config/config.go
index bb93d98..1935e16 100644
--- a/config/config.go
+++ b/config/config.go
@@ -109,7 +109,7 @@ func (c *Config) ProcessOptions(options ...Option) {
 
 // IsValidName validates configuration objects supported by libnetwork
 func IsValidName(name string) bool {
-	if name == "" || strings.Contains(name, ".") {
+	if strings.TrimSpace(name) == "" || strings.Contains(name, ".") {
 		return false
 	}
 	return true
diff --git a/config/config_test.go b/config/config_test.go
index 0d93819..8760786 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -49,6 +49,9 @@ func TestValidName(t *testing.T) {
 	if IsValidName("") {
 		t.Fatal("Name validation succeeds for a case when it is expected to fail")
 	}
+	if IsValidName("   ") {
+		t.Fatal("Name validation succeeds for a case when it is expected to fail")
+	}
 	if IsValidName("name.with.dots") {
 		t.Fatal("Name validation succeeds for a case when it is expected to fail")
 	}
diff --git a/controller.go b/controller.go
index d84f5d4..a2a861f 100644
--- a/controller.go
+++ b/controller.go
@@ -204,11 +204,11 @@ func (c *controller) ConfigureNetworkDriver(networkType string, options map[stri
 }
 
 func (c *controller) RegisterDriver(networkType string, driver driverapi.Driver, capability driverapi.Capability) error {
-	c.Lock()
 	if !config.IsValidName(networkType) {
-		c.Unlock()
 		return ErrInvalidName(networkType)
 	}
+
+	c.Lock()
 	if _, ok := c.drivers[networkType]; ok {
 		c.Unlock()
 		return driverapi.ErrActiveRegistration(networkType)