Debug/marshall/file upload corruption

.build-all-archs.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+version=$(go version|grep -Eo go[0-9]\.[0-9])
+
+if [ "$version" != "go1.9" ]; then
+    echo "Docker images are only generated for Go 1.9 and you have ${version}."
+    exit 0
+fi
+
+for params in "GOOS=linux GOARCH=amd64 EXT=" "GOOS=linux GOARCH=386" "GOOS=linux GOARCH=arm" "GOOS=darwin GOARCH=amd64" "GOOS=windows GOARCH=amd64 EXT=.exe" "GOOS=windows GOARCH=386"
+do
+  export $params
+  echo -n "Building for OS=${GOOS} and ARCH=${GOARCH} ."
+  go get && echo -n "."
+  go build -o ftpserver-${GOOS}-${GOARCH}${EXT}
+  echo .
+done

.docker-create-upload.sh

@@ -14,6 +14,9 @@ echo "Docker repo: ${DOCKER_REPO}:${TRAVIS_COMMIT}"
 
 DOCKER_NAME=${DOCKER_REPO}:${TRAVIS_COMMIT}
 
+# Creating the settings.toml file
+./ftpserver -conf-only -conf=settings.toml
+
 docker build -t ${DOCKER_NAME} .
 
 docker tag ${DOCKER_NAME} ${DOCKER_REPO}:travis-${TRAVIS_BUILD_NUMBER}

.travis.yml

@@ -15,11 +15,13 @@ script:
 - go test -race -v ./...
 - go build -v
 - ./.docker-create-upload.sh
+- ./.build-all-archs.sh
 deploy:
   provider: releases
   api_key:
     secure: K2o6tz2pw9OeIqVMu0sO01+9QFXA6GxG90PG3les4FOMqOUxyYZDPorMqlXpmAKD0mJWzP8PuWPSBfT9zSN3FkUHsjKA3mwvpab04rjFGr5ccmm90EfVttFyzAY45fokSA3fJo5T3iGjPbmg8Qtey2ST7X8dmuTt2i2kzv30cE2rmCE2wUfGWmq2r43ygaJBTjYtUCowxkDYsm/86qx0NB9SAD7LRDEWc62bcc0+CJZtRE5XXG4YhDJxDJWgMSEdwPt3i/c4NqYhOGCoLpBAh77mgHLJKf0NaThLa3Z6vVKog4/dBxJGSu+QvqA7jS6S6Pm72wWvcUqSPzL2TMk8zvD2KND9q6RPdTn1MuzvARn+IZOf5ndGgDjilcNgCXuC2adOzuo7rbecmTSkbzgux+RGRixr93p13Vn4Nt/WqLMq2ftqAv/gvmAi3OntShcKv9487zML/tDIxdvXXf7fmJDKl59eBKVddrY1GjzdcNVU8l+UoenrXIJh6+sTKcxLDVoqGb34T9QLWLYEK9bqGcmSHy9MFmjE/vh4vu8K8Fgrcpb/GHruRCqpFWIS2SxQaPawc8zVtBMXOvpnb8839Bi0HtdbInE6FynOUgHQ87UyFgwwB6v5YFAOgSpStpPqVX5O4UWZ2vNI1N83qSnxZfOmiayAA1Z7zlPPZTNq4rY=
-  file: ftpserver
+  file_glob: true
+  file: ftpserver-*
   skip_cleanup: true
   on:
     tags: true

Dockerfile

@@ -3,6 +3,6 @@
 FROM alpine:latest
 EXPOSE 2121-2200
 RUN mkdir -p /data
-COPY sample/conf/settings.toml /etc/ftpserver.conf
+COPY settings.toml /etc/ftpserver.conf
 COPY ftpserver /bin/ftpserver
 ENTRYPOINT [ "/bin/ftpserver", "-conf=/etc/ftpserver.conf", "-data=/data" ]

README.md

