auth: Some code style fixes
Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
Этот коммит содержится в:
Anderson Toshiyuki Sasaki
родитель
6e74c6c1dc
Коммит
d85827f646
125
src/auth.c
125
src/auth.c
@ -77,9 +77,9 @@ static int ssh_userauth_request_service(ssh_session session) {
|
||||
return rc;
|
||||
}
|
||||
|
||||
static int ssh_auth_response_termination(void *user){
|
||||
ssh_session session=(ssh_session)user;
|
||||
switch(session->auth_state){
|
||||
static int ssh_auth_response_termination(void *user) {
|
||||
ssh_session session = (ssh_session)user;
|
||||
switch (session->auth_state) {
|
||||
case SSH_AUTH_STATE_NONE:
|
||||
case SSH_AUTH_STATE_KBDINT_SENT:
|
||||
case SSH_AUTH_STATE_GSSAPI_REQUEST_SENT:
|
||||
@ -112,7 +112,7 @@ static int ssh_userauth_get_response(ssh_session session) {
|
||||
if (rc == SSH_ERROR) {
|
||||
return SSH_AUTH_ERROR;
|
||||
}
|
||||
if (!ssh_auth_response_termination(session)){
|
||||
if (!ssh_auth_response_termination(session)) {
|
||||
return SSH_AUTH_AGAIN;
|
||||
}
|
||||
|
||||
@ -153,7 +153,7 @@ static int ssh_userauth_get_response(ssh_session session) {
|
||||
*
|
||||
* This banner should be shown to user prior to authentication
|
||||
*/
|
||||
SSH_PACKET_CALLBACK(ssh_packet_userauth_banner){
|
||||
SSH_PACKET_CALLBACK(ssh_packet_userauth_banner) {
|
||||
ssh_string banner;
|
||||
(void)type;
|
||||
(void)user;
|
||||
@ -165,7 +165,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_banner){
|
||||
} else {
|
||||
SSH_LOG(SSH_LOG_DEBUG,
|
||||
"Received SSH_USERAUTH_BANNER packet");
|
||||
if(session->banner != NULL)
|
||||
if (session->banner != NULL)
|
||||
ssh_string_free(session->banner);
|
||||
session->banner = banner;
|
||||
}
|
||||
@ -180,7 +180,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_banner){
|
||||
*
|
||||
* This handles the complete or partial authentication failure.
|
||||
*/
|
||||
SSH_PACKET_CALLBACK(ssh_packet_userauth_failure){
|
||||
SSH_PACKET_CALLBACK(ssh_packet_userauth_failure) {
|
||||
char *auth_methods = NULL;
|
||||
uint8_t partial = 0;
|
||||
int rc;
|
||||
@ -240,7 +240,7 @@ end:
|
||||
*
|
||||
* It is also used to communicate the new to the upper levels.
|
||||
*/
|
||||
SSH_PACKET_CALLBACK(ssh_packet_userauth_success){
|
||||
SSH_PACKET_CALLBACK(ssh_packet_userauth_success) {
|
||||
(void)packet;
|
||||
(void)type;
|
||||
(void)user;
|
||||
@ -248,17 +248,17 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_success){
|
||||
SSH_LOG(SSH_LOG_DEBUG, "Authentication successful");
|
||||
SSH_LOG(SSH_LOG_TRACE, "Received SSH_USERAUTH_SUCCESS");
|
||||
|
||||
session->auth_state=SSH_AUTH_STATE_SUCCESS;
|
||||
session->session_state=SSH_SESSION_STATE_AUTHENTICATED;
|
||||
session->auth_state = SSH_AUTH_STATE_SUCCESS;
|
||||
session->session_state = SSH_SESSION_STATE_AUTHENTICATED;
|
||||
session->flags |= SSH_SESSION_FLAG_AUTHENTICATED;
|
||||
|
||||
if(session->current_crypto && session->current_crypto->delayed_compress_out){
|
||||
if (session->current_crypto && session->current_crypto->delayed_compress_out) {
|
||||
SSH_LOG(SSH_LOG_DEBUG, "Enabling delayed compression OUT");
|
||||
session->current_crypto->do_compress_out=1;
|
||||
session->current_crypto->do_compress_out = 1;
|
||||
}
|
||||
if(session->current_crypto && session->current_crypto->delayed_compress_in){
|
||||
if (session->current_crypto && session->current_crypto->delayed_compress_in) {
|
||||
SSH_LOG(SSH_LOG_DEBUG, "Enabling delayed compression IN");
|
||||
session->current_crypto->do_compress_in=1;
|
||||
session->current_crypto->do_compress_in = 1;
|
||||
}
|
||||
|
||||
return SSH_PACKET_USED;
|
||||
@ -272,24 +272,24 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_success){
|
||||
* Since the two types of packets share the same code, additional work is done
|
||||
* to understand if we are in a public key or keyboard-interactive context.
|
||||
*/
|
||||
SSH_PACKET_CALLBACK(ssh_packet_userauth_pk_ok){
|
||||
SSH_PACKET_CALLBACK(ssh_packet_userauth_pk_ok) {
|
||||
int rc;
|
||||
|
||||
SSH_LOG(SSH_LOG_TRACE, "Received SSH_USERAUTH_PK_OK/INFO_REQUEST/GSSAPI_RESPONSE");
|
||||
|
||||
if(session->auth_state==SSH_AUTH_STATE_KBDINT_SENT){
|
||||
if (session->auth_state==SSH_AUTH_STATE_KBDINT_SENT) {
|
||||
/* Assuming we are in keyboard-interactive context */
|
||||
SSH_LOG(SSH_LOG_TRACE,
|
||||
"keyboard-interactive context, assuming SSH_USERAUTH_INFO_REQUEST");
|
||||
rc=ssh_packet_userauth_info_request(session,type,packet,user);
|
||||
rc = ssh_packet_userauth_info_request(session,type,packet,user);
|
||||
#ifdef WITH_GSSAPI
|
||||
} else if (session->auth_state == SSH_AUTH_STATE_GSSAPI_REQUEST_SENT){
|
||||
} else if (session->auth_state == SSH_AUTH_STATE_GSSAPI_REQUEST_SENT) {
|
||||
rc = ssh_packet_userauth_gssapi_response(session, type, packet, user);
|
||||
#endif
|
||||
} else {
|
||||
session->auth_state=SSH_AUTH_STATE_PK_OK;
|
||||
session->auth_state = SSH_AUTH_STATE_PK_OK;
|
||||
SSH_LOG(SSH_LOG_TRACE, "Assuming SSH_USERAUTH_PK_OK");
|
||||
rc=SSH_PACKET_USED;
|
||||
rc = SSH_PACKET_USED;
|
||||
}
|
||||
|
||||
return rc;
|
||||
@ -348,7 +348,7 @@ int ssh_userauth_list(ssh_session session, const char *username)
|
||||
int ssh_userauth_none(ssh_session session, const char *username) {
|
||||
int rc;
|
||||
|
||||
switch(session->pending_call_state){
|
||||
switch(session->pending_call_state) {
|
||||
case SSH_PENDING_CALL_NONE:
|
||||
break;
|
||||
case SSH_PENDING_CALL_AUTH_NONE:
|
||||
@ -727,6 +727,7 @@ struct ssh_agent_state_struct {
|
||||
/* Internal function */
|
||||
void ssh_agent_state_free(void *data) {
|
||||
struct ssh_agent_state_struct *state = data;
|
||||
|
||||
if (state) {
|
||||
ssh_string_free_char(state->comment);
|
||||
ssh_key_free(state->pubkey);
|
||||
@ -760,6 +761,7 @@ int ssh_userauth_agent(ssh_session session,
|
||||
const char *username) {
|
||||
int rc = SSH_AUTH_ERROR;
|
||||
struct ssh_agent_state_struct *state;
|
||||
|
||||
if (session == NULL) {
|
||||
return SSH_AUTH_ERROR;
|
||||
}
|
||||
@ -767,30 +769,33 @@ int ssh_userauth_agent(ssh_session session,
|
||||
if (!ssh_agent_is_running(session)) {
|
||||
return SSH_AUTH_DENIED;
|
||||
}
|
||||
if (!session->agent_state){
|
||||
|
||||
if (!session->agent_state) {
|
||||
session->agent_state = malloc(sizeof(struct ssh_agent_state_struct));
|
||||
if (!session->agent_state){
|
||||
if (!session->agent_state) {
|
||||
ssh_set_error_oom(session);
|
||||
return SSH_AUTH_ERROR;
|
||||
}
|
||||
ZERO_STRUCTP(session->agent_state);
|
||||
session->agent_state->state=SSH_AGENT_STATE_NONE;
|
||||
}
|
||||
|
||||
state = session->agent_state;
|
||||
if (state->pubkey == NULL)
|
||||
if (state->pubkey == NULL) {
|
||||
state->pubkey = ssh_agent_get_first_ident(session, &state->comment);
|
||||
}
|
||||
|
||||
if (state->pubkey == NULL) {
|
||||
return SSH_AUTH_DENIED;
|
||||
}
|
||||
|
||||
while (state->pubkey != NULL) {
|
||||
if(state->state == SSH_AGENT_STATE_NONE){
|
||||
if (state->state == SSH_AGENT_STATE_NONE) {
|
||||
SSH_LOG(SSH_LOG_DEBUG,
|
||||
"Trying identity %s", state->comment);
|
||||
}
|
||||
if(state->state == SSH_AGENT_STATE_NONE ||
|
||||
state->state == SSH_AGENT_STATE_PUBKEY){
|
||||
if (state->state == SSH_AGENT_STATE_NONE ||
|
||||
state->state == SSH_AGENT_STATE_PUBKEY) {
|
||||
rc = ssh_userauth_try_publickey(session, username, state->pubkey);
|
||||
if (rc == SSH_AUTH_ERROR) {
|
||||
ssh_agent_state_free (state);
|
||||
@ -814,7 +819,7 @@ int ssh_userauth_agent(ssh_session session,
|
||||
"Public key of %s accepted by server", state->comment);
|
||||
state->state = SSH_AGENT_STATE_AUTH;
|
||||
}
|
||||
if (state->state == SSH_AGENT_STATE_AUTH){
|
||||
if (state->state == SSH_AGENT_STATE_AUTH) {
|
||||
rc = ssh_userauth_agent_publickey(session, username, state->pubkey);
|
||||
if (rc == SSH_AUTH_AGAIN)
|
||||
return rc;
|
||||
@ -845,7 +850,7 @@ int ssh_userauth_agent(ssh_session session,
|
||||
#endif
|
||||
|
||||
enum ssh_auth_auto_state_e {
|
||||
SSH_AUTH_AUTO_STATE_NONE=0,
|
||||
SSH_AUTH_AUTO_STATE_NONE = 0,
|
||||
SSH_AUTH_AUTO_STATE_PUBKEY,
|
||||
SSH_AUTH_AUTO_STATE_KEY_IMPORTED,
|
||||
SSH_AUTH_AUTO_STATE_PUBKEY_ACCEPTED
|
||||
@ -907,10 +912,10 @@ int ssh_userauth_publickey_auto(ssh_session session,
|
||||
auth_fn = session->common.callbacks->auth_function;
|
||||
auth_data = session->common.callbacks->userdata;
|
||||
}
|
||||
if (!session->auth_auto_state){
|
||||
if (!session->auth_auto_state) {
|
||||
session->auth_auto_state =
|
||||
malloc(sizeof(struct ssh_auth_auto_state_struct));
|
||||
if (!session->auth_auto_state){
|
||||
if (!session->auth_auto_state) {
|
||||
ssh_set_error_oom(session);
|
||||
return SSH_AUTH_ERROR;
|
||||
}
|
||||
@ -933,10 +938,10 @@ int ssh_userauth_publickey_auto(ssh_session session,
|
||||
state->it = ssh_list_get_iterator(session->opts.identity);
|
||||
}
|
||||
|
||||
while (state->it != NULL){
|
||||
while (state->it != NULL) {
|
||||
const char *privkey_file = state->it->data;
|
||||
char pubkey_file[1024] = {0};
|
||||
if (state->state == SSH_AUTH_AUTO_STATE_PUBKEY){
|
||||
if (state->state == SSH_AUTH_AUTO_STATE_PUBKEY) {
|
||||
SSH_LOG(SSH_LOG_DEBUG,
|
||||
"Trying to authenticate with %s", privkey_file);
|
||||
state->privkey = NULL;
|
||||
@ -990,7 +995,7 @@ int ssh_userauth_publickey_auto(ssh_session session,
|
||||
}
|
||||
state->state = SSH_AUTH_AUTO_STATE_KEY_IMPORTED;
|
||||
}
|
||||
if (state->state == SSH_AUTH_AUTO_STATE_KEY_IMPORTED){
|
||||
if (state->state == SSH_AUTH_AUTO_STATE_KEY_IMPORTED) {
|
||||
rc = ssh_userauth_try_publickey(session, username, state->pubkey);
|
||||
if (rc == SSH_AUTH_ERROR) {
|
||||
SSH_LOG(SSH_LOG_WARN,
|
||||
@ -1000,7 +1005,7 @@ int ssh_userauth_publickey_auto(ssh_session session,
|
||||
ssh_key_free(state->pubkey);
|
||||
SAFE_FREE(session->auth_auto_state);
|
||||
return rc;
|
||||
} else if (rc == SSH_AUTH_AGAIN){
|
||||
} else if (rc == SSH_AUTH_AGAIN) {
|
||||
return rc;
|
||||
} else if (rc != SSH_AUTH_SUCCESS) {
|
||||
SSH_LOG(SSH_LOG_DEBUG,
|
||||
@ -1016,7 +1021,7 @@ int ssh_userauth_publickey_auto(ssh_session session,
|
||||
}
|
||||
state->state = SSH_AUTH_AUTO_STATE_PUBKEY_ACCEPTED;
|
||||
}
|
||||
if (state->state == SSH_AUTH_AUTO_STATE_PUBKEY_ACCEPTED){
|
||||
if (state->state == SSH_AUTH_AUTO_STATE_PUBKEY_ACCEPTED) {
|
||||
/* Public key has been accepted by the server */
|
||||
if (state->privkey == NULL) {
|
||||
rc = ssh_pki_import_privkey_file(privkey_file,
|
||||
@ -1037,11 +1042,11 @@ int ssh_userauth_publickey_auto(ssh_session session,
|
||||
} else if (rc == SSH_EOF) {
|
||||
/* If the file doesn't exist, continue */
|
||||
ssh_key_free(state->pubkey);
|
||||
state->pubkey=NULL;
|
||||
state->pubkey = NULL;
|
||||
SSH_LOG(SSH_LOG_INFO,
|
||||
"Private key %s doesn't exist.",
|
||||
privkey_file);
|
||||
state->it=state->it->next;
|
||||
state->it = state->it->next;
|
||||
state->state = SSH_AUTH_AUTO_STATE_PUBKEY;
|
||||
continue;
|
||||
}
|
||||
@ -1059,14 +1064,14 @@ int ssh_userauth_publickey_auto(ssh_session session,
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
if (rc == SSH_AUTH_AGAIN){
|
||||
if (rc == SSH_AUTH_AGAIN) {
|
||||
return rc;
|
||||
}
|
||||
|
||||
SSH_LOG(SSH_LOG_WARN,
|
||||
"The server accepted the public key but refused the signature");
|
||||
state->it=state->it->next;
|
||||
state->state=SSH_AUTH_AUTO_STATE_PUBKEY;
|
||||
state->it = state->it->next;
|
||||
state->state = SSH_AUTH_AUTO_STATE_PUBKEY;
|
||||
/* continue */
|
||||
}
|
||||
}
|
||||
@ -1283,15 +1288,19 @@ static int ssh_userauth_kbdint_init(ssh_session session,
|
||||
const char *submethods)
|
||||
{
|
||||
int rc;
|
||||
if (session->pending_call_state == SSH_PENDING_CALL_AUTH_KBDINT_INIT)
|
||||
|
||||
if (session->pending_call_state == SSH_PENDING_CALL_AUTH_KBDINT_INIT) {
|
||||
goto pending;
|
||||
if (session->pending_call_state != SSH_PENDING_CALL_NONE){
|
||||
}
|
||||
if (session->pending_call_state != SSH_PENDING_CALL_NONE) {
|
||||
ssh_set_error_invalid(session);
|
||||
return SSH_ERROR;
|
||||
}
|
||||
|
||||
rc = ssh_userauth_request_service(session);
|
||||
if (rc == SSH_AGAIN)
|
||||
if (rc == SSH_AGAIN) {
|
||||
return SSH_AUTH_AGAIN;
|
||||
}
|
||||
if (rc != SSH_OK) {
|
||||
return SSH_AUTH_ERROR;
|
||||
}
|
||||
@ -1349,7 +1358,7 @@ static int ssh_userauth_kbdint_send(ssh_session session)
|
||||
int rc;
|
||||
if (session->pending_call_state == SSH_PENDING_CALL_AUTH_KBDINT_SEND)
|
||||
goto pending;
|
||||
if (session->pending_call_state != SSH_PENDING_CALL_NONE){
|
||||
if (session->pending_call_state != SSH_PENDING_CALL_NONE) {
|
||||
ssh_set_error_invalid(session);
|
||||
return SSH_ERROR;
|
||||
}
|
||||
@ -1558,9 +1567,10 @@ int ssh_userauth_kbdint(ssh_session session, const char *user,
|
||||
* @returns The number of prompts.
|
||||
*/
|
||||
int ssh_userauth_kbdint_getnprompts(ssh_session session) {
|
||||
if(session==NULL)
|
||||
if (session == NULL) {
|
||||
return SSH_ERROR;
|
||||
if(session->kbdint == NULL) {
|
||||
}
|
||||
if (session->kbdint == NULL) {
|
||||
ssh_set_error_invalid(session);
|
||||
return SSH_ERROR;
|
||||
}
|
||||
@ -1579,9 +1589,10 @@ int ssh_userauth_kbdint_getnprompts(ssh_session session) {
|
||||
* @returns The name of the message block. Do not free it.
|
||||
*/
|
||||
const char *ssh_userauth_kbdint_getname(ssh_session session) {
|
||||
if(session==NULL)
|
||||
if (session == NULL) {
|
||||
return NULL;
|
||||
if(session->kbdint == NULL) {
|
||||
}
|
||||
if (session->kbdint == NULL) {
|
||||
ssh_set_error_invalid(session);
|
||||
return NULL;
|
||||
}
|
||||
@ -1601,9 +1612,9 @@ const char *ssh_userauth_kbdint_getname(ssh_session session) {
|
||||
*/
|
||||
|
||||
const char *ssh_userauth_kbdint_getinstruction(ssh_session session) {
|
||||
if(session==NULL)
|
||||
if (session == NULL)
|
||||
return NULL;
|
||||
if(session->kbdint == NULL) {
|
||||
if (session->kbdint == NULL) {
|
||||
ssh_set_error_invalid(session);
|
||||
return NULL;
|
||||
}
|
||||
@ -1637,9 +1648,9 @@ const char *ssh_userauth_kbdint_getinstruction(ssh_session session) {
|
||||
*/
|
||||
const char *ssh_userauth_kbdint_getprompt(ssh_session session, unsigned int i,
|
||||
char *echo) {
|
||||
if(session==NULL)
|
||||
if (session == NULL)
|
||||
return NULL;
|
||||
if(session->kbdint == NULL) {
|
||||
if (session->kbdint == NULL) {
|
||||
ssh_set_error_invalid(session);
|
||||
return NULL;
|
||||
}
|
||||
@ -1664,8 +1675,9 @@ const char *ssh_userauth_kbdint_getprompt(ssh_session session, unsigned int i,
|
||||
* @returns The number of answers.
|
||||
*/
|
||||
int ssh_userauth_kbdint_getnanswers(ssh_session session) {
|
||||
if(session==NULL || session->kbdint == NULL)
|
||||
if (session == NULL || session->kbdint == NULL) {
|
||||
return SSH_ERROR;
|
||||
}
|
||||
return session->kbdint->nanswers;
|
||||
}
|
||||
|
||||
@ -1679,7 +1691,7 @@ int ssh_userauth_kbdint_getnanswers(ssh_session session) {
|
||||
* @return 0 on success, < 0 on error.
|
||||
*/
|
||||
const char *ssh_userauth_kbdint_getanswer(ssh_session session, unsigned int i) {
|
||||
if(session==NULL || session->kbdint == NULL
|
||||
if (session == NULL || session->kbdint == NULL
|
||||
|| session->kbdint->answers == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
@ -1711,8 +1723,9 @@ const char *ssh_userauth_kbdint_getanswer(ssh_session session, unsigned int i) {
|
||||
*/
|
||||
int ssh_userauth_kbdint_setanswer(ssh_session session, unsigned int i,
|
||||
const char *answer) {
|
||||
if (session == NULL)
|
||||
if (session == NULL) {
|
||||
return -1;
|
||||
}
|
||||
if (answer == NULL || session->kbdint == NULL ||
|
||||
i >= session->kbdint->nprompts) {
|
||||
ssh_set_error_invalid(session);
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user