sr-dev September 2022

sr-dev@lists.kamailio.org

16 participants
276 discussions

git:master:fb7c4978: acc: use get_dlg_varval() to get values for dialog variables
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

Module: kamailio Branch: master Commit: fb7c497893f05587bda1c37e09d73a7ebb522715 URL: https://github.com/kamailio/kamailio/commit/fb7c497893f05587bda1c37e09d73a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-23T13:42:18+02:00 acc: use get_dlg_varval() to get values for dialog variables --- Modified: src/modules/acc/acc_cdr.c Modified: src/modules/acc/acc_extra.c --- Diff: https://github.com/kamailio/kamailio/commit/fb7c497893f05587bda1c37e09d73a7… Patch: https://github.com/kamailio/kamailio/commit/fb7c497893f05587bda1c37e09d73a7…

1 0

git:master:ce3cd426: dialog: init output dlg var value param eariler
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

Module: kamailio Branch: master Commit: ce3cd42631ac06a6a20892bd308901c6acd58f7a URL: https://github.com/kamailio/kamailio/commit/ce3cd42631ac06a6a20892bd308901c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-23T13:33:03+02:00 dialog: init output dlg var value param eariler --- Modified: src/modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/ce3cd42631ac06a6a20892bd308901c… Patch: https://github.com/kamailio/kamailio/commit/ce3cd42631ac06a6a20892bd308901c… --- diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index 4db8d84c35..04a645309b 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -310,14 +310,14 @@ int get_dlg_varval(struct dlg_cell *dlg, str *key, str *val) { str *var = NULL; + val->s = NULL; + val->len = 0; + if( !dlg || !key || key->len > strlen(key->s)) { LM_ERR("BUG - bad parameters\n"); return -1; } - val->s = NULL; - val->len = 0; - dlg_lock(d_table, &(d_table->entries[dlg->h_entry])); var = get_dlg_variable_unsafe(dlg, key); if(var) {

1 0

git:master:a7cecdcb: dialog: internal api functions to get dlg variable reference or value
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

Module: kamailio Branch: master Commit: a7cecdcbc3c1d53fce22a33a3768da2a1907d64e URL: https://github.com/kamailio/kamailio/commit/a7cecdcbc3c1d53fce22a33a3768da2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-23T13:17:02+02:00 dialog: internal api functions to get dlg variable reference or value --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_cb.h Modified: src/modules/dialog/dlg_load.h Modified: src/modules/dialog/dlg_var.c Modified: src/modules/dialog/dlg_var.h --- Diff: https://github.com/kamailio/kamailio/commit/a7cecdcbc3c1d53fce22a33a3768da2… Patch: https://github.com/kamailio/kamailio/commit/a7cecdcbc3c1d53fce22a33a3768da2…

1 0

git:master:bcb3970d: acc_json: code formatting updates
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

