Passive port allocation fix + docker integration improvements

Author: Florent Clairambault

.github/workflows/docker-test.yml

@@ -13,7 +13,7 @@ jobs:
       ftpserver:
         image: ftpserver/ftpserver
         ports:
-          - 2121:2121
+          - 2121-2200:2121-2200
 
     steps:
       - name: Run sample
@@ -26,22 +26,21 @@ jobs:
           sudo apt-get install netcat curl -y
 
           # Getting a file
-          curl -o file.bin https://github.com/fclairamb/ftpserver/releases/download/v0.5/ftpserver-linux-amd64
+          curl https://placekitten.com/2048/2048 -o kitty.jpg
 
           # Waiting for server to be ready
           while ! nc -z localhost ${SERVER_PORT} </dev/null; do sleep 1; done
 
           # Upload a file
-          curl -P - -T file.bin ftp://test:test@localhost:2121/remote.bin
+          curl -P - -T kitty.jpg ftp://test:test@localhost:${SERVER_PORT}/remote.jpg
 
           # Download a file
-          curl -P - ftp://test:test@localhost:2121/remote.bin -o remote.bin
+          curl -P - ftp://test:test@localhost:2121/remote.jpg -o remote.jpg
 
           # Checking that the output file exists
-          if [ ! -f remote.bin ]; then
+          if [ ! -f remote.jpg ]; then
             exit 1
           fi
 
           # Comparing file contents
-          diff file.bin remote.bin
-
+          diff kitty.jpg remote.jpg

Dockerfile

@@ -4,5 +4,4 @@ FROM alpine:3.11.6
 EXPOSE 2121-2200
 RUN mkdir -p /data
 COPY ftpserver /bin/ftpserver
-COPY settings_test.toml /etc/ftpserver_test.toml
 ENTRYPOINT [ "/bin/ftpserver", "-data=/data" ]

README.md

@@ -68,15 +68,11 @@ mkdir -p data
 docker run --rm -d -p 2121-2200:2121-2200 -v $(pwd)/data:/data fclairamb/ftpserver
 
 # Download some file
-if [ ! -f file.bin ]; then
-    wget -O file.bin.tmp https://github.com/fclairamb/ftpserver/releases/download/v0.5/ftpserver-linux-amd64 && mv file.bin.tmp file.bin
+if [ ! -f kitty.jpg ]; then
+    curl -o kitty.jpg.tmp https://placekitten.com/2048/2048 && mv kitty.jpg.tmp kitty.jpg
 fi
 
-# Connecting to it and uploading a file
-ftp ftp://test:test@localhost:2121
-put file.bin
-quit
-ls -lh data/file.bin
+curl -v -T kitty.bin ftp://test:test@localhost:2121/
 ```
 
 ## The driver

local-docker-test.sh

@@ -4,6 +4,9 @@ docker rm -f ftpserver ||:
 
 GOOS=linux GOARCH=amd64 go build
 docker build . -t test
-docker run --name ftpserver -p 2121:2121 -p 2122:2122 -p 2123:2123 test -conf /etc/ftpserver_test.toml &
-sleep 1
-curl -v -T main.go ftp://test:test@localhost:2121/
+if [ ! -f kitty.jpg ]; then
+  curl -o kitty.jpg.tmp https://placekitten.com/2048/2048 && mv kitty.jpg.tmp kitty.jpg
+fi
+docker run --name ftpserver -p 2121-2200:2121-2200 test &
+while ! nc -z localhost 2121 </dev/null; do sleep 1; done
+curl -v -T kitty.jpg ftp://test:test@localhost:2121/

main.go

@@ -102,8 +102,6 @@ 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
@@ -114,7 +112,7 @@ max_connections = 10
 # listen_addr="0.0.0.0:2121"
 
 # Public host to expose in the passive connection
-# public_host = ""
+public_host = "127.0.0.1"
 
 # Idle timeout time
 # idle_timeout = 900

sample/sample_driver.go

@@ -313,8 +313,11 @@ func (driver *ClientDriver) OpenFile(cc server.ClientContext, path string, flag
 	if (flag & os.O_WRONLY) != 0 {
 		flag |= os.O_CREATE
 		if (flag & os.O_APPEND) == 0 {
-			if err := os.Remove(path); err != nil {
-				fmt.Println("Problem removing file", path, "err:", err)
+			_, err := os.Stat(path)
+			if !os.IsNotExist(err) {
+				if err := os.Remove(path); err != nil {
+					fmt.Println("Problem removing file", path, "err:", err)
+				}
 			}
 		}
 	}