From 0d29b03dcedfa060980a90e20b7559f20b31700f Mon Sep 17 00:00:00 2001
From: Adrian Malacoda <malacoda@monarch-pass.net>
Date: Sun, 13 Dec 2020 04:18:51 -0600
Subject: [PATCH 1/4] remove unused imports

---
 desktop/src/main/java/net/monarchpass/piecannon/App.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/desktop/src/main/java/net/monarchpass/piecannon/App.java b/desktop/src/main/java/net/monarchpass/piecannon/App.java
index aaa0c00..3c5a15f 100644
--- a/desktop/src/main/java/net/monarchpass/piecannon/App.java
+++ b/desktop/src/main/java/net/monarchpass/piecannon/App.java
@@ -4,15 +4,11 @@ import java.net.URI;
 
 import java.io.File;
 import java.util.List;
-import java.util.ArrayList;
-
 import org.freedesktop.BaseDirectory;
 
 import lombok.extern.java.Log;
 import java.util.logging.Level;
 
-import net.monarchpass.piecannon.util.ServerFactory;
-
 @Log
 public class App {
     public static void main (final String... args) throws Exception {

From 77cf4f58203829b941e914d5c7461b1da3df9573 Mon Sep 17 00:00:00 2001
From: Adrian Malacoda <malacoda@monarch-pass.net>
Date: Thu, 5 Nov 2020 03:56:08 -0600
Subject: [PATCH 2/4] desktop/piecannon: capture output of mvn command so we
 can display it to the user, capture error code so we can pass it upstream

(cherry picked from commit 2f7761bac7fddf857bb31b6db94147e0496153dd)
---
 desktop/piecannon | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/desktop/piecannon b/desktop/piecannon
index 6650dbd..00989be 100755
--- a/desktop/piecannon
+++ b/desktop/piecannon
@@ -8,5 +8,13 @@ STUB_POM="<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://w
 STUB_POM_FILE=/tmp/pc.xml
 echo $STUB_POM > $STUB_POM_FILE
 
-RESULT=$(mvn -f $STUB_POM_FILE -B exec:java -Dexec.mainClass=$PC_CLASS -Dexec.arguments=$1 -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN | tail -n 1)
+OUTPUT=$(mvn -f $STUB_POM_FILE -B exec:java -Dexec.mainClass=$PC_CLASS -Dexec.arguments=$1 -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN)
+EXEC_RESULT=$?
+echo "$OUTPUT"
+
+if [ $EXEC_RESULT != 0 ]; then
+    exit $EXEC_RESULT;
+fi
+
+RESULT=$(echo "$OUTPUT" | tail -n 1)
 xdg-open $RESULT

From cf920c57c6cf4033c4d759727463e5bb4747f120 Mon Sep 17 00:00:00 2001
From: Adrian Malacoda <malacoda@monarch-pass.net>
Date: Sun, 13 Dec 2020 06:26:04 -0600
Subject: [PATCH 3/4] lib: add FtpServer type

---
 README.md                                     |  2 +-
 .../monarchpass/piecannon/impl/FtpServer.java | 45 +++++++++++++++++++
 .../piecannon/util/ServerFactory.java         | 25 ++++++++++-
 servers.example.json                          |  1 +
 4 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 lib/src/main/java/net/monarchpass/piecannon/impl/FtpServer.java

diff --git a/README.md b/README.md
index be754ff..db521fb 100644
--- a/README.md
+++ b/README.md
@@ -28,4 +28,4 @@ TODO
 ## How to use
 Place a `servers.json` in the Pie Cannon data directory. For GNU/Linux this is `XDG_DATA_HOME` (by default this would be `~/.local/share/piecannon`) (create this directory if it does not exist. For Android this would be the app's "externalFilesDir" (probably something like `Android/data/net.monarchpass.piecannon/files` - the app will tell you when you launch it). See `servers.example.json` for an example of such a file. Whenever you initiate a file upload, Pie Cannon will select one of your defined servers at random and upload the file.
 
-For SFTP servers (the only supported type as of now), the `path` is relative to your home directory and should be where `url` points to. i.e. a file uploaded to `path` should be downloadable at `url`. In the future Pie Cannon should be able to get SSH credentials from your agent so you won't need to put a password in this file.
+For FTP/SFTP servers (the only supported types as of now), the `path` is relative to your home directory and should be where `url` points to. i.e. a file uploaded to `path` should be downloadable at `url`. In the future Pie Cannon should be able to get SSH credentials from your agent so you won't need to put a password in this file.
diff --git a/lib/src/main/java/net/monarchpass/piecannon/impl/FtpServer.java b/lib/src/main/java/net/monarchpass/piecannon/impl/FtpServer.java
new file mode 100644
index 0000000..4340edf
--- /dev/null
+++ b/lib/src/main/java/net/monarchpass/piecannon/impl/FtpServer.java
@@ -0,0 +1,45 @@
+package net.monarchpass.piecannon.impl;
+
+import net.monarchpass.piecannon.Server;
+import com.google.common.io.ByteSource;
+import com.google.common.io.ByteStreams;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLConnection;
+
+import lombok.Data;
+
+@Data
+public class FtpServer implements Server {
+    private final String label;
+    private final String host;
+    private final int port;
+    private final String username;
+    private final String password;
+    private final String path;
+    private final URI uri;
+    
+    public URI upload (String name, ByteSource source) {
+        name = name.replace(" ", "%20");
+        
+        try {
+            final URI target = URI.create(uri.toString() + "/" + name);
+            final URL ftpUrl = new URL(String.format("ftp://%s:%s@%s:%d/%s/%s;type=i", username, password, host, port, path, name));
+            final URLConnection connection = ftpUrl.openConnection();
+            
+            try (InputStream in = source.openStream()) {
+                try (OutputStream out = connection.getOutputStream()) {
+                    ByteStreams.copy(in, out);
+                }
+            }
+            
+            return target;
+        } catch (final IOException exception) {
+            throw new RuntimeException(exception);
+        }
+    }
+}
diff --git a/lib/src/main/java/net/monarchpass/piecannon/util/ServerFactory.java b/lib/src/main/java/net/monarchpass/piecannon/util/ServerFactory.java
index aa67bf0..a028a30 100644
--- a/lib/src/main/java/net/monarchpass/piecannon/util/ServerFactory.java
+++ b/lib/src/main/java/net/monarchpass/piecannon/util/ServerFactory.java
@@ -6,11 +6,19 @@ import java.util.function.Function;
 
 import com.google.gson.JsonObject;
 import net.monarchpass.piecannon.Server;
+import net.monarchpass.piecannon.impl.FtpServer;
 import net.monarchpass.piecannon.impl.SftpServer;
 
 public class ServerFactory implements Function<JsonObject, Server> {
     public Server apply (final JsonObject object) {
-        return makeSftpServer(object);
+        final String type = object.getAsJsonPrimitive("type").getAsString();
+        if (type.equalsIgnoreCase("ftp")) {
+            return makeFtpServer(object);
+        } else if (type.equalsIgnoreCase("sftp")) {
+            return makeSftpServer(object);
+        }
+        
+        throw new IllegalArgumentException("Invalid server type: " + type);
     }
     
     private Server makeSftpServer (final JsonObject object) {
@@ -27,4 +35,19 @@ public class ServerFactory implements Function<JsonObject, Server> {
             path, URI.create(url)
         );
     }
+    
+    private Server makeFtpServer (final JsonObject object) {
+        final String host = object.getAsJsonPrimitive("host").getAsString();
+        final String label = object.has("label") ? object.getAsJsonPrimitive("label").getAsString() : host;
+        final int port = object.has("port") ? object.getAsJsonPrimitive("port").getAsInt() : 21;
+        final String username = object.getAsJsonPrimitive("username").getAsString();
+        final String password = object.getAsJsonPrimitive("password").getAsString();
+        final String path = object.getAsJsonPrimitive("path").getAsString();
+        final String url = object.getAsJsonPrimitive("url").getAsString();
+        
+        return new FtpServer(
+            label, host, port, username, password,
+            path, URI.create(url)
+        );
+    }    
 }
diff --git a/servers.example.json b/servers.example.json
index 2579c1b..c4d4a1b 100644
--- a/servers.example.json
+++ b/servers.example.json
@@ -1,4 +1,5 @@
 [{
+    "type": "ftp",
     "host": "example.com",
     "username": "username",
     "password": "password",

From 0ffe4627107b1612c5eeb5811835d865e257f990 Mon Sep 17 00:00:00 2001
From: Adrian Malacoda <malacoda@monarch-pass.net>
Date: Sun, 13 Dec 2020 07:32:54 -0600
Subject: [PATCH 4/4] desktop: add --test command to test all defined servers

---
 .../java/net/monarchpass/piecannon/App.java   | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/desktop/src/main/java/net/monarchpass/piecannon/App.java b/desktop/src/main/java/net/monarchpass/piecannon/App.java
index 3c5a15f..42743ed 100644
--- a/desktop/src/main/java/net/monarchpass/piecannon/App.java
+++ b/desktop/src/main/java/net/monarchpass/piecannon/App.java
@@ -23,16 +23,22 @@ public class App {
             log.log(Level.SEVERE, "No servers defined, please define at least one in {0}", serversJson);
             System.exit(1);
         }
-        
-        final Server server = cannon.selectServer();
-        log.log(Level.INFO, "Randomly selected server: {0}", server.getLabel());
-        
+
         if (args.length == 0) {
             log.log(Level.SEVERE, "No filename provided");
             System.exit(1);
         }
         
-        final File source = new File(args[0]);
+        final Server server = cannon.selectServer();
+        log.log(Level.INFO, "Randomly selected server: {0}", server.getLabel());
+        
+        final String arg = args[0];
+        if (arg.equals("--test")) {
+            testServers(servers);
+            return;
+        }
+        
+        final File source = new File(arg);
         if (!source.exists()) {
             log.log(Level.SEVERE, "No such file: {0}", source);
             System.exit(1);
@@ -42,6 +48,15 @@ public class App {
         System.out.println(result);
     }
  
+    public static void testServers (final List<Server> servers) {
+        log.log(Level.INFO, "Testing all defined servers");
+        for (final Server server : servers) {
+            log.log(Level.INFO, "{0} {1}: {2}", new Object[] {
+                server.getClass().getSimpleName(), server.getLabel(), PieCannon.testServer(server)
+            });
+        }
+    }
+ 
     public static File getServersJson () {
         return new File(getDataDirectory(), "servers.json");
     }