[sr-dev] git:master:91a873df: textops: added remove_hf_idx(hname, idx)

[Daniel-Constantin Mierla]

Content preview: Module: kamailio Branch: master Commit: 91a873dfe070f8041743ea93fafdac438763a2d1
URL: https://github.com/kamailio/kamailio/commit/91a873dfe070f8041743ea93fafdac438763a2d1
Author: Daniel-Constantin Mierla <***@gmail.com> Committer: Daniel-Constantin
Mierla <***@gmail.com> Date: 2021-05-26T15:29:11+02:00

Content analysis details: (-2.4 points, 5.5 required)

pts rule name description
---- ---------------------- --------------------------------------------------
-1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP
-1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%
[score: 0.0000]
0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level
mail domains are different
1.0 FORGED_GMAIL_RCVD 'From' gmail.com does not match 'Received'
headers
0.0 DKIM_ADSP_CUSTOM_MED No valid author signature, adsp_override is
CUSTOM_MED
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (miconda[at]gmail.com)
0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and
EnvelopeFrom freemail headers are
different
-1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list
manager

Module: kamailio
Branch: master
Commit: 91a873dfe070f8041743ea93fafdac438763a2d1
URL: https://github.com/kamailio/kamailio/commit/91a873dfe070f8041743ea93fafdac438763a2d1

Author: Daniel-Constantin Mierla <***@gmail.com>
Committer: Daniel-Constantin Mierla <***@gmail.com>
Date: 2021-05-26T15:29:11+02:00

textops: added remove_hf_idx(hname, idx)

- function to remove a header by name and index

---

Modified: src/modules/textops/textops.c

---

Diff: https://github.com/kamailio/kamailio/commit/91a873dfe070f8041743ea93fafdac438763a2d1.diff
Patch: https://github.com/kamailio/kamailio/commit/91a873dfe070f8041743ea93fafdac438763a2d1.patch

---

diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c
index 2998906051..b192c1306c 100644
--- a/src/modules/textops/textops.c
+++ b/src/modules/textops/textops.c
@@ -143,6 +143,7 @@ static int remove_hf_re_f(struct sip_msg* msg, char* key, char* foo);
static int remove_hf_exp_f(sip_msg_t* msg, char* ematch, char* eskip);
static int is_present_hf_re_f(struct sip_msg* msg, char* key, char* foo);
static int remove_hf_pv_f(sip_msg_t* msg, char* phf, char* foo);
+static int remove_hf_idx_f(sip_msg_t* msg, char* phname, char* pidx);
static int remove_hf_re_pv_f(sip_msg_t* msg, char* key, char* foo);
static int remove_hf_exp_pv_f(sip_msg_t* msg, char* ematch, char* eskip);
static int is_present_hf_pv_f(sip_msg_t* msg, char* key, char* foo);
@@ -239,6 +240,9 @@ static cmd_export_t cmds[]={
{"remove_hf", (cmd_function)remove_hf_f, 1,
hname_fixup, free_hname_fixup,
ANY_ROUTE},
+ {"remove_hf_idx", (cmd_function)remove_hf_idx_f, 2,
+ fixup_spve_igp, fixup_free_spve_igp,
+ ANY_ROUTE},
{"remove_hf_re", (cmd_function)remove_hf_re_f, 1,
fixup_regexp_null, fixup_free_regexp_null,
ANY_ROUTE},
@@ -1747,6 +1751,84 @@ int remove_hf_f(struct sip_msg* msg, char* str_hf, char* foo)
return cnt==0 ? -1 : 1;
}

+static int ki_remove_hf_idx(sip_msg_t* msg, str* hname, int idx)
+{
+ hdr_field_t hfm = {0};
+ hdr_field_t *hfi = NULL;
+ sr_lump_t *anchor = NULL;
+ int i = 0;
+ int rm = 0;
+ int pos = 0;
+
+ /* ensure all headers are parsed */
+ if(parse_headers(msg, HDR_EOH_F, 0)<0) {
+ LM_ERR("error parsing headers\n");
+ return -1;
+ }
+
+ if(parse_hname2_str(hname, &hfm)==NULL) {
+ LM_ERR("failed to parse header name [%.*s]\n", hname->len, hname->s);
+ return -1;
+ }
+
+ LM_DBG("trying to remove hf: %.*s - index: %d\n", hname->len, hname->s, idx);
+ if(idx>=0) {
+ rm = 1;
+ }
+ pos = idx;
+
+again:
+ for (hfi=msg->headers; hfi; hfi=hfi->next) {
+ if (hfm.type!=HDR_OTHER_T && hfm.type!=HDR_ERROR_T) {
+ if (hfm.type!=hfi->type) {
+ continue;
+ }
+ } else {
+ if (hfi->name.len!=hname->len) {
+ continue;
+ }
+ if(strncasecmp(hfi->name.s, hname->s, hname->len)!=0) {
+ continue;
+ }
+ }
+ if(rm==1 && i==pos) {
+ anchor=del_lump(msg, hfi->name.s - msg->buf, hfi->len, 0);
+ if (anchor==0) {
+ LM_ERR("cannot remove hdr %.*s\n", hname->len, hname->s);
+ return -1;
+ }
+ return 1;
+ }
+ i++;
+ }
+ if(rm==1) {
+ /* header not found */
+ return 2;
+ }
+ pos = i + idx;
+ if(pos>=0) {
+ rm = 1;
+ goto again;
+ }
+ return 1;
+}
+
+static int remove_hf_idx_f(sip_msg_t* msg, char* phname, char* pidx)
+{
+ str hname = STR_NULL;
+ int idx = 0;
+
+ if(fixup_get_svalue(msg, (gparam_t*)phname, &hname)<0) {
+ LM_ERR("failed to get header name\n");
+ return -1;
+ }
+ if(fixup_get_ivalue(msg, (gparam_t*)pidx, &idx)<0) {
+ LM_ERR("failed to get header index\n");
+ return -1;
+ }
+ return ki_remove_hf_idx(msg, &hname, idx);
+}
+
static int remove_hf_re(sip_msg_t* msg, regex_t *re)
{
struct hdr_field *hf;
@@ -4984,6 +5066,11 @@ static sr_kemi_t sr_kemi_textops_exports[] = {
{ SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,
SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
},
+ { str_init("textops"), str_init("remove_hf_idx"),
+ SR_KEMIP_INT, ki_remove_hf_idx,
+ { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE,
+ SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
+ },
{ str_init("textops"), str_init("remove_hf_exp"),
SR_KEMIP_INT, ki_remove_hf_exp,
{ SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,