[kamailio/kamailio] auth_ephemeral: fix authentication with secrets added at runtime (PR #3390)
- proper way to work with shm pointer to secret list
<!-- 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) - [ ] 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description In case of adding secrets at runtime with autheph.add_secret rpc, authentication with new secrets not work, this is because rpc process modify local pointer to secret list, instead shm.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3390
-- Commit Summary --
* auth_ephemeral: fix authentication with secrets added at runtime
-- File Changes --
M src/modules/auth_ephemeral/auth_ephemeral_mod.c (48) M src/modules/auth_ephemeral/auth_ephemeral_mod.h (1) M src/modules/auth_ephemeral/authorize.c (16)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3390.patch https://github.com/kamailio/kamailio/pull/3390.diff
@henningw commented on this pull request.
Thanks for the PR. I just added one remark related to the freeing of the previous allocated memory in an error condition. Maybe others like to comment as well, as I do not use this module a lot.
@@ -226,12 +230,22 @@ static inline int add_secret(str _secret_key)
memset(secret_struct, 0, sizeof (struct secret)); secret_struct->secret_key = _secret_key; SECRET_LOCK; - if (secret_list != NULL) + if (secret_list == NULL) + { + secret_list = (struct secret **) shm_malloc(sizeof(struct secret *)); + if (secret_list == NULL) + { + LM_ERR("unable to allocate shared memory\n"); + return -1;
You probably want to free the previously allocated secret_struct
@Den4t commented on this pull request.
@@ -226,12 +230,22 @@ static inline int add_secret(str _secret_key)
memset(secret_struct, 0, sizeof (struct secret)); secret_struct->secret_key = _secret_key; SECRET_LOCK; - if (secret_list != NULL) + if (secret_list == NULL) + { + secret_list = (struct secret **) shm_malloc(sizeof(struct secret *)); + if (secret_list == NULL) + { + LM_ERR("unable to allocate shared memory\n"); + return -1;
Hi, Henning!
You're right, i missed this, will fix.
@Den4t pushed 1 commit.
855d009428b29d88e9a006ceb24a11a91d5e1bb8 fix: free secret_struct shm
@Den4t commented on this pull request.
@@ -226,12 +230,22 @@ static inline int add_secret(str _secret_key)
memset(secret_struct, 0, sizeof (struct secret)); secret_struct->secret_key = _secret_key; SECRET_LOCK; - if (secret_list != NULL) + if (secret_list == NULL) + { + secret_list = (struct secret **) shm_malloc(sizeof(struct secret *)); + if (secret_list == NULL) + { + LM_ERR("unable to allocate shared memory\n"); + return -1;
Fixed.
Thanks!
Merged #3390 into master.
-
Daniel-Constantin Mierla -
Dennis
-
Henning Westerholt