BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent null error when parent meeting does not exist

Browse Source
This commit is contained in:
Paul Trudel 2023-10-19 19:54:43 +00:00
parent d24cdfde6f
commit bc7c3143ba
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java
View File

@ -1156,6 +1156,11 @@ public class ParamsProcessorUtil {
return true; return true;
} }
public boolean parentMeetingExists(String parentMeetingId) {
Meeting meeting = ServiceUtils.findMeetingFromMeetingID(parentMeetingId);
return meeting != null;
}
/************************************************* /*************************************************
* Setters * Setters
************************************************/ ************************************************/

8
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
View File

@ -127,10 +127,16 @@ class ApiController {
return return
} }
if(params.isBreakout == "true" && !params.parentMeetingID) { if(params.isBreakout == "true") {
if(!params.parentMeetingID) {
invalid("parentMeetingIDMissing", "No parent meeting ID was provided for the breakout room") invalid("parentMeetingIDMissing", "No parent meeting ID was provided for the breakout room")
return return
} }
if(!paramsProcessorUtil.parentMeetingExists(params.parentMeetingID)) {
invalid("parentMeetingDoesNotExist", "No parent meeting exists for the breakout room")
return
}
}
// Ensure unique TelVoice. Uniqueness is not guaranteed by paramsProcessorUtil. // Ensure unique TelVoice. Uniqueness is not guaranteed by paramsProcessorUtil.
if (!params.voiceBridge) { if (!params.voiceBridge) {