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

radius: more careful checks around the user_agent access

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2016-01-17 23:18:24 +01:00
parent c662641768
commit 55b1cbec91
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/auth/radius.c
View File

@@ -106,7 +106,8 @@ static int radius_auth_init(void **ctx, void *pool, const common_auth_init_st *i
if (pctx == NULL)
return ERR_AUTH_FAIL;
strlcpy(pctx->remote_ip, info->ip, sizeof(pctx->remote_ip));
if (info->ip)
strlcpy(pctx->remote_ip, info->ip, sizeof(pctx->remote_ip));
if (info->our_ip)
strlcpy(pctx->our_ip, info->our_ip, sizeof(pctx->our_ip));
@@ -121,7 +122,9 @@ static int radius_auth_init(void **ctx, void *pool, const common_auth_init_st *i
strlcpy(pctx->username, info->username, sizeof(pctx->username));
}
pctx->id = info->id;
strlcpy(pctx->user_agent, info->user_agent, sizeof(pctx->user_agent));
if (info->user_agent)
strlcpy(pctx->user_agent, info->user_agent, sizeof(pctx->user_agent));
*ctx = pctx;
@@ -245,12 +248,14 @@ static int radius_auth_pass(void *ctx, const char *pass, unsigned pass_len)
goto cleanup;
}
if (rc_avpair_add(rh, &send, PW_CONNECT_INFO, pctx->user_agent, -1, 0) == NULL) {
syslog(LOG_ERR,
"%s:%u: error in constructing radius message for user '%s'", __func__, __LINE__,
pctx->username);
ret = ERR_AUTH_FAIL;
goto cleanup;
if (pctx->user_agent[0] != 0) {
if (rc_avpair_add(rh, &send, PW_CONNECT_INFO, pctx->user_agent, -1, 0) == NULL) {
syslog(LOG_ERR,
"%s:%u: error in constructing radius message for user '%s'", __func__, __LINE__,
pctx->username);
ret = ERR_AUTH_FAIL;
goto cleanup;
}
}
service = PW_AUTHENTICATE_ONLY;

3
src/worker-auth.c
View File

@@ -1400,7 +1400,8 @@ int post_auth_handler(worker_st * ws, unsigned http_ver)
ireq.hostname = req->hostname;
ireq.ip = ws->remote_ip_str;
ireq.our_ip = get_our_ip(ws, our_ip_str);
ireq.user_agent = req->user_agent;
if (req->user_agent[0] != 0)
ireq.user_agent = req->user_agent;
sd = connect_to_secmod(ws);
if (sd == -1) {