Module: kamailio Branch: master Commit: bcb3970d7a89ab27b43f86aee5b93a473a8b790b URL: https://github.com/kamailio/kamailio/commit/bcb3970d7a89ab27b43f86aee5b93a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-22T20:41:32+02:00 acc_json: code formatting updates --- Modified: src/modules/acc_json/acc_json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bcb3970d7a89ab27b43f86aee5b93a4… Patch: https://github.com/kamailio/kamailio/commit/bcb3970d7a89ab27b43f86aee5b93a4… --- diff --git a/src/modules/acc_json/acc_json_mod.c b/src/modules/acc_json/acc_json_mod.c index 97b1c666bd..7e0698f18c 100644 --- a/src/modules/acc_json/acc_json_mod.c +++ b/src/modules/acc_json/acc_json_mod.c @@ -101,37 +101,41 @@ str cdr_json_pre_encoded_prefix = {0, 0}; static cmd_export_t cmds[] = {{0, 0, 0, 0, 0, 0}}; -static param_export_t params[] = {{"acc_flag", INT_PARAM, &acc_flag}, - {"acc_missed_flag", INT_PARAM, &acc_missed_flag}, - {"acc_extra", PARAM_STRING, &acc_extra_str}, - {"acc_pre_encoded_prefix", PARAM_STRING, &acc_json_pre_encoded_prefix_str}, - {"acc_time_mode", INT_PARAM, &acc_time_mode}, - {"acc_time_format", PARAM_STRING, &acc_time_format}, - {"acc_log_level", INT_PARAM, &acc_log_level}, - {"acc_log_facility", PARAM_STRING, &acc_log_facility_str}, - {"acc_output_mqueue", PARAM_STRING, &acc_output_mqueue_str}, - {"acc_output_syslog", INT_PARAM, &acc_output_syslog}, - {"cdr_extra", PARAM_STRING, &cdr_extra_str}, - {"cdr_pre_encoded_prefix", PARAM_STRING, &cdr_json_pre_encoded_prefix_str}, - {"cdr_enable", INT_PARAM, &cdr_enable}, - {"cdr_expired_dlg_enable", INT_PARAM, &cdr_expired_dlg_enable}, - {"cdr_log_level", INT_PARAM, &cdr_log_level}, - {"cdr_log_facility", PARAM_STRING, &cdr_log_facility_str}, - {"cdr_output_mqueue", PARAM_STRING, &cdr_output_mqueue_str}, - {"cdr_output_syslog", INT_PARAM, &cdr_output_syslog}, {0, 0, 0}}; +static param_export_t params[] = { + {"acc_flag", INT_PARAM, &acc_flag}, + {"acc_missed_flag", INT_PARAM, &acc_missed_flag}, + {"acc_extra", PARAM_STRING, &acc_extra_str}, + {"acc_pre_encoded_prefix", PARAM_STRING, &acc_json_pre_encoded_prefix_str}, + {"acc_time_mode", INT_PARAM, &acc_time_mode}, + {"acc_time_format", PARAM_STRING, &acc_time_format}, + {"acc_log_level", INT_PARAM, &acc_log_level}, + {"acc_log_facility", PARAM_STRING, &acc_log_facility_str}, + {"acc_output_mqueue", PARAM_STRING, &acc_output_mqueue_str}, + {"acc_output_syslog", INT_PARAM, &acc_output_syslog}, + {"cdr_extra", PARAM_STRING, &cdr_extra_str}, + {"cdr_pre_encoded_prefix", PARAM_STRING, &cdr_json_pre_encoded_prefix_str}, + {"cdr_enable", INT_PARAM, &cdr_enable}, + {"cdr_expired_dlg_enable", INT_PARAM, &cdr_expired_dlg_enable}, + {"cdr_log_level", INT_PARAM, &cdr_log_level}, + {"cdr_log_facility", PARAM_STRING, &cdr_log_facility_str}, + {"cdr_output_mqueue", PARAM_STRING, &cdr_output_mqueue_str}, + {"cdr_output_syslog", INT_PARAM, &cdr_output_syslog}, + + {0, 0, 0} +}; struct module_exports exports = { - "acc_json", - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported params */ - 0, /* exported RPC methods */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* initialization module */ - child_init, /* per-child init function */ - destroy /* destroy function */ + "acc_json", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported params */ + 0, /* exported RPC methods */ + 0, /* exported pseudo-variables */ + 0, /* response function */ + mod_init, /* initialization module */ + child_init, /* per-child init function */ + destroy /* destroy function */ }; @@ -306,8 +310,7 @@ int acc_json_send_request(struct sip_msg *req, acc_info_t *inf) } else { t = gmtime(&inf->env->ts); } - if(strftime(acc_time_format_buf, ACC_TIME_FORMAT_SIZE, acc_time_format, - t) + if(strftime(acc_time_format_buf, ACC_TIME_FORMAT_SIZE, acc_time_format, t) <= 0) { acc_time_format_buf[0] = '\0'; }

1 0

git:master:3e2b5d9e: acc_json: use the variable for the time key
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

