diff options
author | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-03-15 12:25:28 -0400 |
---|---|---|
committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-03-15 12:25:32 -0400 |
commit | b46d863e9e5db30291034e8740291c70875f1f5f (patch) | |
tree | 6766ccb15edba5807a429278bf57ed8d241d2ce8 /ccsdk-app-common/src/main/java/org/onap/fusionapp | |
parent | 2e98a6c64dcdc0891f3729abb045115b790a2c54 (diff) |
Resolve security issues
This change contains the following fixes:
1) Updated ccsdk/dashboard to use ONAP's oparent parent pom
2) Removed <version> tag from dependencies managed by oparent,
where feasible (e.g. not spring, since oparent uses Spring 5
and dashboard is based on Spring 4)
3) Updated versions of third party libraries as needed to address
vulnerabilities found in nexus IQ scan.
4) Added missing license headers in source files to resolve
checkstyle error from oparent.
5) Fixed indentation (tab -> 4 spaces) to resolve oparent
checkstyle warning.
Change-Id: Ib92d5ef86dbdb78c270d0901cc0753cd5a78eb6e
Issue-ID: CCSDK-1167
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'ccsdk-app-common/src/main/java/org/onap/fusionapp')
3 files changed, 47 insertions, 51 deletions
diff --git a/ccsdk-app-common/src/main/java/org/onap/fusionapp/model/Result.java b/ccsdk-app-common/src/main/java/org/onap/fusionapp/model/Result.java index 1f6328d..bc0a43a 100644 --- a/ccsdk-app-common/src/main/java/org/onap/fusionapp/model/Result.java +++ b/ccsdk-app-common/src/main/java/org/onap/fusionapp/model/Result.java @@ -25,29 +25,27 @@ package org.onap.fusionapp.model; * Trivial model of a String */ public class Result { - private String result; + private String result; - /** - * @param result - * String - */ - public Result(String result) { - this.result = result; - } + /** + * @param result String + */ + public Result(String result) { + this.result = result; + } - /** - * @return String - */ - public String getResult() { - return result; - } + /** + * @return String + */ + public String getResult() { + return result; + } - /** - * @param result - * String - */ - public void setResult(String result) { - this.result = result; - } + /** + * @param result String + */ + public void setResult(String result) { + this.result = result; + } } diff --git a/ccsdk-app-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java b/ccsdk-app-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java index 644d332..0f2a1db 100644 --- a/ccsdk-app-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java +++ b/ccsdk-app-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java @@ -30,13 +30,12 @@ import org.onap.portalsdk.core.domain.User; */
public class AdminAuthExtension {
- /**
- * @param user
- * User who was authenticated
- */
- public void saveUserExtension(User user) {
- // app's developer implement their own logic here, like updating app's
- // related tables
- }
+ /**
+ * @param user User who was authenticated
+ */
+ public void saveUserExtension(User user) {
+ // app's developer implement their own logic here, like updating app's
+ // related tables
+ }
}
diff --git a/ccsdk-app-common/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java b/ccsdk-app-common/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java index 165a8b8..13c36e6 100644 --- a/ccsdk-app-common/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java +++ b/ccsdk-app-common/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java @@ -33,26 +33,25 @@ import ch.qos.logback.core.spi.FilterReply; */ public class CustomLoggingFilter extends Filter<ILoggingEvent> { - /** - * Custom Filter is added to strip out the continuous U-EB logging messages - * But make sure we log the ERROR and WARNING Level messages. - * - * @param event - * Logging event - */ - @Override - public FilterReply decide(ILoggingEvent event) { - try { - if ((event.getLevel() != Level.ERROR || event.getLevel() != Level.WARN) - && ("UEBConsumerThread".equalsIgnoreCase(event.getThreadName())) - && (event.getLoggerName().contains("com.att.nsa") - || event.getLoggerName().contains("org.apache.http"))) { - return FilterReply.DENY; - } else { - return FilterReply.NEUTRAL; - } - } catch (Exception e) { - return FilterReply.NEUTRAL; - } - } + /** + * Custom Filter is added to strip out the continuous U-EB logging messages But + * make sure we log the ERROR and WARNING Level messages. + * + * @param event Logging event + */ + @Override + public FilterReply decide(ILoggingEvent event) { + try { + if ((event.getLevel() != Level.ERROR || event.getLevel() != Level.WARN) + && ("UEBConsumerThread".equalsIgnoreCase(event.getThreadName())) + && (event.getLoggerName().contains("com.att.nsa") + || event.getLoggerName().contains("org.apache.http"))) { + return FilterReply.DENY; + } else { + return FilterReply.NEUTRAL; + } + } catch (Exception e) { + return FilterReply.NEUTRAL; + } + } } |