From 3ae059ef424a9086afab722a1ad52cee34b4c4d4 Mon Sep 17 00:00:00 2001 From: Rami Winestock Date: Fri, 15 Dec 2023 17:57:31 +0200 Subject: [PATCH] log fields and logo fixes --- .../js/app/openappsec-log/list-all/item.ejs | 30 ++++++------ .../js/app/openappsec-log/list-all/item.js | 8 ++++ .../openappsec-log/list-important/item.ejs | 30 ++++++------ .../app/openappsec-log/list-important/item.js | 7 +++ .../list-notifications/item.ejs | 12 ++--- .../openappsec-log/list-notifications/item.js | 7 +++ frontend/js/login/ui/login.ejs | 22 ++++++--- frontend/js/models/openappsec-log.js | 46 +++++++++---------- 8 files changed, 97 insertions(+), 65 deletions(-) diff --git a/frontend/js/app/openappsec-log/list-all/item.ejs b/frontend/js/app/openappsec-log/list-all/item.ejs index 0d24ab1b..c4c09685 100644 --- a/frontend/js/app/openappsec-log/list-all/item.ejs +++ b/frontend/js/app/openappsec-log/list-all/item.ejs @@ -1,17 +1,17 @@ open <%- formatDbDate(eventTime, 'MMM DD YYYY, H:mm') %> -<%- eventSeverity %> -<%- assetName %> -<%- securityAction %> -<%- waapIncidentType %> -<%- httpSourceId %> -<%- sourceIp %> -<%- proxyIp %> -<%- httpHostName %> -<%- httpMethod %> -<%- httpResponseCode %> -<%- httpUriPath %> -<%- eventTopic %> -<%- matchedLocation %> -<%- matchedParameter %> -<%- matchedSample %> \ No newline at end of file +<%= createSpecificTableCell(eventSeverity) %> +<%= createSpecificTableCell(assetName) %> +<%= createSpecificTableCell(securityAction) %> +<%= createSpecificTableCell(waapIncidentType) %> +<%= createSpecificTableCell(httpSourceId) %> +<%= createSpecificTableCell(sourceIP) %> +<%= createSpecificTableCell(proxyIp) %> +<%= createSpecificTableCell(httpHostName) %> +<%= createSpecificTableCell(httpMethod) %> +<%= createSpecificTableCell(httpResponseCode) %> +<%= createSpecificTableCell(httpUriPath) %> +<%= createSpecificTableCell(eventTopic) %> +<%= createSpecificTableCell(matchedLocation) %> +<%= createSpecificTableCell(matchedParameter) %> +<%= createSpecificTableCell(matchedSample) %> diff --git a/frontend/js/app/openappsec-log/list-all/item.js b/frontend/js/app/openappsec-log/list-all/item.js index 009e3a3e..a65006f0 100644 --- a/frontend/js/app/openappsec-log/list-all/item.js +++ b/frontend/js/app/openappsec-log/list-all/item.js @@ -27,6 +27,14 @@ module.exports = Mn.View.extend({ } return '#' + (this.object_id || '?'); + }, + createSpecificTableCell: function(value) { + if (value && value.trim() !== '') { + return `${value}`; + } else { + return `-`; + } } + } }); diff --git a/frontend/js/app/openappsec-log/list-important/item.ejs b/frontend/js/app/openappsec-log/list-important/item.ejs index d038f03d..266b9597 100644 --- a/frontend/js/app/openappsec-log/list-important/item.ejs +++ b/frontend/js/app/openappsec-log/list-important/item.ejs @@ -1,17 +1,17 @@ open <%- formatDbDate(eventTime, 'MMM DD YYYY, H:mm') %> -<%- eventSeverity %> -<%- assetName %> -<%- securityAction %> -<%- waapIncidentType %> -<%- httpSourceId %> -<%- sourceIp %> -<%- proxyIp %> -<%- httpHostName %> -<%- httpMethod %> -<%- httpResponseCode %> -<%- httpUriPath %> -<%- eventTopic %> -<%- matchedLocation %> -<%- matchedParameter %> -<%- matchedSample %> +<%= createSpecificTableCell(eventSeverity) %> +<%= createSpecificTableCell(assetName) %> +<%= createSpecificTableCell(securityAction) %> +<%= createSpecificTableCell(waapIncidentType) %> +<%= createSpecificTableCell(httpSourceId) %> +<%= createSpecificTableCell(sourceIP) %> +<%= createSpecificTableCell(proxyIp) %> +<%= createSpecificTableCell(httpHostName) %> +<%= createSpecificTableCell(httpMethod) %> +<%= createSpecificTableCell(httpResponseCode) %> +<%= createSpecificTableCell(httpUriPath) %> +<%= createSpecificTableCell(eventTopic) %> +<%= createSpecificTableCell(matchedLocation) %> +<%= createSpecificTableCell(matchedParameter) %> +<%= createSpecificTableCell(matchedSample) %> \ No newline at end of file diff --git a/frontend/js/app/openappsec-log/list-important/item.js b/frontend/js/app/openappsec-log/list-important/item.js index 009e3a3e..22a358e5 100644 --- a/frontend/js/app/openappsec-log/list-important/item.js +++ b/frontend/js/app/openappsec-log/list-important/item.js @@ -27,6 +27,13 @@ module.exports = Mn.View.extend({ } return '#' + (this.object_id || '?'); + }, + createSpecificTableCell: function(value) { + if (value && value.trim() !== '') { + return `${value}`; + } else { + return `-`; + } } } }); diff --git a/frontend/js/app/openappsec-log/list-notifications/item.ejs b/frontend/js/app/openappsec-log/list-notifications/item.ejs index 2c64efd4..f97a9c49 100644 --- a/frontend/js/app/openappsec-log/list-notifications/item.ejs +++ b/frontend/js/app/openappsec-log/list-notifications/item.ejs @@ -1,8 +1,8 @@ open <%- formatDbDate(eventTime, 'MMM DD YYYY, H:mm') %> -<%- eventSeverity %> -<%- eventPriority %> -<%- eventTopic %> -<%- eventName %> -<%- suggestedRemediation %> -<%- assetName %> \ No newline at end of file +<%= createSpecificTableCell(eventSeverity) %> +<%= createSpecificTableCell(eventPriority) %> +<%= createSpecificTableCell(eventTopic) %> +<%= createSpecificTableCell(eventName) %> +<%= createSpecificTableCell(suggestedRemediation) %> +<%= createSpecificTableCell(assetName) %> \ No newline at end of file diff --git a/frontend/js/app/openappsec-log/list-notifications/item.js b/frontend/js/app/openappsec-log/list-notifications/item.js index 009e3a3e..22a358e5 100644 --- a/frontend/js/app/openappsec-log/list-notifications/item.js +++ b/frontend/js/app/openappsec-log/list-notifications/item.js @@ -27,6 +27,13 @@ module.exports = Mn.View.extend({ } return '#' + (this.object_id || '?'); + }, + createSpecificTableCell: function(value) { + if (value && value.trim() !== '') { + return `${value}`; + } else { + return `-`; + } } } }); diff --git a/frontend/js/login/ui/login.ejs b/frontend/js/login/ui/login.ejs index 925bc1b1..3f603acf 100644 --- a/frontend/js/login/ui/login.ejs +++ b/frontend/js/login/ui/login.ejs @@ -7,14 +7,24 @@
+
Logo -
- <%- i18n('main', 'version', {version: getVersion()}) %> +
+ <%- i18n('main', 'version' , {version: getVersion()}) %>
-
- Secured by: - - open-appsec + +
+
+ Secured by: +
+
+ +
+
+ open-appsec +
+
+
diff --git a/frontend/js/models/openappsec-log.js b/frontend/js/models/openappsec-log.js index 5f057538..9ee4c05c 100755 --- a/frontend/js/models/openappsec-log.js +++ b/frontend/js/models/openappsec-log.js @@ -5,30 +5,30 @@ const model = Backbone.Model.extend({ defaults: function () { return { - name: '-', - eventSeverity: '-', - assetName: '-', - securityAction: '-', - waapIncidentType: '-', - httpSourceId: '-', - sourceIp: '-', - // 'Proxy-IP': '-', - proxyIp: '-', - httpHostName: '-', - httpMethod: '-', - // 'HTTP-Response-Code': '-', - httpResponseCode: '-', - httpUriPath: '-', - // 'Protection-Name': '-', - protectionName: '-', - matchedLocation: '-', - matchedParameter: '-', - matchedSample: '-', - eventPriority: '-', - eventTopic: '-', - eventName: '-', + name: '', + eventSeverity: '', + assetName: '', + securityAction: '', + waapIncidentType: '', + httpSourceId: '', + sourceIP: '', + // 'Proxy-IP': '', + proxyIp: '', + httpHostName: '', + httpMethod: '', + // 'HTTP-Response-Code': '', + httpResponseCode: '', + httpUriPath: '', + // 'Protection-Name': '', + protectionName: '', + matchedLocation: '', + matchedParameter: '', + matchedSample: '', + eventPriority: '', + eventTopic: '', + eventName: '', // Suggested Remediation if Applicable - suggestedRemediation: '-' + suggestedRemediation: '' }; } });