<!-- Kamailio Pull Request Template -->
<!--
IMPORTANT:
- for detailed contributing guidelines, read:
https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md
- pull requests must be done to master branch, unless they are backports
of fixes from master branch to a stable branch
- backports to stable branches must be done with 'git cherry-pick -x ...'
- code is contributed under BSD for core and main components (tm, sl, auth, tls)
- code is contributed GPLv2 or a compatible license for the other components
- GPL code is contributed with OpenSSL licensing exception
-->
#### Pre-Submission Checklist
<!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -->
<!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-->
<!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list -->
- [x] Commit message has the format required by CONTRIBUTING guide
- [x] Commits are split per component (core, individual modules, libs, utils, ...)
- [x] Each component has a single commit (if not, squash them into one commit)
- [x] No commits to README files for modules (changes must be done to docbook files
in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change
- [x] Small bug fix (non-breaking change which fixes an issue)
- [x] New feature (non-breaking change which adds new functionality)
- [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist:
<!-- Go over all points below, and after creating the PR, tick the checkboxes that apply -->
- [ ] PR should be backported to stable branches
- [x] Tested changes locally
- [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description
<!-- Describe your changes in detail -->
Diameter requests could contain Application-Ids in multiple AVPs. This fix iterates through them, instead of giving up if the first one does not match. This solves some issues when peers don't always declare support for vendor-specific/non-specific application ids, so routing should be easier.
Also fixed:
- auth state machine being too verbose on regular messages being received or sent while in the Open state
- add Destination-Host from auth state to requests (next-hop immediate routing)
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3914
-- Commit Summary --
* cdp: improved routing and removed useless warning/errors in authstatemachine
-- File Changes --
M src/modules/cdp/authstatemachine.c (42)
M src/modules/cdp/routing.c (176)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3914.patchhttps://github.com/kamailio/kamailio/pull/3914.diff
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3914
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/pull/3914(a)github.com>
### Description
The master branch of the Kamailio project contains unpatched sources from OpenSIPS, in which [CVE-2023-28098](https://github.com/OpenSIPS/opensips/security/advisories/GH… was reported. The function `parse_param_name()` from `kamailio/src/core/parser/digest/param_parser.c` does not include security patches and updates available in newer versions of OpenSIPS. The fix for CVE can be found in this commit: [OpenSIPS Commit dd9141b6](https://github.com/OpenSIPS/opensips/commit/dd9141b6f67d7df4072f3…
### Possible Solutions
I strongly recommend updating the sources from OpenSIPS to the latest version available.
### Report Origin
The bug is detected by a tool developed at [CAST](https://castech.am/).
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/3911
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/issues/3911(a)github.com>
<!-- Kamailio Pull Request Template -->
<!--
IMPORTANT:
- for detailed contributing guidelines, read:
https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md
- pull requests must be done to master branch, unless they are backports
of fixes from master branch to a stable branch
- backports to stable branches must be done with 'git cherry-pick -x ...'
- code is contributed under BSD for core and main components (tm, sl, auth, tls)
- code is contributed GPLv2 or a compatible license for the other components
- GPL code is contributed with OpenSSL licensing exception
-->
#### Pre-Submission Checklist
<!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -->
<!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-->
<!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list -->
- [x] Commit message has the format required by CONTRIBUTING guide
- [x] Commits are split per component (core, individual modules, libs, utils, ...)
- [x] Each component has a single commit (if not, squash them into one commit)
- [x] No commits to README files for modules (changes must be done to docbook files
in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change
- [ ] Small bug fix (non-breaking change which fixes an issue)
- [x] New feature (non-breaking change which adds new functionality)
- [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist:
<!-- Go over all points below, and after creating the PR, tick the checkboxes that apply -->
- [ ] PR should be backported to stable branches
- [x] Tested changes locally
- [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description
<!-- Describe your changes in detail -->
On Mobile-Terminating, if the P-Called-Party-ID header is missing, getting the host (should also be an IP) from the Request-URI can help the P-CSCF when doing AAR for QoS.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3912
-- Commit Summary --
* lib/ims: added cscf_get_host_from_requri
-- File Changes --
M src/lib/ims/ims_getters.c (15)
M src/lib/ims/ims_getters.h (6)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3912.patchhttps://github.com/kamailio/kamailio/pull/3912.diff
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3912
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/pull/3912(a)github.com>
Module: kamailio
Branch: master
Commit: 70fd27174952fe6a67f01fca4fdc941b9fdc045a
URL: https://github.com/kamailio/kamailio/commit/70fd27174952fe6a67f01fca4fdc941…
Author: Dragos Vingarzan <vingarzan(a)gmail.com>
Committer: Dragos Vingarzan <vingarzan(a)gmail.com>
Date: 2024-07-12T13:27:21+02:00
lib/ims: added cscf_get_host_from_requri
---
Modified: src/lib/ims/ims_getters.c
Modified: src/lib/ims/ims_getters.h
---
Diff: https://github.com/kamailio/kamailio/commit/70fd27174952fe6a67f01fca4fdc941…
Patch: https://github.com/kamailio/kamailio/commit/70fd27174952fe6a67f01fca4fdc941…
---
diff --git a/src/lib/ims/ims_getters.c b/src/lib/ims/ims_getters.c
index cf2f618d0de..35dbdca405f 100644
--- a/src/lib/ims/ims_getters.c
+++ b/src/lib/ims/ims_getters.c
@@ -539,6 +539,21 @@ str cscf_get_contact_from_requri(struct sip_msg *msg)
return pu;
}
+/**
+ * Get the host from the Request URI of the message.
+ * Useful for example on MT, to get the destination from the Request URI, if P-Called-Party-ID is not present.
+ */
+str cscf_get_host_from_requri(struct sip_msg *msg)
+{
+ if(msg->first_line.type != SIP_REQUEST || parse_sip_msg_uri(msg) < 0
+ || msg->parsed_uri.type == TEL_URI_T) {
+ str empty = {0};
+ return empty;
+ }
+ return msg->parsed_uri.host;
+}
+
+
/**
* Finds if the message contains the orig parameter in the first Route header
* @param msg - the SIP message
diff --git a/src/lib/ims/ims_getters.h b/src/lib/ims/ims_getters.h
index 77a55a6695b..03ad4bef82b 100644
--- a/src/lib/ims/ims_getters.h
+++ b/src/lib/ims/ims_getters.h
@@ -206,6 +206,12 @@ str cscf_get_public_identity_from_requri(struct sip_msg *msg);
*/
str cscf_get_contact_from_requri(struct sip_msg *msg);
+/**
+ * Get the host from the Request URI of the message.
+ * Useful for example on MT, to get the destination from the Request URI, if P-Called-Party-ID is not present.
+ */
+str cscf_get_host_from_requri(struct sip_msg *msg);
+
/**
* Looks for the Call-ID header
* @param msg - the sip message
Module: kamailio
Branch: master
Commit: c97145862119e9001874cd07de9b20ad8e96ff54
URL: https://github.com/kamailio/kamailio/commit/c97145862119e9001874cd07de9b20a…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2024-07-12T11:49:10+02:00
rls: remove unnecessary assignment
---
Modified: src/modules/rls/resource_notify.c
---
Diff: https://github.com/kamailio/kamailio/commit/c97145862119e9001874cd07de9b20a…
Patch: https://github.com/kamailio/kamailio/commit/c97145862119e9001874cd07de9b20a…
---
diff --git a/src/modules/rls/resource_notify.c b/src/modules/rls/resource_notify.c
index c0b308a76d2..8fd388e463c 100644
--- a/src/modules/rls/resource_notify.c
+++ b/src/modules/rls/resource_notify.c
@@ -179,8 +179,8 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col,
str bstr = {0, 0};
subs_t *dialog = NULL;
int len_est = 0;
- int resource_added =
- 0; /* Flag to indicate that we have added at least one resource */
+ /* Flag to indicate that we have added at least one resource */
+ int resource_added = 0;
/* generate the boundary string */
boundary_string = generate_string(BOUNDARY_STRING_LEN);
@@ -245,7 +245,6 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col,
len_est += 2 * strlen(boundary_string) + 4 + 102 + 2 + 50
+ strlen(resource_uri) + 20;
buf_len = 0;
- resource_added = 0;
/* !!!! for now I will include the auth state without checking if
* it has changed - > in future check if it works */