GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-10-12 01:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

more debug messages and be more strict when cannot read the password.

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2014-01-11 23:30:49 +01:00
parent 0024a9d4a9
commit 50d63259b8
1 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/worker-auth.c
+27 -10
View File
@@ -185,6 +185,8 @@ static int recv_auth_reply(worker_st *ws, char* txt, size_t max_txt_size)
return ret;
}
oclog(ws, LOG_DEBUG, "received auth reply message %u", (unsigned)msg->reply);
switch(msg->reply) {
case AUTH_REPLY_MSG__AUTH__REP__MSG:
if (txt == NULL || msg->msg == NULL) {
@@ -268,8 +270,10 @@ static int recv_auth_reply(worker_st *ws, char* txt, size_t max_txt_size)
goto cleanup;
}
break;
case AUTH_REPLY_MSG__AUTH__REP__FAILED:
default:
oclog(ws, LOG_ERR, "unexpected command");
if (msg->reply != AUTH_REPLY_MSG__AUTH__REP__FAILED)
oclog(ws, LOG_ERR, "unexpected auth reply %u", (unsigned)msg->reply);
ret = ERR_AUTH_FAIL;
goto cleanup;
}
@@ -580,8 +584,10 @@ char msg[MAX_MSG_SIZE];
if (ws->config->auth_types & AUTH_TYPE_USERNAME_PASS) {
ret = read_user_pass(ws, req->body, req->body_length, &username, NULL);
if (ret < 0)
if (ret < 0) {
oclog(ws, LOG_ERR, "failed reading username");
goto ask_auth;
}
snprintf(tmp_user, sizeof(tmp_user), "%s", username);
free(username);
@@ -591,13 +597,15 @@ char msg[MAX_MSG_SIZE];
if (ws->config->auth_types & AUTH_TYPE_CERTIFICATE) {
if (ws->cert_auth_ok == 0) {
oclog(ws, LOG_INFO, "no certificate provided for authentication");
return -1;
goto auth_fail;
}
ret = get_cert_info(ws, tmp_user, sizeof(tmp_user),
tmp_group, sizeof(tmp_group));
if (ret < 0)
return -1;
if (ret < 0) {
oclog(ws, LOG_ERR, "failed reading certificate info");
goto auth_fail;
}
msg.tls_auth_ok = 1;
msg.cert_user_name = tmp_user;
@@ -610,8 +618,10 @@ char msg[MAX_MSG_SIZE];
&msg,
(pack_size_func)auth_init_msg__get_packed_size,
(pack_func)auth_init_msg__pack);
if (ret < 0)
if (ret < 0) {
oclog(ws, LOG_ERR, "failed sending auth init message to main");
goto auth_fail;
}
ws->auth_state = S_AUTH_INIT;
} else {
@@ -619,8 +629,10 @@ char msg[MAX_MSG_SIZE];
if (ws->config->auth_types & AUTH_TYPE_USERNAME_PASS) {
ret = read_user_pass(ws, req->body, req->body_length, NULL, &password);
if (ret < 0)
goto ask_auth;
if (ret < 0) {
oclog(ws, LOG_ERR, "failed reading password");
goto auth_fail;
}
areq.password = password;
@@ -630,8 +642,10 @@ char msg[MAX_MSG_SIZE];
free(password);
if (ret < 0)
if (ret < 0) {
oclog(ws, LOG_ERR, "failed sending auth req message to main");
goto auth_fail;
}
ws->auth_state = S_AUTH_REQ;
} else
@@ -640,10 +654,13 @@ char msg[MAX_MSG_SIZE];
ret = recv_auth_reply(ws, msg, sizeof(msg));
if (ret == ERR_AUTH_CONTINUE) {
oclog(ws, LOG_DEBUG, "continuing authentication for '%s'", ws->username);
ws->auth_state = S_AUTH_REQ;
return get_auth_handler2(ws, http_ver, msg);
} else if (ret < 0)
} else if (ret < 0) {
oclog(ws, LOG_ERR, "failed authentication for '%s'", ws->username);
goto auth_fail;
}
oclog(ws, LOG_INFO, "user '%s' logged in", ws->username);
ws->auth_state = S_AUTH_COMPLETE;