lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-30 13:01:23 +03:00
Code Activity

Added ssh_userauth_[offer_]pubkey nonblocking iface

Browse Source
This commit is contained in:
Aris Adamantiadis
2011-02-12 18:46:10 +01:00
parent 5d4bd5a21d
commit 483cdc2d2c
2 changed files with 59 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/libssh/session.h
View File

@@ -54,7 +54,9 @@ enum ssh_pending_call_e {
SSH_PENDING_CALL_NONE = 0, SSH_PENDING_CALL_NONE = 0,
SSH_PENDING_CALL_CONNECT, SSH_PENDING_CALL_CONNECT,
SSH_PENDING_CALL_AUTH_NONE, SSH_PENDING_CALL_AUTH_NONE,
SSH_PENDING_CALL_AUTH_PASSWORD SSH_PENDING_CALL_AUTH_PASSWORD,
SSH_PENDING_CALL_AUTH_OFFER_PUBKEY,
SSH_PENDING_CALL_AUTH_PUBKEY,
}; };
/* libssh calls may block an undefined amount of time */ /* libssh calls may block an undefined amount of time */

71
src/auth.c
View File

@@ -476,6 +476,8 @@ error:
* have to use another method.\n * have to use another method.\n
* SSH_AUTH_SUCCESS: The public key is accepted, you want now to use * SSH_AUTH_SUCCESS: The public key is accepted, you want now to use
* ssh_userauth_pubkey(). * ssh_userauth_pubkey().
* SSH_AUTH_AGAIN: In nonblocking mode, you've got to call this again
* later.
* *
* @see publickey_from_file() * @see publickey_from_file()
* @see privatekey_from_file() * @see privatekey_from_file()
@@ -522,8 +524,27 @@ int ssh_userauth_offer_pubkey(ssh_session session, const char *username,
leave_function(); leave_function();
return rc; return rc;
} }
switch(session->pending_call_state){
case SSH_PENDING_CALL_NONE:
break;
case SSH_PENDING_CALL_AUTH_OFFER_PUBKEY:
ssh_string_free(user);
user=NULL;
goto pending;
default:
ssh_set_error(session,SSH_FATAL,"Bad call during pending SSH call in ssh_userauth_offer_pubkey");
goto error;
rc=SSH_ERROR;
}
if (ask_userauth(session) < 0) { rc = ask_userauth(session);
if(rc == SSH_AGAIN){
rc=SSH_AUTH_AGAIN;
ssh_string_free(user);
leave_function();
return rc;
} else if(rc == SSH_ERROR){
rc=SSH_AUTH_ERROR;
ssh_string_free(user); ssh_string_free(user);
leave_function(); leave_function();
return rc; return rc;
@@ -557,12 +578,15 @@ int ssh_userauth_offer_pubkey(ssh_session session, const char *username,
ssh_string_free(service); ssh_string_free(service);
ssh_string_free(algo); ssh_string_free(algo);
session->auth_state=SSH_AUTH_STATE_NONE; session->auth_state=SSH_AUTH_STATE_NONE;
session->pending_call_state=SSH_PENDING_CALL_AUTH_OFFER_PUBKEY;
if (packet_send(session) == SSH_ERROR) { if (packet_send(session) == SSH_ERROR) {
leave_function(); leave_function();
return rc; return rc;
} }
pending:
rc = wait_auth_status(session); rc = wait_auth_status(session);
if (rc != SSH_AUTH_AGAIN)
session->pending_call_state=SSH_PENDING_CALL_NONE;
leave_function(); leave_function();
return rc; return rc;
error: error:
@@ -596,7 +620,8 @@ error:
* SSH_AUTH_PARTIAL: You've been partially authenticated, you still * SSH_AUTH_PARTIAL: You've been partially authenticated, you still
* have to use another method.\n * have to use another method.\n
* SSH_AUTH_SUCCESS: Authentication successful. * SSH_AUTH_SUCCESS: Authentication successful.
* * SSH_AUTH_AGAIN: In nonblocking mode, you've got to call this again
* later.
* @see publickey_from_file() * @see publickey_from_file()
* @see privatekey_from_file() * @see privatekey_from_file()
* @see privatekey_free() * @see privatekey_free()
@@ -644,6 +669,19 @@ int ssh_userauth_pubkey(ssh_session session, const char *username,
return rc; return rc;
} }
switch(session->pending_call_state){
case SSH_PENDING_CALL_NONE:
break;
case SSH_PENDING_CALL_AUTH_PUBKEY:
ssh_string_free(user);
user=NULL;
goto pending;
default:
ssh_set_error(session,SSH_FATAL,"Bad call during pending SSH call in ssh_userauth_pubkey");
goto error;
rc=SSH_ERROR;
}
if (ask_userauth(session) < 0) { if (ask_userauth(session) < 0) {
ssh_string_free(user); ssh_string_free(user);
leave_function(); leave_function();
@@ -692,19 +730,22 @@ int ssh_userauth_pubkey(ssh_session session, const char *username,
ssh_string_free(pkstr); ssh_string_free(pkstr);
sign = ssh_do_sign(session,session->out_buffer, privatekey); sign = ssh_do_sign(session,session->out_buffer, privatekey);
if (sign) { if(sign == NULL)
if (buffer_add_ssh_string(session->out_buffer,sign) < 0) { goto error;
goto error; if (buffer_add_ssh_string(session->out_buffer,sign) < 0) {
} goto error;
ssh_string_free(sign);
session->auth_state=SSH_AUTH_STATE_NONE;
if (packet_send(session) == SSH_ERROR) {
leave_function();
return rc;
}
rc = wait_auth_status(session);
} }
ssh_string_free(sign);
session->auth_state=SSH_AUTH_STATE_NONE;
session->pending_call_state=SSH_PENDING_CALL_AUTH_PUBKEY;
if (packet_send(session) == SSH_ERROR) {
leave_function();
return rc;
}
pending:
rc = wait_auth_status(session);
if (rc != SSH_AUTH_AGAIN)
session->pending_call_state=SSH_PENDING_CALL_NONE;
leave_function(); leave_function();
return rc; return rc;
error: error: