USEFULL
/
gogs
mirror of https://github.com/gogs/gogs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

netutil: allow using `*` to match any hostname (#7111)

pull/7116/head
Joe Chen 2022-07-25 21:38:15 +08:00 committed by GitHub
parent 780b33c639
commit db82024fc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -21,6 +21,7 @@ All notable changes to Gogs are documented in this file.
- Use [Task](https://github.com/go-task/task) as the build tool. [#6297](https://github.com/gogs/gogs/pull/6297) - Use [Task](https://github.com/go-task/task) as the build tool. [#6297](https://github.com/gogs/gogs/pull/6297)
- The required Go version to compile source code changed to 1.16. - The required Go version to compile source code changed to 1.16.
- Access tokens are now stored using their SHA256 hashes instead of raw values. [#7008](https://github.com/gogs/gogs/pull/7008) - Access tokens are now stored using their SHA256 hashes instead of raw values. [#7008](https://github.com/gogs/gogs/pull/7008)
- Support using `[security] LOCAL_NETWORK_ALLOWLIST = *` to allow all hostnames. [#7111](https://github.com/gogs/gogs/pull/7111)
### Fixed ### Fixed

1
conf/app.ini
View File

@ -174,6 +174,7 @@ ENABLE_LOGIN_STATUS_COOKIE = false
; The cookie name to store user login status. ; The cookie name to store user login status.
LOGIN_STATUS_COOKIE_NAME = login_status LOGIN_STATUS_COOKIE_NAME = login_status
; A comma separated list of hostnames that are explicitly allowed to be accessed within the local network. ; A comma separated list of hostnames that are explicitly allowed to be accessed within the local network.
; Use "*" to allow all hostnames.
LOCAL_NETWORK_ALLOWLIST = LOCAL_NETWORK_ALLOWLIST =
[email] [email]

2
internal/netutil/netutil.go
View File

@ -52,7 +52,7 @@ func init() {
// allowlist). // allowlist).
func IsBlockedLocalHostname(hostname string, allowlist []string) bool { func IsBlockedLocalHostname(hostname string, allowlist []string) bool {
for _, allow := range allowlist { for _, allow := range allowlist {
if hostname == allow { if hostname == allow || allow == "*" {
return false return false
} }
} }

2
internal/netutil/netutil_test.go
View File

@ -31,6 +31,8 @@ func TestIsLocalHostname(t *testing.T) {
{hostname: "192.168.123.45", allowlist: []string{"10.0.0.17"}, want: true}, // #11 {hostname: "192.168.123.45", allowlist: []string{"10.0.0.17"}, want: true}, // #11
{hostname: "gogs.local", allowlist: []string{"gogs.local"}, want: false}, // #12 {hostname: "gogs.local", allowlist: []string{"gogs.local"}, want: false}, // #12
{hostname: "192.168.123.45", allowlist: []string{"*"}, want: false}, // #13
} }
for _, test := range tests { for _, test := range tests {
t.Run("", func(t *testing.T) { t.Run("", func(t *testing.T) {