revert back to last commit

bcgov · Jan 26, 2024 · 37d5f24 · 37d5f24
1 parent e9f4707
commit 37d5f24
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
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
@@ -65,7 +65,7 @@ public SessionFactory<SftpClient.DirEntry> 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/...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
@@ -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) {