Browse Source

Make RequestProtector's replacement field required

pull/58/head
Kristijan Mitrovic 4 years ago
parent
commit
6d311909b3
2 changed files with 11 additions and 7 deletions
  1. +8
    -5
      bubble-server/src/main/java/bubble/app/request/RequestProtectorAppConfigDriver.java
  2. +3
    -2
      bubble-server/src/main/resources/models/apps/request/bubbleApp_request.json

+ 8
- 5
bubble-server/src/main/java/bubble/app/request/RequestProtectorAppConfigDriver.java View File

@@ -62,15 +62,18 @@ public class RequestProtectorAppConfigDriver extends AppConfigDriverBase {


private Set<HeaderReplacement> addHeaderReplacement(Account account, BubbleApp app, JsonNode data) { private Set<HeaderReplacement> addHeaderReplacement(Account account, BubbleApp app, JsonNode data) {
final JsonNode regexNode = data.get(PARAM_REGEX); final JsonNode regexNode = data.get(PARAM_REGEX);
if (regexNode == null || regexNode.textValue() == null || empty(regexNode.textValue().trim())) {
if (regexNode == null || regexNode.textValue() == null) {
throw invalidEx("err.requestProtector.headerRegexRequired"); throw invalidEx("err.requestProtector.headerRegexRequired");
} }
final String regex = regexNode.textValue().trim().toLowerCase();
final String regex = regexNode.textValue().trim();
if (empty(regex)) throw invalidEx("err.requestProtector.headerRegexRequired");


final JsonNode replacementNode = data.get(PARAM_REPLACEMENT); final JsonNode replacementNode = data.get(PARAM_REPLACEMENT);
final String replacement = replacementNode == null || replacementNode.textValue() == null
? ""
: replacementNode.textValue().trim().toLowerCase();
if (replacementNode == null || replacementNode.textValue() == null) {
throw invalidEx("err.requestProtector.headerReplacementRequired");
}
final String replacement = regexNode.textValue().trim();
if (empty(replacement)) throw invalidEx("err.requestProtector.headerReplacementRequired");


final RequestProtectorConfig config = getConfig(account, app).addHeaderReplacement(regex, replacement); final RequestProtectorConfig config = getConfig(account, app).addHeaderReplacement(regex, replacement);




+ 3
- 2
bubble-server/src/main/resources/models/apps/request/bubbleApp_request.json View File

@@ -68,8 +68,9 @@
{ "name": "config.action.addHeaderReplacement", "value": "Add" }, { "name": "config.action.addHeaderReplacement", "value": "Add" },
{ "name": "config.action.removeHeaderReplacement", "value": "Remove" }, { "name": "config.action.removeHeaderReplacement", "value": "Remove" },


{ "name": "err.requestProtector.headerRegexRequired", "value": "RegEx field is required" }
{ "name": "err.requestProtector.headerRegexRequired", "value": "RegEx field is required" },
{ "name": "err.requestProtector.headerReplacementRequired", "value": "Replacement field is required" }
] ]
}] }]
} }
}]
}]

Loading…
Cancel
Save