Skip to content

Fix "400 bad request" from SCEP PKIOperation when base64 message contains "+" #43319

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

Open
sergey-cheperis wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Fix "400 bad request" from SCEP PKIOperation when base64 message contains "+" #43319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a78e434
Fix SCEP PKIOperation 400: restore '+' sign corrupted by url.Query()
sergey-cheperis Apr 9, 2026
6049937
Add changes file for SCEP PKIOperation '+' fix
sergey-cheperis Apr 9, 2026
39d3980
Remove old changes file
sergey-cheperis Apr 9, 2026
8c27356
Remove inline comment from SCEP fix
sergey-cheperis Apr 9, 2026
fc0e1e1
Add changes file for #43319
sergey-cheperis Apr 9, 2026
453a6e1
Merge branch 'main' into fix/scep-pkiop-plus-sign-url-query
sergey-cheperis Apr 9, 2026
d220a79
Update changes/43319-fix-scep-pkiop-url-query-plus-sign
sergey-cheperis Apr 9, 2026
6a88289
Merge branch 'main' into fix/scep-pkiop-plus-sign-url-query
sergey-cheperis Apr 9, 2026
9daa961
Merge branch 'main' into fix/scep-pkiop-plus-sign-url-query
sergey-cheperis Apr 9, 2026
795cb96
scep/transport: remove no-op url.PathUnescape call (#1)
Copilot Apr 9, 2026
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
1 change: 1 addition & 0 deletions changes/43319-fix-scep-pkiop-url-query-plus-sign
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Fixed SCEP PKIOperation handler incorrectly decoding base64 `+` characters as spaces.
12 changes: 4 additions & 8 deletions server/mdm/scep/server/transport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"io"
"log/slog"
"net/http"
"net/url"
"strings"

"github.com/fleetdm/fleet/v4/server/mdm/scep/kitlogadapter"
"github.com/go-kit/kit/transport"
Expand Down Expand Up @@ -179,14 +179,10 @@ func message(r *http.Request) ([]byte, error) {
return nil, &BadRequestError{Message: "missing PKIOperation message"}
}

msg2, err := url.PathUnescape(msg)
Copy link
Copy Markdown
Author

@sergey-cheperis sergey-cheperis Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PathUnescape() removed because Query() already provides unescaped values.

msg = strings.ReplaceAll(msg, " ", "+")
decoded, err := base64.StdEncoding.DecodeString(msg)
if err != nil {
return nil, &BadRequestError{Message: fmt.Sprintf("invalid PKIOperation message: %s", msg)}
}

decoded, err := base64.StdEncoding.DecodeString(msg2)
if err != nil {
return nil, &BadRequestError{Message: fmt.Sprintf("failed to base64 decode message: %s: %s", err.Error(), msg2)}
return nil, &BadRequestError{Message: fmt.Sprintf("failed to base64 decode message: %s: %s", err.Error(), msg)}
}

return decoded, nil
Expand Down
Loading