Skip to content
This repository was archived by the owner on Nov 28, 2023. It is now read-only.

Commit ce5a5c9

Browse files
FeeiCNFeeiCN
authored
Merge pull request #568 from wufeifei/develop
Released v2.0.0-alpha.3
2 parents 885dafc + 683a0eb commit ce5a5c9

14 files changed

+346
-50
lines changed

‎CHANGES.md

+10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@ Cobra Changelog
33

44
Here you can see the full list of changes between each Cobra release.
55

6+
Version 2.0.0-alpha.3
7+
---------------------
8+
9+
Released on Sep 07 2017
10+
11+
- 漏洞详情中增加CVI编号显示 #552
12+
- 支持非函数体预发解析（print/echo/eval/include）#551
13+
- 文件上传取消选择目录
14+
- 优化API文档
15+
616
Version 2.0.0-alpha.2
717
---------------------
818

‎cobra/__version__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
__issue_page__ = 'https://github.com/wufeifei/cobra/issues/new'
88
__python_version__ = sys.version.split()[0]
99
__platform__ = platform.platform()
10-
__version__ = '2.0.0-alpha.2'
10+
__version__ = '2.0.0-alpha.3'
1111
__author__ = 'Feei'
1212
__author_email__ = '[email protected]'
1313
__license__ = 'MIT License'

‎cobra/api.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def post():
167167
'msg': 'success',
168168
'sid': sid,
169169
'status': result.get('status'),
170-
'report': result.get('report'),
170+
'report': request.url_root + result.get('report'),
171171
'still_running': result.get('still_running'),
172172
'total_target_num': r_data.get('total_target_num'),
173173
'not_finished': int(r_data.get('total_target_num')) - len(r_data.get('sids'))
@@ -312,7 +312,6 @@ def summary():
312312
key=key)
313313

