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

when reading IPv4 routes ensure they are read/converted to proper format

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2015-10-28 13:54:38 +01:00
parent f55ff1dde5
commit 97d6074ed3
5 changed files with 100 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/sup-config/file.c
View File

@@ -151,6 +151,8 @@ int parse_group_cfg_file(struct cfg_st *global_config,
tOptionValue const * pov;
const tOptionValue* val, *prev;
unsigned prefix = 0;
int ret;
unsigned j;
pov = configFileLoad(file);
if (pov == NULL) {
@@ -179,6 +181,27 @@ unsigned prefix = 0;
READ_RAW_MULTI_LINE("no-route", msg->no_routes, msg->n_no_routes);
READ_RAW_MULTI_LINE("iroute", msg->iroutes, msg->n_iroutes);
for (j=0;j<msg->n_routes;j++) {
if (ip_route_sanity_check(msg->routes, &msg->routes[j]) != 0) {
ret = ERR_READ_CONFIG;
goto fail;
}
}
for (j=0;j<msg->n_iroutes;j++) {
if (ip_route_sanity_check(msg->iroutes, &msg->iroutes[j]) != 0) {
ret = ERR_READ_CONFIG;
goto fail;
}
}
for (j=0;j<msg->n_no_routes;j++) {
if (ip_route_sanity_check(msg->no_routes, &msg->no_routes[j]) != 0) {
ret = ERR_READ_CONFIG;
goto fail;
}
}
READ_RAW_MULTI_LINE("dns", msg->dns, msg->n_dns);
if (msg->n_dns == 0) {
/* try aliases */
@@ -229,9 +252,11 @@ unsigned prefix = 0;
READ_RAW_STRING("user-profile", msg->xml_config_file);
ret = 0;
fail:
optionUnloadNested(pov);
return 0;
return ret;
}
static int read_sup_config_file(struct cfg_st *global_config,

4
src/sup-config/radius.c
View File

@@ -73,6 +73,10 @@ static int get_sup_config(struct cfg_st *cfg, client_entry_st *entry,
}
}
for (i=0;i<msg->n_routes;i++) {
ip_route_sanity_check(msg->routes, &msg->routes[i]);
}
if (pctx->ipv4_dns1[0] != 0)
dns++;
if (pctx->ipv4_dns2[0] != 0)