Release 1.4.2: Added configuration field overwrite

Author: Michel Casabianca

Diff for: CHANGELOG.yml

@@ -1,5 +1,12 @@
 # Semantic changelog: https://github.com/c4s4/changelog
 
+- version: 1.4.2
+  date:    2015-07-31
+  summary: Added configuration field overwrite
+  fixed:
+  - "Added configuration field *overwrite* to tell if we can overwrite an
+     existing package."
+
 - version: 1.4.1
   date:    2015-07-30
   summary: Improved documentation

Diff for: README.md

@@ -87,6 +87,8 @@ The configuration file should look like this:
     path:  simple
     # Redirection when not found
     shop:  http://pypi.python.org/simple
+    # Tells if we can overwrite an existing package
+    overwrite: false
     # List of users and their MD5 hashed password
     # To get MD5 sum for password foo, type 'echo -n foo | md5sum'
     # To disable auth when uploading packages, set auth to ~
@@ -149,6 +151,10 @@ This is the URL path that the server will listen. Default value is *simple*, thu
 
 This is the URL of the public package repository, aka <http://pypi.python.org/simple>. This should not be changed.
 
+### overwrite
+
+Tells if we can overwrite an existing package while uploading (with `setup.py upload`). If set to *false* (the default value), you must upload the package manually on the server to amend a release (which is **not** advisable), and an attempt will result in a status code *400*. If set to true, it is possible to overwrite a package.
+
 ### auth
 
 This is the basic authentication configuration. If you don't want authentication, set this value to *~*. This is a list of usernames and MD5 hash of their password. To get the MD5 hash of a given password, you can type following command:

Diff for: cheeseshop.go

@@ -24,14 +24,15 @@ const (
 var DEFAULT_CONFIG = []string{"~/.cheeseshop.yml", "/etc/cheeseshop.yml"}
 
 type Config struct {
-	Http  int
-	Https int
-	Path  string
-	Root  string
-	Shop  string
-	Cert  string
-	Key   string
-	Auth  map[string]string
+	Http      int
+	Https     int
+	Path      string
+	Root      string
+	Shop      string
+	Cert      string
+	Key       string
+	Overwrite bool
+	Auth      map[string]string
 }
 
 var config Config
@@ -107,6 +108,12 @@ func copyFile(w http.ResponseWriter, r *http.Request) {
 		name := file.Filename
 		pack := name[:strings.LastIndex(name, "-")]
 		dir := filepath.Join(config.Root, pack)
+		path := filepath.Join(config.Root, pack, name)
+		if _, err := os.Stat(path); err == nil && !config.Overwrite {
+			log.Printf("Failed attempt to overwrite package %s", name)
+			http.Error(w, fmt.Sprintf("Package %s already exists", name), http.StatusBadRequest)
+			return
+		}
 		if _, err := os.Stat(dir); os.IsNotExist(err) {
 			err = os.Mkdir(dir, 0777)
 			if err != nil {
@@ -123,7 +130,7 @@ func copyFile(w http.ResponseWriter, r *http.Request) {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
-		dst, err := os.Create(filepath.Join(config.Root, pack, name))
+		dst, err := os.Create(path)
 		defer dst.Close()
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -223,8 +230,8 @@ func checkConfig() {
 func main() {
 	loadConfig()
 	checkConfig()
-	log.Printf("Starting CheeseShop (ports: %d & %d, path: %s, root: %s, shop: %s)",
-		config.Http, config.Https, config.Path, config.Root, config.Shop)
+	log.Printf("Starting CheeseShop (ports: %d & %d, path: %s, root: %s, shop: %s, cert: %s, key: %s, overwrite: %t)",
+		config.Http, config.Https, config.Path, config.Root, config.Shop, config.Cert, config.Key, config.Overwrite)
 	http.HandleFunc(config.Path, handler)
 	if config.Http != 0 {
 		go func() {

Diff for: etc/cheeseshop.yml

@@ -12,6 +12,8 @@ https: 443
 path:  simple
 # Redirection when not found
 shop:  http://pypi.python.org/simple
+# Tells if we can overwrite an existing package
+overwrite: false
 # List of users and their MD5 hashed password
 # To get MD5 sum for password foo, type 'echo -n foo | md5sum'
 # To disable auth when uploading packages, set auth to ~