Merge pull request #218 from bcgov/feature/upgradeToSftp6

Feature/upgrade to sftp6
bcgov · Feb 7, 2024 · fb35cdc · fb35cdc
2 parents ca19bea + 4c519bc
commit fb35cdc
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 40 deletions.
diff --git a/jrcc-access-api/pom.xml b/jrcc-access-api/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>ca.bc.gov.open</groupId>
 	<artifactId>jrcc-document-api</artifactId>
-	<version>1.3.2</version>
+	<version>1.3.3</version>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>

diff --git a/jrcc-access-spring-boot-autoconfigure/pom.xml b/jrcc-access-spring-boot-autoconfigure/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>ca.bc.gov.open</groupId>
 	<artifactId>jrcc-access-spring-boot-autoconfigure</artifactId>
-	<version>1.3.2</version>
+	<version>1.3.3</version>
 	<name>jrcc-access-spring-boot-autoconfigure</name>
 	<description>Demo project for Spring Boot</description>
 
@@ -100,12 +100,12 @@
 		<dependency>
 			<groupId>ca.bc.gov.open</groupId>
 			<artifactId>jrcc-document-access-libs</artifactId>
-			<version>1.3.2</version>
+			<version>1.3.3</version>
 		</dependency>
 		<dependency>
 			<groupId>ca.bc.gov.open</groupId>
 			<artifactId>jrcc-document-api</artifactId>
-			<version>1.3.2</version>
+			<version>1.3.3</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jcraft</groupId>

