Skip to content

Added Support for FTPS #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
franky-naidu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added Support for FTPS #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...ashare/transferservice/odstransferservice/model/credential/AccountEndpointCredential.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import lombok.Data;
import lombok.ToString;
import org.apache.commons.lang.StringUtils;
import org.onedatashare.transferservice.odstransferservice.Enum.EndpointType;

@Data
Expand All @@ -17,7 +18,9 @@ public static String[] uriFormat(AccountEndpointCredential credential, EndpointT
if(type.equals(EndpointType.sftp)){
noTypeUri = credential.getUri().replaceFirst("sftp://", "");
}else if(type.equals(EndpointType.ftp)){
noTypeUri = credential.getUri().replaceFirst("ftp://", "");
noTypeUri = credential.getUri().startsWith("ftps://") ?
credential.getUri().replaceFirst("ftps://", "")
: credential.getUri().replaceFirst("ftp://", "");
}
else{
noTypeUri = credential.getUri().replaceFirst("http://", "");
Expand Down
10 changes: 10 additions & 0 deletions ...ain/java/org/onedatashare/transferservice/odstransferservice/pools/FtpConnectionPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@
import lombok.SneakyThrows;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPReply;
import org.apache.commons.net.ftp.FTPSClient;
import org.apache.commons.pool2.ObjectPool;
import org.onedatashare.transferservice.odstransferservice.Enum.EndpointType;
import org.onedatashare.transferservice.odstransferservice.controller.TransferController;
import org.onedatashare.transferservice.odstransferservice.model.credential.AccountEndpointCredential;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.util.concurrent.LinkedBlockingQueue;
Expand All @@ -17,6 +21,8 @@ public class FtpConnectionPool implements ObjectPool<FTPClient> {
private LinkedBlockingQueue<FTPClient> connectionPool;
private Boolean compression;

Logger logger = LoggerFactory.getLogger(FtpConnectionPool.class);

public FtpConnectionPool(AccountEndpointCredential credential, int bufferSize){
this.credential = credential;
this.bufferSize = bufferSize;
Expand All @@ -26,6 +32,10 @@ public FtpConnectionPool(AccountEndpointCredential credential, int bufferSize){
@Override
public void addObject() throws IOException {
FTPClient client = new FTPClient();
if(credential != null && credential.getUri().startsWith("ftps://")){
client = new FTPSClient();
logger.info("Using FTPS call");
}
String[] hostAndPort = AccountEndpointCredential.uriFormat(credential, EndpointType.ftp);
if(hostAndPort.length >1){
client.connect(hostAndPort[0], Integer.parseInt(hostAndPort[1]));
Expand Down