From 59dfb86702f718bfabd760107541792a949f2cb5 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 9 Apr 2026 15:24:58 +0000
Subject: [PATCH 1/2] Initial plan


From b5de7a72366bc54b73a9ec90b2814260a445e677 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 9 Apr 2026 15:26:48 +0000
Subject: [PATCH 2/2] Remove url.PathUnescape no-op and net/url import from
 scep transport

Agent-Logs-Url: https://github.com/sergey-cheperis/fleet/sessions/a348c85d-2d08-4d52-a56f-95ecdc44875d

Co-authored-by: sergey-cheperis <12729914+sergey-cheperis@users.noreply.github.com>
---
 server/mdm/scep/server/transport.go | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/server/mdm/scep/server/transport.go b/server/mdm/scep/server/transport.go
index f23f4133315..9718c36a6e4 100644
--- a/server/mdm/scep/server/transport.go
+++ b/server/mdm/scep/server/transport.go
@@ -9,7 +9,6 @@ import (
 	"io"
 	"log/slog"
 	"net/http"
-	"net/url"
 	"strings"
 
 	"github.com/fleetdm/fleet/v4/server/mdm/scep/kitlogadapter"
@@ -180,15 +179,10 @@ func message(r *http.Request) ([]byte, error) {
 				return nil, &BadRequestError{Message: "missing PKIOperation message"}
 			}
 
-			msg2, err := url.PathUnescape(msg)
+			msg = strings.ReplaceAll(msg, " ", "+")
+			decoded, err := base64.StdEncoding.DecodeString(msg)
 			if err != nil {
-				return nil, &BadRequestError{Message: fmt.Sprintf("invalid PKIOperation message: %s", msg)}
-			}
-
-			msg2 = strings.ReplaceAll(msg2, " ", "+")
-			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