Merge branch '3.4-genesys' into TELECOM-11229

Author: benceszigeti

blacklists.c

@@ -40,6 +40,7 @@
 #include "context.h"
 #include "timer.h"
 #include "ut.h"
+#include "redact_pii.h"
 
 static struct bl_head *blst_heads;
 static unsigned int bl_default_marker;
@@ -1065,7 +1066,7 @@ static mi_response_t *mi_check_all_blacklists(const mi_params_t *params,
 		if (add_mi_string(resp_arr, NULL, 0, blst_heads[i].name.s,
 				blst_heads[i].name.len) < 0) {
 			LM_ERR("cannot add blacklist %.*s\n",
-					blst_heads[i].name.len, blst_heads[i].name.s);
+					blst_heads[i].name.len, redact_pii(blst_heads[i].name.s));
 			free_mi_response(resp);
 			resp = NULL;
 			goto end;

core_cmds.c

@@ -42,6 +42,7 @@
 /* needed by tcpconn_add_alias() */
 #include "net/tcp_conn_defs.h"
 #include "net/net_tcp.h"
+#include "redact_pii.h"
 
 static int fixup_forward_dest(void** param);
 static int fixup_destination(void** param);
@@ -479,7 +480,7 @@ static int fixup_f_send_sock(void** param)
 
 	he=resolvehost(host_nt.s,0);
 	if (he==0){
-		LM_ERR(" could not resolve %s\n", host_nt.s);
+		LM_ERR(" could not resolve %s\n", redact_pii(host_nt.s));
 		goto error;
 	}
 	hostent2ip_addr(&ip, he, 0);

dset.c

@@ -36,6 +36,7 @@
 #include "dset.h"
 #include "mem/mem.h"
 #include "ip_addr.h"
+#include "redact_pii.h"
 
 #define CONTACT "Contact: "
 #define CONTACT_LEN (sizeof(CONTACT) - 1)
@@ -329,7 +330,7 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path,
 	}
 
 	if (luri.len > MAX_URI_SIZE - 1) {
-		LM_ERR("too long uri: %.*s\n", luri.len, luri.s);
+		LM_ERR("too long uri: %.*s\n", luri.len, redact_pii(luri.s));
 		return -1;
 	}
 
@@ -341,7 +342,7 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path,
 		branches[nr_branches].dst_uri_len = 0;
 	} else {
 		if (dst_uri->len > MAX_URI_SIZE - 1) {
-			LM_ERR("too long dst_uri: %.*s\n", dst_uri->len, dst_uri->s);
+			LM_ERR("too long dst_uri: %.*s\n", dst_uri->len, redact_pii(dst_uri->s));
 			return -1;
 		}
 		memcpy(branches[nr_branches].dst_uri, dst_uri->s, dst_uri->len);
@@ -412,7 +413,7 @@ int update_branch(unsigned int idx, str** uri, str** dst_uri, str** path,
 		} else {
 			if ((*dst_uri)->len > MAX_URI_SIZE - 1) {
 				LM_ERR("too long dst_uri: %.*s\n",
-					(*dst_uri)->len, (*dst_uri)->s);
+					(*dst_uri)->len, redact_pii((*dst_uri)->s));
 				return -1;
 			}
 			memcpy(branches[idx].dst_uri, (*dst_uri)->s, (*dst_uri)->len);

forward.c

@@ -79,6 +79,7 @@
 #include "blacklists.h"
 #include "msg_callbacks.h"
 #include "md5utils.h"
+#include "redact_pii.h"
 
 
 
@@ -486,7 +487,7 @@ int forward_reply(struct sip_msg* msg)
 					msg->via1->port?msg->via1->port:SIP_PORT,
 					msg->via1->proto)!=1){
 			LM_ERR("host in first via!=me : %.*s:%d\n",
-				msg->via1->host.len, msg->via1->host.s,	msg->via1->port);
+				msg->via1->host.len, redact_pii(msg->via1->host.s), msg->via1->port);
 			/* send error msg back? */
 			goto error;
 		}

lib/reg/path.c

@@ -26,6 +26,7 @@
 #include "../../parser/parse_uri.h"
 #include "../../ut.h"
 #include "../../strcommon.h"
+#include "../../redact_pii.h"
 
 #include "path.h"
 #include "config.h"
@@ -122,7 +123,7 @@ int build_path_vector(struct sip_msg *_m, str *path, str *received,
 				                           &unescape_buf) != 0)
 					LM_ERR("failed to unescape received=%.*s\n",
 					       hooks.contact.received->body.len,
-					       hooks.contact.received->body.s);
+					       redact_pii(hooks.contact.received->body.s));
 				else
 					*received = unescape_buf;
 			}

lib/reg/pn.c

