From 6f8f97e9d53f6fefaa7e1523fe241617df1f48b4 Mon Sep 17 00:00:00 2001 From: Parshad Patel Date: Tue, 6 Aug 2019 19:41:24 +0900 Subject: [PATCH] Fix sonar issues in portal Use a logger to log this exception Make sure creating this cookie without the "secure" flag is safe here Either re-interrupt this method or rethrow the "InterruptedException" Issue-ID: PORTAL-562 Change-Id: I91d6adce835d9adec4328642e8445f074f7d2d57 Signed-off-by: Parshad Patel --- .../onap/portalapp/uebhandler/MainUebHandler.java | 1 + .../org/onap/portalapp/util/SessionCookieUtil.java | 2 ++ .../controller/WidgetsCatalogController.java | 22 ++++++++++------------ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/uebhandler/MainUebHandler.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/uebhandler/MainUebHandler.java index 33647874..fdb4baf3 100644 --- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/uebhandler/MainUebHandler.java +++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/uebhandler/MainUebHandler.java @@ -117,6 +117,7 @@ public class MainUebHandler { Thread.sleep(10); } catch (InterruptedException e) { logger.error(EELFLoggerDelegate.errorLogger, "runHandler interrupted", e); + Thread.currentThread().interrupt(); } catch (Exception e) { logger.error(EELFLoggerDelegate.errorLogger, "runHandler failed", e); } diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/util/SessionCookieUtil.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/util/SessionCookieUtil.java index 6ac63257..eaf9ec19 100644 --- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/util/SessionCookieUtil.java +++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/util/SessionCookieUtil.java @@ -69,6 +69,7 @@ public class SessionCookieUtil { HttpServletResponse response) { String jSessionId = getJessionId(request); Cookie cookie1 = new Cookie(EP_SERVICE, jSessionId); + cookie1.setSecure(true); cookie1.setMaxAge(cookieMaxAge); cookie1.setDomain(EPCommonSystemProperties.getProperty(EPCommonSystemProperties.COOKIE_DOMAIN)); cookie1.setPath("/"); @@ -81,6 +82,7 @@ public class SessionCookieUtil { userId = CipherUtil.encrypt(userId, SystemProperties.getProperty(SystemProperties.Decryption_Key)); Cookie cookie1 = new Cookie(USER_ID, userId); + cookie1.setSecure(true); cookie1.setMaxAge(cookieMaxAge); cookie1.setDomain(EPCommonSystemProperties.getProperty(EPCommonSystemProperties.COOKIE_DOMAIN)); cookie1.setPath("/"); diff --git a/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/controller/WidgetsCatalogController.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/controller/WidgetsCatalogController.java index 31f9b95f..b1450b6d 100644 --- a/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/controller/WidgetsCatalogController.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/controller/WidgetsCatalogController.java @@ -73,7 +73,7 @@ public class WidgetsCatalogController { widgetCatalog = widgetCatalogService.getWidgetCatalog(); logger.debug("WidgetsCatalogController.getWidgetCatalog: getting widget list {}", widgetCatalog); } catch (Exception e) { - logger.error("Exception occurred while performing WidgetsCatalogController.getWidgetCatalog in widget microservices. Details:" + e.getMessage()); + logger.error("Exception occurred while performing WidgetsCatalogController.getWidgetCatalog in widget microservices. Details:", e); } return widgetCatalog; } @@ -92,7 +92,7 @@ public class WidgetsCatalogController { widgetCatalog = widgetCatalogService.getUserWidgetCatalog(loginName); logger.debug("WidgetsCatalogController.getUserWidgetCatalog: getting widget list {}", widgetCatalog); } catch (Exception e) { - logger.error("Exception occurred while performing WidgetsCatalogController.getUserWidgetCatalog in widget microservices. Details:" + e.getMessage()); + logger.error("Exception occurred while performing WidgetsCatalogController.getUserWidgetCatalog in widget microservices. Details:", e); } return widgetCatalog; } @@ -112,8 +112,7 @@ public class WidgetsCatalogController { widgetCatalogService.updateWidgetCatalog(widgetId, newWidgetCatalog); logger.debug("WidgetsCatalogController.updateWidgetCatalog: updating widget {}", newWidgetCatalog); } catch (Exception e) { - logger.error("Exception occurred while performing WidgetsCatalogController.updateWidgetCatalog in widget microservices. Details:" + e.getMessage()); - e.printStackTrace(); + logger.error("Exception occurred while performing WidgetsCatalogController.updateWidgetCatalog in widget microservices. Details:", e); } } @@ -152,7 +151,7 @@ public class WidgetsCatalogController { @RequestMapping(value = { "/microservices/widgetCatalog/{widgetId}" }, method = RequestMethod.POST, produces = "application/json") public ValidationRespond updateWidgetCatalogwithFiles(HttpServletRequest request, HttpServletResponse response, @RequestHeader(value="Authorization") String auth, @RequestParam("file") MultipartFile file, @RequestParam("widget") String widget, @PathVariable("widgetId") long widgetId) throws IOException { - System.out.println("microserivces updating with files" + widgetId); + logger.debug("microserivces updating with files {}", widgetId); ValidationRespond respond = null; if(!util.authorization(auth, security_user, security_pass)){ response.sendError(HttpServletResponse.SC_UNAUTHORIZED); @@ -171,8 +170,7 @@ public class WidgetsCatalogController { storageService.update(file, newWidget, widgetId); } } catch (Exception e) { - logger.error("Exception occurred while performing WidgetsCatalogController.saveWidgetCatalog in widget microservices. Details:" + e.getMessage()); - e.printStackTrace(); + logger.error("Exception occurred while performing WidgetsCatalogController.saveWidgetCatalog in widget microservices. Details:", e); } return respond; } @@ -193,7 +191,7 @@ public class WidgetsCatalogController { widgetCatalogService.deleteWidgetCatalog(widgetId); storageService.deleteWidgetFile(widgetId); } catch (Exception e) { - logger.error("Exception occurred while performing WidgetsCatalogController.deleteOnboardingWidget in widget microservices. Details:" + e.getMessage()); + logger.error("Exception occurred while performing WidgetsCatalogController.deleteOnboardingWidget in widget microservices. Details:", e); } } @@ -212,7 +210,7 @@ public class WidgetsCatalogController { logger.debug("WidgetsCatalogController.getServiceIdByWidget: getting service Id for widget {}", widgetId); serviceId = widgetCatalogService.getServiceIdByWidget(widgetId); }catch(Exception e){ - logger.error("Exception occurred while performing WidgetsCatalogController.getServiceIdByWidget in widget microservices. Details:" + e.getMessage()); + logger.error("Exception occurred while performing WidgetsCatalogController.getServiceIdByWidget in widget microservices. Details:", e); } return serviceId; } @@ -222,7 +220,7 @@ public class WidgetsCatalogController { @RequestMapping(value = { "/microservices/widgetCatalog/service/{serviceId}" }, method = RequestMethod.GET, produces = "application/json") public List getWidgetByServiceId(HttpServletRequest request, HttpServletResponse response, @PathVariable("serviceId") Long serviceId, @RequestHeader(value="Authorization") String auth) throws IOException { - List list = new ArrayList(); + List list = new ArrayList<>(); if(!util.authorization(auth, security_user, security_pass)){ response.sendError(HttpServletResponse.SC_UNAUTHORIZED); logger.error("Basic Authentication Error while performing WidgetsCatalogController.getWidgetByServiceId in widget microserivce. Please check your username and password."); @@ -232,7 +230,7 @@ public class WidgetsCatalogController { logger.debug("WidgetsCatalogController.getWidgetByServiceId: getting service Id for widget {}", serviceId); list = widgetCatalogService.getWidgetsByServiceId(serviceId); }catch(Exception e){ - logger.error("Exception occurred while performing WidgetsCatalogController.getWidgetByServiceId in widget microservices. Details:" + e.getMessage()); + logger.error("Exception occurred while performing WidgetsCatalogController.getWidgetByServiceId in widget microservices. Details:", e); } return list; } @@ -252,7 +250,7 @@ public class WidgetsCatalogController { byteFile = storageService.getWidgetCatalogContent(widgetId); logger.debug("WidgetsCatalogController.getWidgetZipFile: getting widget zip file for widget with id {}", widgetId); } catch (Exception e) { - logger.error("Exception occurred while performing WidgetsCatalogController.getWidgetZipFile in widget microservices. Details:" + e.getMessage()); + logger.error("Exception occurred while performing WidgetsCatalogController.getWidgetZipFile in widget microservices. Details:", e); } return byteFile; } -- 2.16.6