diff --git a/...src/main/java/ca/bc/gov/open/jrccaccess/autoconfigure/plugins/sftp/AutoConfiguration.java b/...src/main/java/ca/bc/gov/open/jrccaccess/autoconfigure/plugins/sftp/AutoConfiguration.java
@@ -71,31 +71,28 @@ public class AutoConfiguration {
 
     public AutoConfiguration(SftpInputProperties sftpInputProperties) {
         this.properties = sftpInputProperties;
-        logger.info("SFTP Configuration: Host => [{}]", this.properties.getHost());
-        logger.info("SFTP Configuration: Port => [{}]", this.properties.getPort());
-        logger.info("SFTP Configuration: Username => [{}]", this.properties.getUsername());
-        logger.info("SFTP Configuration: Remote Directory => [{}]", this.properties.getRemoteDirectory());
-        logger.info("SFTP Configuration: Filter Pattern => [{}]", this.properties.getFilterPattern());
-        logger.info("SFTP Configuration: Cron => [{}]", this.properties.getCron());
-        logger.info("SFTP Configuration: Max Message Per Poll => [{}]", this.properties.getMaxMessagePerPoll());
-        logger.info("SFTP Configuration: Known Host File => [{}]", this.properties.getKnownHostFile());
+        logger.debug("SFTP Configuration: Host => [{}]", this.properties.getHost());
+        logger.debug("SFTP Configuration: Port => [{}]", this.properties.getPort());
+        logger.debug("SFTP Configuration: Username => [{}]", this.properties.getUsername());
+        logger.debug("SFTP Configuration: Remote Directory => [{}]", this.properties.getRemoteDirectory());
+        logger.debug("SFTP Configuration: Filter Pattern => [{}]", this.properties.getFilterPattern());
+        logger.debug("SFTP Configuration: Cron => [{}]", this.properties.getCron());
+        logger.debug("SFTP Configuration: Max Message Per Poll => [{}]", this.properties.getMaxMessagePerPoll());
+        logger.debug("SFTP Configuration: Known Host File => [{}]", this.properties.getKnownHostFile());
     }
 
     @Bean
     public SessionFactory<SftpClient.DirEntry> sftpSessionFactory() throws InvalidConfigException, IOException {
 
-
         SshClient sshClient = SshClient.setUpDefaultClient();
         sshClient.setKeyExchangeFactories(NamedFactory.setUpTransformedFactories(
                 false,
                 BuiltinDHFactories.VALUES,
                 ClientBuilder.DH2KEX
         ));
-
-        boolean isAllowUnknownKeys = properties.isAllowUnknownKeys();
-
         sshClient.setSignatureFactories(new ArrayList<>(BuiltinSignatures.VALUES));
 
+        boolean isAllowUnknownKeys = properties.isAllowUnknownKeys();
         ServerKeyVerifier serverKeyVerifier =
                 isAllowUnknownKeys ? AcceptAllServerKeyVerifier.INSTANCE : RejectAllServerKeyVerifier.INSTANCE;
 
@@ -108,11 +105,7 @@ public SessionFactory<SftpClient.DirEntry> sftpSessionFactory() throws InvalidCo
             if (!knownHostFile.exists())
                 throw new KnownHostFileNotFoundException("Cannot find known_hosts file when allow-unknown-keys is false.");
 
-            logger.info("SFTP Known Hosts");
             Resource resource = resourceLoader.getResource("file:"+properties.getKnownHostFile());
-            logger.info("SFTP Known Hosts: length = {}", resource.contentLength());
-            logger.info("SFTP Known Hosts: content = {}", resource.getContentAsString(Charset.defaultCharset()));
-
             serverKeyVerifier = new ResourceKnownHostsServerKeyVerifier(resource);
         }
 
@@ -123,10 +116,7 @@ public SessionFactory<SftpClient.DirEntry> sftpSessionFactory() throws InvalidCo
             if(!(new File(properties.getSshPrivateKey()).exists()))
                 throw new KnownHostFileNotDefinedException("Cannot find known_hosts file private key file. ");
 
-            logger.info("SFTP Configuration: setPrivateKey");
             Resource resource = resourceLoader.getResource("file:"+properties.getSshPrivateKey());;
-            logger.info("SFTP Configuration: privateKey - length {}", resource.contentLength());
-            logger.info("SFTP Configuration: privateKey - content {}", resource.getContentAsString(Charset.defaultCharset()));
 
             IoResource<Resource> privateKeyResource =
                     new AbstractIoResource<>(Resource.class, resource) {
@@ -155,9 +145,7 @@ public InputStream openInputStream() throws IOException {
         factory.setPort(properties.getPort());
         factory.setUser(properties.getUsername());
 
-        CachingSessionFactory<SftpClient.DirEntry> cachingSessionFactory = new CachingSessionFactory<>(factory);
-        this.properties.getServerAliveInterval().ifPresent(timeout -> cachingSessionFactory.setSessionWaitTimeout(timeout));
-        return cachingSessionFactory;
+        return factory;
     }
 
     @Bean

diff --git a/...c/main/java/ca/bc/gov/open/jrccaccess/autoconfigure/plugins/sftp/SftpInputProperties.java b/...c/main/java/ca/bc/gov/open/jrccaccess/autoconfigure/plugins/sftp/SftpInputProperties.java
@@ -115,12 +115,6 @@ public void setMaxMessagePerPoll(String maxMessagePerPoll) {
     }
 
     public String getSshPrivateKey() {
-        logger.info("getSshPrivateKey sshPrivateKey = {}", this.sshPrivateKey);
-        logger.info("getSshPrivateKey from System.getenv(SSH_PRIVATE_KEY): {}", System.getenv("SSH_PRIVATE_KEY"));
-        logger.info("getSshPrivateKey from System.getenv(SFTP_HOST): {}", System.getenv("SFTP_HOST"));
-        logger.info("getSshPrivateKey from System.getenv(SFTP_KNOWN_HOST_FILE): {}", System.getenv("SFTP_KNOWN_HOST_FILE"));
-        if (StringUtils.isBlank(this.sshPrivateKey)) { logger.info("getSshPrivateKey return null"); return null;}
-        logger.info("getSshPrivateKey return not null {}", this.sshPrivateKey);
         return this.sshPrivateKey;
     }
 

diff --git a/jrcc-access-spring-boot-sample-app/pom.xml b/jrcc-access-spring-boot-sample-app/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>ca.bc.gov.open</groupId>
 	<artifactId>jrcc-access-spring-boot-sample-app</artifactId>
-	<version>1.3.2</version>
+	<version>1.3.3</version>
 	<name>jrcc-access-spring-boot-sample-app</name>
 	<description>Demo project for Spring Boot</description>
 
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>ca.bc.gov.open</groupId>
 			<artifactId>jrcc-access-spring-boot-starter</artifactId>
-			<version>1.3.2</version>
+			<version>1.3.3</version>
 		</dependency>
 
 	</dependencies>

diff --git a/jrcc-access-spring-boot-starter/pom.xml b/jrcc-access-spring-boot-starter/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>ca.bc.gov.open</groupId>
 	<artifactId>jrcc-access-spring-boot-starter</artifactId>
-	<version>1.3.2</version>
+	<version>1.3.3</version>
 	<name>jrcc-access-spring-boot-starter</name>
 	<description>Demo project for Spring Boot</description>
 
@@ -38,7 +38,7 @@
 		<dependency>
 			<groupId>ca.bc.gov.open</groupId>
 			<artifactId>jrcc-access-spring-boot-autoconfigure</artifactId>
-			<version>1.3.2</version>
+			<version>1.3.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>ca.bc.gov.open</groupId>
 			<artifactId>jrcc-document-access-libs</artifactId>
-			<version>1.3.2</version>
+			<version>1.3.3</version>
 		</dependency>
 	</dependencies>
 

diff --git a/jrcc-document-access-libs/pom.xml b/jrcc-document-access-libs/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>ca.bc.gov.open</groupId>
 		<artifactId>document-access</artifactId>
-		<version>1.3.2</version>
+		<version>1.3.3</version>
 	</parent>
 
 
 	<groupId>ca.bc.gov.open</groupId>
 	<artifactId>jrcc-document-access-libs</artifactId>
-	<version>1.3.2</version>
+	<version>1.3.3</version>
 	<packaging>jar</packaging>
 
 	<name>jrcc-document-access-libs</name>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>ca.bc.gov.open</groupId>
 	<artifactId>document-access</artifactId>
-	<version>1.3.2</version>
+	<version>1.3.3</version>
 
 	<name>document-access</name>
 	<packaging>pom</packaging>