<!-- 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 -->
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3193
-- Commit Summary --
* tls: add timestamp and sni info for a session
-- File Changes --
M src/core/tcp_conn.h (1) M src/core/tcp_main.c (1) M src/modules/tls/tls_rpc.c (18)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3193.patch https://github.com/kamailio/kamailio/pull/3193.diff
@smititelu Thanks for the pull request, did a quick review. It would be great if you could also check for eventual errors at the snprintf call for the time stamp. It might for some reasons fails, as the TLS module might see error conditions during heavy load.
@smititelu pushed 1 commit.
faf733b945a3098d4c83bfc571ebbbb3b532d654 tls: add timestamp and sni info for a session
Updated PR. Will print "N/A" for timestamp too, if snprintf call fails.
Great addition.
@oej commented on this pull request.
"id", con->id,
+ "timestamp", timestamp_s, "timeout", timeout,
Can we get SNI here as well?
@smititelu commented on this pull request.
"id", con->id,
+ "timestamp", timestamp_s, "timeout", timeout,
you mean to print sni right after the "id"?!
@oej commented on this pull request.
"id", con->id,
+ "timestamp", timestamp_s, "timeout", timeout,
Sounds like a good place.
@smititelu pushed 1 commit.
e2d5ddc9db6ca99dc6eef3ad91d771a9b27fc695 tls: add timestamp and sni info for a session
@smititelu commented on this pull request.
"id", con->id,
+ "timestamp", timestamp_s, "timeout", timeout,
:+1: updated PR accordingly
So what do we do if the SNI doesn't match any known SIP domain we handle? Like you have a wildcard cert in your organisation and someone connects to the wrong DNS name?
Will print that wrong requested name.
@smititelu thanks for the updates. @oej This is a generic question, right? Then it should be probably discussed on the mailing list and not in this PR.
It is related to getting SNI available in the config - but could of course be discussed on the mailing list as well. I was wondering what Stefan thought about this since he added better SNI support :-)
But it is not a blocker for this PR, not a requirement.
Will print that wrong requested name. E.g.
Right, but we should propably think about closing early if that's the case or find a way to handle it in the routing script properly. But at that point, we've already accepted the SIP message. Let's continue this discussion outside of this PR.
Thanks, merging!
Merged #3193 into master.
-
Daniel-Constantin Mierla -
Henning Westerholt
-
Olle E. Johansson
-
Stefan Mititelu