Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions saml/service/identity.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,11 @@ func BuildSession(entityID string, clientID string) (*saml.Session, error) {
}

session := &saml.Session{
ID: entityID,
CreateTime: time.Now(),
ExpireTime: time.Now().Add(time.Hour),
ID: entityID,
// UTC so the assertion's AuthnInstant/SessionNotOnOrAfter serialize in
// the Zulu form SAML requires (see GenerateResponse).
CreateTime: time.Now().UTC(),
ExpireTime: time.Now().Add(time.Hour).UTC(),
Index: entityID,
NameID: email,
NameIDFormat: string(saml.EmailAddressNameIDFormat),
Expand Down
5 changes: 4 additions & 1 deletion saml/service/response.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ func GenerateResponse(requestBuffer []byte, relayState string, entityID string,
if err := req.Validate(); err != nil {
return ResponseForm{}, err
}
req.Now = time.Now()
// UTC: SAML serializes timestamps as xsd:dateTime and crewjam's layout emits
// a zone offset for non-UTC times (e.g. -07:00 under the pod's TZ), which
// strict SPs reject — they require the Zulu "...Z" form.
req.Now = time.Now().UTC()

sp, err := ResolveSP(req.Request.Issuer.Value)
if err != nil {
Expand Down
Loading