Module: kamailio Branch: master Commit: 3e2b5d9ed6a0f18199359444c5ae33a1d6b94eb2 URL: https://github.com/kamailio/kamailio/commit/3e2b5d9ed6a0f18199359444c5ae33a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-22T20:32:52+02:00 acc_json: use the variable for the time key --- Modified: src/modules/acc_json/acc_json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3e2b5d9ed6a0f18199359444c5ae33a… Patch: https://github.com/kamailio/kamailio/commit/3e2b5d9ed6a0f18199359444c5ae33a… --- diff --git a/src/modules/acc_json/acc_json_mod.c b/src/modules/acc_json/acc_json_mod.c index ab6f9b4498..97b1c666bd 100644 --- a/src/modules/acc_json/acc_json_mod.c +++ b/src/modules/acc_json/acc_json_mod.c @@ -311,9 +311,9 @@ int acc_json_send_request(struct sip_msg *req, acc_info_t *inf) <= 0) { acc_time_format_buf[0] = '\0'; } - json_object_set_new(object, "time", json_string(acc_time_format_buf)); + json_object_set_new(object, acc_time_key.s, json_string(acc_time_format_buf)); } else { // default acc_time_mode==1 - json_object_set_new(object, "time", json_integer(inf->env->ts)); + json_object_set_new(object, acc_time_key.s, json_integer(inf->env->ts)); } LM_DBG("text[%.*s]\n", inf->env->text.len, inf->env->text.s);

1 0

git:master:023af516: acc_json: moved global vars declaration to .c file
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

Module: kamailio Branch: master Commit: 023af516f4ede3742f2e1836474978b596a4a3a8 URL: https://github.com/kamailio/kamailio/commit/023af516f4ede3742f2e1836474978b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-22T20:30:52+02:00 acc_json: moved global vars declaration to .c file - made them static --- Modified: src/modules/acc_json/acc_json_mod.c Modified: src/modules/acc_json/acc_json_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/023af516f4ede3742f2e1836474978b… Patch: https://github.com/kamailio/kamailio/commit/023af516f4ede3742f2e1836474978b… --- diff --git a/src/modules/acc_json/acc_json_mod.c b/src/modules/acc_json/acc_json_mod.c index accd054de6..ab6f9b4498 100644 --- a/src/modules/acc_json/acc_json_mod.c +++ b/src/modules/acc_json/acc_json_mod.c @@ -37,6 +37,26 @@ MODULE_VERSION +static str acc_method_key = str_init("method"); +static str acc_fromtag_key = str_init("from_tag"); +static str acc_totag_key = str_init("to_tag"); +static str acc_callid_key = str_init("callid"); +static str acc_sipcode_key = str_init("sip_code"); +static str acc_sipreason_key = str_init("sip_reason"); +static str acc_time_key = str_init("time"); + +static str cdr_start_str = str_init("start_time"); +static str cdr_end_str = str_init("end_time"); +static str cdr_duration_str = str_init("duration"); + +static char acc_time_format_buf[ACC_TIME_FORMAT_SIZE]; +static char *acc_time_format = "%Y-%m-%d %H:%M:%S"; + +static int acc_log_level = L_NOTICE; +static int acc_log_facility = LOG_DAEMON; +static int cdr_log_level = L_NOTICE; +static int cdr_log_facility = LOG_DAEMON; + static int mod_init(void); static void destroy(void); static int child_init(int rank); diff --git a/src/modules/acc_json/acc_json_mod.h b/src/modules/acc_json/acc_json_mod.h index 25a3ac120e..62c3350faa 100644 --- a/src/modules/acc_json/acc_json_mod.h +++ b/src/modules/acc_json/acc_json_mod.h @@ -24,25 +24,6 @@ #ifndef _ACC_JSON_MOD_H_ #define _ACC_JSON_MOD_H_ -str acc_method_key = str_init("method"); -str acc_fromtag_key = str_init("from_tag"); -str acc_totag_key = str_init("to_tag"); -str acc_callid_key = str_init("callid"); -str acc_sipcode_key = str_init("sip_code"); -str acc_sipreason_key = str_init("sip_reason"); -str acc_time_key = str_init("time"); - -str cdr_start_str = str_init("start_time"); -str cdr_end_str = str_init("end_time"); -str cdr_duration_str = str_init("duration"); - #define ACC_TIME_FORMAT_SIZE 128 -static char acc_time_format_buf[ACC_TIME_FORMAT_SIZE]; -char *acc_time_format = "%Y-%m-%d %H:%M:%S"; - -int acc_log_level = L_NOTICE; -int acc_log_facility = LOG_DAEMON; -int cdr_log_level = L_NOTICE; -int cdr_log_facility = LOG_DAEMON; #endif

