Archives/smallstep-certificates
2
0
Fork 0
mirror of https://github.com/smallstep/certificates.git synced 2024-11-15 18:12:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

adapt google demo for wire's special handle format "{firstname}_wire"

Browse Source
This commit is contained in:
beltram 2023-03-30 14:33:04 +02:00 committed by Herman Slatman
parent a97991aa83
commit 680b6ea08f
No known key found for this signature in database
GPG Key ID: F4D8A44EA0A75A4F
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
acme/challenge.go
View File

@ -20,7 +20,6 @@ import (
"fmt"
"io"
"net"
"net/mail"
"net/url"
"os"
"os/exec"
@ -383,12 +382,10 @@ func wireOIDC01Validate(ctx context.Context, ch *Challenge, db DB, jwk *jose.JSO
}
var claims struct {
Name string `json:"preferred_username,omitempty"`
Handle string `json:"name"`
Issuer string `json:"iss,omitempty"`
GivenName string `json:"given_name,omitempty"`
FamilyName string `json:"family_name,omitempty"`
Email string `json:"email,omitempty"`
Name string `json:"preferred_username,omitempty"`
Handle string `json:"name"`
Issuer string `json:"iss,omitempty"`
GivenName string `json:"given_name,omitempty"`
}
err = idToken.Claims(&claims)
if err != nil {
@ -412,12 +409,7 @@ func wireOIDC01Validate(ctx context.Context, ch *Challenge, db DB, jwk *jose.JSO
if claims.Issuer == "https://accounts.google.com" {
// for internal demo purpose only
email, err := mail.ParseAddress(claims.Email)
if err != nil {
return storeError(ctx, db, ch, false, NewError(ErrorRejectedIdentifierType, "invalid email address"))
}
var domain = strings.Split(email.Address, "@")[1]
var handle = fmt.Sprintf("im:wireapp=%s.%s@%s", strings.ToLower(claims.GivenName), strings.ToLower(claims.FamilyName), domain)
var handle = fmt.Sprintf("%s_wire", strings.ToLower(claims.GivenName))
var displayName = claims.Handle
if challengeValues.Name != displayName || challengeValues.Handle != handle {
return storeError(ctx, db, ch, false, NewError(ErrorRejectedIdentifierType, "OIDC claims don't match"))