BED-4766: Correctly Format SAML Provider Details in ListAuthProviders…

… Endpoint (#915) * chore: list properly formatted saml provider * chore: addresses array return of FormatSAMLProviderURLs
SpecterOps · Oct 25, 2024 · f8813f8 · f8813f8
1 parent 97edd77
commit f8813f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/cmd/api/src/api/v2/auth/sso.go b/cmd/api/src/api/v2/auth/sso.go
@@ -17,6 +17,7 @@
 package auth
 
 import (
+	"github.com/specterops/bloodhound/src/auth/bhsaml"
 	"net/http"
 	"strconv"
 	"strings"
@@ -116,7 +117,7 @@ func (s ManagementResource) ListAuthProviders(response http.ResponseWriter, requ
 					}
 				case model.SessionAuthProviderSAML:
 					if ssoProvider.SAMLProvider != nil {
-						provider.Details = ssoProvider.SAMLProvider
+						provider.Details = bhsaml.FormatSAMLProviderURLs(request.Context(), *ssoProvider.SAMLProvider)[0]
 					}
 				}
 

diff --git a/cmd/api/src/auth/bhsaml/db.go b/cmd/api/src/auth/bhsaml/db.go
@@ -25,7 +25,7 @@ import (
 	"github.com/specterops/bloodhound/src/serde"
 )
 
-func formatSAMLProviderURLs(requestContext context.Context, samlProviders ...model.SAMLProvider) model.SAMLProviders {
+func FormatSAMLProviderURLs(requestContext context.Context, samlProviders ...model.SAMLProvider) model.SAMLProviders {
 	for idx := 0; idx < len(samlProviders); idx++ {
 		providerURLs := FormatServiceProviderURLs(*ctx.Get(requestContext).Host, samlProviders[idx].Name)
 
@@ -42,22 +42,22 @@ func GetSAMLProviderByName(db database.Database, name string, requestContext con
 	if samlProvider, err := db.LookupSAMLProviderByName(requestContext, name); err != nil {
 		return model.SAMLProvider{}, err
 	} else {
-		return formatSAMLProviderURLs(requestContext, samlProvider)[0], nil
+		return FormatSAMLProviderURLs(requestContext, samlProvider)[0], nil
 	}
 }
 
 func GetSAMLProviderByID(db database.Database, id int32, requestContext context.Context) (model.SAMLProvider, error) {
 	if samlProvider, err := db.GetSAMLProvider(requestContext, id); err != nil {
 		return model.SAMLProvider{}, err
 	} else {
-		return formatSAMLProviderURLs(requestContext, samlProvider)[0], nil
+		return FormatSAMLProviderURLs(requestContext, samlProvider)[0], nil
 	}
 }
 
 func GetAllSAMLProviders(db database.Database, requestContext context.Context) (model.SAMLProviders, error) {
 	if samlProviders, err := db.GetAllSAMLProviders(requestContext); err != nil {
 		return nil, err
 	} else {
-		return formatSAMLProviderURLs(requestContext, samlProviders...), nil
+		return FormatSAMLProviderURLs(requestContext, samlProviders...), nil
 	}
 }