Merge pull request #20 from zitadel/metadata-byte

fix(saml): remove base64 from handling service provider metadata
zitadel · Aug 22, 2022 · 325db04 · 325db04
2 parents 66dc3f9 + 21a164f
commit 325db04
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 60 deletions.
diff --git a/pkg/provider/post_test.go b/pkg/provider/post_test.go
diff --git a/pkg/provider/redirect_test.go b/pkg/provider/redirect_test.go
diff --git a/pkg/provider/serviceprovider/serviceprovider.go b/pkg/provider/serviceprovider/serviceprovider.go
@@ -13,8 +13,8 @@ import (
 	"github.com/zitadel/saml/pkg/provider/xml/md"
 )
 
-type ServiceProviderConfig struct {
-	Metadata string
+type Config struct {
+	Metadata []byte
 	URL      string
 }
 
@@ -34,7 +34,7 @@ func (sp *ServiceProvider) LoginURL(id string) string {
 	return sp.defaultLoginURL + id
 }
 
-func NewServiceProvider(id string, config *ServiceProviderConfig, defaultLoginURL string) (*ServiceProvider, error) {
+func NewServiceProvider(id string, config *Config, defaultLoginURL string) (*ServiceProvider, error) {
 	metadataData := make([]byte, 0)
 	if config.URL != "" {
 		body, err := xml.ReadMetadataFromURL(config.URL)
@@ -43,7 +43,7 @@ func NewServiceProvider(id string, config *ServiceProviderConfig, defaultLoginUR
 		}
 		metadataData = body
 	} else {
-		metadataData = []byte(config.Metadata)
+		metadataData = config.Metadata
 	}
 	metadata, err := xml.ParseMetadataXmlIntoStruct(metadataData)
 	if err != nil {

diff --git a/pkg/provider/sso_test.go b/pkg/provider/sso_test.go
diff --git a/pkg/provider/xml/metadata.go b/pkg/provider/xml/metadata.go
@@ -1,7 +1,6 @@
 package xml
 
 import (
-	"encoding/base64"
 	"encoding/xml"
 	"fmt"
 	"io"
@@ -21,24 +20,12 @@ func ReadMetadataFromURL(url string) ([]byte, error) {
 		return nil, fmt.Errorf("error while reading metadata with statusCode: %d", resp.StatusCode)
 	}
 
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	bodyEncoded := base64.StdEncoding.EncodeToString(body)
-	return []byte(bodyEncoded), nil
+	return io.ReadAll(resp.Body)
 }
 
 func ParseMetadataXmlIntoStruct(xmlData []byte) (*md.EntityDescriptorType, error) {
-	xmlDataDecoded := make([]byte, 0)
-	xmlDataDecoded, err := base64.StdEncoding.DecodeString(string(xmlData))
-	if err != nil {
-		return nil, err
-	}
-
 	metadata := &md.EntityDescriptorType{}
-	if err := xml.Unmarshal(xmlDataDecoded, metadata); err != nil {
+	if err := xml.Unmarshal(xmlData, metadata); err != nil {
 		return nil, err
 	}
 	return metadata, nil