Skip to content

Add support for FTPS #266

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add support for FTPS #266

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: 5 additions & 0 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,13 +221,18 @@ meson.add_install_script('sh', '-c',
meson.add_install_script('sh', '-c',
'ln -svf casync-http $DESTDIR@0@'.format(
join_paths(protocoldir, 'casync-ftp')))
meson.add_install_script('sh', '-c',
'ln -svf casync-http $DESTDIR@0@'.format(
join_paths(protocoldir, 'casync-ftps')))
meson.add_install_script('sh', '-c',
'ln -svf casync-http $DESTDIR@0@'.format(
join_paths(protocoldir, 'casync-sftp')))
meson.add_postconf_script('sh', '-c',
'ln -svf casync-http $MESON_BUILD_ROOT/casync-https')
meson.add_postconf_script('sh', '-c',
'ln -svf casync-http $MESON_BUILD_ROOT/casync-ftp')
meson.add_postconf_script('sh', '-c',
'ln -svf casync-http $MESON_BUILD_ROOT/casync-ftps')
meson.add_postconf_script('sh', '-c',
'ln -svf casync-http $MESON_BUILD_ROOT/casync-sftp')

Expand Down
10 changes: 7 additions & 3 deletions src/casync-http.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ static enum {
ARG_PROTOCOL_HTTP,
ARG_PROTOCOL_FTP,
ARG_PROTOCOL_HTTPS,
ARG_PROTOCOL_FTPS,
ARG_PROTOCOL_SFTP,
_ARG_PROTOCOL_INVALID = -1,
} arg_protocol = _ARG_PROTOCOL_INVALID;
Expand Down Expand Up @@ -340,7 +341,7 @@ static int acquire_file(CaRemote *rr,

return 0;

} else if (arg_protocol == ARG_PROTOCOL_FTP && (protocol_status < 200 || protocol_status > 299)) {
} else if (IN_SET(arg_protocol, ARG_PROTOCOL_FTP, ARG_PROTOCOL_FTPS) && (protocol_status < 200 || protocol_status > 299)) {
char *m;

if (arg_verbose)
Expand Down Expand Up @@ -443,8 +444,9 @@ static int run(int argc, char *argv[]) {
}

if (curl_easy_setopt(curl, CURLOPT_PROTOCOLS, arg_protocol == ARG_PROTOCOL_FTP ? CURLPROTO_FTP :
arg_protocol == ARG_PROTOCOL_FTPS ? CURLPROTO_FTPS :
arg_protocol == ARG_PROTOCOL_SFTP? CURLPROTO_SFTP: CURLPROTO_HTTP|CURLPROTO_HTTPS) != CURLE_OK) {
log_error("Failed to limit protocols to HTTP/HTTPS/FTP/SFTP.");
log_error("Failed to limit protocols to HTTP/HTTPS/FTP/FTPS/SFTP.");
r = -EIO;
goto finish;
}
Expand Down Expand Up @@ -610,7 +612,7 @@ static int run(int argc, char *argv[]) {
goto finish;

if ((IN_SET(arg_protocol, ARG_PROTOCOL_HTTP, ARG_PROTOCOL_HTTPS) && protocol_status == 200) ||
(arg_protocol == ARG_PROTOCOL_FTP && (protocol_status >= 200 && protocol_status <= 299))||
(IN_SET(arg_protocol, ARG_PROTOCOL_FTP, ARG_PROTOCOL_FTPS) && (protocol_status >= 200 && protocol_status <= 299))||
(arg_protocol == ARG_PROTOCOL_SFTP && (protocol_status == 0))) {

r = ca_remote_put_chunk(rr, &id, CA_CHUNK_COMPRESSED, realloc_buffer_data(&buffer), realloc_buffer_size(&buffer));
Expand Down Expand Up @@ -680,6 +682,8 @@ static int parse_argv(int argc, char *argv[]) {
arg_protocol = ARG_PROTOCOL_HTTP;
else if (strstr(argv[0], "sftp"))
arg_protocol = ARG_PROTOCOL_SFTP;
else if (strstr(argv[0], "ftps"))
arg_protocol = ARG_PROTOCOL_FTPS;
else if (strstr(argv[0], "ftp"))
arg_protocol = ARG_PROTOCOL_FTP;
else {
Expand Down