Skip to content

Commit 1370ed7

Browse files
liviuchirculiviuchircu
committed
Fix more logs exposing URL passwords
Continuation of ed74875
1 parent 1ea6e9e commit 1370ed7

File tree

16 files changed

+62
-63
lines changed

16 files changed

+62
-63
lines changed

‎modules/cachedb_cassandra/cachedb_cassandra.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ static int child_init(int rank)
153153
cachedb_con *con;
154154

155155
for (it = cassandra_script_urls; it; it = it->next) {
156-
LM_DBG("iterating through conns - [%.*s]\n", it->url.len, it->url.s);
156+
LM_DBG("iterating through conns - [%s]\n", db_url_escape(&it->url));
157157
con = cassandra_init(&it->url);
158158
if (con == NULL) {
159159
LM_ERR("failed to open connection\n");

‎modules/cachedb_sql/cachedb_sql.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ static int child_init(int rank)
566566
cachedb_con *con;
567567

568568
for (it = sql_script_urls;it;it=it->next) {
569-
LM_DBG("iterating through conns - [%.*s]\n",it->url.len,it->url.s);
569+
LM_DBG("iterating through conns - [%s]\n", db_url_escape(&it->url));
570570
con = dbcache_init(&it->url);
571571
if (con == NULL) {
572572
LM_ERR("failed to open connection\n");

‎modules/db_cachedb/dbase.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ db_con_t* db_cachedb_init(const str* _url)
6363

6464
for (it=db_cachedb_script_urls;it;it=it->next) {
6565
if (memcmp(it->url.s,p,len) == 0) {
66-
LM_DBG("Found matching URL : [%.*s]\n",it->url.len,it->url.s);
66+
LM_DBG("Found matching URL : [%s]\n", db_url_escape(&it->url));
6767

6868
if (cachedb_bind_mod(&it->url,&cdbf) < 0) {
69-
LM_ERR("Cannot bind cachedb functions for URL [%.*s]\n",
70-
it->url.len,it->url.s);
69+
LM_ERR("Cannot bind cachedb functions for URL [%s]\n",
70+
db_url_escape(&it->url));
7171
return NULL;
7272
}
7373

‎modules/dialog/dlg_profile.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ int init_cachedb(void)
312312

313313
cdbc = cdbf.init(&cdb_url);
314314
if (!cdbc) {
315-
LM_ERR("cannot connect to cachedb_url %.*s\n", cdb_url.len, cdb_url.s);
315+
LM_ERR("cannot connect to cachedb_url %s\n", db_url_escape(&cdb_url));
316316
return -1;
317317
}
318318
LM_DBG("Inited cachedb \n");
@@ -342,8 +342,8 @@ int init_cachedb_utils(void)
342342
return -1;
343343
}
344344
if (cachedb_bind_mod(&cdb_url, &cdbf) < 0) {
345-
LM_ERR("cannot bind functions for cachedb_url %.*s\n",
346-
cdb_url.len, cdb_url.s);
345+
LM_ERR("cannot bind functions for cachedb_url %s\n",
346+
db_url_escape(&cdb_url));
347347
return -1;
348348
}
349349
if (!CACHEDB_CAPABILITY(&cdbf,
@@ -354,7 +354,7 @@ int init_cachedb_utils(void)
354354

355355
cdbc = cdbf.init(&cdb_url);
356356
if (!cdbc) {
357-
LM_ERR("cannot connect to cachedb_url %.*s\n", cdb_url.len, cdb_url.s);
357+
LM_ERR("cannot connect to cachedb_url %s\n", db_url_escape(&cdb_url));
358358
return -1;
359359
}
360360

‎modules/dialplan/dialplan.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,9 +335,9 @@ static void dp_print_list(void)
335335
LM_DBG("List is empty\n");
336336

337337
while (start != NULL) {
338-
LM_DBG("Partition=[%.*s] url=[%.*s] table=[%.*s] next=[%p]\n",
338+
LM_DBG("Partition=[%.*s] url=[%s] table=[%.*s] next=[%p]\n",
339339
start->partition.len, start->partition.s,
340-
start->dp_db_url.len, start->dp_db_url.s,
340+
db_url_escape(&start->dp_db_url),
341341
start->dp_table_name.len, start->dp_table_name.s, start->next);
342342
start = start->next;
343343
}

‎modules/dialplan/dp_db.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ int test_db(dp_connection_list_p dp_connection)
8787
}
8888

8989
if (db_bind_mod(&dp_connection->db_url, &dp_connection->dp_dbf) < 0) {
90-
LM_ERR("failed to find a client driver for DB URL: '%.*s'\n",
91-
dp_connection->db_url.len, dp_connection->db_url.s);
90+
LM_ERR("failed to find a client driver for DB URL: '%s'\n",
91+
db_url_escape(&dp_connection->db_url));
9292
return -1;
9393
}
9494

‎modules/dns_cache/dns_cache.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ static int mod_init(void)
106106
return -1;
107107
} else {
108108
cachedb_url.len = strlen(cachedb_url.s);
109-
LM_DBG("using CacheDB URL: %s\n", cachedb_url.s);
109+
LM_DBG("using CacheDB URL: %s\n", db_url_escape(&cachedb_url));
110110
}
111111

112112
/* set pointers that resolver will use for caching */
@@ -119,8 +119,8 @@ static int mod_init(void)
119119
static int child_init(int rank)
120120
{
121121
if (cachedb_bind_mod(&cachedb_url, &cdbf) < 0) {
122-
LM_ERR("cannot bind functions for db_url %.*s\n",
123-
cachedb_url.len, cachedb_url.s);
122+
LM_ERR("cannot bind functions for db_url %s\n",
123+
db_url_escape(&cachedb_url));
124124
return -1;
125125
}
126126

@@ -132,7 +132,7 @@ static int child_init(int rank)
132132

133133
cdbc = cdbf.init(&cachedb_url);
134134
if (!cdbc) {
135-
LM_ERR("cannot connect to db_url %.*s\n", cachedb_url.len, cachedb_url.s);
135+
LM_ERR("cannot connect to db_url %s\n", db_url_escape(&cachedb_url));
136136
return -1;
137137
}
138138

‎modules/drouting/drouting.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2068,8 +2068,8 @@ static int dr_init(void)
20682068

20692069
if( (*db_part->db_con =
20702070
db_part->db_funcs.init(&db_part->db_url)) == 0) {
2071-
LM_ERR("failed to connect to db url <%.*s>\n",
2072-
db_part->db_url.len, db_part->db_url.s);
2071+
LM_ERR("failed to connect to db url <%s>\n",
2072+
db_url_escape(&db_part->db_url));
20732073
goto error_cfg;
20742074
}
20752075

‎modules/imc/imc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ static int mod_init(void)
383383

384384
/* binding to mysql module */
385385
init_db_url( db_url , 0 /*cannot be null*/);
386-
LM_DBG("db_url=%s/%d/%p\n", ZSW(db_url.s), db_url.len, db_url.s);
386+
LM_DBG("db_url=%s\n", db_url_escape(&db_url));
387387

388388
if (db_bind_mod(&db_url, &imc_dbf))
389389
{

‎modules/presence/presence.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,8 @@ struct module_exports exports= {
267267
static int mod_init(void)
268268
{
269269
db_url.len = db_url.s ? strlen(db_url.s) : 0;
270-
LM_DBG("db_url=%s/%d/%p\n", ZSW(db_url.s), db_url.len,db_url.s);
270+
LM_DBG("db_url=%s\n", db_url_escape(&db_url));
271+
271272
presentity_table.len = strlen(presentity_table.s);
272273
active_watchers_table.len = strlen(active_watchers_table.s);
273274
watchers_table.len = strlen(watchers_table.s);

0 commit comments

Comments
 (0)