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

fix(API): Allow additional parameters in content type headers (#20396)

Browse Source 
* Allow additional values in content type header
This commit is contained in:
Paul Trudel 2024-06-04 08:22:09 -04:00 committed by GitHub
parent c0caafd2e6
commit 496a42ff90
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bbb-common-web/src/main/java/org/bigbluebutton/api/model/validator/ContentTypeValidator.java
View File

@ -1,7 +1,6 @@
package org.bigbluebutton.api.model.validator; package org.bigbluebutton.api.model.validator;
import jakarta.ws.rs.core.MediaType; import org.apache.http.entity.ContentType;
import org.apache.commons.compress.utils.Sets;
import org.bigbluebutton.api.model.constraint.ContentTypeConstraint; import org.bigbluebutton.api.model.constraint.ContentTypeConstraint;
import org.bigbluebutton.api.model.request.Request; import org.bigbluebutton.api.model.request.Request;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -10,7 +9,6 @@ import org.slf4j.LoggerFactory;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext; import javax.validation.ConstraintValidatorContext;
import java.util.Set;
public class ContentTypeValidator implements ConstraintValidator<ContentTypeConstraint, Request> { public class ContentTypeValidator implements ConstraintValidator<ContentTypeConstraint, Request> {
@ -31,7 +29,17 @@ public class ContentTypeValidator implements ConstraintValidator<ContentTypeCons
if (requestBodyPresent) { if (requestBodyPresent) {
if (contentType == null || contentTypeHeader == null) return false; if (contentType == null || contentTypeHeader == null) return false;
else { else {
return request.getSupportedContentTypes().contains(contentType); try {
ContentType c = ContentType.parse(contentType);
String mimeType = c.getMimeType();
for (Object o: request.getSupportedContentTypes()) {
String supportedContentType = (String) o;
if (mimeType.equalsIgnoreCase(supportedContentType)) return true;
}
} catch (Exception e) {
return false;
}
return false;
} }
} }