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.

Sign up for GitHub

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

Jump to bottom

fix/feature (bbb-web): Add new join param errorRedirectUrl and fix to respect redirect #17202

Merged
merged 2 commits into from Apr 14, 2023
Merged

fix/feature (bbb-web): Add new join param errorRedirectUrl and fix to respect redirect #17202

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
657d608
Added new join param redirectUrl and fixed redirect
paultrudel Mar 23, 2023
f0ed95f
Renamed join param redirectUrl to errorRedirectUrl
paultrudel Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
57 changes: 36 additions & 21 deletions ...ebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
View file
Open in desktop
Expand Up @@ -207,11 +207,23 @@ class ApiController {

HashMap<String, String> roles = new HashMap<String, String>();

roles.put("moderator", ROLE_MODERATOR);
roles.put("viewer", ROLE_ATTENDEE);
roles.put("moderator", ROLE_MODERATOR)
roles.put("viewer", ROLE_ATTENDEE)

//check if exists the param redirect
boolean redirectClient = true
paultrudel marked this conversation as resolved.
Show resolved Hide resolved
String clientURL = paramsProcessorUtil.getDefaultHTML5ClientUrl();

if (!StringUtils.isEmpty(params.redirect)) {
try {
redirectClient = Boolean.parseBoolean(params.redirect);
} catch (Exception ignored) {
redirectClient = true
}
paultrudel marked this conversation as resolved.
Show resolved Hide resolved
}

if(!(validationResponse == null)) {
invalid(validationResponse.getKey(), validationResponse.getValue(), REDIRECT_RESPONSE)
invalid(validationResponse.getKey(), validationResponse.getValue(), redirectClient)
return
}

Expand All @@ -237,6 +249,15 @@ class ApiController {

Meeting meeting = ServiceUtils.findMeetingFromMeetingID(params.meetingID);

String redirectUrl = ""
if(!StringUtils.isEmpty(params.redirectUrl)) {
if(StringUtils.equals(params.redirectUrl, "logout")) {
redirectUrl = meeting.getLogoutUrl()
} else {
redirectUrl = params.redirectUrl
}
}

// the createTime mismatch with meeting's createTime, complain
// In the future, the createTime param will be required
if (params.createTime != null) {
Expand All @@ -249,7 +270,7 @@ class ApiController {
}
if (createTime != meeting.getCreateTime()) {
// BEGIN - backward compatibility
invalid("mismatchCreateTimeParam", "The createTime parameter submitted mismatches with the current meeting.", REDIRECT_RESPONSE);
invalid("mismatchCreateTimeParam", "The createTime parameter submitted mismatches with the current meeting.", redirectClient, redirectUrl);
return
// END - backward compatibility

Expand Down Expand Up @@ -385,7 +406,7 @@ class ApiController {

if (hasReachedMaxParticipants(meeting, us)) {
// BEGIN - backward compatibility
invalid("maxParticipantsReached", "The number of participants allowed for this meeting has been reached.", REDIRECT_RESPONSE);
invalid("maxParticipantsReached", "The number of participants allowed for this meeting has been reached.", redirectClient, redirectUrl)
return
// END - backward compatibility

Expand All @@ -412,18 +433,6 @@ class ApiController {

session.setMaxInactiveInterval(paramsProcessorUtil.getDefaultHttpSessionTimeout())

//check if exists the param redirect
boolean redirectClient = true;
String clientURL = paramsProcessorUtil.getDefaultHTML5ClientUrl();

if (!StringUtils.isEmpty(params.redirect)) {
try {
redirectClient = Boolean.parseBoolean(params.redirect);
} catch (Exception e) {
redirectClient = true;
}
}

String msgKey = "successfullyJoined"
String msgValue = "You have joined successfully."

Expand Down Expand Up @@ -455,7 +464,7 @@ class ApiController {
msgKey = "guestWait"
msgValue = "Guest waiting for approval to join meeting."
} else if (guestStatusVal.equals(GuestPolicy.DENY)) {
invalid("guestDeniedAccess", "You have been denied access to this meeting based on the meeting's guest policy", REDIRECT_RESPONSE)
invalid("guestDeniedAccess", "You have been denied access to this meeting based on the meeting's guest policy", redirectClient, redirectUrl)
return
}

Expand Down Expand Up @@ -1783,7 +1792,7 @@ class ApiController {
}

//TODO: method added for backward compatibility, it will be removed in next versions after 0.8
private void invalid(key, msg, redirectResponse = false) {
private void invalid(key, msg, redirectResponse = false, redirectUrl = "") {
// Note: This xml scheme will be DEPRECATED.
log.debug CONTROLLER_NAME + "#invalid " + msg
if (redirectResponse) {
Expand All @@ -1796,7 +1805,7 @@ class ApiController {
JSONArray errorsJSONArray = new JSONArray(errors)
log.debug "JSON Errors {}", errorsJSONArray.toString()

respondWithRedirect(errorsJSONArray)
respondWithRedirect(errorsJSONArray, redirectUrl)
} else {
response.addHeader("Cache-Control", "no-cache")
withFormat {
Expand All @@ -1817,7 +1826,7 @@ class ApiController {
}
}

private void respondWithRedirect(errorsJSONArray) {
private void respondWithRedirect(errorsJSONArray, redirectUrl = "") {
String logoutUrl = paramsProcessorUtil.getDefaultLogoutUrl()
URI oldUri = URI.create(logoutUrl)

Expand All @@ -1829,6 +1838,12 @@ class ApiController {
}
}

if(!StringUtils.isEmpty(redirectUrl)) {
try {
oldUri = URI.create(redirectUrl)
} catch(Exception ignored) {}
}

String newQuery = oldUri.getQuery();

if (newQuery == null) {
Expand Down