<!-- 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, ...) - [ ] 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) - [ ] New feature (non-breaking change which adds new functionality) - [x] 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 --> - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue [reported in lists](https://lists.kamailio.org/mailman3/hyperkitty/list/sr-users@lists.kamailio....)
#### Description <!-- Describe your changes in detail --> This PR aims to fix a bug/security issue where data that was supposed to be encrypted and transferred through TLS, were transferred instead with TCP protocol.
More information and how to replicate can be found in the above [issue](https://lists.kamailio.org/mailman3/hyperkitty/list/sr-users@lists.kamailio....) in list.
This PR suggests using also the protocol to match if a TCP connection exists, and when doing connection lookups, otherwise, it might return a wrong connection, ie a TCP one when we are asking for a TLS one (a case when source ip/port and dest IP are same but dest port is set 0 (wildcard) ).
`tcpconn_get` was left unchanged due to being used by some modules and not wanting to break them. Please advise whether it should be beneficial to also change it.
In some cases like, `tcpconn_add_alias` and `tcpconn_get` we used the `PROTO_NONE` which preserves the original behavior. `tcpconn_add_alias` we do have the protocol available, should it be also used? `tcpconn_get` does not have the protocol available unless we pass it as an argument. You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3810
-- Commit Summary --
* tcp_main: Add protocol argument for searching tcp/tls connections * tcp_main: Add proto argument to tcpconn_exists function * tcp_main: Update comment docs * core/forward: Match protocol when forwarding * tcp_main: Match wss protocol
-- File Changes --
M src/core/forward.h (3) M src/core/tcp_conn.h (3) M src/core/tcp_main.c (43)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3810.patch https://github.com/kamailio/kamailio/pull/3810.diff
It can be merged from my point of view, although I am not the main developer of tcp/tls code in Kamailio, I guess it was considered that remote ip/port is enough, considering that tls is over a tcp connection, so it cannot overlap, but when listening on different sockets, it could be a conflict.
Ok, thanks for the review!
If there are no other comments, I will merge it today
@xkaraman I'll try to test this for you today and let you know my results.
Merged #3810 into master.
I've tested this successfully.
@frideo Thank you for the tests!
@frideo thanks for the confirmation james! @henningw thanks for merging it!
this broke t_relay() for websockets. getting connection not found
From Freeswitch
``` BYE sip:helen1.d8f97e04@first.local.root.io;gr=urn:uuid:06e7104a-22ff-43c3-ac7e-ba363b799b3f;x9nh=192.168.105.1~64930~6 SIP/2.0 Via: SIP/2.0/TCP 10.10.1.10:11000;rport;branch=z9hG4bKNS0Ug4S1m19je Route: sip:10.10.6.119:5070;transport=tcp;r2=on;lr;ftag=f29hrf0d3e Route: sip:192.168.140.121:5065;transport=ws;r2=on;lr;ftag=f29hrf0d3e Max-Forwards: 70 From: sip:3000@first.local.root.io;tag=jp95N51N49XDB To: sip:helen1.d8f97e04@first.local.root.io;tag=f29hrf0d3e Call-ID: bjtacsul5mm6omprf72d CSeq: 88904921 BYE User-Agent: 2600hz Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, MESSAGE, INFO, UPDATE, REFER, NOTIFY, PUBLISH, SUBSCRIBE Supported: path, replaces Reason: SIP;cause=200;text="Call completed elsewhere" Content-Length: 0 ```
Kamailio reply
``` SIP/2.0 408 Request Timeout Via: SIP/2.0/TCP 10.10.1.10:11000;rport=11000;branch=z9hG4bKNS0Ug4S1m19je;received=10.10.1.10 From: sip:3000@first.local.root.io;tag=jp95N51N49XDB To: sip:helen1.d8f97e04@first.local.root.io;tag=f29hrf0d3e Call-ID: bjtacsul5mm6omprf72d CSeq: 88904921 BYE Content-Length: 0 ```
Kamailio relevant logs
``` 2024-09-21 12:17:06.507 [info] bjtacsul5mm6omprf72d default.cfg:301 (log_request) start - received tcp request BYE sip:helen1.d8f97e04@first.local.root.io;gr=urn:uuid:06e7104a-22ff-43c3-ac7e-ba363b799b3f;x9nh=192.168.105.1~64930~6 2024-09-21 12:17:06.507 [info] bjtacsul5mm6omprf72d default.cfg:302 (log_request) source 10.10.1.10:11000 -> 10.10.6.119:5070 2024-09-21 12:17:06.507 [info] bjtacsul5mm6omprf72d default.cfg:303 (log_request) from sip:3000@first.local.root.io 2024-09-21 12:17:06.507 [info] bjtacsul5mm6omprf72d default.cfg:304 (log_request) to sip:helen1.d8f97e04@first.local.root.io 2024-09-21 12:17:06.507 [info] bjtacsul5mm6omprf72d default.cfg:313 (log_request_classified_source) originated from internal sources 2024-09-21 12:17:06.507 [info] bjtacsul5mm6omprf72d default.cfg:482 (handle_in_dialog_requests) loose_route in-dialog message => sip:192.168.105.1:64930;transport=ws 2024-09-21 12:17:06.508 [info] bjtacsul5mm6omprf72d default.cfg:639 (manage_branch) new branch [0] to sip:helen1.d8f97e04@first.local.root.io;gr=urn:uuid:06e7104a-22ff-43c3-ac7e-ba363b799b3f 2024-09-21 12:17:06.508 [info] bjtacsul5mm6omprf72d default.cfg:949 (default_send) pass - tls 10.10.6.119:5065 -> 192.168.105.1:64930 2024-09-21 12:17:06.508 120(399) WARNING: tm [../../core/forward.h:238]: msg_send_buffer(): TCP/TLS connection for WebSocket could not be found 2024-09-21 12:17:11.508 [info] bjtacsul5mm6omprf72d default.cfg:788 (external_fault) 408 Request Timeout ```
@lazedo It was already fixed in git master, refer to #3969
thanks @henningw , I reverted 8edeac3be8870bdd4f8d17066172bf2b0182198d from this pr.