From 37d5f243854153e777da2e6689d6dc47cd2c1b84 Mon Sep 17 00:00:00 2001 From: jianming tu Date: Fri, 26 Jan 2024 09:08:08 -0800 Subject: [PATCH] revert back to last commit --- .../autoconfigure/plugins/sftp/AutoConfiguration.java | 2 +- .../autoconfigure/plugins/sftp/SftpInputProperties.java | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/jrcc-access-spring-boot-autoconfigure/src/main/java/ca/bc/gov/open/jrccaccess/autoconfigure/plugins/sftp/AutoConfiguration.java b/jrcc-access-spring-boot-autoconfigure/src/main/java/ca/bc/gov/open/jrccaccess/autoconfigure/plugins/sftp/AutoConfiguration.java index f214db1..1a94bc2 100644 --- a/jrcc-access-spring-boot-autoconfigure/src/main/java/ca/bc/gov/open/jrccaccess/autoconfigure/plugins/sftp/AutoConfiguration.java +++ b/jrcc-access-spring-boot-autoconfigure/src/main/java/ca/bc/gov/open/jrccaccess/autoconfigure/plugins/sftp/AutoConfiguration.java @@ -65,7 +65,7 @@ public SessionFactory sftpSessionFactory() throws InvalidCo factory.setUser(properties.getUsername()); if (properties.getSshPrivateKey() != null) { logger.info("SFTP Configuration: setPrivateKey"); - factory.setPrivateKey(new DefaultResourceLoader().getResource(properties.getSshPrivateKey())); + factory.setPrivateKey(properties.getSshPrivateKey()); factory.setPrivateKeyPassphrase(properties.getSshPrivatePassphrase()); } else { logger.info("SFTP Configuration: setPassword"); diff --git a/jrcc-access-spring-boot-autoconfigure/src/main/java/ca/bc/gov/open/jrccaccess/autoconfigure/plugins/sftp/SftpInputProperties.java b/jrcc-access-spring-boot-autoconfigure/src/main/java/ca/bc/gov/open/jrccaccess/autoconfigure/plugins/sftp/SftpInputProperties.java index 8dfbdd6..7e042d3 100644 --- a/jrcc-access-spring-boot-autoconfigure/src/main/java/ca/bc/gov/open/jrccaccess/autoconfigure/plugins/sftp/SftpInputProperties.java +++ b/jrcc-access-spring-boot-autoconfigure/src/main/java/ca/bc/gov/open/jrccaccess/autoconfigure/plugins/sftp/SftpInputProperties.java @@ -6,6 +6,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import jakarta.validation.constraints.Min; +import org.springframework.core.io.ByteArrayResource; +import org.springframework.core.io.Resource; + import java.util.Optional; /** @@ -114,14 +117,14 @@ public void setMaxMessagePerPoll(String maxMessagePerPoll) { this.maxMessagePerPoll = maxMessagePerPoll; } - public String getSshPrivateKey() { + public Resource 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; + logger.info("getSshPrivateKey return not null {}", this.sshPrivateKey.getBytes()); + return new ByteArrayResource(this.sshPrivateKey.getBytes()); } public void setSshPrivateKey(String sshPrivateKey) {