embulk-output-sftp 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b60e9f9177d328ee62002c1ebdcb195defa7eb1
-  data.tar.gz: ca9c05c13f8095ca39e4b951c62e6179054cc970
+  metadata.gz: 51708045da5829301daa1d1d816688c262b6e932
+  data.tar.gz: 3fedac6d7f98845a1278beaba39de3cfd0722ff4
 SHA512:
-  metadata.gz: 08a86e8657aee83ccb8b16c465ae9cfdb12f17351ee2f546199c3f087b4c589214847f66c293d846f1e582e85ccef2683c82254c96f403b8c82ba82a4a7a8426
-  data.tar.gz: 04b6d71aea96667779340171de9e78c0a25b84bcdd8758def6f7c99e628cdd7f83121d402d3294ea6e30621fab057f60a4926f2bb4e3487dd30f5b98f7650e9c
+  metadata.gz: de3417dd58045d5c8bccc8b78896f1134bb320c0637207599ac974dec2032cb1a609244d95066008199f37194129c3fbe5d2d1b1dcd07a7996717669b08aa3c2
+  data.tar.gz: 8e4ca5ae5bc7fddc25ba4a1bdd26e29a2dd07488477ee5f166592bb8fc957276b669c5fd0b158a98c1f084de9cd87c45a50c806c644c306a9a018b121ff90c33

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+0.1.9 (2018-04-26)
+- Enhance: Add validation for "host" and "proxy.host"
+  - https://github.com/embulk/embulk-output-sftp/pull/48
 0.1.8 (2018-03-20)
 - Change input stream buffer size to 32MB to reduce number of storage reads
   - https://github.com/embulk/embulk-output-sftp/pull/47

data/build.gradle

@@ -17,7 +17,7 @@ configurations {
 }
 
 group = "org.embulk.output.sftp"
-version = "0.1.8"
+version = "0.1.9"
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 

data/src/main/java/org/embulk/output/sftp/SftpFileOutputPlugin.java

@@ -81,6 +81,16 @@ public class SftpFileOutputPlugin
             FileOutputPlugin.Control control)
     {
         PluginTask task = config.loadConfig(PluginTask.class);
+        SftpUtils sftpUtils = null;
+        try {
+            sftpUtils = new SftpUtils(task);
+            sftpUtils.validateHost(task);
+        }
+        finally {
+            if (sftpUtils != null) {
+                sftpUtils.close();
+            }
+        }
 
         // retryable (idempotent) output:
         // return resume(task.dump(), taskCount, control);

data/src/main/java/org/embulk/output/sftp/SftpUtils.java

@@ -35,6 +35,7 @@ public class SftpUtils
     private final DefaultFileSystemManager manager;
     private final FileSystemOptions fsOptions;
     private final String userInfo;
+    private final String user;
     private final String host;
     private final int port;
     private final int maxConnectionRetry;
@@ -127,6 +128,7 @@ public class SftpUtils
     {
         this.manager = initializeStandardFileSystemManager();
         this.userInfo = initializeUserInfo(task);
+        this.user = task.getUser();
         this.fsOptions = initializeFsOptions(task);
         this.host = task.getHost();
         this.port = task.getPort();
@@ -182,6 +184,9 @@ public class SftpUtils
                         @Override
                         public boolean isRetryableException(Exception exception)
                         {
+                            if (exception instanceof ConfigException) {
+                                return false;
+                            }
                             return true;
                         }
 
@@ -264,14 +269,28 @@ public class SftpUtils
         }
     }
 
+    public void validateHost(PluginTask task)
+    {
+        if (task.getHost().contains("%s")) {
+            throw new ConfigException("'host' can't contain spaces");
+        }
+        getSftpFileUri("/");
+
+        if (task.getProxy().isPresent() && task.getProxy().get().getHost().isPresent()) {
+            if (task.getProxy().get().getHost().get().contains("%s")) {
+                throw new ConfigException("'proxy.host' can't contains spaces");
+            }
+        }
+    }
+
     private URI getSftpFileUri(String remoteFilePath)
     {
         try {
             return new URI("sftp", userInfo, host, port, remoteFilePath, null, null);
         }
         catch (URISyntaxException e) {
-            logger.error(e.getMessage());
-            throw new ConfigException(e);
+            String message = String.format("URISyntaxException was thrown: Illegal character in sftp://%s:******@%s:%s%s", user, host, port, remoteFilePath);
+            throw new ConfigException(message);
         }
     }
 

data/src/test/java/org/embulk/output/sftp/TestSftpFileOutputPlugin.java

@@ -247,6 +247,37 @@ public class TestSftpFileOutputPlugin
         }
     }
 
+    @Test(expected = ConfigException.class)
+    public void testInvalidHost()
+    {
+        // setting embulk config
+        final String pathPrefix = "/test/testUserPassword";
+        String configYaml = "" +
+                "type: sftp\n" +
+                "host: " + HOST + "\n" +
+                "user: " + USERNAME + "\n" +
+                "path_prefix: " + pathPrefix + "\n" +
+                "file_ext: txt\n" +
+                "formatter:\n" +
+                "  type: csv\n" +
+                "  newline: CRLF\n" +
+                "  newline_in_field: LF\n" +
+                "  header_line: true\n" +
+                "  charset: UTF-8\n" +
+                "  quote_policy: NONE\n" +
+                "  quote: \"\\\"\"\n" +
+                "  escape: \"\\\\\"\n" +
+                "  null_string: \"\"\n" +
+                "  default_timezone: 'UTC'";
+
+        ConfigSource config = getConfigFromYaml(configYaml);
+        config.set("host", HOST + " ");
+        PluginTask task = config.loadConfig(PluginTask.class);
+
+        SftpUtils utils = new SftpUtils(task);
+        utils.validateHost(task);
+    }
+
     @Test
     public void testConfigValuesIncludingDefault()
     {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-sftp
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Civitaspo
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +78,7 @@ files:
 - classpath/commons-io-2.6.jar
 - classpath/commons-logging-1.2.jar
 - classpath/commons-vfs2-2.2.jar
-- classpath/embulk-output-sftp-0.1.8.jar
+- classpath/embulk-output-sftp-0.1.9.jar
 - classpath/jsch-0.1.54.jar
 homepage: https://github.com/embulk/embulk-output-sftp
 licenses: