Skip to content

Commit

Permalink
Trimming leading and trailing whitespace for the meetingId and fullna…
Browse files Browse the repository at this point in the history 
…me for both cases
  • Loading branch information
@OZhurbenko
OZhurbenko committed Mar 25, 2015
1 parent 5a167f3 commit 67ef612
Show file tree
Hide file tree
Showing 2 changed files with 194 additions and 66 deletions.
237 changes: 182 additions & 55 deletions ...ebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
View file
Expand Up @@ -95,17 +95,20 @@ class ApiController {
return
}

/*
if (StringUtils.isEmpty(params.name)) {
invalid("missingParamName", "You must specify a name for the meeting.");
return
}
*/
if (StringUtils.isEmpty(params.meetingID)) {
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
if(!StringUtils.isEmpty(params.meetingID))
{
params.meetingID = StringUtils.strip(params.meetingID);
if (StringUtils.isEmpty(params.meetingID))
{
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
}
}
else {
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
}
}

if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
invalid("checksumError", "You did not pass the checksum security check")
return
Expand Down Expand Up @@ -196,10 +199,19 @@ class ApiController {
return
}

if (StringUtils.isEmpty(params.meetingID)) {
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
if(!StringUtils.isEmpty(params.meetingID))
{
params.meetingID = StringUtils.strip(params.meetingID);
if (StringUtils.isEmpty(params.meetingID))
{
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
}
}
else {
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
}
}

if (StringUtils.isEmpty(params.password)) {
invalid("invalidPassword","You either did not supply a password or the password supplied is neither the attendee or moderator password for this conference.");
Expand All @@ -210,24 +222,42 @@ class ApiController {
invalid("checksumError", "You did not pass the checksum security check")
return
}
// END - backward compatibility

// END - backward compatibility

// Do we have a checksum? If none, complain.
if (StringUtils.isEmpty(params.checksum)) {
errors.missingParamError("checksum");
}

// Do we have a name for the user joining? If none, complain.
String fullName = params.fullName
if (StringUtils.isEmpty(fullName)) {
errors.missingParamError("fullName");
if(!StringUtils.isEmpty(params.fullName))
{
params.fullName = StringUtils.strip(params.fullName);

if (StringUtils.isEmpty(params.fullName))
{
errors.missingParamError("fullName");
}
}
else {
errors.missingParamError("fullName");
}
String fullName = params.fullName

// Do we have a meeting id? If none, complain.
String externalMeetingId = params.meetingID
if (StringUtils.isEmpty(externalMeetingId)) {
errors.missingParamError("meetingID");
if(!StringUtils.isEmpty(params.meetingID))
{
params.meetingID = StringUtils.strip(params.meetingID);
if (StringUtils.isEmpty(params.meetingID))
{
errors.missingParamError("meetingID");
}
}
else {
errors.missingParamError("meetingID");
}
String externalMeetingId = params.meetingID

// Do we have a password? If not, complain.
String attPW = params.password
Expand Down Expand Up @@ -458,10 +488,19 @@ class ApiController {
return
}

if (StringUtils.isEmpty(params.meetingID)) {
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
if(!StringUtils.isEmpty(params.meetingID))
{
params.meetingID = StringUtils.strip(params.meetingID);
if (StringUtils.isEmpty(params.meetingID))
{
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
}
}
else {
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
}
}

if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
invalid("checksumError", "You did not pass the checksum security check")
Expand All @@ -477,10 +516,19 @@ class ApiController {
}

// Do we have a meeting id? If none, complain.
String externalMeetingId = params.meetingID
if (StringUtils.isEmpty(externalMeetingId)) {
errors.missingParamError("meetingID");
if(!StringUtils.isEmpty(params.meetingID))
{
params.meetingID = StringUtils.strip(params.meetingID);
if (StringUtils.isEmpty(params.meetingID))
{
errors.missingParamError("meetingID");
}
}
else {
errors.missingParamError("meetingID");
}
String externalMeetingId = params.meetingID


if (errors.hasErrors()) {
respondWithErrors(errors)
Expand Down Expand Up @@ -528,10 +576,19 @@ class ApiController {
return
}

if (StringUtils.isEmpty(params.meetingID)) {
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
if(!StringUtils.isEmpty(params.meetingID))
{
params.meetingID = StringUtils.strip(params.meetingID);
if (StringUtils.isEmpty(params.meetingID))
{
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
}
}
else {
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
}
}

if (StringUtils.isEmpty(params.password)) {
invalid("invalidPassword","You must supply the moderator password for this call.");
Expand All @@ -552,10 +609,18 @@ class ApiController {
}

// Do we have a meeting id? If none, complain.
String externalMeetingId = params.meetingID
if (StringUtils.isEmpty(externalMeetingId)) {
errors.missingParamError("meetingID");
if(!StringUtils.isEmpty(params.meetingID))
{
params.meetingID = StringUtils.strip(params.meetingID);
if (StringUtils.isEmpty(params.meetingID))
{
errors.missingParamError("meetingID");
}
}
else {
errors.missingParamError("meetingID");
}
String externalMeetingId = params.meetingID

// Do we have a password? If not, complain.
String modPW = params.password
Expand Down Expand Up @@ -631,10 +696,19 @@ class ApiController {
return
}

if (StringUtils.isEmpty(params.meetingID)) {
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
}
if(!StringUtils.isEmpty(params.meetingID))
{
params.meetingID = StringUtils.strip(params.meetingID);
if (StringUtils.isEmpty(params.meetingID))
{
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
}
}
else {
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
}


if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
Expand All @@ -651,10 +725,18 @@ class ApiController {
}

// Do we have a meeting id? If none, complain.
String externalMeetingId = params.meetingID
if (StringUtils.isEmpty(externalMeetingId)) {
errors.missingParamError("meetingID");
if(!StringUtils.isEmpty(params.meetingID))
{
params.meetingID = StringUtils.strip(params.meetingID);
if (StringUtils.isEmpty(params.meetingID))
{
errors.missingParamError("meetingID");
}
}
else {
errors.missingParamError("meetingID");
}
String externalMeetingId = params.meetingID

if (errors.hasErrors()) {
respondWithErrors(errors)
Expand Down Expand Up @@ -833,9 +915,18 @@ class ApiController {
return
}

if (StringUtils.isEmpty(params.meetingID)) {
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
if(!StringUtils.isEmpty(params.meetingID))
{
params.meetingID = StringUtils.strip(params.meetingID);
if (StringUtils.isEmpty(params.meetingID))
{
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
}
}
else {
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
}

// Translate the external meeting id into an internal meeting id.
Expand Down Expand Up @@ -932,10 +1023,19 @@ class ApiController {
return
}

if (StringUtils.isEmpty(params.meetingID)) {
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
}
if(!StringUtils.isEmpty(params.meetingID))
{
params.meetingID = StringUtils.strip(params.meetingID);
if (StringUtils.isEmpty(params.meetingID))
{
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
}
}
else {
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
}

// Translate the external meeting id into an internal meeting id.
String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(params.meetingID);
Expand Down Expand Up @@ -1025,9 +1125,18 @@ class ApiController {
return
}

if (StringUtils.isEmpty(params.meetingID)) {
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
if(!StringUtils.isEmpty(params.meetingID))
{
params.meetingID = StringUtils.strip(params.meetingID);
if (StringUtils.isEmpty(params.meetingID))
{
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
}
}
else {
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
}

String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(params.meetingID);
Expand Down Expand Up @@ -1106,9 +1215,18 @@ class ApiController {
return
}

if (StringUtils.isEmpty(params.meetingID)) {
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
if(!StringUtils.isEmpty(params.meetingID))
{
params.meetingID = StringUtils.strip(params.meetingID);
if (StringUtils.isEmpty(params.meetingID))
{
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
}
}
else {
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
}

String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(params.meetingID);
Expand Down Expand Up @@ -1183,9 +1301,18 @@ class ApiController {
return
}

if (StringUtils.isEmpty(params.meetingID)) {
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
if(!StringUtils.isEmpty(params.meetingID))
{
params.meetingID = StringUtils.strip(params.meetingID);
if (StringUtils.isEmpty(params.meetingID))
{
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
}
}
else {
invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
return
}

String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(params.meetingID);
Expand Down
23 changes: 12 additions & 11 deletions bigbluebutton-web/src/java/org/bigbluebutton/api/ParamsProcessorUtil.java 100644 → 100755
View file
Expand Up @@ -98,18 +98,19 @@ public void processRequiredCreateParams(Map<String, String> params, ApiErrors er
if (StringUtils.isEmpty(params.get("checksum"))) {
errors.missingParamError("checksum");
}
/*
// Do we have a meeting name? If not, complain.
String meetingName = params.get("name");
if (StringUtils.isEmpty(meetingName) ) {
errors.missingParamError("name");
}
*/

// Do we have a meeting id? If not, complain.
String externalMeetingId = params.get("meetingID");
if (StringUtils.isEmpty(externalMeetingId)) {
errors.missingParamError("meetingID");
}
if(!StringUtils.isEmpty(params.get("meetingID")))
{
if (StringUtils.isEmpty(StringUtils.strip(params.get("meetingID"))))
{
errors.missingParamError("meetingID");

}
}
else {
errors.missingParamError("meetingID");
}
}

public void updateMeeting(Map<String, Object> updateParams, Meeting existing) {
Expand Down

0 comments on commit 67ef612

Please sign in to comment.