Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Respect join_hub permission #32

Merged
merged 3 commits into from
Apr 1, 2019
Merged

Conversation

brianpeiris
Copy link
Contributor

No description provided.

@brianpeiris brianpeiris requested a review from mqp March 28, 2019 18:55
Copy link
Contributor

@mqp mqp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems highly reasonable.

@@ -410,14 +410,19 @@ fn process_join(from: &Arc<Session>, room_id: RoomId, user_id: UserId, subscribe
match ValidatedToken::from_str(token, key) {
Ok(tok) => {
janus_info!("Processing validated join from {:p} to room ID {} with user ID {}. Join allowed: {}", from.handle, room_id, user_id, tok.join_hub);
if !tok.join_hub {
return Err(From::from("Rejecting join with no join_hub permission!"))
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably eliminate this log message in the expected case, but it's low-volume anyway so it doesn't matter much.

src/lib.rs Outdated Show resolved Hide resolved
@brianpeiris brianpeiris merged commit c19384e into master Apr 1, 2019
@brianpeiris brianpeiris deleted the respect-join-hub-permission branch April 1, 2019 17:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants