From 19daef5d092291cae3a9c4bcf3814e6c47a61a9b Mon Sep 17 00:00:00 2001
From: Christoph Weitkamp <github@christophweitkamp.de>
Date: Wed, 23 Dec 2020 12:57:27 +0100
Subject: [PATCH] Harden ChartServlet against NPEs when no 'period' parameter
 is given (#1992)

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
---
 .../core/ui/internal/chart/ChartServlet.java  | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/ChartServlet.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/ChartServlet.java
index 84d2740b761..e0291feaf78 100644
--- a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/ChartServlet.java
+++ b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/ChartServlet.java
@@ -213,27 +213,32 @@ protected void doGet(HttpServletRequest req, HttpServletResponse res) throws Ser
             }
         }
 
+        String periodParam = req.getParameter("period");
+        String timeBeginParam = req.getParameter("begin");
+        String timeEndParam = req.getParameter("end");
         // To avoid ambiguity you are not allowed to specify period, begin and end time at the same time.
-        if (req.getParameter("period") != null && req.getParameter("begin") != null
-                && req.getParameter("end") != null) {
+        if (periodParam != null && timeBeginParam != null && timeEndParam != null) {
             res.sendError(HttpServletResponse.SC_BAD_REQUEST,
                     "Do not specify the three parameters period, begin and end at the same time.");
             return;
         }
 
         // Read out the parameter period, begin and end and save them.
+        Long period = null;
         Date timeBegin = null;
         Date timeEnd = null;
 
-        Long period = PERIODS.get(req.getParameter("period"));
+        if (periodParam != null) {
+            period = PERIODS.get(periodParam);
+        }
         if (period == null) {
             // use a day as the default period
             period = PERIODS.get("D");
         }
 
-        if (req.getParameter("begin") != null) {
+        if (timeBeginParam != null) {
             try {
-                timeBegin = new SimpleDateFormat(DATE_FORMAT).parse(req.getParameter("begin"));
+                timeBegin = new SimpleDateFormat(DATE_FORMAT).parse(timeBeginParam);
             } catch (ParseException e) {
                 res.sendError(HttpServletResponse.SC_BAD_REQUEST,
                         "Begin and end must have this format: " + DATE_FORMAT + ".");
@@ -241,9 +246,9 @@ protected void doGet(HttpServletRequest req, HttpServletResponse res) throws Ser
             }
         }
 
-        if (req.getParameter("end") != null) {
+        if (timeEndParam != null) {
             try {
-                timeEnd = new SimpleDateFormat(DATE_FORMAT).parse(req.getParameter("end"));
+                timeEnd = new SimpleDateFormat(DATE_FORMAT).parse(timeEndParam);
             } catch (ParseException e) {
                 res.sendError(HttpServletResponse.SC_BAD_REQUEST,
                         "Begin and end must have this format: " + DATE_FORMAT + ".");
@@ -292,9 +297,10 @@ protected void doGet(HttpServletRequest req, HttpServletResponse res) throws Ser
         }
 
         // Read out parameter 'legend'
+        String legendParam = req.getParameter("legend");
         Boolean legend = null;
-        if (req.getParameter("legend") != null) {
-            legend = Boolean.valueOf(req.getParameter("legend"));
+        if (legendParam != null) {
+            legend = Boolean.valueOf(legendParam);
         }
 
         if (maxWidth > 0 && width > maxWidth) {