@@ -28,6 +28,7 @@
 #include "../../usr_avp.h"
 #include "../../data_lump.h"
 #include "../../data_lump_rpl.h"
+#include "../../redact_pii.h"
 
 #include "../../modules/usrloc/ul_evi.h"
 #include "../../modules/event_routing/api.h"
@@ -280,7 +281,7 @@ enum pn_action pn_inspect_ct_params(struct sip_msg *req, const str *ct_uri)
 	int i, is_cap_query = 1, is_handled_upstream = 0;
 
 	if (parse_uri(ct_uri->s, ct_uri->len, &puri) != 0) {
-		LM_ERR("failed to parse Contact URI '%.*s'\n", ct_uri->len, ct_uri->s);
+		LM_ERR("failed to parse Contact URI '%.*s'\n", ct_uri->len, redact_pii(ct_uri->s));
 		return -1;
 	}
 
@@ -551,7 +552,7 @@ static struct usr_avp *pn_trim_pn_params(evi_params_t *params)
               pn_has_uri_params(&p->val.s, &puri)) {
 			if (pn_remove_uri_params(&puri, p->val.s.len, &_sval) != 0) {
 				LM_ERR("failed to remove PN params from Contact '%.*s'\n",
-				       p->val.s.len, p->val.s.s);
+				       p->val.s.len, redact_pii(p->val.s.s));
 				sval = &p->val.s;
 			} else {
 				sval = &_sval;
@@ -631,13 +632,13 @@ int pn_awake_pn_contacts(struct sip_msg *req, ucontact_t **cts, int sz)
 	for (end = cts + sz; cts < end; cts++) {
 		if (parse_uri((*cts)->c.s, (*cts)->c.len, &puri) != 0) {
 			LM_ERR("failed to parse Contact '%.*s'\n",
-			       (*cts)->c.len, (*cts)->c.s);
+			       (*cts)->c.len, redact_pii((*cts)->c.s));
 			continue;
 		}
 
 		if (pn_trigger_pn(req, *cts, &puri) != 0) {
 			LM_ERR("failed to trigger PN for Contact: '%.*s'\n",
-			       (*cts)->c.len, (*cts)->c.s);
+			       (*cts)->c.len, redact_pii((*cts)->c.s));
 			continue;
 		}
 
@@ -660,15 +661,15 @@ int pn_trigger_pn(struct sip_msg *req, const ucontact_t *ct,
 		if (get_uri_param_val(ct_uri, &f->uri_param_key, &f->val) != 0) {
 			LM_ERR("failed to locate '%.*s' URI param in Contact '%.*s'\n",
 			       f->uri_param_key.len, f->uri_param_key.s,
-			       ct->c.len, ct->c.s);
+			       ct->c.len, redact_pii(ct->c.s));
 			return -1;
 		}
 	}
 
 	if (ebr.notify_on_event(req, ev_ct_update, pn_ebr_filters,
 	        pn_trim_pn_params, pn_inject_branch, pn_refresh_timeout) != 0) {
 		LM_ERR("failed to EBR-subscribe to "UL_EV_CT_UPDATE", Contact: %.*s\n",
-		       ct->c.len, ct->c.s);
+		       ct->c.len, redact_pii(ct->c.s));
 		return -1;
 	}
 
@@ -693,7 +694,7 @@ int pn_has_uri_params(const str *ct, struct sip_uri *puri)
 		puri = &_puri;
 
 	if (parse_uri(ct->s, ct->len, puri) != 0) {
-		LM_ERR("failed to parse contact: '%.*s'\n", ct->len, ct->s);
+		LM_ERR("failed to parse contact: '%.*s'\n", ct->len, redact_pii(ct->s));
 		return 0;
 	}
 
@@ -791,7 +792,7 @@ int pn_async_process_purr(struct sip_msg *req, async_ctx *ctx, udomain_t *d)
 	/* locate "pn-purr" in the R-URI */
 	if (parse_sip_msg_uri(req) < 0) {
 		LM_ERR("failed to parse R-URI: '%.*s'\n",
-		       GET_RURI(req)->len, GET_RURI(req)->s);
+		       GET_RURI(req)->len, redact_pii(GET_RURI(req)->s));
 		return -1;
 	}
 
@@ -814,7 +815,7 @@ int pn_async_process_purr(struct sip_msg *req, async_ctx *ctx, udomain_t *d)
 
 	rt_uri = &((rr_t *)req->route->parsed)->nameaddr.uri;
 	if (parse_uri(rt_uri->s, rt_uri->len, &puri) != 0) {
-		LM_ERR("failed to parse Route URI: '%.*s'\n", rt_uri->len, rt_uri->s);
+		LM_ERR("failed to parse Route URI: '%.*s'\n", rt_uri->len, redact_pii(rt_uri->s));
 		return -1;
 	}
 
