mirror of
https://github.com/go-gitea/gitea.git
synced 2026-05-06 04:01:05 +09:00
This PR simplifies URL validation by removing `IsValidExternalURL` and
`IsAPIURL` from `modules/validation/helpers.go` and switching repository
settings/API callers to `IsValidURL`.
It also aligns tracker-format validation and tests with the new helper
surface.
- **Validation helpers**
- Removed `IsValidExternalURL` and `IsAPIURL`.
- Updated `IsValidExternalTrackerURLFormat` to depend on `IsValidURL`.
- **Caller updates**
- Replaced `validation.IsValidExternalURL(...)` with
`validation.IsValidURL(...)` in:
- `routers/web/repo/setting/setting.go`
- `routers/api/v1/repo/repo.go`
- **Tests**
- Removed tests dedicated to `IsValidExternalURL`.
- Updated tracker-format test expectations to match `IsValidURL`-based
behavior.
```go
// before
if !validation.IsValidExternalURL(form.ExternalTrackerURL) { ... }
// after
if !validation.IsValidURL(form.ExternalTrackerURL) { ... }
```
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: wxiaoguang <2114189+wxiaoguang@users.noreply.github.com>
163 lines
4.0 KiB
Go
163 lines
4.0 KiB
Go
// Copyright 2018 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package validation
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func Test_IsValidURL(t *testing.T) {
|
|
cases := []struct {
|
|
description string
|
|
url string
|
|
valid bool
|
|
}{
|
|
{
|
|
description: "Empty URL",
|
|
url: "",
|
|
valid: false,
|
|
},
|
|
{
|
|
description: "Loopback IPv4 URL",
|
|
url: "http://127.0.1.1:5678/",
|
|
valid: true,
|
|
},
|
|
{
|
|
description: "Loopback IPv6 URL",
|
|
url: "https://[::1]/",
|
|
valid: true,
|
|
},
|
|
{
|
|
description: "Missing semicolon after schema",
|
|
url: "http//meh/",
|
|
valid: false,
|
|
},
|
|
}
|
|
|
|
for _, testCase := range cases {
|
|
t.Run(testCase.description, func(t *testing.T) {
|
|
assert.Equal(t, testCase.valid, IsValidURL(testCase.url))
|
|
})
|
|
}
|
|
}
|
|
|
|
func Test_IsValidExternalTrackerURLFormat(t *testing.T) {
|
|
cases := []struct {
|
|
description string
|
|
url string
|
|
valid bool
|
|
}{
|
|
{
|
|
description: "Correct external tracker URL with all placeholders",
|
|
url: "https://github.com/{user}/{repo}/issues/{index}",
|
|
valid: true,
|
|
},
|
|
{
|
|
description: "Local external tracker URL with all placeholders",
|
|
url: "https://127.0.0.1/{user}/{repo}/issues/{index}",
|
|
valid: true,
|
|
},
|
|
{
|
|
description: "External tracker URL with typo placeholder",
|
|
url: "https://github.com/{user}/{repo/issues/{index}",
|
|
valid: false,
|
|
},
|
|
{
|
|
description: "External tracker URL with typo placeholder",
|
|
url: "https://github.com/[user}/{repo/issues/{index}",
|
|
valid: false,
|
|
},
|
|
{
|
|
description: "External tracker URL with typo placeholder",
|
|
url: "https://github.com/{user}/repo}/issues/{index}",
|
|
valid: false,
|
|
},
|
|
{
|
|
description: "External tracker URL missing optional placeholder",
|
|
url: "https://github.com/{user}/issues/{index}",
|
|
valid: true,
|
|
},
|
|
{
|
|
description: "External tracker URL missing optional placeholder",
|
|
url: "https://github.com/{repo}/issues/{index}",
|
|
valid: true,
|
|
},
|
|
{
|
|
description: "External tracker URL missing optional placeholder",
|
|
url: "https://github.com/issues/{index}",
|
|
valid: true,
|
|
},
|
|
{
|
|
description: "External tracker URL missing optional placeholder",
|
|
url: "https://github.com/issues/{user}",
|
|
valid: true,
|
|
},
|
|
{
|
|
description: "External tracker URL with similar placeholder names test",
|
|
url: "https://github.com/user/repo/issues/{index}",
|
|
valid: true,
|
|
},
|
|
}
|
|
|
|
for _, testCase := range cases {
|
|
t.Run(testCase.description, func(t *testing.T) {
|
|
assert.Equal(t, testCase.valid, IsValidExternalTrackerURLFormat(testCase.url))
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestIsValidUsername(t *testing.T) {
|
|
tests := []struct {
|
|
arg string
|
|
want bool
|
|
}{
|
|
{arg: "a", want: true},
|
|
{arg: "abc", want: true},
|
|
{arg: "0.b-c", want: true},
|
|
{arg: "a.b-c_d", want: true},
|
|
{arg: "", want: false},
|
|
{arg: ".abc", want: false},
|
|
{arg: "abc.", want: false},
|
|
{arg: "a..bc", want: false},
|
|
{arg: "a...bc", want: false},
|
|
{arg: "a.-bc", want: false},
|
|
{arg: "a._bc", want: false},
|
|
{arg: "a_-bc", want: false},
|
|
{arg: "a/bc", want: false},
|
|
{arg: "☁️", want: false},
|
|
{arg: "-", want: false},
|
|
{arg: "--diff", want: false},
|
|
{arg: "-im-here", want: false},
|
|
{arg: "a space", want: false},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.arg, func(t *testing.T) {
|
|
assert.Equalf(t, tt.want, IsValidUsername(tt.arg), "IsValidUsername(%v)", tt.arg)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestIsValidBadgeSlug(t *testing.T) {
|
|
tests := []struct {
|
|
arg string
|
|
want bool
|
|
}{
|
|
{arg: "badge-1", want: true},
|
|
{arg: "badge.slug", want: true},
|
|
{arg: "new", want: true},
|
|
{arg: "Badge_1", want: true},
|
|
{arg: "a..b", want: false},
|
|
{arg: "a/b", want: false},
|
|
{arg: "Awesome!", want: false},
|
|
{arg: "Emoji 💯", want: false},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.arg, func(t *testing.T) {
|
|
assert.Equalf(t, tt.want, IsValidBadgeSlug(tt.arg), "IsValidBadgeSlug(%v)", tt.arg)
|
|
})
|
|
}
|
|
}
|