embulk-input-sftp 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9e0c79f27fccf85103bbbfca4fe4230e16e564d
-  data.tar.gz: 53b679a39dfddb526e44397781d6ef240652823f
+  metadata.gz: 9c33467b7d6bc31212b8814d3705f257ffd093ce
+  data.tar.gz: 1e7004637de8d3c897743eaebf6084356ef8b1eb
 SHA512:
-  metadata.gz: fe0c37dad8a9b545d194b01b11b34a8cb745bcc48c3b85031b30caf839d40d2f5a32ccf4cfea976a85388333c0c7417b876a34aa49fb18cd8457fe6793eee9e8
-  data.tar.gz: 1122f60a71055f2e390b96c5cc2fdd0b00c36607ccaf53d94301cfa21d3cf8dc09f6a0831de123c1b77942ffddc73b07c1db2f303a24ab954b6d9e38a83ce252
+  metadata.gz: 3bc6eeec14c63504e2f74096e9f4e25fab4e709ad982cab68bf817f6c1b03da9c76fcdd2753c4324b026f9d22bfb5ce0ac538acfc91a3916aeca54a4233741ec
+  data.tar.gz: 2675cda9d5683cb89a742e39ee9c418778670d4bf81845db215ac2c5e4898c46888c2fdd411d19a8313664870e68ba970059fa184654a23ad00ad2728f76ef08

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.10 - 2018-04-26
+* [maintenance] Add validation for "host" and "proxy.host" [#31](https://github.com/embulk/embulk-input-sftp/pull/31)
+
 ## 0.2.9 - 2018-04-20
 * [maintenance] Throw ConfigException when process fails with "com.jcraft.jsch.JSchException: Auth fail" [#29](https://github.com/embulk/embulk-input-sftp/pull/29) 
 

data/build.gradle

@@ -16,7 +16,7 @@ configurations {
 }
 
 group = "org.embulk.input.sftp"
-version = "0.2.9"
+version = "0.2.10"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7

data/src/main/java/org/embulk/input/sftp/SftpFileInput.java

@@ -3,7 +3,6 @@ package org.embulk.input.sftp;
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
-import com.jcraft.jsch.JSchException;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.vfs2.FileObject;
@@ -138,6 +137,20 @@ public class SftpFileInput
         return fsOptions;
     }
 
+    public static void validateHost(PluginTask task)
+    {
+        if (task.getHost().contains("%s")) {
+            throw new ConfigException("'host' can't contain spaces");
+        }
+        getSftpFileUri(task, "/");
+
+        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");
+            }
+        }
+    }
+
     public static String getSftpFileUri(PluginTask task, String path)
     {
         try {
@@ -146,7 +159,9 @@ public class SftpFileInput
             return uri;
         }
         catch (URISyntaxException ex) {
-            throw new ConfigException(ex);
+            String message = String.format("URISyntaxException was thrown: Illegal character in sftp://%s:******@%s:%s%s",
+                    task.getUser(), task.getHost(), task.getPort(), path);
+            throw new ConfigException(message);
         }
     }
 
@@ -247,6 +262,9 @@ public class SftpFileInput
                         @Override
                         public boolean isRetryableException(Exception exception)
                         {
+                            if (exception instanceof ConfigException) {
+                                return false;
+                            }
                             return true;
                         }
 
@@ -270,7 +288,7 @@ public class SftpFileInput
                         {
                             // Generally, Auth fail should be caught and throw ConfigException when first retry. But this library is a bit unstable.
                             // So we throw ConfigException after all retries are completed
-                            if (lastException.getCause().getCause() != null) {
+                            if (lastException.getCause() != null && lastException.getCause().getCause() != null) {
                                 Throwable cause = lastException.getCause().getCause();
                                 if (cause.getMessage().contains("Auth fail")) {
                                     throw new ConfigException(lastException);

data/src/main/java/org/embulk/input/sftp/SftpFileInputPlugin.java

@@ -17,6 +17,7 @@ public class SftpFileInputPlugin
     public ConfigDiff transaction(ConfigSource config, FileInputPlugin.Control control)
     {
         PluginTask task = config.loadConfig(PluginTask.class);
+        SftpFileInput.validateHost(task);
 
         // list files recursively
         task.setFiles(SftpFileInput.listFilesByPrefix(task));

data/src/test/java/org/embulk/input/sftp/TestSftpFileInputPlugin.java

@@ -162,6 +162,20 @@ public class TestSftpFileInputPlugin
         runner.transaction(config, new Control());
     }
 
+    @Test(expected = ConfigException.class)
+    public void checkDefaultValuesHostIsInvalid()
+    {
+        ConfigSource config = Exec.newConfigSource()
+                .set("host", HOST + " ")
+                .set("user", null)
+                .set("password", PASSWORD)
+                .set("path_prefix", "")
+                .set("last_path", "")
+                .set("parser", parserConfig(schemaConfig()));
+
+        runner.transaction(config, new Control());
+    }
+
     @Test
     public void testResume()
     {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-sftp
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Satoshi Akama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-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
@@ -72,7 +72,7 @@ files:
 - classpath/commons-io-2.6.jar
 - classpath/commons-logging-1.2.jar
 - classpath/commons-vfs2-2.2.jar
-- classpath/embulk-input-sftp-0.2.9.jar
+- classpath/embulk-input-sftp-0.2.10.jar
 - classpath/jsch-0.1.54.jar
 homepage: https://github.com/embulk/embulk-input-sftp
 licenses: