diff --git a/modules/auth_aka/aka_av_mgm.c b/modules/auth_aka/aka_av_mgm.c index 0575eecccd..797ce56667 100644 --- a/modules/auth_aka/aka_av_mgm.c +++ b/modules/auth_aka/aka_av_mgm.c @@ -301,26 +301,13 @@ struct aka_av *aka_cdb_fetch_av(str *impu, str *impi, str *nonce) LM_DBG("fetching AV key=%.*s\n", key.len, key.s); get_ret = aka_cdbf.get(aka_cdb, &key, &value); - // #region agent log H4-cdb-get - {FILE *_df = fopen("/tmp/debug.log", "a"); if(_df){fprintf(_df, "{\"hypothesisId\":\"H4\",\"location\":\"aka_av_mgm.c:aka_cdb_fetch_av\",\"message\":\"cdb_get_result\",\"data\":{\"get_ret\":%d,\"value_s\":\"%p\",\"value_len\":%d,\"key\":\"%.*s\"}}\n", get_ret, (void*)value.s, value.len, key.len, key.s); fclose(_df);}} - // #endregion - if (get_ret < 0 || value.s == NULL) { LM_DBG("AV not found in cachedb for key=%.*s\n", key.len, key.s); pkg_free(key.s); return NULL; } - // #region agent log H1-deserialize-input - {FILE *_df = fopen("/tmp/debug.log", "a"); if(_df){fprintf(_df, "{\"hypothesisId\":\"H1\",\"location\":\"aka_av_mgm.c:aka_cdb_fetch_av\",\"message\":\"deserialize_input\",\"data\":{\"value_len\":%d,\"value\":\"%.*s\"}}\n", value.len, value.len > 200 ? 200 : value.len, value.s); fclose(_df);}} - // #endregion - av = aka_cdb_deserialize_av(&value); - - // #region agent log H1-deserialize-result - {FILE *_df = fopen("/tmp/debug.log", "a"); if(_df){fprintf(_df, "{\"hypothesisId\":\"H1\",\"location\":\"aka_av_mgm.c:aka_cdb_fetch_av\",\"message\":\"deserialize_result\",\"data\":{\"av\":\"%p\",\"state\":%d,\"xres_len\":%d}}\n", (void*)av, av ? av->state : -1, av ? av->authorize.len : -1); fclose(_df);}} - // #endregion - if (av) { LM_DBG("fetched AV from cachedb key=%.*s state=%d\n", key.len, key.s, av->state); diff --git a/modules/auth_aka/auth_aka.c b/modules/auth_aka/auth_aka.c index bbcaba7ffa..0cf8a006f8 100644 --- a/modules/auth_aka/auth_aka.c +++ b/modules/auth_aka/auth_aka.c @@ -902,35 +902,19 @@ static int aka_authorize(struct sip_msg *_msg, str *_realm, realm.len, realm.s, public_id->len, public_id->s, private_id->len, private_id->s); - // #region agent log H1-entry - {FILE *_df = fopen("/tmp/debug.log", "a"); if(_df){fprintf(_df, "{\"hypothesisId\":\"H1\",\"location\":\"auth_aka.c:aka_authorize\",\"message\":\"entry\",\"data\":{\"aka_cdb\":\"%p\",\"nonce_len\":%d,\"nonce\":\"%.*s\"}}\n", (void*)aka_cdb, digest->nonce.len, digest->nonce.len, digest->nonce.s); fclose(_df);}} - // #endregion - user = aka_user_find(public_id, private_id); if (user == NULL) { - // #region agent log H2-user-null - {FILE *_df = fopen("/tmp/debug.log", "a"); if(_df){fprintf(_df, "{\"hypothesisId\":\"H2\",\"location\":\"auth_aka.c:aka_authorize\",\"message\":\"user_not_found_locally\",\"data\":{\"checking_cdb\":%d}}\n", (aka_cdb && digest->nonce.len) ? 1 : 0); fclose(_df);}} - // #endregion - /* User not found locally - check CacheDB if configured */ if (aka_cdb && digest->nonce.len) { LM_DBG("user not found locally, checking CacheDB for %.*s/%.*s nonce %.*s\n", public_id->len, public_id->s, private_id->len, private_id->s, digest->nonce.len, digest->nonce.s); av = aka_cdb_fetch_av(public_id, private_id, &digest->nonce); - - // #region agent log H1-fetch-result - {FILE *_df = fopen("/tmp/debug.log", "a"); if(_df){fprintf(_df, "{\"hypothesisId\":\"H1\",\"location\":\"auth_aka.c:aka_authorize\",\"message\":\"cdb_fetch_result\",\"data\":{\"av\":\"%p\",\"state\":%d,\"algmask\":%d,\"alg\":%d}}\n", (void*)av, av ? av->state : -1, av ? av->algmask : -1, av ? av->alg : -1); fclose(_df);}} - // #endregion - if (av) { LM_DBG("AV fetched from CacheDB: state=%d algmask=%d alg=%d\n", av->state, av->algmask, av->alg); /* Check state - only USING or USED states are valid */ if (av->state != AKA_AV_USING && av->state != AKA_AV_USED) { - // #region agent log H3-state-reject - {FILE *_df = fopen("/tmp/debug.log", "a"); if(_df){fprintf(_df, "{\"hypothesisId\":\"H3\",\"location\":\"auth_aka.c:aka_authorize\",\"message\":\"state_rejected\",\"data\":{\"state\":%d,\"expected_using\":%d,\"expected_used\":%d}}\n", av->state, AKA_AV_USING, AKA_AV_USED); fclose(_df);}} - // #endregion LM_WARN("AV from CacheDB has invalid state %d (expected USING=%d or USED=%d)\n", av->state, AKA_AV_USING, AKA_AV_USED); shm_free(av); @@ -938,21 +922,11 @@ static int aka_authorize(struct sip_msg *_msg, str *_realm, } /* Create user locally and attach the AV */ user = aka_user_get(public_id, private_id); - - // #region agent log H2-user-create - {FILE *_df = fopen("/tmp/debug.log", "a"); if(_df){fprintf(_df, "{\"hypothesisId\":\"H2\",\"location\":\"auth_aka.c:aka_authorize\",\"message\":\"user_create_result\",\"data\":{\"user\":\"%p\"}}\n", (void*)user); fclose(_df);}} - // #endregion - if (user) { cond_lock(&user->cond); av->state = AKA_AV_USED; list_add_tail(&av->list, &user->avs); cond_unlock(&user->cond); - - // #region agent log H3-av-attached - {FILE *_df = fopen("/tmp/debug.log", "a"); if(_df){fprintf(_df, "{\"hypothesisId\":\"H3\",\"location\":\"auth_aka.c:aka_authorize\",\"message\":\"av_attached_to_user\",\"data\":{\"av_state\":%d}}\n", av->state); fclose(_df);}} - // #endregion - LM_DBG("created local user from CacheDB AV\n"); goto av_found; } else { @@ -962,10 +936,6 @@ static int aka_authorize(struct sip_msg *_msg, str *_realm, } } - // #region agent log H4-failure - {FILE *_df = fopen("/tmp/debug.log", "a"); if(_df){fprintf(_df, "{\"hypothesisId\":\"H4\",\"location\":\"auth_aka.c:aka_authorize\",\"message\":\"returning_stale_nonce\",\"data\":{\"nonce_len\":%d}}\n", digest->nonce.len); fclose(_df);}} - // #endregion - if (digest->nonce.len) LM_ERR("could not get AKA user %.*s/%.*s with nonce %.*s\n", public_id->len, public_id->s, private_id->len, private_id->s, @@ -984,11 +954,6 @@ static int aka_authorize(struct sip_msg *_msg, str *_realm, goto release; } av_found: - - // #region agent log H5-av-found - {FILE *_df = fopen("/tmp/debug.log", "a"); if(_df){fprintf(_df, "{\"hypothesisId\":\"H5\",\"location\":\"auth_aka.c:aka_authorize\",\"message\":\"av_found_reached\",\"data\":{\"av\":\"%p\",\"av_state\":%d,\"xres_len\":%d}}\n", (void*)av, av ? av->state : -1, av ? av->authorize.len : -1); fclose(_df);}} - // #endregion - /* now that we are trusting the user, check whether it has an auts * parameter - if it does, we need to re-challenge him */ if (digest->auts.len) { @@ -1012,14 +977,8 @@ static int aka_authorize(struct sip_msg *_msg, str *_realm, if (!auth_api.check_response(digest, &_msg->first_line.u.request.method, &msg_body, &ha1)) { - // #region agent log H5-auth-success - {FILE *_df = fopen("/tmp/debug.log", "a"); if(_df){fprintf(_df, "{\"hypothesisId\":\"H5\",\"location\":\"auth_aka.c:aka_authorize\",\"message\":\"auth_success\",\"data\":{}}\n"); fclose(_df);}} - // #endregion ret = auth_api.post_auth(_msg, h); } else { - // #region agent log H5-auth-failure - {FILE *_df = fopen("/tmp/debug.log", "a"); if(_df){fprintf(_df, "{\"hypothesisId\":\"H5\",\"location\":\"auth_aka.c:aka_authorize\",\"message\":\"auth_failed_invalid_password\",\"data\":{\"xres_len\":%d}}\n", av ? av->authorize.len : -1); fclose(_df);}} - // #endregion ret = INVALID_PASSWORD; }