rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce pkg/mail.Addr

Browse Source 
Signed-off-by: Émile Ré <nemile.re@gmail.com>
This commit is contained in:
Émile Ré
2025-12-12 15:32:46 +01:00
parent cab9d6f2ed
commit c0b2a5702d
85 changed files with 842 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/auth/saml_mapper.go
View File

@@ -20,6 +20,7 @@ import (
"github.com/crewjam/saml"
"go.probo.inc/probo/pkg/coredata"
"go.probo.inc/probo/pkg/mail"
)
func ExtractAttributeValue(assertion *saml.Assertion, attributeName string) (string, error) {
@@ -98,25 +99,32 @@ func isValidRole(role string) bool {
func ExtractUserAttributes(
assertion *saml.Assertion,
attributeEmail, attributeFirstname, attributeLastname, attributeRole string,
) (email, fullname, role string, err error) {
) (email mail.Addr, fullname, role string, err error) {
if len(assertion.AttributeStatements) == 0 {
if assertion.Subject != nil && assertion.Subject.NameID != nil {
email = assertion.Subject.NameID.Value
fullname = email
email, err = mail.ParseAddr(assertion.Subject.NameID.Value)
if err != nil {
return mail.Nil, "", "", fmt.Errorf("invalid nameID as email address")
}
fullname = email.String()
role = ""
return email, fullname, role, nil
}
return "", "", "", fmt.Errorf("no attribute statement and no NameID in assertion")
return mail.Nil, "", "", fmt.Errorf("no attribute statement and no NameID in assertion")
}
email, err = ExtractAttributeValue(assertion, attributeEmail)
emailString, err := ExtractAttributeValue(assertion, attributeEmail)
if err != nil {
if assertion.Subject != nil && assertion.Subject.NameID != nil {
email = assertion.Subject.NameID.Value
emailString = assertion.Subject.NameID.Value
} else {
return "", "", "", fmt.Errorf("cannot extract email: %w", err)
return mail.Nil, "", "", fmt.Errorf("cannot extract email: %w", err)
}
}
email, err = mail.ParseAddr(emailString)
if err != nil {
return mail.Nil, "", "", fmt.Errorf("invalid attribute email")
}
firstname, err := ExtractAttributeValue(assertion, attributeFirstname)
if err != nil {
@@ -135,7 +143,7 @@ func ExtractUserAttributes(
} else if lastname != "" {
fullname = lastname
} else {
fullname = email
fullname = email.String()
}
role, err = ExtractAttributeValue(assertion, attributeRole)