X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=refresh.go;h=0138e7ddfbf6f93e29e13f318ee025064ac6b640;hb=fe95091cb996ebc6c92bceace37b7e70c7528b67;hp=b97d2becfac6b71ee10c8466179f496533211910;hpb=60bbf40bfc8b720f176faef55b5403986db86f8c;p=gocheese.git

diff --git a/refresh.go b/refresh.go
index b97d2be..0138e7d 100644
--- a/refresh.go
+++ b/refresh.go
@@ -25,6 +25,7 @@ import (
 	"crypto/sha512"
 	"encoding/hex"
 	"encoding/json"
+	"errors"
 	"hash"
 	"io"
 	"io/ioutil"
@@ -79,6 +80,11 @@ func agentedReq(url string) *http.Request {
 	return req
 }
 
+type RecFieldToValuesMap struct {
+	recField   string
+	jsonFields []string
+}
+
 func refreshDir(
 	w http.ResponseWriter,
 	r *http.Request,
@@ -117,20 +123,21 @@ func refreshDir(
 		var meta PkgMeta
 		err = json.Unmarshal(body, &meta)
 		if err == nil {
-			for recField, jsonField := range map[string]string{
-				MetadataFieldName:                   meta.Info.Name,
-				MetadataFieldVersion:                meta.Info.Version,
-				MetadataFieldSummary:                meta.Info.Summary,
-				MetadataFieldDescriptionContentType: meta.Info.DescriptionContentType,
-				MetadataFieldKeywords:               meta.Info.Keywords,
-				MetadataFieldHomePage:               meta.Info.HomePage,
-				MetadataFieldAuthor:                 meta.Info.Author,
-				MetadataFieldAuthorEmail:            meta.Info.AuthorEmail,
-				MetadataFieldMaintainer:             meta.Info.Maintainer,
-				MetadataFieldMaintainerEmail:        meta.Info.MaintainerEmail,
-				MetadataFieldLicense:                meta.Info.License,
-				MetadataFieldRequiresPython:         meta.Info.RequiresPython,
+			for _, m := range [][2]string{
+				{MetadataFieldName, meta.Info.Name},
+				{MetadataFieldVersion, meta.Info.Version},
+				{MetadataFieldSummary, meta.Info.Summary},
+				{MetadataFieldDescriptionContentType, meta.Info.DescriptionContentType},
+				{MetadataFieldKeywords, meta.Info.Keywords},
+				{MetadataFieldHomePage, meta.Info.HomePage},
+				{MetadataFieldAuthor, meta.Info.Author},
+				{MetadataFieldAuthorEmail, meta.Info.AuthorEmail},
+				{MetadataFieldMaintainer, meta.Info.Maintainer},
+				{MetadataFieldMaintainerEmail, meta.Info.MaintainerEmail},
+				{MetadataFieldLicense, meta.Info.License},
+				{MetadataFieldRequiresPython, meta.Info.RequiresPython},
 			} {
+				recField, jsonField := m[0], m[1]
 				if jsonField == "" {
 					continue
 				}
@@ -141,18 +148,18 @@ func refreshDir(
 					log.Fatalln(err)
 				}
 			}
-			for recField, jsonFields := range map[string][]string{
-				MetadataFieldClassifier:        meta.Info.Classifier,
-				MetadataFieldPlatform:          meta.Info.Platform,
-				MetadataFieldSupportedPlatform: meta.Info.SupportedPlatform,
-				MetadataFieldRequiresDist:      meta.Info.RequiresDist,
-				MetadataFieldRequiresExternal:  meta.Info.RequiresExternal,
-				MetadataFieldProjectURL:        meta.Info.ProjectURL,
-				MetadataFieldProvidesExtra:     meta.Info.ProvidesExtra,
+			for _, m := range []RecFieldToValuesMap{
+				{MetadataFieldClassifier, meta.Info.Classifier},
+				{MetadataFieldPlatform, meta.Info.Platform},
+				{MetadataFieldSupportedPlatform, meta.Info.SupportedPlatform},
+				{MetadataFieldRequiresDist, meta.Info.RequiresDist},
+				{MetadataFieldRequiresExternal, meta.Info.RequiresExternal},
+				{MetadataFieldProjectURL, meta.Info.ProjectURL},
+				{MetadataFieldProvidesExtra, meta.Info.ProvidesExtra},
 			} {
-				for _, v := range jsonFields {
+				for _, v := range m.jsonFields {
 					if _, err = wr.WriteFields(recfile.Field{
-						Name:  metadataFieldToRecField(recField),
+						Name:  metadataFieldToRecField(m.recField),
 						Value: v,
 					}); err != nil {
 						log.Fatalln(err)
@@ -172,20 +179,21 @@ func refreshDir(
 				http.Error(w, "can not parse metadata JSON", http.StatusBadGateway)
 				return false
 			}
-			for recField, jsonField := range map[string]string{
-				MetadataFieldName:                   metaStripped.Info.Name,
-				MetadataFieldVersion:                metaStripped.Info.Version,
-				MetadataFieldSummary:                metaStripped.Info.Summary,
-				MetadataFieldDescriptionContentType: metaStripped.Info.DescriptionContentType,
-				MetadataFieldKeywords:               metaStripped.Info.Keywords,
-				MetadataFieldHomePage:               metaStripped.Info.HomePage,
-				MetadataFieldAuthor:                 metaStripped.Info.Author,
-				MetadataFieldAuthorEmail:            metaStripped.Info.AuthorEmail,
-				MetadataFieldMaintainer:             metaStripped.Info.Maintainer,
-				MetadataFieldMaintainerEmail:        metaStripped.Info.MaintainerEmail,
-				MetadataFieldLicense:                metaStripped.Info.License,
-				MetadataFieldRequiresPython:         metaStripped.Info.RequiresPython,
+			for _, m := range [][2]string{
+				{MetadataFieldName, metaStripped.Info.Name},
+				{MetadataFieldVersion, metaStripped.Info.Version},
+				{MetadataFieldSummary, metaStripped.Info.Summary},
+				{MetadataFieldDescriptionContentType, metaStripped.Info.DescriptionContentType},
+				{MetadataFieldKeywords, metaStripped.Info.Keywords},
+				{MetadataFieldHomePage, metaStripped.Info.HomePage},
+				{MetadataFieldAuthor, metaStripped.Info.Author},
+				{MetadataFieldAuthorEmail, metaStripped.Info.AuthorEmail},
+				{MetadataFieldMaintainer, metaStripped.Info.Maintainer},
+				{MetadataFieldMaintainerEmail, metaStripped.Info.MaintainerEmail},
+				{MetadataFieldLicense, metaStripped.Info.License},
+				{MetadataFieldRequiresPython, metaStripped.Info.RequiresPython},
 			} {
+				recField, jsonField := m[0], m[1]
 				if jsonField == "" {
 					continue
 				}
@@ -197,13 +205,13 @@ func refreshDir(
 				}
 			}
 
-			for recField, jsonFields := range map[string][]string{
-				MetadataFieldClassifier:   metaStripped.Info.Classifier,
-				MetadataFieldRequiresDist: metaStripped.Info.RequiresDist,
+			for _, m := range []RecFieldToValuesMap{
+				{MetadataFieldClassifier, metaStripped.Info.Classifier},
+				{MetadataFieldRequiresDist, metaStripped.Info.RequiresDist},
 			} {
-				for _, v := range jsonFields {
+				for _, v := range m.jsonFields {
 					if _, err = wr.WriteFields(recfile.Field{
-						Name:  metadataFieldToRecField(recField),
+						Name:  metadataFieldToRecField(m.recField),
 						Value: v,
 					}); err != nil {
 						log.Fatalln(err)
@@ -233,7 +241,7 @@ func refreshDir(
 				http.Error(w, err.Error(), http.StatusInternalServerError)
 				return false
 			}
-			log.Println(r.RemoteAddr, "pypi", pkgName+"."+MetadataFile, "touch")
+			log.Println(r.RemoteAddr, "pypi", pkgName+"/"+MetadataFile, "touch")
 		}
 	}
 	mtimes := make(map[string]time.Time)
@@ -331,12 +339,17 @@ func refreshDir(
 			hasherNew = blake2b256New
 			hashSize = blake2b.Size256
 		default:
-			log.Println("error", r.RemoteAddr, "pypi", filename, "unknown digest", hashAlgo)
+			log.Println(
+				"error", r.RemoteAddr, "pypi",
+				filename, "unknown digest", hashAlgo,
+			)
 			http.Error(w, "unknown digest algorithm", http.StatusBadGateway)
 			return false
 		}
 		if len(digest) != hashSize {
-			log.Println("error", r.RemoteAddr, "pypi", filename, "invalid digest length")
+			log.Println(
+				"error", r.RemoteAddr, "pypi",
+				filename, "invalid digest length")
 			http.Error(w, "invalid digest length", http.StatusBadGateway)
 			return false
 		}
@@ -415,6 +428,15 @@ func refreshDir(
 				http.Error(w, "digest mismatch", http.StatusBadGateway)
 				return false
 			}
+			if digestStored, err := ioutil.ReadFile(path + "." + hashAlgo); err == nil &&
+				bytes.Compare(digest, digestStored) != 0 {
+				err = errors.New("stored digest mismatch")
+				log.Println("error", r.RemoteAddr, "pypi", filename, err)
+				os.Remove(dst.Name())
+				dst.Close()
+				http.Error(w, err.Error(), http.StatusInternalServerError)
+				return false
+			}
 			if !NoSync {
 				if err = dst.Sync(); err != nil {
 					os.Remove(dst.Name())
@@ -539,8 +561,8 @@ func refreshDir(
 		}
 		path = path + "." + hashAlgo
 		stat, err := os.Stat(path)
-		if err == nil &&
-			(mtimeExists && stat.ModTime().Truncate(time.Second).Equal(mtime)) {
+		if err == nil && (!mtimeExists ||
+			(mtimeExists && stat.ModTime().Truncate(time.Second).Equal(mtime))) {
 			continue
 		}
 		if err != nil && !os.IsNotExist(err) {