mirror of
https://github.com/Ylianst/MeshCentral.git
synced 2024-12-23 21:55:52 -05:00
improved proxy support in ClickOnce application.
This commit is contained in:
parent
d8fcbbef41
commit
747586cdd9
@ -461,7 +461,7 @@ function createMeshCore(agent) {
|
||||
}
|
||||
case 'getclip': {
|
||||
// Send the load clipboard back to the user
|
||||
sendConsoleText('getClip: ' + JSON.stringify(data));
|
||||
//sendConsoleText('getClip: ' + JSON.stringify(data));
|
||||
if (require('MeshAgent').isService)
|
||||
{
|
||||
require('clipboard').dispatchRead().then(function (str) { mesh.SendCommand({ "action": "msg", "type": "getclip", "sessionid": data.sessionid, "data": str }); });
|
||||
@ -474,7 +474,7 @@ function createMeshCore(agent) {
|
||||
}
|
||||
case 'setclip': {
|
||||
// Set the load clipboard to a user value
|
||||
sendConsoleText('setClip: ' + JSON.stringify(data));
|
||||
//sendConsoleText('setClip: ' + JSON.stringify(data));
|
||||
if (typeof data.data == 'string')
|
||||
{
|
||||
if (require('MeshAgent').isService)
|
||||
@ -1177,22 +1177,20 @@ function createMeshCore(agent) {
|
||||
case 'getclip':
|
||||
if (require('MeshAgent').isService) {
|
||||
require('clipboard').dispatchRead().then(function (str) { sendConsoleText(str, sessionid); });
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
require("clipboard").read().then(function (str) { sendConsoleText(str, sessionid); });
|
||||
}
|
||||
break;
|
||||
case 'setclip': {
|
||||
if (args['_'].length != 1) {
|
||||
response = 'Proper usage: setclip (text)';
|
||||
}
|
||||
else {
|
||||
response = 'Proper usage: setclip "sample text"';
|
||||
} else {
|
||||
if (require('MeshAgent').isService) {
|
||||
require('clipboard').dispatchWrite(args['_'][0]);
|
||||
response = 'Setting clipboard to: ' + args['_'][0];
|
||||
response = 'Setting clipboard to: "' + args['_'][0] + '"';
|
||||
}
|
||||
else {
|
||||
require("clipboard")(args['_'][0]); response = 'Setting clipboard to: ' + args['_'][0];
|
||||
require("clipboard")(args['_'][0]); response = 'Setting clipboard to: "' + args['_'][0] + '"';
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
2
agents/meshcore.min.js
vendored
2
agents/meshcore.min.js
vendored
File diff suppressed because one or more lines are too long
@ -156,13 +156,9 @@ module.exports.CertificateOperations = function (parent) {
|
||||
var extensions = [{ name: "basicConstraints", cA: false }, { name: "keyUsage", keyCertSign: false, digitalSignature: true, nonRepudiation: false, keyEncipherment: true, dataEncipherment: (extKeyUsage.serverAuth !== true) }, extKeyUsage, { name: "subjectKeyIdentifier" }];
|
||||
|
||||
if (extKeyUsage.serverAuth === true) {
|
||||
|
||||
// set subjectAltName according to commonName parsing.
|
||||
// Set subjectAltName according to commonName parsing.
|
||||
// Ideally, we should let opportunity in given interface to set any type of altNames according to node_forge library
|
||||
// such as type 2, 6 and 7
|
||||
// 2 -> DNS
|
||||
// 6 -> URI
|
||||
// 7 -> IP
|
||||
// such as type 2, 6 and 7. (2 -> DNS, 6 -> URI, 7 -> IP)
|
||||
var altNames = [];
|
||||
|
||||
// According to commonName parsing (IP or DNS), add URI and DNS and/or IP altNames
|
||||
@ -176,7 +172,7 @@ module.exports.CertificateOperations = function (parent) {
|
||||
}
|
||||
altNames.push({ type: 6, value: "http://" + commonName + "/" })
|
||||
|
||||
// add localhost stuff for easy testing on localhost ;)
|
||||
// Add localhost stuff for easy testing on localhost ;)
|
||||
altNames.push({ type: 2, value: "localhost" });
|
||||
altNames.push({ type: 6, value: "http://localhost/" });
|
||||
altNames.push({ type: 7, ip: "127.0.0.1" });
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "meshcentral",
|
||||
"version": "0.3.0-n",
|
||||
"version": "0.3.0-p",
|
||||
"keywords": [
|
||||
"Remote Management",
|
||||
"Intel AMT",
|
||||
|
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
File diff suppressed because one or more lines are too long
@ -59,7 +59,7 @@ FONT.key {font-weight: bold; color: darkgreen}
|
||||
<TR><TD ALIGN="LEFT"><TABLE CELLPADDING="2" CELLSPACING="0" BORDER="0" WIDTH="540"><TR><TD WIDTH="496">
|
||||
|
||||
<!-- Begin AppInfo -->
|
||||
<TABLE><TR><TD COLSPAN="3"> </TD></TR><TR><TD><B>Name:</B></TD><TD WIDTH="5"><SPACER TYPE="block" WIDTH="10" /></TD><TD>MeshCentral Mini-Router</TD></TR><TR><TD COLSPAN="3"> </TD></TR><TR><TD><B>Version:</B></TD><TD WIDTH="5"><SPACER TYPE="block" WIDTH="10" /></TD><TD>2.0.0.25</TD></TR><TR><TD COLSPAN="3"> </TD></TR><TR><TD><B>Publisher:</B></TD><TD WIDTH="5"><SPACER TYPE="block" WIDTH="10" /></TD><TD>Meshcentral.com</TD></TR><tr><td colspan="3"> </td></tr></TABLE>
|
||||
<TABLE><TR><TD COLSPAN="3"> </TD></TR><TR><TD><B>Name:</B></TD><TD WIDTH="5"><SPACER TYPE="block" WIDTH="10" /></TD><TD>MeshCentral Mini-Router</TD></TR><TR><TD COLSPAN="3"> </TD></TR><TR><TD><B>Version:</B></TD><TD WIDTH="5"><SPACER TYPE="block" WIDTH="10" /></TD><TD>2.0.0.26</TD></TR><TR><TD COLSPAN="3"> </TD></TR><TR><TD><B>Publisher:</B></TD><TD WIDTH="5"><SPACER TYPE="block" WIDTH="10" /></TD><TD>Meshcentral.com</TD></TR><tr><td colspan="3"> </td></tr></TABLE>
|
||||
<!-- End AppInfo -->
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user