Skip to content

Commit 0807389

Browse files
committed
check: fall back to heuristically scanning directory index
1 parent 8250aa3 commit 0807389

File tree

3 files changed

+100
-2
lines changed

3 files changed

+100
-2
lines changed

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@ require (
1616
github.com/protocolbuffers/txtpbfmt v0.0.0-20191018194151-ab9b9b21328a
1717
github.com/s-urbaniak/uevent v1.0.0
1818
golang.org/x/exp v0.0.0-20190221220918-438050ddec5e
19+
golang.org/x/mod v0.2.0
1920
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 // indirect
2021
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be
2122
golang.org/x/sync v0.0.0-20190423024810-112230192c58
2223
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b
2324
golang.org/x/text v0.3.2 // indirect
24-
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
25+
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898
2526
gonum.org/v1/gonum v0.0.0-20181012194325-406984d37414
2627
gonum.org/v1/netlib v0.0.0-20181018051557-57e1e4db57a7 // indirect
2728
google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 // indirect

go.sum

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,23 @@ github.com/s-urbaniak/uevent v1.0.0 h1:y1e40TmDfCU0l1o/MBpimGJgo2UzTTqBl/0GF6vx/
4141
github.com/s-urbaniak/uevent v1.0.0/go.mod h1:h83SVc1NQj/EubPaK4hWyiG217xLYr+fS+Jf10COrG0=
4242
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
4343
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
44+
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
45+
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
4446
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
4547
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
4648
golang.org/x/exp v0.0.0-20190221220918-438050ddec5e h1:dVreTP5bOOWt5GFwwvgTE2iU0TkIqi2x3r0b8qGlp6k=
4749
golang.org/x/exp v0.0.0-20190221220918-438050ddec5e/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
4850
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
4951
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
5052
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
53+
golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
54+
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
5155
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
5256
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
5357
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
5458
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
59+
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
60+
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
5561
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk=
5662
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
5763
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs=
@@ -65,6 +71,7 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
6571
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522 h1:Ve1ORMCxvRmSXBwJK+t3Oy+V2vRW2OetUQBq4rJIkZE=
6672
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
6773
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
74+
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
6875
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b h1:ag/x1USPSsqHud38I9BAC88qdNLDHHtQ4mlgQIZPPNA=
6976
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
7077
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
@@ -76,8 +83,11 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
7683
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
7784
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
7885
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
86+
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
7987
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
8088
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
89+
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA=
90+
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
8191
gonum.org/v1/gonum v0.0.0-20181012194325-406984d37414 h1:I9CLYgoY02/pOK+fYZ5PSRwoGafdCYnUMtiiQ8cS3Co=
8292
gonum.org/v1/gonum v0.0.0-20181012194325-406984d37414/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
8393
gonum.org/v1/netlib v0.0.0-20181018051557-57e1e4db57a7 h1:biGE8p3sxXv+JdArdlsXEJZBPPFk51mQHVwOv6h1gnY=

internal/checkupstream/check.go

Lines changed: 88 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,19 @@ import (
44
"context"
55
"fmt"
66
"io/ioutil"
7+
"log"
78
"net/http"
89
"net/url"
910
"path"
11+
"regexp"
12+
"sort"
1013
"strconv"
1114
"strings"
1215
"time"
1316

17+
"github.com/distr1/distri"
1418
"github.com/protocolbuffers/txtpbfmt/ast"
19+
"golang.org/x/mod/semver"
1520
)
1621

1722
func checkDebian(debianPackagesURL, source string) (remoteSource, remoteHash, remoteVersion string, _ error) {
@@ -71,6 +76,80 @@ func checkDebian(debianPackagesURL, source string) (remoteSource, remoteHash, re
7176
return "", "", "", fmt.Errorf("package not found in Debian Packages file")
7277
}
7378

79+
func maybeV(v string) string {
80+
if strings.HasPrefix(v, "v") {
81+
return v
82+
}
83+
return "v" + v
84+
}
85+
86+
func checkHeuristic(upstreamVersion, source string) (remoteSource, remoteHash, remoteVersion string, _ error) {
87+
u, err := url.Parse(source)
88+
u.Path = path.Dir(u.Path)
89+
resp, err := http.Get(u.String())
90+
if err != nil {
91+
return "", "", "", err
92+
}
93+
if resp.StatusCode != http.StatusOK {
94+
return "", "", "", fmt.Errorf("unexpected HTTP response: got %v, want 200 OK", resp.Status)
95+
}
96+
b, err := ioutil.ReadAll(resp.Body)
97+
if err != nil {
98+
return "", "", "", err
99+
}
100+
// TODO: add special casing for parsing apache directory index?
101+
log.Printf("base: %v", path.Base(source))
102+
pattern := strings.Replace(path.Base(source), upstreamVersion, `([^"]*)`, 1)
103+
if pattern == path.Base(source) {
104+
return "", "", "", fmt.Errorf("could not derive regexp pattern, specify manually")
105+
}
106+
log.Printf("pattern: %v", pattern)
107+
re, err := regexp.Compile(pattern)
108+
if err != nil {
109+
return "", "", "", err
110+
}
111+
log.Printf("re: %v", re)
112+
matches := re.FindAllStringSubmatch(string(b), -1)
113+
log.Printf("matches: %v", matches)
114+
versions := func() []string {
115+
v := make(map[string]bool)
116+
for _, m := range matches {
117+
if m[1] == "latest" {
118+
continue // skip common latest symlink
119+
}
120+
v[m[1]] = true
121+
}
122+
result := make([]string, 0, len(v))
123+
for version := range v {
124+
result = append(result, version)
125+
}
126+
valid := true
127+
for _, r := range result {
128+
if !semver.IsValid(maybeV(r)) {
129+
valid = false
130+
break
131+
}
132+
}
133+
if !valid {
134+
// Prefer a string sort when the versions aren’t semver, it’s better
135+
// than semver.Compare.
136+
sort.Sort(sort.Reverse(sort.StringSlice(result)))
137+
} else {
138+
sort.Slice(result, func(i, j int) bool {
139+
v, w := result[i], result[j]
140+
v, w = maybeV(v), maybeV(w)
141+
return semver.Compare(v, w) >= 0 // reverse
142+
})
143+
}
144+
return result
145+
}()
146+
if len(versions) == 0 {
147+
return "", "", "", fmt.Errorf("not yet implemented")
148+
}
149+
u.Path = path.Join(u.Path, strings.Replace(path.Base(source), upstreamVersion, versions[0], 1))
150+
return u.String(), "TODO", versions[0], nil
151+
}
152+
74153
func Check(build []*ast.Node) (source, hash, version string, _ error) {
75154
stringVal := func(path ...string) (string, error) {
76155
nodes := ast.GetFromPath(build, path)
@@ -95,5 +174,13 @@ func Check(build []*ast.Node) (source, hash, version string, _ error) {
95174
}
96175
return checkDebian(u, source)
97176
}
98-
return "", "", "", fmt.Errorf("not yet implemented")
177+
178+
version, err = stringVal("version")
179+
if err != nil {
180+
return "", "", "", err
181+
}
182+
183+
pv := distri.ParseVersion(version)
184+
// fall back: see if we can obtain an index page
185+
return checkHeuristic(pv.Upstream, source)
99186
}

0 commit comments

Comments
 (0)