From 50886eb0b9dff548fe2bc1e494ed4a4835bd2b7d Mon Sep 17 00:00:00 2001 From: Victor Lyuboslavsky Date: Wed, 11 Sep 2024 12:22:35 -0500 Subject: [PATCH] Fixed regex. --- ee/server/service/software_installers.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ee/server/service/software_installers.go b/ee/server/service/software_installers.go index 22af337251..c716063178 100644 --- a/ee/server/service/software_installers.go +++ b/ee/server/service/software_installers.go @@ -94,8 +94,7 @@ func (svc *Service) UploadSoftwareInstaller(ctx context.Context, payload *fleet. return nil } -var packageIDRawRegex = regexp.MustCompile(`(("\$PACKAGE_ID")|(\$PACKAGE_ID))(\W|$)`) -var packageIDBracketRegex = regexp.MustCompile(`(("\${PACKAGE_ID}")|(\${PACKAGE_ID}))`) +var packageIDRegex = regexp.MustCompile(`((("\$PACKAGE_ID")|(\$PACKAGE_ID))(?P\W|$))|(("\${PACKAGE_ID}")|(\${PACKAGE_ID}))`) func preProcessUninstallScript(payload *fleet.UploadSoftwareInstallerPayload) { // We assume that we already validated that payload.PackageIDs is not empty. @@ -114,8 +113,7 @@ func preProcessUninstallScript(payload *fleet.UploadSoftwareInstallerPayload) { packageID = fmt.Sprintf("\"%s\"", payload.PackageIDs[0]) } - payload.UninstallScript = packageIDRawRegex.ReplaceAllString(payload.UninstallScript, fmt.Sprintf("%s$4", packageID)) - payload.UninstallScript = packageIDBracketRegex.ReplaceAllString(payload.UninstallScript, fmt.Sprintf("%s$4", packageID)) + payload.UninstallScript = packageIDRegex.ReplaceAllString(payload.UninstallScript, fmt.Sprintf("%s${suffix}", packageID)) } func (svc *Service) DeleteSoftwareInstaller(ctx context.Context, titleID uint, teamID *uint) error {