@@ -24,12 +24,13 @@ Note: this is a fork of [andrewarrow/paradise_ftp](https://github.com/andrewarro
  * Small memory footprint
  * Only relies on the standard library except for logging which uses [go-kit log](https://github.com/go-kit/kit/tree/master/log).
  * Supported extensions:
-   * [MDTM](https://tools.ietf.org/html/rfc3659#page-8) - File Modification Time
-   * [MLST](https://tools.ietf.org/html/rfc3659#page-23) - Directory listing for maching processing
-   * [REST](https://tools.ietf.org/html/rfc3659#page-13) - Restart of interrupted transfer
-   * [SIZE](https://tools.ietf.org/html/rfc3659#page-11) - Size of a string
    * [AUTH](https://tools.ietf.org/html/rfc2228#page-6) - Control session protection
    * [PROT](https://tools.ietf.org/html/rfc2228#page-8) - Transfer protection
+   * [MDTM](https://tools.ietf.org/html/rfc3659#page-8) - File Modification Time
+   * [SIZE](https://tools.ietf.org/html/rfc3659#page-11) - Size of a file
+   * [REST](https://tools.ietf.org/html/rfc3659#page-13) - Restart of interrupted transfer
+   * [MLST](https://tools.ietf.org/html/rfc3659#page-23) - Simple file listing for machine processing
+   * [MLSD](https://tools.ietf.org/html/rfc3659#page-23) - Directory listing for machine processing
 
 ## Quick test with docker
 
@@ -41,7 +42,7 @@ container (less than 15MB image, based on alpine):
 mkdir data
 
 # Starting the sample FTP server
-docker run -d -p 2121-2200:2121-2200 -v $(pwd)/data:/data fclairamb/ftpserver:travis-171
+docker run --rm -d -p 2121-2200:2121-2200 -v $(pwd)/data:/data fclairamb/ftpserver
 
 # Connecting to it and uploading a file
 ftp ftp://test:test@localhost:2121

main.go

@@ -3,6 +3,7 @@ package main
 
 import (
 	"flag"
+	"io/ioutil"
 	"os"
 	"os/signal"
 	"syscall"
@@ -18,9 +19,14 @@ var (
 )
 
 func main() {
+	// Arguments vars
+	var confFile, dataDir string
+	var onlyConf bool
+
 	// Parsing arguments
-	confFile := flag.String("conf", "sample/conf/settings.toml", "Configuration file")
-	dataDir := flag.String("data", "", "Data directory")
+	flag.StringVar(&confFile, "conf", "", "Configuration file")
+	flag.StringVar(&dataDir, "data", "", "Data directory")
+	flag.BoolVar(&onlyConf, "conf-only", false, "Only create the config")
 	flag.Parse()
 
 	// Setting up the logger
@@ -30,8 +36,27 @@ func main() {
 		"caller", log.DefaultCaller,
 	)
 
+	autoCreate := onlyConf
+
+	// The general idea here is that if you start it without any arg, you're probably doing a local quick&dirty run
+	// possibly on a windows machine, so we're better of just using a default file name and create the file.
+	if confFile == "" {
+		confFile = "settings.toml"
+		autoCreate = true
+	}
+
+	if autoCreate {
+		if _, err := os.Stat(confFile); err != nil && os.IsNotExist(err) {
+			level.Info(logger).Log("msg", "Not config file, creating one", "action", "conf_file.create", "confFile", confFile)
+
+			if err := ioutil.WriteFile(confFile, confFileContent(), 0644); err != nil {
+				level.Error(logger).Log("msg", "Couldn't create config file", "action", "conf_file.could_not_create", "confFile", confFile)
+			}
+		}
+	}
+
 	// Loading the driver
-	driver, err := sample.NewSampleDriver(*dataDir, *confFile)
+	driver, err := sample.NewSampleDriver(dataDir, confFile)
 
 	if err != nil {
 		level.Error(logger).Log("msg", "Could not load the driver", "err", err)
@@ -51,6 +76,11 @@ func main() {
 	go signalHandler()
 
 	// Blocking call, behaving similarly to the http.ListenAndServe
+	if onlyConf {
+		level.Error(logger).Log("msg", "Only creating conf")
+		return
+	}
+
 	if err := ftpServer.ListenAndServe(); err != nil {
 		level.Error(logger).Log("msg", "Problem listening", "err", err)
 	}
@@ -67,3 +97,52 @@ func signalHandler() {
 		}
 	}
 }
+
+func confFileContent() []byte {
+	str := `# ftpserver configuration file
+#
+# These are all the config parameters with their default values. If not present,
+
+# Max number of control connections to accept
+# max_connections = 0
+max_connections = 10
+
+[server]
+# Address to listen on
+# listen_host = "0.0.0.0"
+
+# Port to listen on
+# listen_port = 2121
+
+# Public host to expose in the passive connection
+# public_host = ""
+
+# Idle timeout time
+# idle_timeout = 900
+
+# Data port range from 10000 to 15000
+# [dataPortRange]
+# start = 2122
+# end = 2200
+
+[server.dataPortRange]
+start = 2122
+end = 2200
+
+[[users]]
+user="fclairamb"
+pass="floflo"
+dir="shared"
+
+[[users]]
+user="test"
+pass="test"
+dir="shared"
+
+[[users]]
+user="mcardon"
+pass="marmar"
+dir="marie"
+`
+	return []byte(str)
+}