From 6057050899a97913e7bb638cfc320822d2a7eb92 Mon Sep 17 00:00:00 2001 From: Ben Ford Date: Mon, 2 Nov 2020 10:29:31 -0600 Subject: [PATCH] AST-2020-002 - res_pjsip: Stop sending INVITEs after challenge limit. If Asterisk sends out an INVITE and receives a challenge with a different nonce value each time, it will continuously send out INVITEs, even if the call is hung up. The endpoint must be configured for outbound authentication for this to occur. A limit has been set on outbound INVITEs so that, once reached, Asterisk will stop sending INVITEs and the transaction will terminate. ASTERISK-29013 Change-Id: I2d001ca745b00ca8aa12030f2240cd72363b46f7 --- include/asterisk/res_pjsip.h | 3 +++ include/asterisk/res_pjsip_session.h | 4 +++- res/res_pjsip.c | 2 -- res/res_pjsip_session.c | 10 +++++++++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h index a78311daa7..22292cce1c 100644 --- a/include/asterisk/res_pjsip.h +++ b/include/asterisk/res_pjsip.h @@ -63,6 +63,9 @@ struct pjsip_tpselector; /*! \brief Maximum number of ciphers supported for a TLS transport */ #define SIP_TLS_MAX_CIPHERS 64 +/*! Maximum number of challenges before assuming that we are in a loop */ +#define MAX_RX_CHALLENGES 10 + /*! * \brief Structure for SIP transport information */ diff --git a/include/asterisk/res_pjsip_session.h b/include/asterisk/res_pjsip_session.h index 44b45680d4..f814fa0431 100644 --- a/include/asterisk/res_pjsip_session.h +++ b/include/asterisk/res_pjsip_session.h @@ -221,8 +221,10 @@ struct ast_sip_session { enum ast_sip_dtmf_mode dtmf; /*! Initial incoming INVITE Request-URI. NULL otherwise. */ pjsip_uri *request_uri; - /* Media statistics for negotiated RTP streams */ + /*! Media statistics for negotiated RTP streams */ AST_VECTOR(, struct ast_rtp_instance_stats *) media_stats; + /*! Number of challenges received during outgoing requests to determine if we are in a loop */ + unsigned int authentication_challenge_count:4; }; typedef int (*ast_sip_session_request_creation_cb)(struct ast_sip_session *session, pjsip_tx_data *tdata); diff --git a/res/res_pjsip.c b/res/res_pjsip.c index 3e11a6bd8c..7f090368cd 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -4000,8 +4000,6 @@ static pj_bool_t does_method_match(const pj_str_t *message_method, const char *s return pj_stristr(&method, message_method) ? PJ_TRUE : PJ_FALSE; } -/*! Maximum number of challenges before assuming that we are in a loop */ -#define MAX_RX_CHALLENGES 10 #define TIMER_INACTIVE 0 #define TIMEOUT_TIMER2 5 diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c index 4399d552c1..563989d9f8 100644 --- a/res/res_pjsip_session.c +++ b/res/res_pjsip_session.c @@ -2842,7 +2842,6 @@ static pjsip_module session_reinvite_module = { .on_rx_request = session_reinvite_on_rx_request, }; - void ast_sip_session_send_request_with_cb(struct ast_sip_session *session, pjsip_tx_data *tdata, ast_sip_session_response_cb on_response) { @@ -3094,6 +3093,9 @@ struct ast_sip_session *ast_sip_session_alloc(struct ast_sip_endpoint *endpoint, return NULL; } + /* Track the number of challenges received on outbound requests */ + session->authentication_challenge_count = 0; + /* Fire seesion begin handlers */ handle_session_begin(session); @@ -3263,6 +3265,10 @@ static pj_bool_t outbound_invite_auth(pjsip_rx_data *rdata) } ast_debug(3, "%s: Initial INVITE is being challenged.\n", ast_sip_session_get_name(session)); + if (++session->authentication_challenge_count > MAX_RX_CHALLENGES) { + ast_debug(3, "%s: Initial INVITE reached maximum number of auth attempts.\n", ast_sip_session_get_name(session)); + return PJ_FALSE; + } if (ast_sip_create_request_with_auth(&session->endpoint->outbound_auths, rdata, tsx->last_tx, &tdata)) { @@ -4565,6 +4571,7 @@ static void session_inv_on_tsx_state_changed(pjsip_inv_session *inv, pjsip_trans ast_sip_session_get_name(session), tsx->status_code); if ((tsx->status_code == 401 || tsx->status_code == 407) + && ++session->authentication_challenge_count < MAX_RX_CHALLENGES && !ast_sip_create_request_with_auth( &session->endpoint->outbound_auths, e->body.tsx_state.src.rdata, tsx->last_tx, &tdata)) { @@ -4641,6 +4648,7 @@ static void session_inv_on_tsx_state_changed(pjsip_inv_session *inv, pjsip_trans (int) pj_strlen(&tsx->method.name), pj_strbuf(&tsx->method.name), tsx->status_code); if ((tsx->status_code == 401 || tsx->status_code == 407) + && ++session->authentication_challenge_count < MAX_RX_CHALLENGES && !ast_sip_create_request_with_auth( &session->endpoint->outbound_auths, e->body.tsx_state.src.rdata, tsx->last_tx, &tdata)) { -- 2.47.2