shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 02:38:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

Improve ssh_userauth_offer_pubkey().

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@666 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-04-30 14:40:32 +00:00
parent 0881ba13d6
commit 65d09f3268
1 changed files with 99 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
libssh/auth.c
View File

@@ -274,29 +274,43 @@ error:
return rc;
}
/** \brief Try to authenticate through public key
* \param session ssh session
* \param username username to authenticate. You can specify NULL if
* ssh_option_set_username() has been used. You cannot try two different logins in a row.
* \param type type of public key. This value is given by publickey_from_file()
* \param publickey a public key returned by publickey_from_file()
* \returns SSH_AUTH_ERROR : a serious error happened\n
* SSH_AUTH_DENIED : The server doesn't accept that public key as an authentication token. Try another key or another method\n
* SSH_AUTH_PARTIAL : You've been partially authenticated, you still have to use another method\n
* SSH_AUTH_SUCCESS : The public key is accepted, you want now to use ssh_userauth_pubkey()
* \see publickey_from_file()
* \see privatekey_from_file()
* \see ssh_userauth_pubkey()
/**
* @brief Try to authenticate through public key.
*
* @param session The ssh session to use.
*
* @param username The username to authenticate. You can specify NULL if
* ssh_option_set_username() has been used. You cannot try
* two different logins in a row.
*
* @param type The type of the public key. This value is given by
* publickey_from_file().
*
* @param publickey A public key returned by publickey_from_file().
*
* @returns SSH_AUTH_ERROR: A serious error happened.\n
* SSH_AUTH_DENIED: The server doesn't accept that public key as an
* authentication token. Try another key or another
* method.\n
* SSH_AUTH_PARTIAL: You've been partially authenticated, you still
* have to use another method.\n
* SSH_AUTH_SUCCESS: The public key is accepted, you want now to use
* ssh_userauth_pubkey().
*
* @see publickey_from_file()
* @see privatekey_from_file()
* @see ssh_userauth_pubkey()
*/
int ssh_userauth_offer_pubkey(SSH_SESSION *session, const char *username,int type, STRING *publickey){
STRING *user = NULL;
STRING *service = NULL;
STRING *method = NULL;
STRING *algo = NULL;
int ssh_userauth_offer_pubkey(SSH_SESSION *session, const char *username,
int type, STRING *publickey) {
STRING *user;
STRING *service;
STRING *method;
STRING *algo;
int rc = SSH_AUTH_ERROR;
enter_function();
#ifdef HAVE_SSH1
if (session->version == 1) {
ssh_userauth1_offer_pubkey(session, username, type, publickey);
@@ -304,23 +318,30 @@ int ssh_userauth_offer_pubkey(SSH_SESSION *session, const char *username,int typ
return rc;
}
#endif
if(!username)
if(!(username=session->options->username)){
if(ssh_options_default_username(session->options)){
if (username == NULL) {
if (session->options->username == NULL) {
if (ssh_options_default_username(session->options) < 0) {
leave_function();
return rc;
} else
username=session->options->username;
}
if(ask_userauth(session)){
}
user = string_from_char(session->options->username);
} else {
user = string_from_char(username);
}
if (user == NULL) {
leave_function();
return rc;
}
user = string_from_char(username);
if (user == NULL) {
goto error;
if (ask_userauth(session) < 0) {
string_free(user);
leave_function();
return rc;
}
service = string_from_char("ssh-connection");
if (service == NULL) {
goto error;
@@ -334,25 +355,13 @@ int ssh_userauth_offer_pubkey(SSH_SESSION *session, const char *username,int typ
goto error;
}
if (buffer_add_u8(session->out_buffer, SSH2_MSG_USERAUTH_REQUEST) < 0) {
goto error;
}
if (buffer_add_ssh_string(session->out_buffer, user) < 0) {
goto error;
}
if (buffer_add_ssh_string(session->out_buffer, service) < 0) {
goto error;
}
if (buffer_add_ssh_string(session->out_buffer, method) < 0) {
goto error;
}
if (buffer_add_u8(session->out_buffer, 0) < 0) {
goto error;
}
if (buffer_add_ssh_string(session->out_buffer, algo) < 0) {
goto error;
}
if (buffer_add_ssh_string(session->out_buffer, publickey) < 0) {
if (buffer_add_u8(session->out_buffer, SSH2_MSG_USERAUTH_REQUEST) < 0 ||
buffer_add_ssh_string(session->out_buffer, user) < 0 ||
buffer_add_ssh_string(session->out_buffer, service) < 0 ||
buffer_add_ssh_string(session->out_buffer, method) < 0 ||
buffer_add_u8(session->out_buffer, 0) < 0 ||
buffer_add_ssh_string(session->out_buffer, algo) < 0 ||
buffer_add_ssh_string(session->out_buffer, publickey) < 0) {
goto error;
}