)
const (
- Version = "3.7.0"
+ Version = "4.1.0"
UserAgent = "GoCheese/" + Version
)
NoRefreshURLPath = flag.String("norefresh", DefaultNoRefreshURLPath, "")
RefreshURLPath = flag.String("refresh", DefaultRefreshURLPath, "")
- GPGUpdateURLPath = flag.String("gpgupdate", DefaultGPGUpdateURLPath, "")
JSONURLPath = flag.String("json", DefaultJSONURLPath, "")
PyPIURL = flag.String("pypi", DefaultPyPIURL, "")
log.Println(r.RemoteAddr, "get", filename)
path := filepath.Join(Root, pkgName, filename)
if _, err := os.Stat(path); os.IsNotExist(err) {
- if !refreshDir(w, r, pkgName, filename, false) {
+ if !refreshDir(w, r, pkgName, filename) {
return
}
}
case "GET":
var path string
var autorefresh bool
- var gpgUpdate bool
if strings.HasPrefix(r.URL.Path, *NoRefreshURLPath) {
path = strings.TrimPrefix(r.URL.Path, *NoRefreshURLPath)
} else if strings.HasPrefix(r.URL.Path, *RefreshURLPath) {
path = strings.TrimPrefix(r.URL.Path, *RefreshURLPath)
autorefresh = true
- } else if strings.HasPrefix(r.URL.Path, *GPGUpdateURLPath) {
- path = strings.TrimPrefix(r.URL.Path, *GPGUpdateURLPath)
- autorefresh = true
- gpgUpdate = true
} else {
http.Error(w, "unknown action", http.StatusBadRequest)
return
if parts[0] == "" {
listRoot(w, r)
} else {
- serveListDir(w, r, parts[0], autorefresh, gpgUpdate)
+ serveListDir(w, r, parts[0], autorefresh)
}
} else {
servePkg(w, r, parts[0], parts[1])
}
Root = flag.Args()[0]
if _, err := os.Stat(Root); err != nil {
- log.Fatalln(err)
+ log.Fatal(err)
}
if *FSCK {
os.FileMode(0666),
)
if err != nil {
- log.Fatalln(err)
+ log.Fatal(err)
}
passwdReader(fd)
fd.Close()
os.FileMode(0666),
)
if err != nil {
- log.Fatalln(err)
+ log.Fatal(err)
}
passwdLister(fd)
fd.Close()
}
if (*TLSCert != "" && *TLSKey == "") || (*TLSCert == "" && *TLSKey != "") {
- log.Fatalln("Both -tls-cert and -tls-key are required")
+ log.Fatal("Both -tls-cert and -tls-key are required")
}
UmaskCur = syscall.Umask(0)
var err error
PyPIURLParsed, err = url.Parse(*PyPIURL)
if err != nil {
- log.Fatalln(err)
+ log.Fatal(err)
}
tlsConfig := tls.Config{
ClientSessionCache: tls.NewLRUClientSessionCache(16),
if *PyPICertHash != "" {
ourDgst, err := hex.DecodeString(*PyPICertHash)
if err != nil {
- log.Fatalln(err)
+ log.Fatal(err)
}
tlsConfig.VerifyConnection = func(s tls.ConnectionState) error {
spki := s.VerifiedChains[0][0].RawSubjectPublicKeyInfo
theirDgst := sha256.Sum256(spki)
- if bytes.Compare(ourDgst, theirDgst[:]) != 0 {
+ if !bytes.Equal(ourDgst, theirDgst[:]) {
return errors.New("certificate's SPKI digest mismatch")
}
return nil
http.HandleFunc(*JSONURLPath, serveJSON)
http.HandleFunc(*NoRefreshURLPath, handler)
http.HandleFunc(*RefreshURLPath, handler)
- if *GPGUpdateURLPath != "" {
- http.HandleFunc(*GPGUpdateURLPath, handler)
- }
if *DoUCSPI {
server.SetKeepAlivesEnabled(false)
server.ConnState = connStater
err := server.Serve(ln)
if _, ok := err.(UCSPIAlreadyAccepted); !ok {
- log.Fatalln(err)
+ log.Fatal(err)
}
UCSPIJob.Wait()
return
}
ln = netutil.LimitListener(ln, *MaxClients)
- needsShutdown := make(chan os.Signal, 0)
- exitErr := make(chan error, 0)
+ needsShutdown := make(chan os.Signal, 1)
+ exitErr := make(chan error)
signal.Notify(needsShutdown, syscall.SIGTERM, syscall.SIGINT)
go func(s *http.Server) {
<-needsShutdown