diff options
| author |   Fiachra Corcoran <fiachra.corcoran@est.tech> | 2021-08-18 14:14:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-08-18 14:14:36 +0000 |
| commit | e83c9d2afb18817fdb23cf9777e2b4f2afef28ca (patch) | |
| tree | d09ffa52a327ada647be0e60c352418f9b92b432 /datarouter-prov/src/main/java | |
| parent | cb2d2a283852fe8e47d9f21d93c191230bf42f5a (diff) | |
| parent | 6cae65debc366ca3fb2f2467226420b82f2b0070 (diff) | |
Merge "DMAAP-DR - Additional parameter validation"
Diffstat (limited to 'datarouter-prov/src/main/java')
| -rwxr-xr-x | datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java | 39 |
1 files changed, 32 insertions, 7 deletions
diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java index 7163a638..4bc39771 100755 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java @@ -155,22 +155,43 @@ public class StatisticsServlet extends BaseServlet { if (req.getParameter("type") != null) {
map.put(EVENT_TYPE, req.getParameter("type").replace("|", ","));
}
- if (req.getParameter(OUTPUT_TYPE) != null && req.getParameter(OUTPUT_TYPE).equals(CSV_OUTPUT_TYPE)) {
- map.put(OUTPUT_TYPE, CSV_OUTPUT_TYPE);
- outputType = CSV_OUTPUT_TYPE;
+ if (req.getParameter(OUTPUT_TYPE) != null) {
+ map.put(OUTPUT_TYPE, req.getParameter(OUTPUT_TYPE));
+ outputType = req.getParameter(OUTPUT_TYPE);
}
if (req.getParameter(OUTPUT_TYPE) != null && req.getParameter(OUTPUT_TYPE).equals(JSON_OUTPUT_TYPE)) {
map.put(OUTPUT_TYPE, JSON_OUTPUT_TYPE);
}
if (req.getParameter(START_TIME) != null) {
- map.put(START_TIME, req.getParameter(START_TIME));
+ String start_time = req.getParameter(START_TIME);
+ try{
+ Long.parseLong(start_time);
+ map.put(START_TIME, start_time);
+ }
+ catch (NumberFormatException e){
+ eventlogger.error("Invalid start time StatisticsServlet.doGet: " + e.getMessage(), e);
+ }
}
if (req.getParameter(END_TIME) != null) {
- map.put(END_TIME, req.getParameter(END_TIME));
+ String end_time = req.getParameter(END_TIME);
+ try{
+ Long.parseLong(end_time);
+ map.put(END_TIME, end_time);
+ }
+ catch (NumberFormatException e){
+ eventlogger.error("Invalid end time StatisticsServlet.doGet: " + e.getMessage(), e);
+ }
}
if (req.getParameter("time") != null) {
- map.put(START_TIME, req.getParameter("time"));
- map.put(END_TIME, null);
+ String time = req.getParameter("time");
+ try{
+ Long.parseLong(time);
+ map.put(START_TIME, time);
+ map.put(END_TIME, null);
+ }
+ catch (NumberFormatException e){
+ eventlogger.error("Invalid end time StatisticsServlet.doGet: " + e.getMessage(), e);
+ }
}
try {
this.getRecordsForSQL(map, outputType, resp.getOutputStream(), resp);
@@ -180,6 +201,10 @@ public class StatisticsServlet extends BaseServlet { }
+ private boolean validateDateInput(String date){
+
+ return true;
+ }
/**
* rsToJson - Converting RS to JSON object.
|