Skip to content

F
freeswitch
提交 254b739b authored 作者: Luis Azedo's avatar Luis Azedo 提交者： lazedo
浏览文件
操作

FS-11025 [mod_sofia] use ports for acl check 

* optionally use port for acl check
* optionally lookup acl token from header
* optionally processed auth only by acl
上级 60956d7f
隐藏空白字符变更
内嵌 并排
正在显示 包含 98 行增加 和 40 行删除
src/mod/endpoints/mod_sofia/mod_sofia.h
浏览文件 @ 254b739b
...@@ -310,6 +310,8 @@ typedef enum { ...@@ -310,6 +310,8 @@ typedef enum {
PFLAG_AUTO_INVITE_100, PFLAG_AUTO_INVITE_100,
PFLAG_UPDATE_REFRESHER, PFLAG_UPDATE_REFRESHER,
PFLAG_AUTH_REQUIRE_USER, PFLAG_AUTH_REQUIRE_USER,
PFLAG_AUTH_CALLS_ACL_ONLY,
PFLAG_USE_PORT_FOR_ACL_CHECK,
/* No new flags below this line */ /* No new flags below this line */
PFLAG_MAX PFLAG_MAX
...@@ -787,6 +789,8 @@ struct sofia_profile { ...@@ -787,6 +789,8 @@ struct sofia_profile {
int bind_attempt_interval; int bind_attempt_interval;
char *proxy_notify_events; char *proxy_notify_events;
char *proxy_info_content_types; char *proxy_info_content_types;
char *acl_inbound_x_token_header;
char *acl_proxy_x_token_header;
}; };
......
src/mod/endpoints/mod_sofia/sofia.c
浏览文件 @ 254b739b
...@@ -4592,6 +4592,8 @@ switch_status_t config_sofia(sofia_config_t reload, char *profile_name) ...@@ -4592,6 +4592,8 @@ switch_status_t config_sofia(sofia_config_t reload, char *profile_name)
sofia_clear_pflag(profile, PFLAG_FIRE_TRANFER_EVENTS); sofia_clear_pflag(profile, PFLAG_FIRE_TRANFER_EVENTS);
sofia_clear_pflag(profile, PFLAG_BLIND_AUTH_ENFORCE_RESULT); sofia_clear_pflag(profile, PFLAG_BLIND_AUTH_ENFORCE_RESULT);
sofia_clear_pflag(profile, PFLAG_AUTH_REQUIRE_USER); sofia_clear_pflag(profile, PFLAG_AUTH_REQUIRE_USER);
sofia_clear_pflag(profile, PFLAG_AUTH_CALLS_ACL_ONLY);
sofia_clear_pflag(profile, PFLAG_USE_PORT_FOR_ACL_CHECK);
profile->shutdown_type = "false"; profile->shutdown_type = "false";
profile->local_network = "localnet.auto"; profile->local_network = "localnet.auto";
sofia_set_flag(profile, TFLAG_ENABLE_SOA); sofia_set_flag(profile, TFLAG_ENABLE_SOA);
...@@ -5908,6 +5910,22 @@ switch_status_t config_sofia(sofia_config_t reload, char *profile_name) ...@@ -5908,6 +5910,22 @@ switch_status_t config_sofia(sofia_config_t reload, char *profile_name)
} else { } else {
sofia_clear_pflag(profile, PFLAG_BLIND_AUTH_ENFORCE_RESULT); sofia_clear_pflag(profile, PFLAG_BLIND_AUTH_ENFORCE_RESULT);
} }
} else if (!strcasecmp(var, "auth-calls-acl-only")) {
if(switch_true(val)) {
sofia_set_pflag(profile, PFLAG_AUTH_CALLS_ACL_ONLY);
} else {
sofia_clear_pflag(profile, PFLAG_AUTH_CALLS_ACL_ONLY);
}
} else if (!strcasecmp(var, "use-port-for-acl-check")) {
if(switch_true(val)) {
sofia_set_pflag(profile, PFLAG_USE_PORT_FOR_ACL_CHECK);
} else {
sofia_clear_pflag(profile, PFLAG_USE_PORT_FOR_ACL_CHECK);
}
} else if (!strcasecmp(var, "apply-inbound-acl-x-token")) {
profile->acl_inbound_x_token_header = switch_core_strdup(profile->pool, val);
} else if (!strcasecmp(var, "apply-proxy-acl-x-token")) {
profile->acl_proxy_x_token_header = switch_core_strdup(profile->pool, val);
} else if (!strcasecmp(var, "proxy-hold")) { } else if (!strcasecmp(var, "proxy-hold")) {
if(switch_true(val)) { if(switch_true(val)) {
sofia_set_pflag(profile, PFLAG_PROXY_HOLD); sofia_set_pflag(profile, PFLAG_PROXY_HOLD);
...@@ -10188,14 +10206,23 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia ...@@ -10188,14 +10206,23 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
int ok = 1; int ok = 1;
char *last_acl = NULL; char *last_acl = NULL;
const char *token = NULL; const char *token = NULL;
int acl_port = sofia_test_pflag(profile, PFLAG_USE_PORT_FOR_ACL_CHECK) ? network_port : 0;
for (x = 0; x < profile->acl_count; x++) { for (x = 0; x < profile->acl_count; x++) {
last_acl = profile->acl[x]; last_acl = profile->acl[x];
if ((ok = switch_check_network_list_ip_token(network_ip, last_acl, &token))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "verifying acl \"%s\" for ip/port %s:%i.\n",
switch_str_nil(last_acl), network_ip, acl_port);
if ((ok = switch_check_network_list_ip_port_token(network_ip, acl_port, last_acl, &token))) {
if (profile->acl_pass_context[x]) { if (profile->acl_pass_context[x]) {
acl_context = profile->acl_pass_context[x]; acl_context = profile->acl_pass_context[x];
} }
if(!token && profile->acl_inbound_x_token_header) {
const char * x_auth_token = sofia_glue_get_unknown_header(sip, profile->acl_inbound_x_token_header);
if (!zstr(x_auth_token)) {
token = x_auth_token;
}
}
break; break;
} }
...@@ -10220,76 +10247,103 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia ...@@ -10220,76 +10247,103 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
} }
} else { } else {
int network_ip_is_proxy = 0; int network_ip_is_proxy = 0;
const char* x_auth_ip = network_ip;
/* Check if network_ip is a proxy allowed to send us calls */ /* Check if network_ip is a proxy allowed to send us calls */
if (profile->proxy_acl_count) { if (profile->proxy_acl_count) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%d acls to check for proxy\n", profile->proxy_acl_count); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%d acls to check for proxy\n", profile->proxy_acl_count);
} for (x = 0; x < profile->proxy_acl_count; x++) {
last_acl = profile->proxy_acl[x];
for (x = 0; x < profile->proxy_acl_count; x++) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "checking %s against acl %s\n", network_ip, last_acl);
last_acl = profile->proxy_acl[x]; if (switch_check_network_list_ip_port_token(network_ip, network_port, last_acl, &token)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "checking %s against acl %s\n", network_ip, last_acl); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s is a proxy according to the %s acl\n", network_ip, last_acl);
if (switch_check_network_list_ip_token(network_ip, last_acl, &token)) { network_ip_is_proxy = 1;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s is a proxy according to the %s acl\n", network_ip, last_acl); break;
network_ip_is_proxy = 1; }
break;
} }
} }
/* /*
* if network_ip is a proxy allowed to send calls, check for auth * if network_ip is a proxy allowed to send calls, check for auth
* ip header and see if it matches against the inbound acl * ip header and see if it matches against the inbound acl
*/ */
if (network_ip_is_proxy) { if (network_ip_is_proxy) {
const char * x_auth_ip = sofia_glue_get_unknown_header(sip, "X-AUTH-IP"); const char * x_auth_port = sofia_glue_get_unknown_header(sip, "X-AUTH-PORT");
const char * x_auth_token = sofia_glue_get_unknown_header(sip, "X-AUTH-Token"); int x_auth_port_i = sofia_test_pflag(profile, PFLAG_USE_PORT_FOR_ACL_CHECK) ? zstr(x_auth_port) ? 0 : atoi(x_auth_port) : 0;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "network ip is a proxy\n");
/*
if (!zstr(x_auth_token) && !zstr(x_auth_ip)) { * if network_ip is a proxy allowed to send calls,
switch_copy_string(proxied_client_ip, x_auth_ip, sizeof(proxied_client_ip)); * authorize call if proxy provided matched token header
token = x_auth_token; */
ok = 1; if (profile->acl_proxy_x_token_header) {
} else if (!zstr(x_auth_ip)) { const char * x_auth_token = sofia_glue_get_unknown_header(sip, profile->acl_proxy_x_token_header);
if (!zstr(x_auth_token)) {
token = x_auth_token;
switch_copy_string(proxied_client_ip, x_auth_ip, sizeof(proxied_client_ip));
ok = 1;
}
}
if (!ok && (x_auth_ip = sofia_glue_get_unknown_header(sip, "X-AUTH-IP")) && !zstr(x_auth_ip)) {
for (x = 0; x < profile->acl_count; x++) { for (x = 0; x < profile->acl_count; x++) {
last_acl = profile->acl[x]; last_acl = profile->acl[x];
if ((ok = switch_check_network_list_ip_token(x_auth_ip, last_acl, &token))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "verifying acl \"%s\" from proxy for ip/port %s:%i.\n",
switch_str_nil(last_acl), x_auth_ip, x_auth_port_i);
if ((ok = switch_check_network_list_ip_port_token(x_auth_ip, x_auth_port_i, last_acl, &token))) {
switch_copy_string(proxied_client_ip, x_auth_ip, sizeof(proxied_client_ip)); switch_copy_string(proxied_client_ip, x_auth_ip, sizeof(proxied_client_ip));
if (profile->acl_pass_context[x]) {
acl_context = profile->acl_pass_context[x];
}
break; break;
} }
}
}
if (!ok) { if (profile->acl_fail_context[x]) {
if (!sofia_test_pflag(profile, PFLAG_AUTH_CALLS)) { acl_context = profile->acl_fail_context[x];
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by acl \"%s\"\n", x_auth_ip, switch_str_nil(last_acl)); } else {
nua_respond(nh, SIP_403_FORBIDDEN, TAG_END()); acl_context = NULL;
goto fail; }
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IP %s Rejected by acl \"%s\". Falling back to Digest auth.\n",
x_auth_ip, switch_str_nil(last_acl));
} }
} else { } else {
if (token) { x_auth_ip = network_ip;
switch_set_string(acl_token, token); }
} }
if (ok) {
if (token) {
switch_set_string(acl_token, token);
}
if (sofia_test_pflag(profile, PFLAG_AUTH_CALLS)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IP %s Approved by acl \"%s[%s]\". Access Granted.\n", switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IP %s Approved by acl \"%s[%s]\". Access Granted.\n",
proxied_client_ip, switch_str_nil(last_acl), acl_token); x_auth_ip, switch_str_nil(last_acl), acl_token);
switch_set_string(sip_acl_authed_by, last_acl); switch_set_string(sip_acl_authed_by, last_acl);
switch_set_string(sip_acl_token, acl_token); switch_set_string(sip_acl_token, acl_token);
is_auth = 1; is_auth = 1;
} }
} else { } else {
if (!sofia_test_pflag(profile, PFLAG_AUTH_CALLS)) { if (!sofia_test_pflag(profile, PFLAG_AUTH_CALLS)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by acl \"%s\"\n", network_ip, switch_str_nil(last_acl)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by acl \"%s\"\n", x_auth_ip, switch_str_nil(last_acl));
nua_respond(nh, SIP_403_FORBIDDEN, TAG_END()); if (!acl_context) {
goto fail; nua_respond(nh, SIP_403_FORBIDDEN, TAG_END());
} else { goto fail;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IP %s Rejected by acl \"%s\". Falling back to Digest auth.\n", } else {
network_ip, switch_str_nil(last_acl)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IP %s Rejected by acl \"%s\". Falling back to Digest auth.\n",
x_auth_ip, switch_str_nil(last_acl));
}
} }
} }
} }
} }
if (!is_auth && sofia_test_pflag(profile, PFLAG_AUTH_CALLS) && sofia_test_pflag(profile, PFLAG_AUTH_CALLS_ACL_ONLY)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IP/Port %s %i Rejected by acls and auth-calls-acl-only flag is set, rejecting call\n",
network_ip, network_port);
nua_respond(nh, SIP_403_FORBIDDEN, TAG_END());
goto fail;
}
if (!is_auth && sofia_test_pflag(profile, PFLAG_AUTH_CALLS) && sofia_test_pflag(profile, PFLAG_BLIND_AUTH)) { if (!is_auth && sofia_test_pflag(profile, PFLAG_AUTH_CALLS) && sofia_test_pflag(profile, PFLAG_BLIND_AUTH)) {
char *user; char *user;
switch_status_t blind_result = SWITCH_STATUS_FALSE; switch_status_t blind_result = SWITCH_STATUS_FALSE;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论