diff options
| author |  Krish Mamtora <privat.mamtora@gmail.com>
| 2024-07-03 09:04:54 -0400 |
|---|---|---|
| committer |  Frédéric Guillot <f@miniflux.net>
| 2024-07-04 13:07:40 -0700 |
| commit | a09ddbbaf4dbda24aaa7da45d7de7785c1f6cb3e (patch) | |
| tree | 847b451059b25929a1ecc45e75c770c6ac9da95a /internal/api/user.go | |
| parent | 92db6913449a57dea9aedbc8670449ae0392943d (diff) | |
| download | v2-a09ddbbaf4dbda24aaa7da45d7de7785c1f6cb3e.tar.gz v2-a09ddbbaf4dbda24aaa7da45d7de7785c1f6cb3e.tar.zst v2-a09ddbbaf4dbda24aaa7da45d7de7785c1f6cb3e.zip | |
Remove carriage returns to sanitizer strings from windows
Diffstat (limited to 'internal/api/user.go')
| -rw-r--r-- | internal/api/user.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/internal/api/user.go b/internal/api/user.go index d507d550..71d70e9c 100644 --- a/internal/api/user.go +++ b/internal/api/user.go @@ -8,6 +8,7 @@ import ( "errors" "net/http" "regexp" + "strings" "miniflux.app/v2/internal/http/request" "miniflux.app/v2/internal/http/response/json" @@ -86,9 +87,13 @@ func (h *handler) updateUser(w http.ResponseWriter, r *http.Request) { cleanEnd := regexp.MustCompile(`(?m)\r\n\s*$`) if userModificationRequest.BlockFilterEntryRules != nil { *userModificationRequest.BlockFilterEntryRules = cleanEnd.ReplaceAllLiteralString(*userModificationRequest.BlockFilterEntryRules, "") + // Clean carriage returns for Windows environments + *userModificationRequest.BlockFilterEntryRules = strings.ReplaceAll(*userModificationRequest.BlockFilterEntryRules, "\r\n", "\n") } if userModificationRequest.KeepFilterEntryRules != nil { *userModificationRequest.KeepFilterEntryRules = cleanEnd.ReplaceAllLiteralString(*userModificationRequest.KeepFilterEntryRules, "") + // Clean carriage returns for Windows environments + *userModificationRequest.KeepFilterEntryRules = strings.ReplaceAll(*userModificationRequest.KeepFilterEntryRules, "\r\n", "\n") } if validationErr := validator.ValidateUserModification(h.store, originalUser.ID, &userModificationRequest); validationErr != nil { |