mirror of
				https://codeberg.org/forgejo/forgejo.git
				synced 2025-10-31 14:31:02 +00:00 
			
		
		
		
	This fixes a TODO in the code to validate the RedirectURIs when adding or editing an OAuth application in user settings. This also includes a refactor of the user settings tests to only create the DB once per top-level test to avoid reloading fixtures. (cherry picked from commit 16a7d343d78807e39df124756e5d43a69a2203a3) Conflicts: services/forms/user_form.go tests/integration/user_settings_test.go simple conflicts
		
			
				
	
	
		
			56 lines
		
	
	
	
		
			1.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			56 lines
		
	
	
	
		
			1.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2021 The Gitea Authors. All rights reserved.
 | |
| // SPDX-License-Identifier: MIT
 | |
| 
 | |
| package util
 | |
| 
 | |
| import (
 | |
| 	"strings"
 | |
| 	"unicode/utf8"
 | |
| )
 | |
| 
 | |
| // in UTF8 "…" is 3 bytes so doesn't really gain us anything...
 | |
| const (
 | |
| 	utf8Ellipsis  = "…"
 | |
| 	asciiEllipsis = "..."
 | |
| )
 | |
| 
 | |
| // SplitStringAtByteN splits a string at byte n accounting for rune boundaries. (Combining characters are not accounted for.)
 | |
| func SplitStringAtByteN(input string, n int) (left, right string) {
 | |
| 	if len(input) <= n {
 | |
| 		return input, ""
 | |
| 	}
 | |
| 
 | |
| 	if !utf8.ValidString(input) {
 | |
| 		if n-3 < 0 {
 | |
| 			return input, ""
 | |
| 		}
 | |
| 		return input[:n-3] + asciiEllipsis, asciiEllipsis + input[n-3:]
 | |
| 	}
 | |
| 
 | |
| 	end := 0
 | |
| 	for end <= n-3 {
 | |
| 		_, size := utf8.DecodeRuneInString(input[end:])
 | |
| 		if end+size > n-3 {
 | |
| 			break
 | |
| 		}
 | |
| 		end += size
 | |
| 	}
 | |
| 
 | |
| 	return input[:end] + utf8Ellipsis, utf8Ellipsis + input[end:]
 | |
| }
 | |
| 
 | |
| // SplitTrimSpace splits the string at given separator and trims leading and trailing space
 | |
| func SplitTrimSpace(input, sep string) []string {
 | |
| 	// Trim initial leading & trailing space
 | |
| 	input = strings.TrimSpace(input)
 | |
| 	// replace CRLF with LF
 | |
| 	input = strings.ReplaceAll(input, "\r\n", "\n")
 | |
| 
 | |
| 	var stringList []string
 | |
| 	for _, s := range strings.Split(input, sep) {
 | |
| 		// trim leading and trailing space
 | |
| 		stringList = append(stringList, strings.TrimSpace(s))
 | |
| 	}
 | |
| 
 | |
| 	return stringList
 | |
| }
 |