mirror of
https://github.com/gnh1201/caterpillar.git
synced 2025-09-08 18:59:34 +00:00
Update console.html
This commit is contained in:
parent
7f76da7530
commit
be29ac3d85
38
console.html
38
console.html
|
@ -43,20 +43,46 @@
|
||||||
url: env.target,
|
url: env.target,
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
contentType: 'application/json',
|
contentType: 'application/json',
|
||||||
dataType: 'json',
|
dataType: 'text',
|
||||||
data: JSON.stringify(requestData),
|
data: JSON.stringify(requestData),
|
||||||
beforeSend: function(xhr) {
|
beforeSend: function(xhr) {
|
||||||
xhr.setRequestHeader("X-User-Agent", "php-httpproxy/0.1.5 (Client; WebConsole; abuse@catswords.net)");
|
xhr.setRequestHeader("X-User-Agent", "php-httpproxy/0.1.5 (Client; WebConsole; abuse@catswords.net)");
|
||||||
},
|
},
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
|
var responseData = {
|
||||||
|
"error": {
|
||||||
|
"message": "Empty response data"
|
||||||
|
}
|
||||||
|
};
|
||||||
|
var process_corrupted_json = function(s) {
|
||||||
|
try {
|
||||||
|
var start = s.indexOf('{');
|
||||||
|
var end = s.lastIndexOf('}');
|
||||||
|
if (start > -1 && end > -1 && end > start) {
|
||||||
|
responseData = JSON.parse(s.substring(start, end));
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
responseData.error.message = e.message;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (response != "") {
|
||||||
|
responseData = JSON.parse(response);
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
responseData.error.message = e.message;
|
||||||
|
process_corrupted_json(response);
|
||||||
|
}
|
||||||
|
|
||||||
var text = "";
|
var text = "";
|
||||||
if ("error" in response) {
|
if ("error" in responseData) {
|
||||||
text = response.error.message;
|
text = responseData.error.message;
|
||||||
} else {
|
} else {
|
||||||
if (typeof response.result.data === "object") {
|
if (typeof responseData.result.data === "object") {
|
||||||
text = pretty_jsonify(response.result.data);
|
text = pretty_jsonify(responseData.result.data);
|
||||||
} else {
|
} else {
|
||||||
text = response.result.data;
|
text = responseData.result.data;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
term.echo(text);
|
term.echo(text);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user