mirror of
https://github.com/kubernetes/kubernetes.git
synced 2026-08-06 12:50:40 +00:00
Bump go-openapi dependencies to latest versions: - github.com/go-openapi/jsonpointer v0.21.0 → v0.22.4 - github.com/go-openapi/jsonreference v0.20.2 → v0.21.4 - github.com/go-openapi/swag v0.23.0 → v0.25.4 The new swag version has been restructured into a multi-module monorepo with submodules (cmdutils, conv, fileutils, jsonname, jsonutils, loading, mangling, netutils, stringutils, typeutils, yamlutils). As a result: - mailru/easyjson and josharian/intern are no longer transitive deps and have been removed from vendor - go-openapi/jsonpointer and go-openapi/swag no longer reference unwanted deps davecgh/go-spew, mailru/easyjson, or gopkg.in/yaml.v3 - Updated hack/unwanted-dependencies.json accordingly Signed-off-by: Davanum Srinivas <davanum@gmail.com>
75 lines
1.8 KiB
Go
75 lines
1.8 KiB
Go
// SPDX-FileCopyrightText: Copyright (c) 2015-2025 go-swagger maintainers
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package internal
|
|
|
|
import (
|
|
"net/url"
|
|
"regexp"
|
|
"strings"
|
|
)
|
|
|
|
const (
|
|
defaultHTTPPort = ":80"
|
|
defaultHTTPSPort = ":443"
|
|
)
|
|
|
|
// Regular expressions used by the normalizations.
|
|
var (
|
|
rxPort = regexp.MustCompile(`(:\d+)/?$`)
|
|
rxDupSlashes = regexp.MustCompile(`/{2,}`)
|
|
)
|
|
|
|
// NormalizeURL will normalize the specified URL
|
|
// This was added to replace a previous call to the no longer maintained purell library:
|
|
// The call that was used looked like the following:
|
|
//
|
|
// url.Parse(purell.NormalizeURL(parsed, purell.FlagsSafe|purell.FlagRemoveDuplicateSlashes))
|
|
//
|
|
// To explain all that was included in the call above, purell.FlagsSafe was really just the following:
|
|
// - FlagLowercaseScheme
|
|
// - FlagLowercaseHost
|
|
// - FlagRemoveDefaultPort
|
|
// - FlagRemoveDuplicateSlashes (and this was mixed in with the |)
|
|
//
|
|
// This also normalizes the URL into its urlencoded form by removing RawPath and RawFragment.
|
|
func NormalizeURL(u *url.URL) {
|
|
lowercaseScheme(u)
|
|
lowercaseHost(u)
|
|
removeDefaultPort(u)
|
|
removeDuplicateSlashes(u)
|
|
|
|
u.RawPath = ""
|
|
u.RawFragment = ""
|
|
}
|
|
|
|
func lowercaseScheme(u *url.URL) {
|
|
if len(u.Scheme) > 0 {
|
|
u.Scheme = strings.ToLower(u.Scheme)
|
|
}
|
|
}
|
|
|
|
func lowercaseHost(u *url.URL) {
|
|
if len(u.Host) > 0 {
|
|
u.Host = strings.ToLower(u.Host)
|
|
}
|
|
}
|
|
|
|
func removeDefaultPort(u *url.URL) {
|
|
if len(u.Host) > 0 {
|
|
scheme := strings.ToLower(u.Scheme)
|
|
u.Host = rxPort.ReplaceAllStringFunc(u.Host, func(val string) string {
|
|
if (scheme == "http" && val == defaultHTTPPort) || (scheme == "https" && val == defaultHTTPSPort) {
|
|
return ""
|
|
}
|
|
return val
|
|
})
|
|
}
|
|
}
|
|
|
|
func removeDuplicateSlashes(u *url.URL) {
|
|
if len(u.Path) > 0 {
|
|
u.Path = rxDupSlashes.ReplaceAllString(u.Path, "/")
|
|
}
|
|
}
|