external/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-03-09 15:40:18 +00:00
Code Issues Releases Wiki Activity

New agents, fixed cert loading with text prefix.

Browse source
This commit is contained in:
Ylian Saint-Hilaire 2019-01-15 09:20:21 -08:00
parent b514efaaf1
commit e7c3c2cd70
23 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
certoperations.js
View file

@ -148,6 +148,9 @@ module.exports.CertificateOperations = function () {
// Make sure a string with Mac style CR endo of line is changed to Linux LF style.
function fixEndOfLines(str) {
if (typeof (str) != 'string') return str; // If this is not a string, do nothing.
var i = str.indexOf('-----'); // Remove everything before "-----".
if (i > 0) { str = str.substring(i); } // this solves problems with editors that save text file type indicators ahead of the text.
if ((typeof(str) != 'string') || (str.indexOf('\n') > 0)) return str; // If there is a \n in the file, keep the file as-is.
return str.split('\r').join('\n'); // If there is no \n, replace all \r with \n.
}