From fad82b92d70c0dbcd88063a2886aeea4f87f02f1 Mon Sep 17 00:00:00 2001
From: Russell Jones <russell.valerius.jones@gmail.com>
Date: Mon, 15 Oct 2018 15:22:25 -0700
Subject: [PATCH] Support Windows claim formats.

---
 lib/services/user.go                         |  2 +-
 lib/services/{users_test.go => user_test.go} | 58 +++++++++++++++++---
 2 files changed, 50 insertions(+), 10 deletions(-)
 rename lib/services/{users_test.go => user_test.go} (80%)

diff --git a/lib/services/user.go b/lib/services/user.go
index 5985b0a7f9558..34fed81fda0fa 100644
--- a/lib/services/user.go
+++ b/lib/services/user.go
@@ -317,7 +317,7 @@ const UserSpecV2SchemaTemplate = `{
       "type": "object",
       "additionalProperties": false,
       "patternProperties": {
-        "^[a-zA-Z/.0-9_]+$": {
+        "^[a-zA-Z/.0-9_:]+$": {
           "type": ["array", "null"],
           "items": {
             "type": "string"
diff --git a/lib/services/users_test.go b/lib/services/user_test.go
similarity index 80%
rename from lib/services/users_test.go
rename to lib/services/user_test.go
index c735c8061840f..04cb76f7c7f40 100644
--- a/lib/services/users_test.go
+++ b/lib/services/user_test.go
@@ -17,25 +17,65 @@ limitations under the License.
 package services
 
 import (
+	"encoding/json"
 	"fmt"
+
+	"github.com/gravitational/teleport/lib/defaults"
 	"github.com/gravitational/teleport/lib/utils"
-	"github.com/russellhaering/gosaml2/types"
 
 	"github.com/coreos/go-oidc/jose"
 	saml2 "github.com/russellhaering/gosaml2"
-	. "gopkg.in/check.v1"
+	"github.com/russellhaering/gosaml2/types"
+	"gopkg.in/check.v1"
 )
 
 type UserSuite struct {
 }
 
-var _ = Suite(&UserSuite{})
+var _ = check.Suite(&UserSuite{})
 
-func (s *UserSuite) SetUpSuite(c *C) {
+func (s *UserSuite) SetUpSuite(c *check.C) {
 	utils.InitLoggerForTests()
 }
 
-func (s *UserSuite) TestOIDCMapping(c *C) {
+func (s *UserSuite) TestTraits(c *check.C) {
+	var tests = []struct {
+		traitName string
+	}{
+		// Windows trait names are URLs.
+		{
+			traitName: "http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname",
+		},
+		// Simple strings are the most common trait names.
+		{
+			traitName: "groups",
+		},
+	}
+
+	for _, tt := range tests {
+		user := &UserV2{
+			Kind:    KindUser,
+			Version: V2,
+			Metadata: Metadata{
+				Name:      "foo",
+				Namespace: defaults.Namespace,
+			},
+			Spec: UserSpecV2{
+				Traits: map[string][]string{
+					tt.traitName: []string{"foo"},
+				},
+			},
+		}
+
+		data, err := json.Marshal(user)
+		c.Assert(err, check.IsNil)
+
+		_, err = GetUserMarshaler().UnmarshalUser(data)
+		c.Assert(err, check.IsNil)
+	}
+}
+
+func (s *UserSuite) TestOIDCMapping(c *check.C) {
 	type input struct {
 		comment string
 		claims  jose.Claims
@@ -162,9 +202,9 @@ func (s *UserSuite) TestOIDCMapping(c *C) {
 			},
 		}
 		for _, input := range testCase.inputs {
-			comment := Commentf("OIDC Test case %v %v, input %#v", i, testCase.comment, input)
+			comment := check.Commentf("OIDC Test case %v %v, input %#v", i, testCase.comment, input)
 			outRoles := conn.MapClaims(input.claims)
-			c.Assert(outRoles, DeepEquals, input.roles, comment)
+			c.Assert(outRoles, check.DeepEquals, input.roles, comment)
 		}
 
 		samlConn := SAMLConnectorV2{
@@ -173,9 +213,9 @@ func (s *UserSuite) TestOIDCMapping(c *C) {
 			},
 		}
 		for _, input := range testCase.inputs {
-			comment := Commentf("SAML Test case %v %v, input %#v", i, testCase.comment, input)
+			comment := check.Commentf("SAML Test case %v %v, input %#v", i, testCase.comment, input)
 			outRoles := samlConn.MapAttributes(claimsToAttributes(input.claims))
-			c.Assert(outRoles, DeepEquals, input.roles, comment)
+			c.Assert(outRoles, check.DeepEquals, input.roles, comment)
 		}
 	}
 }