diff --git a/go.mod b/go.mod index dc3fffd39..15b0e7bf2 100644 --- a/go.mod +++ b/go.mod @@ -57,7 +57,7 @@ require ( gopkg.in/DATA-DOG/go-sqlmock.v2 v2.0.0-20180914054222-c19298f520d0 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df - gopkg.in/ini.v1 v1.66.4 + gopkg.in/ini.v1 v1.66.5 gopkg.in/macaron.v1 v1.4.0 gorm.io/driver/mysql v1.3.3 gorm.io/driver/postgres v1.3.7 diff --git a/go.sum b/go.sum index 7d742e5f8..d3667f471 100644 --- a/go.sum +++ b/go.sum @@ -815,8 +815,9 @@ gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AW gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= gopkg.in/ini.v1 v1.46.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4= gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.66.5 h1:zfiCO0p88Fj4f6NR6KR5WdGMQ02U8vlDnN6HuD2xv5o= +gopkg.in/ini.v1 v1.66.5/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/macaron.v1 v1.3.4/go.mod h1:/RoHTdC8ALpyJ3+QR36mKjwnT1F1dyYtsGM9Ate6ZFI= gopkg.in/macaron.v1 v1.3.5/go.mod h1:uMZCFccv9yr5TipIalVOyAyZQuOH3OkmXvgcWwhJuP4= gopkg.in/macaron.v1 v1.4.0 h1:RJHC09fAnQ8tuGUiZNjG0uyL1BWSdSWd9SpufIcEArQ= diff --git a/internal/conf/testdata/TestInit.golden.ini b/internal/conf/testdata/TestInit.golden.ini index 374bbc3e1..b7dc6f227 100644 --- a/internal/conf/testdata/TestInit.golden.ini +++ b/internal/conf/testdata/TestInit.golden.ini @@ -141,4 +141,3 @@ DEFAULT_INTERVAL=8 [i18n] LANGS=en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR,gl-ES,uk-UA,en-GB,hu-HU,sk-SK,id-ID,fa-IR,vi-VN,pt-PT,mn-MN NAMES=English,简体中文,繁體中文(香港),繁體中文(臺灣),Deutsch,français,Nederlands,latviešu,русский,日本語,español,português do Brasil,polski,български,italiano,suomi,Türkçe,čeština,српски,svenska,한국어,galego,українська,English (United Kingdom),Magyar,Slovenčina,Indonesian,Persian,Vietnamese,Português,Монгол - diff --git a/internal/netutil/netutil_test.go b/internal/netutil/netutil_test.go index c65af2c0b..65202baf3 100644 --- a/internal/netutil/netutil_test.go +++ b/internal/netutil/netutil_test.go @@ -16,21 +16,21 @@ func TestIsLocalHostname(t *testing.T) { allowlist []string want bool }{ - {hostname: "localhost", want: true}, - {hostname: "127.0.0.1", want: true}, - {hostname: "::1", want: true}, - {hostname: "0:0:0:0:0:0:0:1", want: true}, - {hostname: "fuf.me", want: true}, - {hostname: "127.0.0.95", want: true}, - {hostname: "0.0.0.0", want: true}, - {hostname: "192.168.123.45", want: true}, + {hostname: "localhost", want: true}, // #00 + {hostname: "127.0.0.1", want: true}, // #01 + {hostname: "::1", want: true}, // #02 + {hostname: "0:0:0:0:0:0:0:1", want: true}, // #03 + {hostname: "fuf.me", want: true}, // #04 + {hostname: "127.0.0.95", want: true}, // #05 + {hostname: "0.0.0.0", want: true}, // #06 + {hostname: "192.168.123.45", want: true}, // #07 - {hostname: "gogs.io", want: false}, - {hostname: "google.com", want: false}, - {hostname: "165.232.140.255", want: false}, + {hostname: "gogs.io", want: false}, // #08 + {hostname: "google.com", want: false}, // #09 + {hostname: "165.232.140.255", want: false}, // #10 - {hostname: "192.168.123.45", allowlist: []string{"10.0.0.17"}, want: true}, - {hostname: "gogs.local", allowlist: []string{"gogs.local"}, want: false}, + {hostname: "192.168.123.45", allowlist: []string{"10.0.0.17"}, want: true}, // #11 + {hostname: "gogs.local", allowlist: []string{"gogs.local"}, want: false}, // #12 } for _, test := range tests { t.Run("", func(t *testing.T) {