@@ -843,7 +844,7 @@ int pn_async_process_purr(struct sip_msg *req, async_ctx *ctx, udomain_t *d)
 	       purr->len, purr->s);
 
 	if (parse_uri(c->c.s, c->c.len, &puri) != 0) {
-		LM_ERR("failed to parse Contact: '%.*s'\n", c->c.len, c->c.s);
+		LM_ERR("failed to parse Contact: '%.*s'\n", c->c.len, redact_pii(c->c.s));
 		goto err_unlock;
 	}
 
@@ -852,7 +853,7 @@ int pn_async_process_purr(struct sip_msg *req, async_ctx *ctx, udomain_t *d)
 		if (get_uri_param_val(&puri, &f->uri_param_key, &f->val) != 0) {
 			LM_ERR("failed to locate '%.*s' URI param in Contact '%.*s'\n",
 			       f->uri_param_key.len, f->uri_param_key.s,
-			       c->c.len, c->c.s);
+			       c->c.len, redact_pii(c->c.s));
 			goto err_unlock;
 		}
 	}
@@ -861,7 +862,7 @@ int pn_async_process_purr(struct sip_msg *req, async_ctx *ctx, udomain_t *d)
 	if (ebr.async_wait_for_event(req, ctx, ev_ct_update, pn_ebr_filters,
 	          pn_trim_pn_params, pn_refresh_timeout) != 0) {
 		LM_ERR("failed to EBR-subscribe to "UL_EV_CT_UPDATE", ct: '%.*s'\n",
-		       c->c.len, c->c.s);
+		       c->c.len, redact_pii(c->c.s));
 		goto err_unlock;
 	}
 
@@ -892,7 +893,7 @@ int pn_add_reply_purr(const ucontact_t *ct)
 		return 0;
 
 	if (parse_uri(ct->c.s, ct->c.len, &puri) != 0) {
-		LM_ERR("failed to parse Contact URI: '%.*s'\n", ct->c.len, ct->c.s);
+		LM_ERR("failed to parse Contact URI: '%.*s'\n", ct->c.len, redact_pii(ct->c.s));
 		return -1;
 	}
 

lib/reg/sip_msg.c

@@ -23,6 +23,7 @@
 
 #include "../../parser/contact/parse_contact.h"
 #include "../../parser/parse_uri.h"
+#include "../../redact_pii.h"
 
 #include "common.h"
 
@@ -420,7 +421,7 @@ int calc_contact_q(param_t* _q, qvalue_t* _r)
 		if (rc < 0) {
 			rerrno = R_INV_Q; /* Invalid q parameter */
 			LM_ERR("invalid qvalue (%.*s): %s\n",
-					_q->body.len, _q->body.s, qverr2str(rc));
+					_q->body.len, redact_pii(_q->body.s), qverr2str(rc));
 			return -1;
 		}
 	}

lib/url.c

@@ -25,6 +25,7 @@
 
 #include "../mem/mem.h"
 #include "../ut.h"
+#include "../redact_pii.h"
 
 #include "csv.h"
 
@@ -52,7 +53,7 @@ struct url *parse_url(const str *in, enum url_parse_flags opts, int pkg_dup)
 #define ENSURE_N_LEFT(n) \
 	do { \
 		if (st.len < n) { \
-			LM_ERR("incomplete URL: '%.*s'\n", in->len, in->s); \
+			LM_ERR("incomplete URL: '%.*s'\n", in->len, redact_pii(in->s)); \
 			goto out_err; \
 		} \
 	} while (0)
@@ -96,14 +97,14 @@ struct url *parse_url(const str *in, enum url_parse_flags opts, int pkg_dup)
 	if (opts & (URL_REQ_SCHEME|URL_REQ_SCHEME_GROUP)) {
 		if (!url->scheme.s || url->scheme.len <= 0) {
 			LM_ERR("incomplete \"scheme://\" part in URL %.*s\n",
-			       in->len, in->s);
+			       in->len, redact_pii(in->s));
 			goto out_err;
 		}
 
 		if ((opts & URL_REQ_SCHEME_GROUP) &&
 		    (!url->group_name.s || url->group_name.len <= 0)) {
 			LM_ERR("bad or missing \"scheme:group://\" part in URL %.*s\n",
-			       in->len, in->s);
+			       in->len, redact_pii(in->s));
 			goto out_err;
 		}
 	}
