QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 13:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged feature/fix-formParam-exceptions-for-plaintext-body-with-percent into dev

Browse Source
This commit is contained in:
darin.kelkhoff
2024-08-05 13:36:43 -05:00
parent 207311eb0b 9baa7c32bf
commit f237b5e82d
4 changed files with 387 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementation.java
View File

@ -549,14 +549,17 @@ public class QJavalinImplementation
}
else
{
String authorizationFormValue = context.formParam("Authorization");
if(StringUtils.hasContent(authorizationFormValue))
try
{
processAuthorizationValue(authenticationContext, authorizationFormValue);
String authorizationFormValue = context.formParam("Authorization");
if(StringUtils.hasContent(authorizationFormValue))
{
processAuthorizationValue(authenticationContext, authorizationFormValue);
}
}
else
catch(Exception e)
{
LOG.debug("Neither [" + SESSION_ID_COOKIE_NAME + "] cookie nor [Authorization] header was present in request.");
LOG.info("Exception looking for Authorization formParam", e);
}
}
@ -567,7 +570,7 @@ public class QJavalinImplementation
QSession session = authenticationModule.createSession(qInstance, authenticationContext);
QContext.init(qInstance, session, null, input);
String tableVariant = StringUtils.hasContent(context.formParam("tableVariant")) ? context.formParam("tableVariant") : context.queryParam("tableVariant");
String tableVariant = QJavalinUtils.getFormParamOrQueryParam(context, "tableVariant");
if(StringUtils.hasContent(tableVariant))
{
JSONObject variant = new JSONObject(tableVariant);
@ -1185,11 +1188,7 @@ public class QJavalinImplementation
PermissionsHelper.checkTablePermissionThrowing(countInput, TablePermissionSubType.READ);
filter = QJavalinUtils.stringQueryParam(context, "filter");
if(!StringUtils.hasContent(filter))
{
filter = context.formParam("filter");
}
filter = QJavalinUtils.getQueryParamOrFormParam(context, "filter");
if(filter != null)
{
countInput.setFilter(JsonUtils.toObject(filter, QQueryFilter.class));
@ -1258,11 +1257,7 @@ public class QJavalinImplementation
PermissionsHelper.checkTablePermissionThrowing(queryInput, TablePermissionSubType.READ);
filter = QJavalinUtils.stringQueryParam(context, "filter");
if(!StringUtils.hasContent(filter))
{
filter = context.formParam("filter");
}
filter = QJavalinUtils.getQueryParamOrFormParam(context, "filter");
if(filter != null)
{
QQueryFilter qQueryFilter = JsonUtils.toObject(filter, QQueryFilter.class);
@ -1542,23 +1537,13 @@ public class QJavalinImplementation
PermissionsHelper.checkTablePermissionThrowing(exportInput, TablePermissionSubType.READ);
String fields = QJavalinUtils.stringQueryParam(context, "fields");
if(!StringUtils.hasContent(fields))
{
fields = context.formParam("fields");
}
String fields = QJavalinUtils.getQueryParamOrFormParam(context, "fields");
if(StringUtils.hasContent(fields))
{
exportInput.setFieldNames(List.of(fields.split(",")));
}
String filter = context.queryParam("filter");
if(!StringUtils.hasContent(filter))
{
filter = context.formParam("filter");
}
String filter = QJavalinUtils.getQueryParamOrFormParam(context, "filter");
if(StringUtils.hasContent(filter))
{
exportInput.setQueryFilter(JsonUtils.toObject(filter, QQueryFilter.class));

76
qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinUtils.java
View File

@ -102,4 +102,80 @@ public class QJavalinUtils
return (null);
}
/***************************************************************************
** get a param value from either the form-body, or query string returning
** the first one found, looking in that order, null if neither is found.
** uses try-catch on reading each of those, as they apparently can throw!
***************************************************************************/
static String getFormParamOrQueryParam(Context context, String parameterName)
{
String value = null;
try
{
value = context.formParam(parameterName);
}
catch(Exception e)
{
////////////////
// leave null //
////////////////
}
if(!StringUtils.hasContent(value))
{
try
{
value = context.queryParam(parameterName);
}
catch(Exception e)
{
////////////////
// leave null //
////////////////
}
}
return value;
}
/***************************************************************************
** get a param value from either the query string, or form-body, returning
** the first one found, looking in that order, null if neither is found.
** uses try-catch on reading each of those, as they apparently can throw!
***************************************************************************/
static String getQueryParamOrFormParam(Context context, String parameterName)
{
String value = null;
try
{
value = context.queryParam(parameterName);
}
catch(Exception e)
{
////////////////
// leave null //
////////////////
}
if(!StringUtils.hasContent(value))
{
try
{
value = context.formParam(parameterName);
}
catch(Exception e)
{
////////////////
// leave null //
////////////////
}
}
return value;
}
}