314314
status_url = 'http://{host}:{port}/api/status'.format(host=running_host, port=running_port)
315-
logger.critical(status_url)
316315
post_data = {
317316
'key': key,
318317
'sid': a_sid,
@@ -340,7 +339,6 @@ def summary():
340339
elif len(split_target) == 2:
341340
target, branch = target_str, 'master'
342341
else:
343-
logger.critical('[API] Target url exception: {u}'.format(u=target_str))
344342
target, branch = target_str, 'master'
345343
still_running[s_sid] = {'target': target,
346344
'branch': branch}
@@ -373,7 +371,6 @@ def summary():
373371
elif len(split_target) == 2:
374372
target, branch = target_str, 'master'
375373
else:
376-
logger.critical('Target url exception: {u}'.format(u=target_str))
377374
target, branch = target_str, 'master'
378375

379376
target_info.update({

‎cobra/const.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
# eval ($test + $test2);
3232
# call_function ($exp);
3333
#
34-
fpc = '\s*\((.*)(?:\))'
34+
fpc = '(\s*\((.*)(?:\))|\s*(.*\.)*\$.+)'
3535
fpc_single = '[f]{fpc}'.format(fpc=fpc)
3636
fpc_multi = '(?:[f]){fpc}'.format(fpc=fpc)
3737

‎cobra/export.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import csv
1515
import json
1616
import os
17-
from codecs import open,BOM_UTF8
17+
from codecs import open, BOM_UTF8
1818

1919
from prettytable import PrettyTable
2020

‎cobra/templates/asset/js/jquery.fileupload-process.js

+178
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
/*
2+
* jQuery File Upload Processing Plugin
3+
* https://github.com/blueimp/jQuery-File-Upload
4+
*
5+
* Copyright 2012, Sebastian Tschan
6+
* https://blueimp.net
7+
*
8+
* Licensed under the MIT license:
9+
* https://opensource.org/licenses/MIT
10+
*/
11+
12+
/* jshint nomen:false */
13+
/* global define, require, window */
14+
15+
;(function (factory) {
16+
'use strict';
17+
if (typeof define === 'function' && define.amd) {
18+
// Register as an anonymous AMD module:
19+
define([
20+
'jquery',
21+
'./jquery.fileupload'
22+
], factory);
23+
} else if (typeof exports === 'object') {
24+
// Node/CommonJS:
25+
factory(
26+
require('jquery'),
27+
require('./jquery.fileupload')
28+
);
29+
} else {
30+
// Browser globals:
31+
factory(
32+
window.jQuery
33+
);
34+
}
35+
}(function ($) {
36+
'use strict';
37+
38+
var originalAdd = $.blueimp.fileupload.prototype.options.add;
39+
40+
// The File Upload Processing plugin extends the fileupload widget
41+
// with file processing functionality:
42+
$.widget('blueimp.fileupload', $.blueimp.fileupload, {
43+
44+
options: {
45+
// The list of processing actions:
46+
processQueue: [
47+
/*
48+
{
49+
action: 'log',
50+
type: 'debug'
51+
}
52+
*/
53+
],
54+
add: function (e, data) {
55+
var $this = $(this);
56+
data.process(function () {
57+
return $this.fileupload('process', data);
58+
});
59+
originalAdd.call(this, e, data);
60+
}
61+
},
62+
63+
processActions: {
64+
/*
65+
log: function (data, options) {
66+
console[options.type](
67+
'Processing "' + data.files[data.index].name + '"'
68+
);
69+
}
70+
*/
71+
},
72+
73+
_processFile: function (data, originalData) {
74+
var that = this,
75+
dfd = $.Deferred().resolveWith(that, [data]),
76+
chain = dfd.promise();
77+
this._trigger('process', null, data);
78+
$.each(data.processQueue, function (i, settings) {
79+
var func = function (data) {
80+
if (originalData.errorThrown) {
81+
return $.Deferred()
82+
.rejectWith(that, [originalData]).promise();
83+
}
84+
return that.processActions[settings.action].call(
85+
that,
86+
data,
87+
settings
88+
);
89+
};
90+
chain = chain.then(func, settings.always && func);
91+
});
92+
chain
93+
.done(function () {
94+
that._trigger('processdone', null, data);
95+
that._trigger('processalways', null, data);
96+
})
97+
.fail(function () {
98+
that._trigger('processfail', null, data);
99+
that._trigger('processalways', null, data);
100+
});
101+
return chain;
102+
},
103+
104+
// Replaces the settings of each processQueue item that
105+
// are strings starting with an "@", using the remaining
106+
// substring as key for the option map,
107+
// e.g. "@autoUpload" is replaced with options.autoUpload:
108+
_transformProcessQueue: function (options) {
109+
var processQueue = [];
110+
$.each(options.processQueue, function () {
111+
var settings = {},
112+
action = this.action,
113+
prefix = this.prefix === true ? action : this.prefix;
114+
$.each(this, function (key, value) {
115+
if ($.type(value) === 'string' &&
116+
value.charAt(0) === '@') {
117+
settings[key] = options[
118+
value.slice(1) || (prefix ? prefix +
119+
key.charAt(0).toUpperCase() + key.slice(1) : key)
120+
];
121+
} else {
122+
settings[key] = value;
123+
}
124+
125+
});
126+
processQueue.push(settings);
127+
});
128+
options.processQueue = processQueue;
129+
},
130+
131+
// Returns the number of files currently in the processsing queue:
132+
processing: function () {
133+
return this._processing;
134+
},
135+
136+
// Processes the files given as files property of the data parameter,
137+
// returns a Promise object that allows to bind callbacks:
138+
process: function (data) {
139+
var that = this,
140+
options = $.extend({}, this.options, data);
141+
if (options.processQueue && options.processQueue.length) {
142+
this._transformProcessQueue(options);
143+
if (this._processing === 0) {
144+
this._trigger('processstart');
145+
}
146+
$.each(data.files, function (index) {
147+
var opts = index ? $.extend({}, options) : options,
148+
func = function () {
149+
if (data.errorThrown) {
150+
return $.Deferred()
151+
.rejectWith(that, [data]).promise();
152+
}
153+
return that._processFile(opts, data);
154+
};
155+
opts.index = index;
156+
that._processing += 1;
157+
that._processingQueue = that._processingQueue.then(func, func)
158+
.always(function () {
159+
that._processing -= 1;
160+
if (that._processing === 0) {
161+
that._trigger('processstop');
162+
}
163+
});
164+
});
165+
}
166+
return this._processingQueue;
167+
},
168+
169+
_create: function () {
170+
this._super();
171+
this._processing = 0;
172+
this._processingQueue = $.Deferred().resolveWith(this)
173+
.promise();
174+
}
175+
176+
});
177+
178+
}));

‎cobra/templates/asset/js/jquery.fileupload-validate.js

+125
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
/*
2+
* jQuery File Upload Validation Plugin
3+
* https://github.com/blueimp/jQuery-File-Upload
4+
*
5+
* Copyright 2013, Sebastian Tschan
6+
* https://blueimp.net
7+
*
8+
* Licensed under the MIT license:
9+
* https://opensource.org/licenses/MIT
10+
*/
11+
12+
/* global define, require, window */
13+
14+
;(function (factory) {
15+
'use strict';
16+
if (typeof define === 'function' && define.amd) {
17+
// Register as an anonymous AMD module:
18+
define([
19+
'jquery',
20+
'./jquery.fileupload-process'
21+
], factory);
22+
} else if (typeof exports === 'object') {
23+
// Node/CommonJS:
24+
factory(
25+
require('jquery'),
26+
require('./jquery.fileupload-process')
27+
);
28+
} else {
29+
// Browser globals:
30+
factory(
31+
window.jQuery
32+
);
33+
}
34+
}(function ($) {
35+
'use strict';
36+
37+
// Append to the default processQueue:
38+
$.blueimp.fileupload.prototype.options.processQueue.push(
39+
{
40+
action: 'validate',
41+
// Always trigger this action,
42+
// even if the previous action was rejected:
43+
always: true,
44+
// Options taken from the global options map:
45+
acceptFileTypes: '@',
46+
maxFileSize: '@',
47+
minFileSize: '@',
48+
maxNumberOfFiles: '@',
49+
disabled: '@disableValidation'
50+
}
51+
);
52+
53+
// The File Upload Validation plugin extends the fileupload widget
54+
// with file validation functionality:
55+
$.widget('blueimp.fileupload', $.blueimp.fileupload, {
56+
57+
options: {
58+
/*
59+
// The regular expression for allowed file types, matches
60+
// against either file type or file name:
61+
acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
62+
// The maximum allowed file size in bytes:
63+
maxFileSize: 10000000, // 10 MB
64+
// The minimum allowed file size in bytes:
65+
minFileSize: undefined, // No minimal file size
66+
// The limit of files to be uploaded:
67+
maxNumberOfFiles: 10,
68+
*/
69+
70+
// Function returning the current number of files,
71+
// has to be overriden for maxNumberOfFiles validation:
72+
getNumberOfFiles: $.noop,
73+
74+
// Error and info messages:
75+
messages: {
76+
maxNumberOfFiles: 'Maximum number of files exceeded',
77+
acceptFileTypes: 'File type not allowed',
78+
maxFileSize: 'File is too large',
79+
minFileSize: 'File is too small'
80+
}
81+
},
82+
83+
processActions: {
84+
85+
validate: function (data, options) {
86+
if (options.disabled) {
87+
return data;
88+
}
89+
var dfd = $.Deferred(),
90+
settings = this.options,
91+
file = data.files[data.index],
92+
fileSize;
93+
if (options.minFileSize || options.maxFileSize) {
94+
fileSize = file.size;
95+
}
96+
if ($.type(options.maxNumberOfFiles) === 'number' &&
97+
(settings.getNumberOfFiles() || 0) + data.files.length >
98+
options.maxNumberOfFiles) {
99+
file.error = settings.i18n('maxNumberOfFiles');
100+
} else if (options.acceptFileTypes &&
101+
!(options.acceptFileTypes.test(file.type) ||
102+
options.acceptFileTypes.test(file.name))) {
103+
file.error = settings.i18n('acceptFileTypes');
104+
} else if (fileSize > options.maxFileSize) {
105+
file.error = settings.i18n('maxFileSize');
106+
} else if ($.type(fileSize) === 'number' &&
107+
fileSize < options.minFileSize) {
108+
file.error = settings.i18n('minFileSize');
109+
} else {
110+
delete file.error;
111+
}
112+
if (file.error || data.files.error) {
113+
data.files.error = true;
114+
dfd.rejectWith(this, [data]);
115+
} else {
116+
dfd.resolveWith(this, [data]);
117+
}
118+
return dfd.promise();
119+
}
120+
121+
}
122+
123+
});
124+
125+
}));

‎cobra/templates/asset/js/jquery.fileupload.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1122,8 +1122,9 @@
11221122
}, errorHandler);
11231123
}
11241124
} else if (entry.isDirectory) {
1125-
dirReader = entry.createReader();
1126-
readEntries();
1125+
$('#progress').empty();
1126+
$('#progress').html('禁止文件夹上传！');
1127+
return;
11271128
} else {
11281129
// Return an empy list for file system items
11291130
// other than files or directories:

0 commit comments

Comments
 (0)