From 136b4accf18ca2888988a34d84e5723e16c92ead Mon Sep 17 00:00:00 2001 From: ziirish Date: Thu, 14 Jan 2016 20:09:30 +0100 Subject: [PATCH] fix: wrong routes --- burpui/api/client.py | 60 ++++++++++++++-------------- burpui/templates/js/backup-report.js | 2 +- burpui/templates/js/client-report.js | 2 +- burpui/templates/js/client.js | 2 +- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/burpui/api/client.py b/burpui/api/client.py index 05584b2d..c7eae3c4 100644 --- a/burpui/api/client.py +++ b/burpui/api/client.py @@ -116,14 +116,14 @@ class ClientTree(Resource): return j -@ns.route('/stats/', - '//stats/', - '/stats//', - '//stats//', - endpoint='client_stats') -class ClientStats(Resource): +@ns.route('/report/', + '//report/', + '/report//', + '//report//', + endpoint='client_report') +class ClientReport(Resource): """The :class:`burpui.api.client.ClientStats` resource allows you to - retrieve a statistics on a given backup for a given client. + retrieve a report on a given backup for a given client. This resource is part of the :mod:`burpui.api.client` module. @@ -132,7 +132,7 @@ class ClientStats(Resource): """ parser = api.parser() parser.add_argument('server', type=str, help='Which server to collect data from when in multi-agent mode') - stats_tpl_fields = api.model('ClientStatsTpl', { + report_tpl_fields = api.model('ClientReportTpl', { 'changed': fields.Integer(required=True, description='Number of changed files'), 'deleted': fields.Integer(required=True, description='Number of deleted files'), 'new': fields.Integer(required=True, description='Number of new files'), @@ -140,32 +140,32 @@ class ClientStats(Resource): 'total': fields.Integer(required=True, description='Total number of files'), 'unchanged': fields.Integer(required=True, description='Number of scanned files'), }) - stats_fields = api.model('ClientStats', { - 'dir': fields.Nested(stats_tpl_fields, required=True), + report_fields = api.model('ClientReport', { + 'dir': fields.Nested(report_tpl_fields, required=True), 'duration': fields.Integer(required=True, description='Backup duration in seconds'), - 'efs': fields.Nested(stats_tpl_fields, required=True), + 'efs': fields.Nested(report_tpl_fields, required=True), 'encrypted': fields.Boolean(required=True, description='Is the backup encrypted'), 'end': fields.Integer(required=True, description='Timestamp of the end date of the backup'), - 'files': fields.Nested(stats_tpl_fields, required=True), - 'files_enc': fields.Nested(stats_tpl_fields, required=True), - 'hardlink': fields.Nested(stats_tpl_fields, required=True), - 'meta': fields.Nested(stats_tpl_fields, required=True), - 'meta_enc': fields.Nested(stats_tpl_fields, required=True), + 'files': fields.Nested(report_tpl_fields, required=True), + 'files_enc': fields.Nested(report_tpl_fields, required=True), + 'hardlink': fields.Nested(report_tpl_fields, required=True), + 'meta': fields.Nested(report_tpl_fields, required=True), + 'meta_enc': fields.Nested(report_tpl_fields, required=True), 'number': fields.Integer(required=True, description='Backup number'), 'received': fields.Integer(required=True, description='Bytes received'), - 'softlink': fields.Nested(stats_tpl_fields, required=True), - 'special': fields.Nested(stats_tpl_fields, required=True), + 'softlink': fields.Nested(report_tpl_fields, required=True), + 'special': fields.Nested(report_tpl_fields, required=True), 'start': fields.Integer(required=True, description='Timestamp of the beginning of the backup'), 'totsize': fields.Integer(required=True, description='Total size of the backup'), - 'vssfooter': fields.Nested(stats_tpl_fields, required=True), - 'vssfooter_enc': fields.Nested(stats_tpl_fields, required=True), - 'vssheader': fields.Nested(stats_tpl_fields, required=True), - 'vssheader_enc': fields.Nested(stats_tpl_fields, required=True), + 'vssfooter': fields.Nested(report_tpl_fields, required=True), + 'vssfooter_enc': fields.Nested(report_tpl_fields, required=True), + 'vssheader': fields.Nested(report_tpl_fields, required=True), + 'vssheader_enc': fields.Nested(report_tpl_fields, required=True), 'windows': fields.Boolean(required=True, description='Is the client a windows system'), }) @api.cache.cached(timeout=1800, key_prefix=cache_key) - @api.marshal_with(stats_fields, code=200, description='Success') + @api.marshal_with(report_fields, code=200, description='Success') @api.doc( params={ 'server': 'Which server to collect data from when in multi-agent mode', @@ -179,7 +179,7 @@ class ClientStats(Resource): parser=parser ) def get(self, server=None, name=None, backup=None): - """Returns global statistics of a given backup/client + """Returns a global report of a given backup/client **GET** method provided by the webservice. @@ -334,7 +334,7 @@ class ClientStats(Resource): api.bui.acl.is_client_allowed(current_user.get_id(), name, server)): - api.abort(403, 'You don\'t have rights to view this client stats') + api.abort(403, 'You don\'t have rights to view this client report') if backup: try: j = api.bui.cli.get_backup_logs(backup, name, agent=server) @@ -358,10 +358,10 @@ class ClientStats(Resource): return j -@ns.route('/report/', - '//report/', - endpoint='client_report') -class ClientReport(Resource): +@ns.route('/stats/', + '//stats/', + endpoint='client_stats') +class ClientStats(Resource): """The :class:`burpui.api.client.ClientReport` resource allows you to retrieve a list of backups for a given client. @@ -372,7 +372,7 @@ class ClientReport(Resource): """ parser = api.parser() parser.add_argument('server', type=str, help='Which server to collect data from when in multi-agent mode') - client_fields = api.model('ClientReport', { + client_fields = api.model('ClientStats', { 'number': fields.Integer(required=True, description='Backup number'), 'received': fields.Integer(required=True, description='Bytes received'), 'size': fields.Integer(required=True, description='Total size'), diff --git a/burpui/templates/js/backup-report.js b/burpui/templates/js/backup-report.js index 12fd9ae5..054f96cd 100644 --- a/burpui/templates/js/backup-report.js +++ b/burpui/templates/js/backup-report.js @@ -35,7 +35,7 @@ var _client = function() { chart_unified.tooltip.enabled(true); chart_unified.tooltip.contentGenerator(function(obj) { return '

' + obj.data.key + ' - ' + obj.data.label + '

' + obj.data.value + '

'; }); } - url = '{{ url_for("api.client_stats", name=cname, backup=nbackup, server=server) }}'; + url = '{{ url_for("api.client_report", name=cname, backup=nbackup, server=server) }}'; $.getJSON(url, function(d) { j = d; var _fields = []; diff --git a/burpui/templates/js/client-report.js b/burpui/templates/js/client-report.js index 916ea1bf..a5b182b3 100644 --- a/burpui/templates/js/client-report.js +++ b/burpui/templates/js/client-report.js @@ -128,7 +128,7 @@ var _client = function() { _chart_stats.bars.forceY([0]); } - url = '{{ url_for("api.client_stats", name=cname, server=server) }}'; + url = '{{ url_for("api.client_report", name=cname, server=server) }}'; $.getJSON(url, function(d) { var _fields = [ 'dir', 'files', 'hardlink', 'softlink', 'files_enc', 'meta', 'meta_enc', 'special', 'efs', 'vssheader', 'vssheader_enc', 'vssfooter', 'vssfooter_enc' ]; var stats = true; diff --git a/burpui/templates/js/client.js b/burpui/templates/js/client.js index f2760ef8..ce60c892 100644 --- a/burpui/templates/js/client.js +++ b/burpui/templates/js/client.js @@ -31,7 +31,7 @@ var _client_table = $('#table-client').dataTable( { responsive: true, ajax: { - url: '{{ url_for("api.client_report", name=cname, server=server) }}', + url: '{{ url_for("api.client_stats", name=cname, server=server) }}', dataSrc: function (data) { if (data.length == 0) { $('#table-client').hide();