Tolerate string-typed allowpublic values from UAA

UAA stores allowpublic in a loosely-typed additionalInformation map, so
the JSON type on the wire depends on how the client was originally
created (bool or string). The strict bool field caused
json.Unmarshal to fail for clients with a string allowpublic value,
breaking ListAllClients/GetClient. Mirrors the existing AutoApproveRaw
pattern used for the same class of issue with autoapprove.

Author: duanemay

clients.go

@@ -39,7 +39,7 @@ type Client struct {
 	RequiredUserGroups   []string        `json:"required_user_groups,omitempty"`
 	ClientSecret         string          `json:"client_secret,omitempty"`
 	LastModified         int64           `json:"lastModified,omitempty"`
-	AllowPublic          bool            `json:"allowpublic,omitempty"`
+	AllowPublicRaw       interface{}     `json:"allowpublic,omitempty"`
 	JwksURI              string          `json:"jwks_uri,omitempty"`
 	Jwks                 json.RawMessage `json:"jwks,omitempty"`
 }
@@ -61,6 +61,22 @@ func (c Client) AutoApprove() []string {
 	return []string{}
 }
 
+// AllowPublic returns whether the client allows public access, tolerating
+// UAA responses that encode allowpublic as either a JSON boolean or string.
+func (c Client) AllowPublic() bool {
+	switch t := c.AllowPublicRaw.(type) {
+	case bool:
+		return t
+	case string:
+		b, err := strconv.ParseBool(t)
+		if err != nil {
+			return false
+		}
+		return b
+	}
+	return false
+}
+
 // GrantType is a type of oauth2 grant.
 type GrantType string
 

clients_test.go

@@ -42,9 +42,9 @@ const clientListResponse = `{
 }`
 
 var testClientValue uaa.Client = uaa.Client{
-	ClientID:     "00000000-0000-0000-0000-000000000001",
-	ClientSecret: "new_secret",
-	AllowPublic:  true,
+	ClientID:       "00000000-0000-0000-0000-000000000001",
+	ClientSecret:   "new_secret",
+	AllowPublicRaw: true,
 }
 
 const testClientJSON string = `{"client_id": "00000000-0000-0000-0000-000000000001", "client_secret": "new_secret", "allowpublic": true}`
@@ -134,6 +134,44 @@ func testClientExtra(t *testing.T, when spec.G, it spec.S) {
 				Expect(err).NotTo(HaveOccurred())
 				Expect(client.AutoApprove()).To(Equal([]string{"scope"}))
 			})
+
+			it("decodes the allowpublic value", func() {
+				client, err := a.GetClient("00000000-0000-0000-0000-000000000001")
+				Expect(err).NotTo(HaveOccurred())
+				Expect(client.AllowPublic()).To(BeTrue())
+			})
+		})
+
+		when("the client returned from the server contains an allowpublic value that is a string", func() {
+			response := `{
+      	"scope" : [ "clients.read", "clients.write" ],
+      	"client_id" : "00000000-0000-0000-0000-000000000001",
+      	"resource_ids" : [ "none" ],
+      	"authorized_grant_types" : [ "client_credentials" ],
+      	"redirect_uri" : [ "http://ant.path.wildcard/**/passback/*", "http://test1.com" ],
+      	"autoapprove" : [ "true" ],
+      	"authorities" : [ "clients.read", "clients.write" ],
+      	"token_salt" : "1SztLL",
+      	"allowedproviders" : [ "uaa", "ldap", "my-saml-provider" ],
+      	"name" : "My Client Name",
+      	"lastModified" : 1502816030525,
+      	"required_user_groups" : [ ],
+		"allowpublic" : "true"
+      }`
+
+			it.Before(func() {
+				server.AppendHandlers(ghttp.CombineHandlers(
+					ghttp.VerifyRequest("GET", uaa.ClientsEndpoint+"/00000000-0000-0000-0000-000000000001"),
+					ghttp.VerifyHeaderKV("Accept", "application/json"),
+					ghttp.RespondWith(http.StatusOK, response),
+				))
+			})
+
+			it("decodes the allowpublic value", func() {
+				client, err := a.GetClient("00000000-0000-0000-0000-000000000001")
+				Expect(err).NotTo(HaveOccurred())
+				Expect(client.AllowPublic()).To(BeTrue())
+			})
 		})
 	})