@@ -130,14 +131,14 @@ struct url *parse_url(const str *in, enum url_parse_flags opts, int pkg_dup)
 
 	if (opts & URL_REQ_USER) {
 		if (!url->username.s || url->username.len <= 0) {
-			LM_ERR("missing \"username\" part in URL %.*s\n", in->len, in->s);
+			LM_ERR("missing \"username\" part in URL %.*s\n", in->len, redact_pii(in->s));
 			goto out_err;
 		}
 	}
 
 	if (opts & URL_REQ_PASS) {
 		if (!url->password.s || url->password.len <= 0) {
-			LM_ERR("missing \"password\" part in URL %.*s\n", in->len, in->s);
+			LM_ERR("missing \"password\" part in URL %.*s\n", in->len, redact_pii(in->s));
 			goto out_err;
 		}
 	}
@@ -149,14 +150,14 @@ struct url *parse_url(const str *in, enum url_parse_flags opts, int pkg_dup)
 	hosts_chunk = __parse_csv_record(&hosts_db->s, 0, '/');
 
 	if (!hosts_chunk->s.s || hosts_chunk->s.len <= 0) {
-		LM_ERR("empty/missing \"host\" part in URL %.*s\n", in->len, in->s);
+		LM_ERR("empty/missing \"host\" part in URL %.*s\n", in->len, redact_pii(in->s));
 		goto out_err;
 	}
 
 	/* host1[:port1][,host2[:port2]...]] */
 	hosts = parse_csv_record(&hosts_chunk->s);
 	if (hosts->next && !(opts & URL_ALLOW_EXTRA_HOSTS)) {
-		LM_ERR("multiple hosts not allowed in URL %.*s\n", in->len, in->s);
+		LM_ERR("multiple hosts not allowed in URL %.*s\n", in->len, redact_pii(in->s));
 		goto out_err;
 	}
 
@@ -180,18 +181,18 @@ struct url *parse_url(const str *in, enum url_parse_flags opts, int pkg_dup)
 		ch = memchr(rec->s.s, ':', rec->s.len);
 		if (ch) {
 			if (ch == rec->s.s) {
-				LM_ERR("empty \"host\" in URL %.*s\n", in->len, in->s);
+				LM_ERR("empty \"host\" in URL %.*s\n", in->len, redact_pii(in->s));
 				goto out_err;
 			}
 
 			port.len = rec->s.len - (ch + 1 - rec->s.s);
 			port.s = ch + 1;
 			if (port.len <= 0 && (opts & URL_REQ_PORT)) {
-				LM_ERR("empty \"port\" in URL %.*s\n", in->len, in->s);
+				LM_ERR("empty \"port\" in URL %.*s\n", in->len, redact_pii(in->s));
 				goto out_err;
 			}
 			if (str2short(&port, &hostlist->port) != 0) {
-				LM_ERR("bad \"port\" in URL %.*s\n", in->len, in->s);
+				LM_ERR("bad \"port\" in URL %.*s\n", in->len, redact_pii(in->s));
 				goto out_err;
 			}
 
@@ -208,7 +209,7 @@ struct url *parse_url(const str *in, enum url_parse_flags opts, int pkg_dup)
 			url->database = hosts_chunk->next->s;
 
 	if (!url->database.s && (opts & URL_REQ_DB)) {
-		LM_ERR("missing \"database\" part in URL %.*s\n", in->len, in->s);
+		LM_ERR("missing \"database\" part in URL %.*s\n", in->len, redact_pii(in->s));
 		goto out_err;
 	}
 
@@ -237,7 +238,7 @@ struct url *parse_url(const str *in, enum url_parse_flags opts, int pkg_dup)
 			if (ch) {
 				if (ch == rec->s.s) {
 					LM_ERR("empty \"key\" parameter part in URL %.*s\n",
-					       in->len, in->s);
+					       in->len, redact_pii(in->s));
 					goto out_err;
 				}
 
@@ -254,7 +255,7 @@ struct url *parse_url(const str *in, enum url_parse_flags opts, int pkg_dup)
 	}
 
 	if (!url->params && (opts & URL_REQ_PARAMS)) {
-		LM_ERR("missing \"parameters\" part in URL %.*s\n", in->len, in->s);
+		LM_ERR("missing \"parameters\" part in URL %.*s\n", in->len, redact_pii(in->s));
 		goto out_err;
 	}
 

modules/auth_db/checks.c

@@ -41,6 +41,7 @@
 #include "../../pvar.h"
 #include "../../script_var.h"
 #include "../../mod_fix.h"
+#include "../../redact_pii.h"
 #include "authdb_mod.h"
 #include "checks.h"
 
@@ -296,7 +297,7 @@ int get_auth_id(struct sip_msg* _msg, str *_table, str* uri,
 	if (parse_uri(uri->s, uri->len, &sip_uri) < 0
 	&& (sip_uri.user.s == NULL || sip_uri.user.len <= 0)) {
 		LM_ERR("First parameter must be a URI with username (val = '%.*s').",
-			uri->len, uri->s);
+			uri->len, redact_pii(uri->s));
 		return -1;
 	}