1 0

git:master:41babc99: core: added #!defexps preprocessor directive
by Daniel-Constantin Mierla 22 Sep '22

22 Sep '22

Module: kamailio Branch: master Commit: 41babc99c83c74ca3d1494698455394dd8458e87 URL: https://github.com/kamailio/kamailio/commit/41babc99c83c74ca3d1494698455394… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-22T09:35:04+02:00 core: added #!defexps preprocessor directive - similar to #!defexp but the resulted value is enclosed in double quotes --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.c Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/41babc99c83c74ca3d1494698455394… Patch: https://github.com/kamailio/kamailio/commit/41babc99c83c74ca3d1494698455394… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index e508d420e3..cc0afb8f22 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -576,6 +576,7 @@ ENDIF endif TRYDEF "trydefine"|"trydef" REDEF "redefine"|"redef" DEFEXP defexp +DEFEXPS defexps DEFENV defenv DEFENVS defenvs TRYDEFENV trydefenv @@ -1344,6 +1345,10 @@ IMPORTFILE "import_file" ksr_cfg_print_part(yytext); pp_define_set_type(KSR_PPDEF_DEFEXP); state = DEFINE_S; BEGIN(DEFINE_ID); } +<INITIAL,CFGPRINTMODE>{PREP_START}{DEFEXPS}{EAT_ABLE}+ { count(); + ksr_cfg_print_part(yytext); + pp_define_set_type(KSR_PPDEF_DEFEXPS); + state = DEFINE_S; BEGIN(DEFINE_ID); } <DEFINE_ID>{ID}{MINUS} { count(); ksr_cfg_print_part(yytext); LM_CRIT( @@ -2150,8 +2155,13 @@ int pp_define_set(int len, char *text, int mode) return -1; } - if(pp_defines[ppos].dtype == KSR_PPDEF_DEFEXP) { - sval = pp_defexp_eval(text, len); + if(pp_defines[ppos].dtype == KSR_PPDEF_DEFEXP + || pp_defines[ppos].dtype == KSR_PPDEF_DEFEXPS) { + if(pp_defines[ppos].dtype == KSR_PPDEF_DEFEXP) { + sval = pp_defexp_eval(text, len, 0); + } else { + sval = pp_defexp_eval(text, len, 1); + } if(sval==NULL) { LM_NOTICE("no value returned to set the defexp [%.*s]\n", pp_defines[ppos].name.len, pp_defines[ppos].name.s); diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 8e43e9722d..e8aac78233 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -461,7 +461,7 @@ void pp_ifexp_eval(char *exval, int exlen) snexpr_destroy(e, &vars); } -char *pp_defexp_eval(char *exval, int exlen) +char *pp_defexp_eval(char *exval, int exlen, int qmode) { str exstr; struct snexpr_var_list vars = {0}; @@ -505,13 +505,25 @@ char *pp_defexp_eval(char *exval, int exlen) sval.len = strlen(result->param.stz.sval); } - res = (char*)pkg_malloc(sval.len + 1); + if(qmode==1) { + res = (char*)pkg_malloc(sval.len + 3); + } else { + res = (char*)pkg_malloc(sval.len + 1); + } if(res==NULL) { PKG_MEM_ERROR; goto done; } - memcpy(res, sval.s, sval.len); - res[sval.len] = '\0'; + if(qmode==1) { + res[0] = '"'; + memcpy(res, sval.s+1, sval.len); + res[sval.len+1] = '"'; + res[sval.len+2] = '\0'; + LM_DBG("expression quoted string result: [%s]\n", res); + } else { + memcpy(res, sval.s, sval.len); + res[sval.len] = '\0'; + } done: snexpr_result_free(result); diff --git a/src/core/ppcfg.h b/src/core/ppcfg.h index 7b5b016c08..f461535ed8 100644 --- a/src/core/ppcfg.h +++ b/src/core/ppcfg.h @@ -35,6 +35,7 @@ #define KSR_PPDEF_TRYDEF 1 #define KSR_PPDEF_REDEF 2 #define KSR_PPDEF_DEFEXP 3 +#define KSR_PPDEF_DEFEXPS 4 typedef struct ksr_ppdefine { str name; @@ -68,7 +69,7 @@ void ksr_cfg_print_initial_state(void); void pp_ifexp_eval(char *exval, int exlen); void pp_ifexp_state(int state); -char *pp_defexp_eval(char *exval, int exlen); +char *pp_defexp_eval(char *exval, int exlen, int qmode); #endif /*_PPCFG_H_*/

