Skip to content
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-22.04
strategy:
matrix:
go: ['1.23', '1.24']
go: ['1.24', '1.25']
name: Go ${{ matrix.go }} test
steps:
- uses: actions/checkout@v6
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/zitadel/saml

go 1.23.7
go 1.24.10

require (
github.com/amdonov/xmlsig v0.1.0
Expand Down
9 changes: 5 additions & 4 deletions pkg/provider/login.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package provider

import (
"context"
"errors"
"fmt"
"net/http"

Expand Down Expand Up @@ -66,25 +67,25 @@ func (p *IdentityProvider) callbackHandleFunc(w http.ResponseWriter, r *http.Req
func (p *IdentityProvider) loginResponse(ctx context.Context, authRequest models.AuthRequestInt, response *Response) (*samlp.ResponseType, error) {
if !authRequest.Done() {
logging.Error(StatusCodeAuthNFailed)
return nil, fmt.Errorf(StatusCodeAuthNFailed)
return nil, errors.New(StatusCodeAuthNFailed)
}

attrs := &Attributes{}
if err := p.storage.SetUserinfoWithUserID(ctx, authRequest.GetApplicationID(), attrs, authRequest.GetUserID(), []int{}); err != nil {
logging.Error(err)
return nil, fmt.Errorf(StatusCodeInvalidAttrNameOrValue)
return nil, errors.New(StatusCodeInvalidAttrNameOrValue)
}

cert, key, err := getResponseCert(ctx, p.storage)
if err != nil {
logging.Error(err)
return nil, fmt.Errorf(StatusCodeInvalidAttrNameOrValue)
return nil, errors.New(StatusCodeInvalidAttrNameOrValue)
}

samlResponse := response.makeSuccessfulResponse(attrs, p.TimeFormat, p.Expiration)
if err := createSignature(response, samlResponse, key, cert, p.conf.SignatureAlgorithm); err != nil {
logging.Error(err)
return nil, fmt.Errorf(StatusCodeResponder)
return nil, errors.New(StatusCodeResponder)
}
return samlResponse, nil
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/provider/response.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/zitadel/saml/pkg/provider/xml/samlp"
)

var (
const (
StatusCodeSuccess = "urn:oasis:names:tc:SAML:2.0:status:Success"
StatusCodeVersionMissmatch = "urn:oasis:names:tc:SAML:2.0:status:VersionMismatch"
StatusCodeAuthNFailed = "urn:oasis:names:tc:SAML:2.0:status:AuthnFailed"
Expand Down
4 changes: 2 additions & 2 deletions pkg/provider/signature/certificates.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ func ParseCertificates(certStrs []string) ([]*x509.Certificate, error) {
certStr = strings.TrimPrefix(strings.TrimSuffix(certStr, "-----ENDCERTIFICATE-----"), "-----BEGINCERTIFICATE-----")
certBytes, err := base64.StdEncoding.DecodeString(certStr)
if err != nil {
return nil, fmt.Errorf("failed to decode certificate:" + err.Error())
return nil, fmt.Errorf("failed to decode certificate: %v", err)
}
block, _ := pem.Decode(certBytes)
if block != nil {
certBytes = block.Bytes
}
parsedCert, err := x509.ParseCertificate(certBytes)
if err != nil {
return nil, fmt.Errorf("failed to parse certificate: " + err.Error())
return nil, fmt.Errorf("failed to parse certificate: %s", err)
}
certs[i] = parsedCert
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/provider/signature/signature_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -250,18 +250,18 @@ func TestSignature_ValidateRedirect(t *testing.T) {

certBytes, err := base64.StdEncoding.DecodeString(certStr)
if err != nil {
t.Errorf("failed to parse PEM block containing the public key")
t.Error("failed to parse PEM block containing the public key")
return
}
parsedCert, err := x509.ParseCertificate(certBytes)
if err != nil {
t.Errorf("failed to parse certificate: " + err.Error())
t.Errorf("failed to parse certificate: %v", err)
return
}

signatureValue, err := base64.StdEncoding.DecodeString(tt.args.sig)
if err != nil {
t.Errorf("failed to decode sig: " + err.Error())
t.Errorf("failed to decode sig: %v", err)
return
}

Expand Down
Loading