mike/systeminformation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged pull request networkInterfaces(), renamed properties, osInfo() macos added catalina detection

Browse Source
This commit is contained in:
Sebastian Hildebrandt 2020-01-02 22:06:15 +01:00
parent 0feb6469b8
commit 6e98139272
3 changed files with 115 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/index.d.ts vendored
View File

@ -318,6 +318,10 @@ export namespace Systeminformation {
duplex: string;
mtu: number;
speed: number;
dhcp: boolean;
dnsSuffix: string;
ieee8021xAuth: string;
ieee8021xState: string;
carrier_changes: number;
}

154
lib/network.js
View File

@ -236,27 +236,27 @@ function getWindowsDNSsuffixes() {
try {
const ipconfig = execSync('ipconfig /all', util.execOptsWin);
const ipconfigArray = ipconfig.split('\r\n\r\n');
const ipconfigArray = ipconfig.split('\r\n\r\n');
ipconfigArray.forEach( (element, index) => {
ipconfigArray.forEach((element, index) => {
if(index == 1) {
if (index == 1) {
const longPrimaryDNS = element.split('\r\n').filter((element) => {
return element.toUpperCase().includes('DNS');
});
const primaryDNS = longPrimaryDNS[0].substring(longPrimaryDNS[0].lastIndexOf(":")+1);
const primaryDNS = longPrimaryDNS[0].substring(longPrimaryDNS[0].lastIndexOf(":") + 1);
dnsSuffixes.primaryDNS = primaryDNS.trim();
if(!dnsSuffixes.primaryDNS) dnsSuffixes.primaryDNS = 'Not defined';
if (!dnsSuffixes.primaryDNS) dnsSuffixes.primaryDNS = 'Not defined';
}
if(index > 1) {
if(index % 2 == 0){
const name = element.substring(element.lastIndexOf(" ")+1).replace(':', '');
if (index > 1) {
if (index % 2 == 0) {
const name = element.substring(element.lastIndexOf(" ") + 1).replace(':', '');
iface.name = name;
}else {
} else {
const connectionSpecificDNS = element.split('\r\n').filter((element) => {
return element.toUpperCase().includes('DNS')
});
const dnsSuffix = connectionSpecificDNS[0].substring(connectionSpecificDNS[0].lastIndexOf(":")+1);
const dnsSuffix = connectionSpecificDNS[0].substring(connectionSpecificDNS[0].lastIndexOf(":") + 1);
iface.dnsSuffix = dnsSuffix.trim();
dnsSuffixes.ifaces.push(iface);
iface = {};
@ -266,7 +266,7 @@ function getWindowsDNSsuffixes() {
return dnsSuffixes;
} catch (error) {
console.log('An error occurred trying to bring the Connection-specific DNS suffix', error.message);
// console.log('An error occurred trying to bring the Connection-specific DNS suffix', error.message);
return {
primaryDNS: '',
exitCode: 0,
@ -278,45 +278,45 @@ function getWindowsDNSsuffixes() {
function getWindowsIfaceDNSsuffix(ifaces, ifacename) {
let dnsSuffix = '';
// Adding (.) to ensure ifacename compatibility when duplicated iface-names
// Adding (.) to ensure ifacename compatibility when duplicated iface-names
const interfaceName = ifacename + '.';
try {
const connectionDnsSuffix = ifaces.filter((iface) => {
return interfaceName.includes(iface.name + '.');
const connectionDnsSuffix = ifaces.filter((iface) => {
return interfaceName.includes(iface.name + '.');
}).map((iface) => iface.dnsSuffix);
if(connectionDnsSuffix[0]) {
if (connectionDnsSuffix[0]) {
dnsSuffix = connectionDnsSuffix[0];
}
if(!dnsSuffix) dnsSuffix = '';
return dnsSuffix ;
if (!dnsSuffix) dnsSuffix = '';
return dnsSuffix;
} catch (error) {
console.log('Error getting Connection-specific DNS suffix: ', error.message);
// console.log('Error getting Connection-specific DNS suffix: ', error.message);
return 'Unknown';
}
}
function getWindowsWiredProfilesInformation() {
try {
const result = execSync('netsh lan show profiles', util.execOptsWin);
const profileList = result.split('\r\nProfile on interface');
return profileList;
} catch (error) {
if(error.status === 1 && error.stdout.includes('AutoConfig')){
return 'Disabled';
}
return [];
}
try {
const result = execSync('netsh lan show profiles', util.execOptsWin);
const profileList = result.split('\r\nProfile on interface');
return profileList;
} catch (error) {
if (error.status === 1 && error.stdout.includes('AutoConfig')) {
return 'Disabled';
}
return [];
}
}
function getWindowsWirelessIfaceSSID(interfaceName){
function getWindowsWirelessIfaceSSID(interfaceName) {
try {
const result = execSync(`netsh wlan show interface name="${interfaceName}" | findstr "SSID"`, util.execOptsWin);
const result = execSync(`netsh wlan show interface name="${interfaceName}" | findstr "SSID"`, util.execOptsWin);
const SSID = result.split('\r\n').shift();
const parseSSID = SSID.split(':').pop();
return parseSSID;
} catch (error) {
return 'Unknown';
}
} catch (error) {
return 'Unknown';
}
}
function getWindowsIEEE8021x(connectionType, iface, ifaces) {
let i8021x = {
@ -324,13 +324,13 @@ function getWindowsIEEE8021x(connectionType, iface, ifaces) {
protocol: 'Unknown',
};
if(ifaces === 'Disabled'){
if (ifaces === 'Disabled') {
i8021x.state = "Disabled";
i8021x.protocol = "Not defined";
return i8021x;
}
if(connectionType == 'wired' && ifaces.length > 0){
if (connectionType == 'wired' && ifaces.length > 0) {
try {
// Get 802.1x information by interface name
const iface8021xInfo = ifaces.find((element) => {
@ -343,7 +343,7 @@ function getWindowsIEEE8021x(connectionType, iface, ifaces) {
return element.includes('802.1x');
});
if(state8021x.includes('Disabled')){
if (state8021x.includes('Disabled')) {
i8021x.state = "Disabled";
i8021x.protocol = "Not defined";
@ -360,7 +360,7 @@ function getWindowsIEEE8021x(connectionType, iface, ifaces) {
// console.log('Error getting wired information:', error);
return i8021x;
}
} else if (connectionType == 'wireless'){
} else if (connectionType == 'wireless') {
let i8021xState = '';
let i8021xProtocol = '';
@ -368,24 +368,24 @@ function getWindowsIEEE8021x(connectionType, iface, ifaces) {
try {
const SSID = getWindowsWirelessIfaceSSID(iface);
if(SSID !== 'Unknown') {
i8021xState = execSync(`netsh wlan show profiles "${SSID}" | findstr "802.1X"`, util.execOptsWin);
i8021xProtocol = execSync(`netsh wlan show profiles "${SSID}" | findstr "EAP"`, util.execOptsWin);
}
const SSID = getWindowsWirelessIfaceSSID(iface);
if (SSID !== 'Unknown') {
i8021xState = execSync(`netsh wlan show profiles "${SSID}" | findstr "802.1X"`, util.execOptsWin);
i8021xProtocol = execSync(`netsh wlan show profiles "${SSID}" | findstr "EAP"`, util.execOptsWin);
}
if (i8021xState.includes(':') && i8021xProtocol.includes(':')) {
i8021x.state = i8021xState.split(':').pop();
i8021x.protocol = i8021xProtocol.split(':').pop();
}
} catch (error) {
// console.log('Error getting wireless information:', error);
if(error.status === 1 && error.stdout.includes('AutoConfig')){
if (i8021xState.includes(':') && i8021xProtocol.includes(':')) {
i8021x.state = i8021xState.split(':').pop();
i8021x.protocol = i8021xProtocol.split(':').pop();
}
} catch (error) {
// console.log('Error getting wireless information:', error);
if (error.status === 1 && error.stdout.includes('AutoConfig')) {
i8021x.state = "Disabled";
i8021x.protocol = "Not defined";
}
return i8021x;
}
}
return i8021x;
}
}
return i8021x;
@ -483,7 +483,7 @@ function getLinuxIfaceConnectionName(interfaceName) {
try {
const result = execSync(cmd).toString();
const resultFormat = result.replace(/\s+/g,' ').trim();
const resultFormat = result.replace(/\s+/g, ' ').trim();
const connectionNameLines = resultFormat.split(" ").slice(3);
const connectionName = connectionNameLines.join(' ');
return connectionName != '--' ? connectionName : '';
@ -493,11 +493,11 @@ function getLinuxIfaceConnectionName(interfaceName) {
}
function getLinuxIfaceDHCPstatus(connectionName) {
if(connectionName) {
if (connectionName) {
const cmd = `nmcli connection show "${connectionName}" \| grep ipv4.method;`;
try {
const result = execSync(cmd).toString();
const resultFormat = result.replace(/\s+/g,' ').trim();
const resultFormat = result.replace(/\s+/g, ' ').trim();
let dhcStatus = resultFormat.split(" ").slice(1).toString();
switch (dhcStatus) {
@ -519,13 +519,13 @@ function getLinuxIfaceDHCPstatus(connectionName) {
}
function getLinuxIfaceDNSsuffix(connectionName) {
if(connectionName) {
if (connectionName) {
const cmd = `nmcli connection show "${connectionName}" \| grep ipv4.dns-search;`;
try {
const result = execSync(cmd).toString();
const resultFormat = result.replace(/\s+/g,' ').trim();
const resultFormat = result.replace(/\s+/g, ' ').trim();
const dnsSuffix = resultFormat.split(" ").slice(1).toString();
return dnsSuffix == '--' ? 'Not defined': dnsSuffix;
return dnsSuffix == '--' ? 'Not defined' : dnsSuffix;
} catch (e) {
return 'Unknown';
}
@ -534,16 +534,16 @@ function getLinuxIfaceDNSsuffix(connectionName) {
}
}
function getLinuxIfaceAuth8021x(connectionName) {
if(connectionName) {
function getLinuxIfaceIEEE8021xAuth(connectionName) {
if (connectionName) {
const cmd = `nmcli connection show "${connectionName}" \| grep 802-1x.eap;`;
try {
const result = execSync(cmd).toString();
const resultFormat = result.replace(/\s+/g,' ').trim();
const resultFormat = result.replace(/\s+/g, ' ').trim();
const authenticationProtocol = resultFormat.split(" ").slice(1).toString();
return authenticationProtocol == '--' ? '': authenticationProtocol;
return authenticationProtocol == '--' ? '' : authenticationProtocol;
} catch (e) {
return 'Not defined';
}
@ -552,9 +552,9 @@ function getLinuxIfaceAuth8021x(connectionName) {
}
}
function getLinuxIfaceState8021x(authenticationProtocol) {
if(authenticationProtocol) {
if(authenticationProtocol == 'Not defined'){
function getLinuxIfaceIEEE8021xState(authenticationProtocol) {
if (authenticationProtocol) {
if (authenticationProtocol == 'Not defined') {
return 'Disabled';
}
return 'Enabled';
@ -606,6 +606,10 @@ function networkInterfaces(callback) {
duplex: nic.duplex,
mtu: nic.mtu,
speed: nic.speed,
dhcp: false,
dnsSuffix: '',
ieee8021xAuth: '',
ieee8021xState: '',
carrierChanges: 0
});
});
@ -636,8 +640,8 @@ function networkInterfaces(callback) {
let operstate = 'down';
let dhcp = false;
let dnsSuffix = '';
let auth8021x = '';
let state8021x = '';
let ieee8021xAuth = '';
let ieee8021xState = '';
let type = '';
if (ifaces.hasOwnProperty(dev)) {
@ -688,13 +692,13 @@ function networkInterfaces(callback) {
echo -n "wireless: "; cat /proc/net/wireless 2>/dev/null \| grep ${iface}; echo;
echo -n "wirelessspeed: "; iw dev ${iface} link 2>&1 \| grep bitrate; echo;`;
let lines = [];
let lines = [];
try {
const connectionName = getLinuxIfaceConnectionName(iface);
dhcp = getLinuxIfaceDHCPstatus(connectionName);
dnsSuffix = getLinuxIfaceDNSsuffix(connectionName);
auth8021x = getLinuxIfaceAuth8021x(connectionName);
state8021x = getLinuxIfaceState8021x(auth8021x);
ieee8021xAuth = getLinuxIfaceIEEE8021xAuth(connectionName);
ieee8021xState = getLinuxIfaceIEEE8021xState(ieee8021xAuth);
lines = execSync(cmd).toString().split('\n');
@ -730,13 +734,13 @@ function networkInterfaces(callback) {
}
});
if (dev.toLowerCase().indexOf('wlan') >= 0 || ifaceName.toLowerCase().indexOf('wlan') >= 0|| ifaceName.toLowerCase().indexOf('802.11n') >= 0 || ifaceName.toLowerCase().indexOf('wireless') >= 0 || ifaceName.toLowerCase().indexOf('wi-fi') >= 0 || ifaceName.toLowerCase().indexOf('wifi') >= 0) {
if (dev.toLowerCase().indexOf('wlan') >= 0 || ifaceName.toLowerCase().indexOf('wlan') >= 0 || ifaceName.toLowerCase().indexOf('802.11n') >= 0 || ifaceName.toLowerCase().indexOf('wireless') >= 0 || ifaceName.toLowerCase().indexOf('wi-fi') >= 0 || ifaceName.toLowerCase().indexOf('wifi') >= 0) {
type = 'wireless';
}
const IEEE8021x = getWindowsIEEE8021x(type, dev, nics8021xInfo);
auth8021x = IEEE8021x.protocol;
state8021x = IEEE8021x.state;
ieee8021xAuth = IEEE8021x.protocol;
ieee8021xState = IEEE8021x.state;
}
let internal = (ifaces[dev] && ifaces[dev][0]) ? ifaces[dev][0].internal : null;
const virtual = internal ? false : testVirtualNic(dev, ifaceName, mac);
@ -755,8 +759,8 @@ function networkInterfaces(callback) {
speed,
dhcp,
dnsSuffix,
auth8021x,
state8021x,
ieee8021xAuth,
ieee8021xState,
carrierChanges,
});
}

1
lib/osinfo.js
View File

@ -264,6 +264,7 @@ function osInfo(callback) {
result.codename = (result.release.indexOf('10.12') > -1 ? 'macOS Sierra' : result.codename);
result.codename = (result.release.indexOf('10.13') > -1 ? 'macOS High Sierra' : result.codename);
result.codename = (result.release.indexOf('10.14') > -1 ? 'macOS Mojave' : result.codename);
result.codename = (result.release.indexOf('10.15') > -1 ? 'macOS Catalina' : result.codename);
result.codepage = util.getCodepage();
if (callback) {