1 0

git:master:e241f7b8: kex: add additional safety checks for printing, based on PR #3250 from bensly-shanmugam
by Henning Westerholt 21 Sep '22

21 Sep '22

Module: kamailio Branch: master Commit: e241f7b8a07b24fba6d6ecf2c344a39d2b2b5859 URL: https://github.com/kamailio/kamailio/commit/e241f7b8a07b24fba6d6ecf2c344a39… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-09-21T18:34:04Z kex: add additional safety checks for printing, based on PR #3250 from bensly-shanmugam --- Modified: src/modules/kex/mod_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/e241f7b8a07b24fba6d6ecf2c344a39… Patch: https://github.com/kamailio/kamailio/commit/e241f7b8a07b24fba6d6ecf2c344a39… --- diff --git a/src/modules/kex/mod_stats.c b/src/modules/kex/mod_stats.c index 25e3285c780..dd73bec522a 100644 --- a/src/modules/kex/mod_stats.c +++ b/src/modules/kex/mod_stats.c @@ -86,7 +86,14 @@ static const char* rpc_mod_mem_statsx_doc[2] = { /* test if the current mod info was already printed */ static int rpc_mod_is_printed_one(mem_counter *stats, mem_counter *current) { - mem_counter *iter = stats; + mem_counter *iter; + + if ( stats == NULL || current == NULL ) + { + LM_ERR("invalid parameter\n"); + return 1; + } + iter = stats; while (iter && iter != current) { if (strcmp(iter->mname, current->mname) == 0) {

1 0

[kamailio/kamailio] GitHub Workflows security hardening (PR #3248)
by Alex 21 Sep '22

21 Sep '22

This PR adds explicit [permissions section](https://docs.github.com/en/actions/using-workflows/workflow-syntax… to workflows. This is a security best practice because by default workflows run with [extended set of permissions](https://docs.github.com/en/actions/security-guides/automatic-t… (except from `on: pull_request` [from external forks](https://securitylab.github.com/research/github-actions-preventing-pw…). By specifying any permission explicitly all others are set to none. By using the principle of least privilege the damage a compromised workflow can do (because of an [injection](https://securitylab.github.com/research/github-actions-untrusted… or compromised third party tool or action) is restricted. It is recommended to have [most strict permissions on the top level](https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-per… and grant write permissions on [job level](https://docs.github.com/en/actions/using-jobs/assigning-permissions-… case by case. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3248 -- Commit Summary -- * build: harden main.yml permissions * build: harden pull_request.yml permissions -- File Changes -- M .github/workflows/main.yml (2) M .github/workflows/pull_request.yml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3248.patch https://github.com/kamailio/kamailio/pull/3248.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3248 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3248(a)github.com>

2 2

git:master:8064a1d3: build: harden pull_request.yml permissions
by Victor Seva 21 Sep '22

21 Sep '22

Module: kamailio Branch: master Commit: 8064a1d3cd35e76f0e563fa401c181632f33b43a URL: https://github.com/kamailio/kamailio/commit/8064a1d3cd35e76f0e563fa401c1816… Author: Alex <aleksandrosansan(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-09-21T09:29:31+02:00 build: harden pull_request.yml permissions Signed-off-by: Alex <aleksandrosansan(a)gmail.com> --- Modified: .github/workflows/pull_request.yml --- Diff: https://github.com/kamailio/kamailio/commit/8064a1d3cd35e76f0e563fa401c1816… Patch: https://github.com/kamailio/kamailio/commit/8064a1d3cd35e76f0e563fa401c1816… --- diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 2633e7e29e..e2f6416ce4 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -6,6 +6,8 @@ name: checks_pr - master # Allows you to run this workflow manually from the Actions tab workflow_dispatch: +permissions: + contents: read # to fetch code (actions/checkout) jobs: build: runs-on: ubuntu-latest

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2022