diff --git a/backend/internal/openappsec-log.js b/backend/internal/openappsec-log.js index dfdf19e5..6a9486db 100755 --- a/backend/internal/openappsec-log.js +++ b/backend/internal/openappsec-log.js @@ -58,6 +58,18 @@ const internalOpenappsecLog = { eventSeverity: json.eventSeverity, eventLevel: json.eventLevel, eventTime: json.eventTime, + assetName: json.eventSource.assetName, + securityAction: json.eventData.securityAction, + waapIncidentType: json.eventData.waapIncidentType, + httpSourceId: json.eventData.httpSourceId, + sourceIP: json.eventData.sourceIP, + httpHostName: json.eventData.httpHostName, + httpMethod: json.eventData.httpMethod, + httpUriPath: json.eventData.httpUriPath, + eventTopic: json.eventSource.eventTopic, + matchedLocation: json.eventData.matchedLocation, + matchedParameter: json.eventData.matchedParameter, + matchedSample: json.eventData.matchedSample, eventName: json.eventName }; dataLines.push(wrappedObject); diff --git a/backend/package.json b/backend/package.json index 3227ec93..cb0dee9e 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "nginx-proxy-manager", - "version": "0.0.0", + "version": "1.0.1", "description": "A beautiful interface for creating Nginx endpoints", "main": "js/index.js", "dependencies": { diff --git a/frontend/html/login.ejs b/frontend/html/login.ejs index bc4b9a27..d24a76e3 100644 --- a/frontend/html/login.ejs +++ b/frontend/html/login.ejs @@ -1,9 +1,9 @@ <% var title = 'Login – Nginx Proxy Manager' %> <%- include partials/header.ejs %> -
+
- + <%- include partials/footer.ejs %> diff --git a/frontend/js/app/openappsec-log/list-all/item.ejs b/frontend/js/app/openappsec-log/list-all/item.ejs index 087ea989..0d24ab1b 100644 --- a/frontend/js/app/openappsec-log/list-all/item.ejs +++ b/frontend/js/app/openappsec-log/list-all/item.ejs @@ -1,5 +1,5 @@ - -<%- formatDbDate(eventTime, 'D-M-YY, H:mm') %> +open +<%- formatDbDate(eventTime, 'MMM DD YYYY, H:mm') %> <%- eventSeverity %> <%- assetName %> <%- securityAction %> @@ -14,7 +14,4 @@ <%- eventTopic %> <%- matchedLocation %> <%- matchedParameter %> -<%- matchedSample %> - - open - \ No newline at end of file +<%- matchedSample %> \ No newline at end of file diff --git a/frontend/js/app/openappsec-log/list-all/main.ejs b/frontend/js/app/openappsec-log/list-all/main.ejs index 07ad186c..e2fd8fa9 100644 --- a/frontend/js/app/openappsec-log/list-all/main.ejs +++ b/frontend/js/app/openappsec-log/list-all/main.ejs @@ -1,21 +1,21 @@ +   Time Event Severity Asset Name Security Action - AppSec Incident Type + AppSec Incident Type Source Identifier Source IP Proxy IP HTTP Host HTTP Method - HTTP Response Code - HTTP URI Path + HTTP Response Code + HTTP URI Path Event Topic Matched Location Matched Parameter Matched Sample -   diff --git a/frontend/js/app/openappsec-log/list-important/item.ejs b/frontend/js/app/openappsec-log/list-important/item.ejs index a6f8b3a1..d038f03d 100644 --- a/frontend/js/app/openappsec-log/list-important/item.ejs +++ b/frontend/js/app/openappsec-log/list-important/item.ejs @@ -1,5 +1,5 @@ - -<%- formatDbDate(eventTime, 'D-M-YY, H:mm') %> +open +<%- formatDbDate(eventTime, 'MMM DD YYYY, H:mm') %> <%- eventSeverity %> <%- assetName %> <%- securityAction %> @@ -15,6 +15,3 @@ <%- matchedLocation %> <%- matchedParameter %> <%- matchedSample %> - - open - diff --git a/frontend/js/app/openappsec-log/list-important/main.ejs b/frontend/js/app/openappsec-log/list-important/main.ejs index 07ad186c..e2fd8fa9 100644 --- a/frontend/js/app/openappsec-log/list-important/main.ejs +++ b/frontend/js/app/openappsec-log/list-important/main.ejs @@ -1,21 +1,21 @@ +   Time Event Severity Asset Name Security Action - AppSec Incident Type + AppSec Incident Type Source Identifier Source IP Proxy IP HTTP Host HTTP Method - HTTP Response Code - HTTP URI Path + HTTP Response Code + HTTP URI Path Event Topic Matched Location Matched Parameter Matched Sample -   diff --git a/frontend/js/app/openappsec-log/list-notifications/item.ejs b/frontend/js/app/openappsec-log/list-notifications/item.ejs index 86457f26..2c64efd4 100644 --- a/frontend/js/app/openappsec-log/list-notifications/item.ejs +++ b/frontend/js/app/openappsec-log/list-notifications/item.ejs @@ -1,10 +1,8 @@ -<%- formatDbDate(eventTime, 'D-M-YY, H:mm') %> +open +<%- formatDbDate(eventTime, 'MMM DD YYYY, H:mm') %> <%- eventSeverity %> <%- eventPriority %> <%- eventTopic %> <%- eventName %> <%- suggestedRemediation %> -<%- assetName %> - - open - +<%- assetName %> \ No newline at end of file diff --git a/frontend/js/app/openappsec-log/list-notifications/main.ejs b/frontend/js/app/openappsec-log/list-notifications/main.ejs index 9092a11a..30b06c70 100644 --- a/frontend/js/app/openappsec-log/list-notifications/main.ejs +++ b/frontend/js/app/openappsec-log/list-notifications/main.ejs @@ -1,4 +1,5 @@ +   Time Event Severity Event Priority @@ -6,7 +7,6 @@ Event Name Suggested Remediation if Applicable Asset Name -   diff --git a/frontend/js/app/openappsec-log/main.js b/frontend/js/app/openappsec-log/main.js index cb992877..2afd08b1 100755 --- a/frontend/js/app/openappsec-log/main.js +++ b/frontend/js/app/openappsec-log/main.js @@ -78,9 +78,9 @@ module.exports = Mn.View.extend({ }; this.tabPaginationStates = { - tab1: { page: 1, perPage: this.options.perPage }, - tab2: { page: 1, perPage: this.options.perPage }, - tab3: { page: 1, perPage: this.options.perPage } + tab1: { page: 1, perPage: this.options.perPage, totalDataLines: tab1Data.length }, + tab2: { page: 1, perPage: this.options.perPage, totalDataLines: tab2Data.length }, + tab3: { page: 1, perPage: this.options.perPage, totalDataLines: tab3Data.length } }; // Define an object mapping for the ListViews @@ -99,36 +99,16 @@ module.exports = Mn.View.extend({ // Show the ListView for the current tab this.showChildView('list_region', new CurrentListView({ collection: this.tabCollections[currentTab], - page: 1, - perPage: this.options.perPage - // page: this.tabPaginationStates[currentTab].page, - // perPage: this.tabPaginationStates[currentTab].perPage + // page: 1, + // perPage: this.options.perPage + page: this.tabPaginationStates[currentTab].page, + perPage: this.tabPaginationStates[currentTab].perPage })); - // const totalDataLines = response.length; - // this.showChildView('list_region', new ListView({ - // collection: this.tabCollections.tab1, - // page: this.tabPaginationStates.tab1.page, - // perPage: this.tabPaginationStates.tab1.perPage - // })); - - // this.showChildView('pagination_region', new PaginationView({ - // totalDataLines: this.tabCollectionLengths.tab1, - // totalPages: Math.ceil(this.tabCollectionLengths.tab1 / this.options.perPage), - // currentPage: this.tabPaginationStates.tab1.page - // })); - - // const totalDataLines = response.length; - // this.showChildView('list_region', new ListView({ - // collection: new OpenappsecLogModel.Collection(response), - // page: this.options.page, - // perPage: this.options.perPage - // })); - - // this.showChildView('pagination_region', new PaginationView({ - // totalDataLines: totalDataLines, - // totalPages: Math.ceil(totalDataLines / this.options.perPage), - // currentPage: this.options.page + // this.showChildView('pagination_region', new PaginationView({ + // totalDataLines: this.tabPaginationStates[currentTab].totalDataLines, + // totalPages: Math.ceil(this.tabPaginationStates[currentTab].totalDataLines / this.options.perPage), + // currentPage: this.tabPaginationStates[currentTab].page // })); }, @@ -184,7 +164,7 @@ module.exports = Mn.View.extend({ const selectedTab = event.target.id; let view = this; let query = this.ui.query.val() || ''; - + view.ui.dimmer.addClass('active'); view.fetch(['user'], query) .then(response => { if (!view.isDestroyed() && response) { diff --git a/frontend/js/login/ui/login.ejs b/frontend/js/login/ui/login.ejs index 693bc050..925bc1b1 100644 --- a/frontend/js/login/ui/login.ejs +++ b/frontend/js/login/ui/login.ejs @@ -6,11 +6,16 @@
-
+
Logo
<%- i18n('main', 'version', {version: getVersion()}) %>
+
+ Secured by: + + open-appsec +
diff --git a/frontend/js/login/ui/login.js b/frontend/js/login/ui/login.js index 757eb4e3..dc90b642 100644 --- a/frontend/js/login/ui/login.js +++ b/frontend/js/login/ui/login.js @@ -36,7 +36,9 @@ module.exports = Mn.View.extend({ templateContext: { i18n: i18n, getVersion: function () { - return $('#login').data('version'); + const version = require('../../../package.json').version; + return version; + // return $('#login').data('version'); } } }); diff --git a/frontend/package.json b/frontend/package.json index 4965d0df..6c3ea0d0 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "nginx-proxy-manager", - "version": "0.0.0", + "version": "1.0.1", "description": "A beautiful interface for creating Nginx endpoints", "main": "js/index.js", "devDependencies": {