close_issue_1
/
tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[release-branch.go1.10] godoc/dl: add meta tags for go get golang.org/dl/go1.N 

Updates golang/go#23223

Change-Id: I628cea181d3a0e6bb25fdd98e098581aa222e049
Reviewed-on: https://go-review.googlesource.com/123679
Reviewed-by: Andrew Bonventre <andybons@golang.org>
(cherry picked from commit 827f47db85)
Reviewed-on: https://go-review.googlesource.com/125175
This commit is contained in:
Brad Fitzpatrick 2018-07-12 21:23:00 +00:00
parent e9928cbe4a
commit 42933c415e
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
godoc/dl/dl.go
View File

@ -16,6 +16,7 @@ import (
"crypto/md5" "crypto/md5"
"encoding/json" "encoding/json"
"fmt" "fmt"
"html"
"html/template" "html/template"
"io" "io"
"net/http" "net/http"
@ -432,11 +433,31 @@ func getHandler(w http.ResponseWriter, r *http.Request) {
listHandler(w, r) listHandler(w, r)
return return
} }
if !fileRe.MatchString(name) { if fileRe.MatchString(name) {
http.NotFound(w, r) http.Redirect(w, r, downloadBaseURL+name, http.StatusFound)
return return
} }
http.Redirect(w, r, downloadBaseURL+name, http.StatusFound) if goGetRe.MatchString(name) {
if r.Method == "GET" || r.Method == "HEAD" {
w.Header().Set("Content-Type", "text/html; charset=utf-8")
}
w.Header().Set("Location", "https://golang.org/dl/#"+name)
w.WriteHeader(http.StatusFound)
fmt.Fprintf(w, `<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="go-import" content="golang.org/dl git https://go.googlesource.com/dl">
<meta http-equiv="refresh" content="0; url=https://golang.org/dl/#%s">
</head>
<body>
Nothing to see here; <a href="https://golang.org/dl/#%s">move along</a>.
</body>
</html>
`, html.EscapeString(name), html.EscapeString(name))
return
}
http.NotFound(w, r)
} }
func validUser(user string) bool { func validUser(user string) bool {
@ -453,7 +474,10 @@ func userKey(c context.Context, user string) string {
return fmt.Sprintf("%x", h.Sum(nil)) return fmt.Sprintf("%x", h.Sum(nil))
} }
var fileRe = regexp.MustCompile(`^go[0-9a-z.]+\.[0-9a-z.-]+\.(tar\.gz|pkg|msi|zip)$`) var (
fileRe = regexp.MustCompile(`^go[0-9a-z.]+\.[0-9a-z.-]+\.(tar\.gz|pkg|msi|zip)$`)
goGetRe = regexp.MustCompile(`^go[0-9a-z.]+\.[0-9a-z.-]+$`)
)
func initHandler(w http.ResponseWriter, r *http.Request) { func initHandler(w http.ResponseWriter, r *http.Request) {
var fileRoot struct { var fileRoot struct {