Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BED-4766: Correctly Format SAML Provider Details in ListAuthProviders Endpoint #915

Merged
merged 2 commits into from
Oct 25, 2024
+6 −5
Merged

BED-4766: Correctly Format SAML Provider Details in ListAuthProviders Endpoint #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41ba1df
chore: list properly formatted saml provider
iustinum Oct 25, 2024
6f1f33c
chore: addresses array return of FormatSAMLProviderURLs
iustinum Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cmd/api/src/api/v2/auth/sso.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package auth

import (
"github.com/specterops/bloodhound/src/auth/bhsaml"
"net/http"
"strconv"
"strings"
Expand Down Expand Up @@ -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]
}
}

Expand Down
8 changes: 4 additions & 4 deletions cmd/api/src/auth/bhsaml/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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
}
}
Loading