liangsheng8708
/
dget
mirror of https://gitee.com/extrame/dget.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed

This commit is contained in:
刘铭 2023-08-22 17:38:54 +08:00
parent a74da5972d
commit 4ed5dc5f59
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/dget/main.go
View File

@ -50,7 +50,7 @@ func main() {
var client dget.Client var client dget.Client
if *proxy != "" { if *proxy != "" {
proxyUrl, err := url.Parse("http://proxyIp:proxyPort") proxyUrl, err := url.Parse(*proxy)
if err != nil { if err != nil {
logrus.Fatalln("代理地址"+*proxy+"错误", err) logrus.Fatalln("代理地址"+*proxy+"错误", err)
} }

9
install.go
View File

@ -89,13 +89,14 @@ func (m *Client) Install(_registry, d, tag string, arch string, printInfo bool)
if resp.StatusCode == 401 { if resp.StatusCode == 401 {
//Bearer realm="https://auth.docker.io/token",service="registry.docker.io" //Bearer realm="https://auth.docker.io/token",service="registry.docker.io"
var hAuths = strings.Split(resp.Header.Get("Www-Authenticate"), "\"") var hAuths = strings.Split(resp.Header.Get("Www-Authenticate"), "\"")
logrus.Debugln("Www-Authenticate", hAuths)
if len(hAuths) > 1 { if len(hAuths) > 1 {
authUrl = hAuths[1] authUrl = hAuths[1]
} }
if len(hAuths) > 3 { if len(hAuths) > 3 {
regService = hAuths[3] regService = hAuths[3]
} else { } else {
regService = "" regService = _registry
} }
} }
resp.Body.Close() resp.Body.Close()
@ -115,8 +116,8 @@ func (m *Client) Install(_registry, d, tag string, arch string, printInfo bool)
logrus.Debugln("Authorization by", accessToken) logrus.Debugln("Authorization by", accessToken)
req.Header.Add("Authorization", "Bearer "+accessToken) req.Header.Add("Authorization", "Bearer "+accessToken)
// req.Header.Add("Accept", "application/vnd.oci.image.manifest.v1+json") // req.Header.Add("Accept", "application/vnd.oci.image.manifest.v1+json")
req.Header.Add("Accept", "application/vnd.oci.image.index.v1+json")
req.Header.Add("Accept", "application/vnd.docker.distribution.manifest.list.v2+json") req.Header.Add("Accept", "application/vnd.docker.distribution.manifest.list.v2+json")
req.Header.Add("Accept", "application/vnd.oci.image.index.v1+json")
var authHeader = req.Header var authHeader = req.Header
@ -372,7 +373,9 @@ func (m *Client) download(_registry, d, tag string, digest digest.Digest, authHe
} }
func getAuthHead(a, r, d string) (string, error) { func getAuthHead(a, r, d string) (string, error) {
resp, err := http.Get(fmt.Sprintf("%s?service=%s&scope=repository:%s:pull", a, r, d)) var regUrl = fmt.Sprintf("%s?service=%s&scope=repository:%s:pull", a, r, d)
logrus.Debug("get auth head from", regUrl)
resp, err := http.Get(regUrl)
if err == nil { if err == nil {
defer resp.Body.Close() defer resp.Body.Close()
var results map[string]interface{} var results map[string]interface{}