diff --git a/internal/define/centos.go b/internal/define/centos.go index 3d71624..ade1046 100644 --- a/internal/define/centos.go +++ b/internal/define/centos.go @@ -6,20 +6,25 @@ var CENTOS_HOST_PATTERN = regexp.MustCompile(`https?://.+/centos/(.+)$`) const CENTOS_BENCHMAKR_URL = "TIME" -// https://www.centos.org/download/mirrors/ -var BUILDIN_CENTOS_MIRRORS = []UrlWithAlias{ - {URL: "https://mirrors.tuna.tsinghua.edu.cn/centos/", Alias: "cn:tsinghua", Http: true, Https: true, Official: true}, - {URL: "http://mirrors.aliyun.com/centos/", Alias: "cn:aliyun", Http: true, Https: true, Official: true}, - {URL: "https://mirrors.bfsu.edu.cn/centos/", Alias: "cn:bfsu", Http: true, Https: true, Official: true}, - {URL: "https://mirrors.cqu.edu.cn/CentOS/", Alias: "cn:cqu", Http: true, Https: true, Official: true}, - {URL: "https://mirror.nju.edu.cn/centos/", Alias: "cn:nju", Http: true, Https: true, Official: true}, - {URL: "http://mirror.lzu.edu.cn/centos/", Alias: "cn:lzu", Http: true, Https: true, Official: true}, - {URL: "https://mirrors.njupt.edu.cn/centos/", Alias: "cn:njupt", Http: true, Https: true, Official: true}, - {URL: "http://mirrors.163.com/centos/", Alias: "cn:163", Http: true, Https: true, Official: true}, - {URL: "https://mirrors.bupt.edu.cn/centos/", Alias: "cn:bupt", Http: true, Https: true, Official: true}, - {URL: "https://ftp.sjtu.edu.cn/centos/", Alias: "cn:sjtu", Http: true, Https: true, Official: true}, - {URL: "https://mirrors.ustc.edu.cn/centos/", Alias: "cn:ustc", Http: true, Https: true, Official: true}, - // TODO: valid? - // {URL: "http://mirrors.neusoft.edu.cn/centos/", Alias: "cn:neusoft"}, - {URL: "https://mirrors.huaweicloud.com/centos/", Alias: "cn:huaweicloud", Http: true, Https: true, Official: false}, +// https://www.centos.org/download/mirrors/ 2022.11.19 +// Sites that contain protocol headers, restrict access to resources using that protocol +var CENTOS_OFFICAL_MIRRORS = []string{ + "mirrors.bfsu.edu.cn/centos/", + "mirrors.cqu.edu.cn/CentOS/", + "http://mirrors.neusoft.edu.cn/centos/", + "mirrors.nju.edu.cn/centos/", + "mirrors.huaweicloud.com/centos/", + "mirror.lzu.edu.cn/centos/", + "http://mirrors.njupt.edu.cn/centos/", + "mirrors.163.com/centos/", + "mirrors.bupt.edu.cn/centos/", + "ftp.sjtu.edu.cn/centos/", + "mirrors.tuna.tsinghua.edu.cn/centos/", + "mirrors.ustc.edu.cn/centos/", } + +var CENTOS_CUSTOM_MIRRORS = []string{ + "http://mirrors.aliyun.com/centos/", +} + +var BUILDIN_CENTOS_MIRRORS = GenerateBuildInList(CENTOS_OFFICAL_MIRRORS, CENTOS_CUSTOM_MIRRORS) diff --git a/internal/define/define_test.go b/internal/define/define_test.go index 05065bd..a153260 100644 --- a/internal/define/define_test.go +++ b/internal/define/define_test.go @@ -9,33 +9,6 @@ import ( Define "github.com/soulteary/apt-proxy/internal/define" ) -// func TestPrintUbuntuPingScript(t *testing.T) { -// for _, url := range UBUNTU_OFFICAL_MIRRORS { -// fmt.Println(`echo "` + url + `"`) -// http := "curl --connect-timeout 2 -I http://" + url + UBUNTU_BENCHMAKR_URL -// fmt.Println(http) -// https := "curl --connect-timeout 2 -I https://" + url + UBUNTU_BENCHMAKR_URL -// fmt.Println(https) -// } -// } - -// func TestPrintDebianPingScript(t *testing.T) { -// for _, url := range Define.DEBIAN_OFFICAL_MIRRORS { -// fmt.Println(`echo "` + url + `"`) -// http := "curl --connect-timeout 2 -I http://" + url + Define.DEBIAN_BENCHMAKR_URL -// fmt.Println(http) -// https := "curl --connect-timeout 2 -I https://" + url + Define.DEBIAN_BENCHMAKR_URL -// fmt.Println(https) -// } -// for _, url := range Define.DEBIAN_CUSTOM_MIRRORS { -// fmt.Println(`echo "` + url + `"`) -// http := "curl --connect-timeout 2 -I http://" + url + Define.DEBIAN_BENCHMAKR_URL -// fmt.Println(http) -// https := "curl --connect-timeout 2 -I https://" + url + Define.DEBIAN_BENCHMAKR_URL -// fmt.Println(https) -// } -// } - func TestRuleToString(t *testing.T) { r := Define.Rule{ Pattern: regexp.MustCompile(`a$`), diff --git a/internal/define/mirror_test.go b/internal/define/mirror_test.go new file mode 100644 index 0000000..99bec33 --- /dev/null +++ b/internal/define/mirror_test.go @@ -0,0 +1,64 @@ +package define_test + +// func TestPrintUbuntuPingScript(t *testing.T) { +// for _, url := range Define.UBUNTU_OFFICAL_MIRRORS { +// if !(strings.HasPrefix(url, "http://") || strings.HasPrefix(url, "https://")) { +// fmt.Println(`echo "` + url + `"`) +// http := "curl --connect-timeout 2 -I http://" + url + Define.UBUNTU_BENCHMAKR_URL +// fmt.Println(http) +// https := "curl --connect-timeout 2 -I https://" + url + Define.UBUNTU_BENCHMAKR_URL +// fmt.Println(https) +// } +// } +// for _, url := range Define.UBUNTU_CUSTOM_MIRRORS { +// if !(strings.HasPrefix(url, "http://") || strings.HasPrefix(url, "https://")) { +// fmt.Println(`echo "` + url + `"`) +// http := "curl --connect-timeout 2 -I http://" + url + Define.UBUNTU_BENCHMAKR_URL +// fmt.Println(http) +// https := "curl --connect-timeout 2 -I https://" + url + Define.UBUNTU_BENCHMAKR_URL +// fmt.Println(https) +// } +// } +// } + +// func TestPrintDebianPingScript(t *testing.T) { +// for _, url := range Define.DEBIAN_OFFICAL_MIRRORS { +// if !(strings.HasPrefix(url, "http://") || strings.HasPrefix(url, "https://")) { +// fmt.Println(`echo "` + url + `"`) +// http := "curl --connect-timeout 2 -I http://" + url + Define.DEBIAN_BENCHMAKR_URL +// fmt.Println(http) +// https := "curl --connect-timeout 2 -I https://" + url + Define.DEBIAN_BENCHMAKR_URL +// fmt.Println(https) +// } +// } +// for _, url := range Define.DEBIAN_CUSTOM_MIRRORS { +// if !(strings.HasPrefix(url, "http://") || strings.HasPrefix(url, "https://")) { +// fmt.Println(`echo "` + url + `"`) +// http := "curl --connect-timeout 2 -I http://" + url + Define.DEBIAN_BENCHMAKR_URL +// fmt.Println(http) +// https := "curl --connect-timeout 2 -I https://" + url + Define.DEBIAN_BENCHMAKR_URL +// fmt.Println(https) +// } +// } +// } + +// func TestPrintCentosPingScript(t *testing.T) { +// for _, url := range Define.CENTOS_OFFICAL_MIRRORS { +// if !(strings.HasPrefix(url, "http://") || strings.HasPrefix(url, "https://")) { +// fmt.Println(`echo "` + url + `"`) +// http := "curl --connect-timeout 2 -I http://" + url + Define.CENTOS_BENCHMAKR_URL +// fmt.Println(http) +// https := "curl --connect-timeout 2 -I https://" + url + Define.CENTOS_BENCHMAKR_URL +// fmt.Println(https) +// } +// } +// for _, url := range Define.CENTOS_CUSTOM_MIRRORS { +// if !(strings.HasPrefix(url, "http://") || strings.HasPrefix(url, "https://")) { +// fmt.Println(`echo "` + url + `"`) +// http := "curl --connect-timeout 2 -I http://" + url + Define.CENTOS_BENCHMAKR_URL +// fmt.Println(http) +// https := "curl --connect-timeout 2 -I https://" + url + Define.CENTOS_BENCHMAKR_URL +// fmt.Println(https) +// } +// } +// }