/*
GoCheese -- Python private package repository and caching proxy
-Copyright (C) 2019-2020 Sergey Matveev <stargrave@stargrave.org>
- 2019-2020 Elena Balakhonova <balakhonova_e@riseup.net>
+Copyright (C) 2019-2021 Sergey Matveev <stargrave@stargrave.org>
+ 2019-2021 Elena Balakhonova <balakhonova_e@riseup.net>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
import (
"bytes"
"context"
+ "crypto/sha256"
+ "crypto/tls"
"encoding/hex"
+ "errors"
"flag"
"fmt"
"io/ioutil"
)
const (
- Version = "2.4.1"
+ Version = "2.6.0"
HTMLBegin = `<!DOCTYPE html>
<html>
<head>
refreshURLPath = flag.String("refresh", "/simple/", "Auto-refreshing URL path")
gpgUpdateURLPath = flag.String("gpgupdate", "/gpgupdate/", "GPG forceful refreshing URL path")
pypiURL = flag.String("pypi", "https://pypi.org/simple/", "Upstream PyPI URL")
+ pypiCertHash = flag.String("pypi-cert-hash", "", "Authenticate PyPI by its X.509 certificate's SHA256 hash")
passwdPath = flag.String("passwd", "passwd", "Path to file with authenticators")
+ logTimestamped = flag.Bool("log-timestamped", false, "Prepend timestmap to log messages")
passwdCheck = flag.Bool("passwd-check", false, "Test the -passwd file for syntax errors and exit")
fsck = flag.Bool("fsck", false, "Check integrity of all packages (errors are in stderr)")
maxClients = flag.Int("maxclients", 128, "Maximal amount of simultaneous clients")
var result bytes.Buffer
result.WriteString(fmt.Sprintf(HTMLBegin, pkgName))
for _, algo := range knownHashAlgos {
- for fn, _ := range files {
+ for fn := range files {
if killed {
// Skip expensive I/O when shutting down
http.Error(w, "shutting down", http.StatusInternalServerError)
return
}
if *version {
- fmt.Println("GoCheese version", Version, "built with", runtime.Version())
+ fmt.Println("GoCheese", Version, "built with", runtime.Version())
return
}
+
+ if *logTimestamped {
+ log.SetFlags(log.Ldate | log.Lmicroseconds | log.Lshortfile)
+ } else {
+ log.SetFlags(log.Lshortfile)
+ }
+ log.SetOutput(os.Stdout)
+
if *fsck {
if !goodIntegrity() {
os.Exit(1)
}
return
}
+
if *passwdCheck {
refreshPasswd()
return
}
+
if (*tlsCert != "" && *tlsKey == "") || (*tlsCert == "" && *tlsKey != "") {
log.Fatalln("Both -tls-cert and -tls-key are required")
}
+
var err error
pypiURLParsed, err = url.Parse(*pypiURL)
if err != nil {
log.Fatalln(err)
}
refreshPasswd()
- log.Println("root:", *root)
- log.Println("bind:", *bind)
- log.Println("pypi:", *pypiURL)
+ if *pypiCertHash == "" {
+ pypiHTTPTransport = http.Transport{}
+ } else {
+ ourDgst, err := hex.DecodeString(*pypiCertHash)
+ if err != nil {
+ log.Fatalln(err)
+ }
+ pypiHTTPTransport = http.Transport{
+ TLSClientConfig: &tls.Config{
+ VerifyConnection: func(s tls.ConnectionState) error {
+ spki := s.VerifiedChains[0][0].RawSubjectPublicKeyInfo
+ theirDgst := sha256.Sum256(spki)
+ if bytes.Compare(ourDgst, theirDgst[:]) != 0 {
+ return errors.New("certificate's digest mismatch")
+ }
+ return nil
+ }},
+ }
+ }
ln, err := net.Listen("tcp", *bind)
if err != nil {
cancel()
}(server)
+ log.Println(
+ "GoCheese", Version, "listens:",
+ "root:", *root,
+ "bind:", *bind,
+ "pypi:", *pypiURL,
+ )
if *tlsCert == "" {
err = server.Serve(ln)
} else {