fix saving signed_tokens field when room is permanent #2843
Conversation
|
This patch goes beyond just saving the property to the config file, when saving rooms permanently. It also adds an option to "edit" to change the behaviour dynamically within a room. Please only do the former in this patch: the latter is something that is not there yet, and I'm not sure it should be, and so needs a separate discussion. |
timsolov
force-pushed
the
fix-saving-signed-tokens
branch
from
09a8695
to
8c015cd
Compare
|
@lminiero updated |
| @@ -3445,6 +3445,8 @@ static json_t *janus_videoroom_process_synchronous_request(janus_videoroom_sessi | |||
| janus_config_add(config, c, janus_config_item_create("is_private", "yes")); | |||
| if(videoroom->require_pvtid) | |||
| janus_config_add(config, c, janus_config_item_create("require_pvtid", "yes")); | |||
| if(videoroom->signed_tokens) | |||
| janus_config_add(config, c, janus_config_item_create("signed_tokens", "yes")); | |||
There was a problem hiding this comment.
Shouldn't this be in the "edit" part too? Even if "edit" doesn't expose a way to modify that property, if you don't have lines to save the value there, a permanent "edit" will result in not saving the signed_tokens property, which would be lost as a consequence.
There was a problem hiding this comment.
Yeh, you're right. I forgot about edit.
timsolov
force-pushed
the
fix-saving-signed-tokens
branch
from
8c015cd
to
a3bb23f
Compare
plugins/janus_videoroom.c
Outdated
| @@ -2328,11 +2328,14 @@ int janus_videoroom_init(janus_callbacks *callback, const char *config_path) { | |||
| videoroom->is_private = priv && priv->value && janus_is_true(priv->value); | |||
| videoroom->require_pvtid = req_pvtid && req_pvtid->value && janus_is_true(req_pvtid->value); | |||
| if(signed_tokens && signed_tokens->value && janus_is_true(signed_tokens->value)) { | |||
| JANUS_LOG(LOG_INFO, "Room id %s signed_tokens value: %s\n", videoroom->room_id_str, signed_tokens->value); | |||
plugins/janus_videoroom.c
Outdated
| if(!gateway->auth_is_signed()) { | ||
| JANUS_LOG(LOG_WARN, "Can't enforce signed tokens for this room, signed-mode not in use in the core\n"); | ||
| } else { | ||
| videoroom->signed_tokens = TRUE; | ||
| } | ||
| } else { | ||
| JANUS_LOG(LOG_INFO, "Room id %s signed_tokens value: false\n", videoroom->room_id_str); |
plugins/janus_videoroom.c
Outdated
| @@ -3005,6 +3008,7 @@ static int janus_videoroom_access_room(json_t *root, gboolean check_modify, gboo | |||
| } | |||
| } | |||
| if(check_join) { | |||
| JANUS_LOG(LOG_INFO, "check_join = true (%s)\n", room_id_str); | |||
There was a problem hiding this comment.
This looks like a debug line that was left there?
timsolov
force-pushed
the
fix-saving-signed-tokens
branch
from
a3bb23f
to
eb3c5a5
Compare
|
Thanks, merging then! |
#2825
fix saving room's configuration to config file when room is permanent.