luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libssh2: keep sftp errors as 'unsigned long'

Browse Source 
Remove weird work-around for storing the SFTP errors as int instead of
the "unsigned long" that libssh2 actually returns for SFTP errors.

Closes #5534
This commit is contained in:
Daniel Stenberg 2020-06-07 00:30:50 +02:00
parent 3186f50054
commit 7370b4e39f
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 66 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
lib/vssh/libssh2.c
View File

@ -93,14 +93,12 @@
#define HAS_STATVFS_SUPPORT 1 #define HAS_STATVFS_SUPPORT 1
#endif #endif
#define sftp_libssh2_last_error(s) curlx_ultosi(libssh2_sftp_last_error(s))
#define sftp_libssh2_realpath(s,p,t,m) \ #define sftp_libssh2_realpath(s,p,t,m) \
libssh2_sftp_symlink_ex((s), (p), curlx_uztoui(strlen(p)), \ libssh2_sftp_symlink_ex((s), (p), curlx_uztoui(strlen(p)), \
(t), (m), LIBSSH2_SFTP_REALPATH) (t), (m), LIBSSH2_SFTP_REALPATH)
/* Local functions: */ /* Local functions: */
static const char *sftp_libssh2_strerror(int err); static const char *sftp_libssh2_strerror(unsigned long err);
static LIBSSH2_ALLOC_FUNC(my_libssh2_malloc); static LIBSSH2_ALLOC_FUNC(my_libssh2_malloc);
static LIBSSH2_REALLOC_FUNC(my_libssh2_realloc); static LIBSSH2_REALLOC_FUNC(my_libssh2_realloc);
static LIBSSH2_FREE_FUNC(my_libssh2_free); static LIBSSH2_FREE_FUNC(my_libssh2_free);
@ -212,7 +210,7 @@ kbd_callback(const char *name, int name_len, const char *instruction,
(void)abstract; (void)abstract;
} /* kbd_callback */ } /* kbd_callback */
static CURLcode sftp_libssh2_error_to_CURLE(int err) static CURLcode sftp_libssh2_error_to_CURLE(unsigned long err)
{ {
switch(err) { switch(err) {
case LIBSSH2_FX_OK: case LIBSSH2_FX_OK:
@ -795,7 +793,8 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
struct ssh_conn *sshc = &conn->proto.sshc; struct ssh_conn *sshc = &conn->proto.sshc;
curl_socket_t sock = conn->sock[FIRSTSOCKET]; curl_socket_t sock = conn->sock[FIRSTSOCKET];
int rc = LIBSSH2_ERROR_NONE; int rc = LIBSSH2_ERROR_NONE;
int err; int ssherr;
unsigned long sftperr;
int seekerr = CURL_SEEKFUNC_OK; int seekerr = CURL_SEEKFUNC_OK;
size_t readdir_len; size_t readdir_len;
*block = 0; /* we're not blocking by default */ *block = 0; /* we're not blocking by default */
@ -873,12 +872,12 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
state(conn, SSH_AUTH_DONE); state(conn, SSH_AUTH_DONE);
break; break;
} }
err = libssh2_session_last_errno(sshc->ssh_session); ssherr = libssh2_session_last_errno(sshc->ssh_session);
if(err == LIBSSH2_ERROR_EAGAIN) if(ssherr == LIBSSH2_ERROR_EAGAIN)
rc = LIBSSH2_ERROR_EAGAIN; rc = LIBSSH2_ERROR_EAGAIN;
else { else {
state(conn, SSH_SESSION_FREE); state(conn, SSH_SESSION_FREE);
sshc->actualcode = libssh2_session_error_to_CURLE(err); sshc->actualcode = libssh2_session_error_to_CURLE(ssherr);
} }
break; break;
} }
@ -1248,16 +1247,16 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
} }
else { else {
/* Return the error type */ /* Return the error type */
err = sftp_libssh2_last_error(sshc->sftp_session); sftperr = libssh2_sftp_last_error(sshc->sftp_session);
if(err) if(sftperr)
result = sftp_libssh2_error_to_CURLE(err); result = sftp_libssh2_error_to_CURLE(sftperr);
else else
/* in this case, the error wasn't in the SFTP level but for example /* in this case, the error wasn't in the SFTP level but for example
a time-out or similar */ a time-out or similar */
result = CURLE_SSH; result = CURLE_SSH;
sshc->actualcode = result; sshc->actualcode = result;
DEBUGF(infof(data, "error = %d makes libcurl = %d\n", DEBUGF(infof(data, "error = %d makes libcurl = %d\n",
err, (int)result)); ssherr, (int)result));
state(conn, SSH_STOP); state(conn, SSH_STOP);
break; break;
} }
@ -1532,11 +1531,11 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
break; break;
} }
if(rc != 0 && !sshc->acceptfail) { /* get those attributes */ if(rc != 0 && !sshc->acceptfail) { /* get those attributes */
err = sftp_libssh2_last_error(sshc->sftp_session); sftperr = libssh2_sftp_last_error(sshc->sftp_session);
Curl_safefree(sshc->quote_path1); Curl_safefree(sshc->quote_path1);
Curl_safefree(sshc->quote_path2); Curl_safefree(sshc->quote_path2);
failf(data, "Attempt to get SFTP stats failed: %s", failf(data, "Attempt to get SFTP stats failed: %s",
sftp_libssh2_strerror(err)); sftp_libssh2_strerror(sftperr));
state(conn, SSH_SFTP_CLOSE); state(conn, SSH_SFTP_CLOSE);
sshc->nextstate = SSH_NO_STATE; sshc->nextstate = SSH_NO_STATE;
sshc->actualcode = CURLE_QUOTE_ERROR; sshc->actualcode = CURLE_QUOTE_ERROR;
@ -1603,11 +1602,11 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
break; break;
} }
if(rc != 0 && !sshc->acceptfail) { if(rc != 0 && !sshc->acceptfail) {
err = sftp_libssh2_last_error(sshc->sftp_session); sftperr = libssh2_sftp_last_error(sshc->sftp_session);
Curl_safefree(sshc->quote_path1); Curl_safefree(sshc->quote_path1);
Curl_safefree(sshc->quote_path2); Curl_safefree(sshc->quote_path2);
failf(data, "Attempt to set SFTP stats failed: %s", failf(data, "Attempt to set SFTP stats failed: %s",
sftp_libssh2_strerror(err)); sftp_libssh2_strerror(sftperr));
state(conn, SSH_SFTP_CLOSE); state(conn, SSH_SFTP_CLOSE);
sshc->nextstate = SSH_NO_STATE; sshc->nextstate = SSH_NO_STATE;
sshc->actualcode = CURLE_QUOTE_ERROR; sshc->actualcode = CURLE_QUOTE_ERROR;
@ -1626,11 +1625,11 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
break; break;
} }
if(rc != 0 && !sshc->acceptfail) { if(rc != 0 && !sshc->acceptfail) {
err = sftp_libssh2_last_error(sshc->sftp_session); sftperr = libssh2_sftp_last_error(sshc->sftp_session);
Curl_safefree(sshc->quote_path1); Curl_safefree(sshc->quote_path1);
Curl_safefree(sshc->quote_path2); Curl_safefree(sshc->quote_path2);
failf(data, "symlink command failed: %s", failf(data, "symlink command failed: %s",
sftp_libssh2_strerror(err)); sftp_libssh2_strerror(sftperr));
state(conn, SSH_SFTP_CLOSE); state(conn, SSH_SFTP_CLOSE);
sshc->nextstate = SSH_NO_STATE; sshc->nextstate = SSH_NO_STATE;
sshc->actualcode = CURLE_QUOTE_ERROR; sshc->actualcode = CURLE_QUOTE_ERROR;
@ -1647,9 +1646,10 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
break; break;
} }
if(rc != 0 && !sshc->acceptfail) { if(rc != 0 && !sshc->acceptfail) {
err = sftp_libssh2_last_error(sshc->sftp_session); sftperr = libssh2_sftp_last_error(sshc->sftp_session);
Curl_safefree(sshc->quote_path1); Curl_safefree(sshc->quote_path1);
failf(data, "mkdir command failed: %s", sftp_libssh2_strerror(err)); failf(data, "mkdir command failed: %s",
sftp_libssh2_strerror(sftperr));
state(conn, SSH_SFTP_CLOSE); state(conn, SSH_SFTP_CLOSE);
sshc->nextstate = SSH_NO_STATE; sshc->nextstate = SSH_NO_STATE;
sshc->actualcode = CURLE_QUOTE_ERROR; sshc->actualcode = CURLE_QUOTE_ERROR;
@ -1671,10 +1671,11 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
break; break;
} }
if(rc != 0 && !sshc->acceptfail) { if(rc != 0 && !sshc->acceptfail) {
err = sftp_libssh2_last_error(sshc->sftp_session); sftperr = libssh2_sftp_last_error(sshc->sftp_session);
Curl_safefree(sshc->quote_path1); Curl_safefree(sshc->quote_path1);
Curl_safefree(sshc->quote_path2); Curl_safefree(sshc->quote_path2);
failf(data, "rename command failed: %s", sftp_libssh2_strerror(err)); failf(data, "rename command failed: %s",
sftp_libssh2_strerror(sftperr));
state(conn, SSH_SFTP_CLOSE); state(conn, SSH_SFTP_CLOSE);
sshc->nextstate = SSH_NO_STATE; sshc->nextstate = SSH_NO_STATE;
sshc->actualcode = CURLE_QUOTE_ERROR; sshc->actualcode = CURLE_QUOTE_ERROR;
@ -1690,9 +1691,10 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
break; break;
} }
if(rc != 0 && !sshc->acceptfail) { if(rc != 0 && !sshc->acceptfail) {
err = sftp_libssh2_last_error(sshc->sftp_session); sftperr = libssh2_sftp_last_error(sshc->sftp_session);
Curl_safefree(sshc->quote_path1); Curl_safefree(sshc->quote_path1);
failf(data, "rmdir command failed: %s", sftp_libssh2_strerror(err)); failf(data, "rmdir command failed: %s",
sftp_libssh2_strerror(sftperr));
state(conn, SSH_SFTP_CLOSE); state(conn, SSH_SFTP_CLOSE);
sshc->nextstate = SSH_NO_STATE; sshc->nextstate = SSH_NO_STATE;
sshc->actualcode = CURLE_QUOTE_ERROR; sshc->actualcode = CURLE_QUOTE_ERROR;
@ -1708,9 +1710,9 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
break; break;
} }
if(rc != 0 && !sshc->acceptfail) { if(rc != 0 && !sshc->acceptfail) {
err = sftp_libssh2_last_error(sshc->sftp_session); sftperr = libssh2_sftp_last_error(sshc->sftp_session);
Curl_safefree(sshc->quote_path1); Curl_safefree(sshc->quote_path1);
failf(data, "rm command failed: %s", sftp_libssh2_strerror(err)); failf(data, "rm command failed: %s", sftp_libssh2_strerror(sftperr));
state(conn, SSH_SFTP_CLOSE); state(conn, SSH_SFTP_CLOSE);
sshc->nextstate = SSH_NO_STATE; sshc->nextstate = SSH_NO_STATE;
sshc->actualcode = CURLE_QUOTE_ERROR; sshc->actualcode = CURLE_QUOTE_ERROR;
@ -1731,9 +1733,10 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
break; break;
} }
if(rc != 0 && !sshc->acceptfail) { if(rc != 0 && !sshc->acceptfail) {
err = sftp_libssh2_last_error(sshc->sftp_session); sftperr = libssh2_sftp_last_error(sshc->sftp_session);
Curl_safefree(sshc->quote_path1); Curl_safefree(sshc->quote_path1);
failf(data, "statvfs command failed: %s", sftp_libssh2_strerror(err)); failf(data, "statvfs command failed: %s",
sftp_libssh2_strerror(sftperr));
state(conn, SSH_SFTP_CLOSE); state(conn, SSH_SFTP_CLOSE);
sshc->nextstate = SSH_NO_STATE; sshc->nextstate = SSH_NO_STATE;
sshc->actualcode = CURLE_QUOTE_ERROR; sshc->actualcode = CURLE_QUOTE_ERROR;
@ -1870,21 +1873,21 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
if(LIBSSH2_ERROR_SFTP_PROTOCOL == rc) if(LIBSSH2_ERROR_SFTP_PROTOCOL == rc)
/* only when there was an SFTP protocol error can we extract /* only when there was an SFTP protocol error can we extract
the sftp error! */ the sftp error! */
err = sftp_libssh2_last_error(sshc->sftp_session); sftperr = libssh2_sftp_last_error(sshc->sftp_session);
else else
err = -1; /* not an sftp error at all */ sftperr = LIBSSH2_FX_OK; /* not an sftp error at all */
if(sshc->secondCreateDirs) { if(sshc->secondCreateDirs) {
state(conn, SSH_SFTP_CLOSE); state(conn, SSH_SFTP_CLOSE);
sshc->actualcode = err>= LIBSSH2_FX_OK? sshc->actualcode = sftperr != LIBSSH2_FX_OK ?
sftp_libssh2_error_to_CURLE(err):CURLE_SSH; sftp_libssh2_error_to_CURLE(sftperr):CURLE_SSH;
failf(data, "Creating the dir/file failed: %s", failf(data, "Creating the dir/file failed: %s",
sftp_libssh2_strerror(err)); sftp_libssh2_strerror(sftperr));
break; break;
} }
if(((err == LIBSSH2_FX_NO_SUCH_FILE) || if(((sftperr == LIBSSH2_FX_NO_SUCH_FILE) ||
(err == LIBSSH2_FX_FAILURE) || (sftperr == LIBSSH2_FX_FAILURE) ||
(err == LIBSSH2_FX_NO_SUCH_PATH)) && (sftperr == LIBSSH2_FX_NO_SUCH_PATH)) &&
(data->set.ftp_create_missing_dirs && (data->set.ftp_create_missing_dirs &&
(strlen(sftp_scp->path) > 1))) { (strlen(sftp_scp->path) > 1))) {
/* try to create the path remotely */ /* try to create the path remotely */
@ -1894,18 +1897,19 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
break; break;
} }
state(conn, SSH_SFTP_CLOSE); state(conn, SSH_SFTP_CLOSE);
sshc->actualcode = err>= LIBSSH2_FX_OK? sshc->actualcode = sftperr != LIBSSH2_FX_OK ?
sftp_libssh2_error_to_CURLE(err):CURLE_SSH; sftp_libssh2_error_to_CURLE(sftperr):CURLE_SSH;
if(!sshc->actualcode) { if(!sshc->actualcode) {
/* Sometimes, for some reason libssh2_sftp_last_error() returns /* Sometimes, for some reason libssh2_sftp_last_error() returns zero
zero even though libssh2_sftp_open() failed previously! We need even though libssh2_sftp_open() failed previously! We need to
to work around that! */ work around that! */
sshc->actualcode = CURLE_SSH; sshc->actualcode = CURLE_SSH;
err = -1; sftperr = LIBSSH2_FX_OK;
} }
failf(data, "Upload failed: %s (%d/%d)", failf(data, "Upload failed: %s (%d/%d)",
err>= LIBSSH2_FX_OK?sftp_libssh2_strerror(err):"ssh error", sftperr != LIBSSH2_FX_OK ?
err, rc); sftp_libssh2_strerror(sftperr):"ssh error",
sftperr, rc);
break; break;
} }
@ -2032,11 +2036,11 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
* permission was denied (creation might succeed further down the * permission was denied (creation might succeed further down the
* path) - retry on unspecific FAILURE also * path) - retry on unspecific FAILURE also
*/ */
err = sftp_libssh2_last_error(sshc->sftp_session); sftperr = libssh2_sftp_last_error(sshc->sftp_session);
if((err != LIBSSH2_FX_FILE_ALREADY_EXISTS) && if((sftperr != LIBSSH2_FX_FILE_ALREADY_EXISTS) &&
(err != LIBSSH2_FX_FAILURE) && (sftperr != LIBSSH2_FX_FAILURE) &&
(err != LIBSSH2_FX_PERMISSION_DENIED)) { (sftperr != LIBSSH2_FX_PERMISSION_DENIED)) {
result = sftp_libssh2_error_to_CURLE(err); result = sftp_libssh2_error_to_CURLE(sftperr);
state(conn, SSH_SFTP_CLOSE); state(conn, SSH_SFTP_CLOSE);
sshc->actualcode = result?result:CURLE_SSH; sshc->actualcode = result?result:CURLE_SSH;
break; break;
@ -2068,11 +2072,11 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
rc = LIBSSH2_ERROR_EAGAIN; rc = LIBSSH2_ERROR_EAGAIN;
break; break;
} }
err = sftp_libssh2_last_error(sshc->sftp_session); sftperr = libssh2_sftp_last_error(sshc->sftp_session);
failf(data, "Could not open directory for reading: %s", failf(data, "Could not open directory for reading: %s",
sftp_libssh2_strerror(err)); sftp_libssh2_strerror(sftperr));
state(conn, SSH_SFTP_CLOSE); state(conn, SSH_SFTP_CLOSE);
result = sftp_libssh2_error_to_CURLE(err); result = sftp_libssh2_error_to_CURLE(sftperr);
sshc->actualcode = result?result:CURLE_SSH; sshc->actualcode = result?result:CURLE_SSH;
break; break;
} }
@ -2159,11 +2163,11 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
break; break;
} }
else if(rc < 0) { else if(rc < 0) {
err = sftp_libssh2_last_error(sshc->sftp_session); sftperr = libssh2_sftp_last_error(sshc->sftp_session);
result = sftp_libssh2_error_to_CURLE(err); result = sftp_libssh2_error_to_CURLE(sftperr);
sshc->actualcode = result?result:CURLE_SSH; sshc->actualcode = result?result:CURLE_SSH;
failf(data, "Could not open remote file for reading: %s :: %d", failf(data, "Could not open remote file for reading: %s :: %d",
sftp_libssh2_strerror(err), sftp_libssh2_strerror(sftperr),
libssh2_session_last_errno(sshc->ssh_session)); libssh2_session_last_errno(sshc->ssh_session));
Curl_safefree(sshc->readdir_filename); Curl_safefree(sshc->readdir_filename);
Curl_safefree(sshc->readdir_longentry); Curl_safefree(sshc->readdir_longentry);
@ -2257,11 +2261,11 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
rc = LIBSSH2_ERROR_EAGAIN; rc = LIBSSH2_ERROR_EAGAIN;
break; break;
} }
err = sftp_libssh2_last_error(sshc->sftp_session); sftperr = libssh2_sftp_last_error(sshc->sftp_session);
failf(data, "Could not open remote file for reading: %s", failf(data, "Could not open remote file for reading: %s",
sftp_libssh2_strerror(err)); sftp_libssh2_strerror(sftperr));
state(conn, SSH_SFTP_CLOSE); state(conn, SSH_SFTP_CLOSE);
result = sftp_libssh2_error_to_CURLE(err); result = sftp_libssh2_error_to_CURLE(sftperr);
sshc->actualcode = result?result:CURLE_SSH; sshc->actualcode = result?result:CURLE_SSH;
break; break;
} }
@ -3401,7 +3405,7 @@ static ssize_t sftp_recv(struct connectdata *conn, int sockindex,
return nread; return nread;
} }
static const char *sftp_libssh2_strerror(int err) static const char *sftp_libssh2_strerror(unsigned long err)
{ {
switch(err) { switch(err) {
case LIBSSH2_FX_NO_SUCH_FILE: case LIBSSH2_FX_NO_SUCH_FILE: