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

Corrected plain passwd authentication to read group name when needed.

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2013-07-01 13:58:53 +02:00
parent f307fbcdbe
commit 9af4f67df7
1 changed files with 59 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plain.c
+57 -31
View File
@@ -25,41 +25,18 @@
#include <vpn.h>
#include <plain.h>
#define MAX_CPASS_SIZE 128
struct plain_ctx_st {
char username[MAX_USERNAME_SIZE];
char cpass[MAX_CPASS_SIZE]; /* crypt() passwd */
char groupname[MAX_GROUPNAME_SIZE];
const char* passwd;
const char* passwd; /* password file */
};
static int plain_auth_init(void** ctx, const char* username, const char* ip, void* additional)
{
struct plain_ctx_st* pctx;
pctx = malloc(sizeof(*pctx));
if (pctx == NULL)
return ERR_AUTH_FAIL;
snprintf(pctx->username, sizeof(pctx->username), "%s", username);
pctx->groupname[0] = 0;
pctx->passwd = additional;
*ctx = pctx;
return 0;
}
static int plain_auth_group(void* ctx, char *groupname, int groupname_size)
{
struct plain_ctx_st* pctx = ctx;
snprintf(groupname, groupname_size, "%s", pctx->groupname);
return 0;
}
/* Returns 0 if the user is successfully authenticated, and sets the appropriate group name.
*/
static int plain_auth_pass(void* ctx, const char* pass, unsigned pass_len)
static int read_auth_pass(void* ctx)
{
struct plain_ctx_st* pctx = ctx;
unsigned groupname_size;
@@ -96,7 +73,8 @@ int ret;
pctx->groupname[0] = 0;
p = strtok(NULL, ":");
if (p != NULL && strcmp(crypt(pass, p), p) == 0) {
if (p != NULL) {
snprintf(pctx->cpass, sizeof(pctx->cpass), "%s", p);
ret = 0;
goto exit;
}
@@ -104,14 +82,62 @@ int ret;
}
}
ret = -1;
syslog(LOG_AUTH, "error in plain authentication; error in user '%s'", pctx->username);
/* always succeed */
ret = 0;
exit:
fclose(fp);
free(line);
return ret;
}
static int plain_auth_init(void** ctx, const char* username, const char* ip, void* additional)
{
struct plain_ctx_st* pctx;
int ret;
pctx = malloc(sizeof(*pctx));
if (pctx == NULL)
return ERR_AUTH_FAIL;
snprintf(pctx->username, sizeof(pctx->username), "%s", username);
pctx->groupname[0] = 0;
pctx->cpass[0] = 0;
pctx->passwd = additional;
ret = read_auth_pass(pctx);
if (ret < 0) {
free(pctx);
return ERR_AUTH_FAIL;
}
*ctx = pctx;
return 0;
}
static int plain_auth_group(void* ctx, char *groupname, int groupname_size)
{
struct plain_ctx_st* pctx = ctx;
snprintf(groupname, groupname_size, "%s", pctx->groupname);
return 0;
}
/* Returns 0 if the user is successfully authenticated, and sets the appropriate group name.
*/
static int plain_auth_pass(void* ctx, const char* pass, unsigned pass_len)
{
struct plain_ctx_st* pctx = ctx;
if (pctx->cpass[0] != 0 && strcmp(crypt(pass, pctx->cpass), pctx->cpass) == 0)
return 0;
else {
syslog(LOG_AUTH, "error in plain authentication; error in user '%s'", pctx->username);
return ERR_AUTH_FAIL;
}
}
static int plain_auth_msg(void* ctx, char* msg, size_t msg_size)
{
snprintf(msg, msg_size, "%s", "Please enter your password");