diff --git a/lib/users.js b/lib/users.js index 4425286..1fb82ea 100644 --- a/lib/users.js +++ b/lib/users.js @@ -293,7 +293,7 @@ function users(callback) { // ).then(data => { let cmd = 'Get-WmiObject Win32_LogonSession | fl *' + '; echo \'#-#-#-#\';'; cmd += 'Get-WmiObject Win32_LoggedOnUser | fl *' + '; echo \'#-#-#-#\';'; - cmd += 'Get-WmiObject Win32_Process -Filter "name=\'explorer.exe\'" | Select @{Name="domain";Expression={$_.GetOwner().Domain}}, @{Name="username";Expression={$_.GetOwner().User}} | fl'; + cmd += 'Get-WmiObject Win32_Process -Filter "name=\'explorer.exe\'" | Select @{Name="sessionid";Expression={$_.SessionId}}, @{Name="domain";Expression={$_.GetOwner().Domain}}, @{Name="username";Expression={$_.GetOwner().User}} | fl'; util.powerShell(cmd).then(data => { // controller + vram // let accounts = parseWinAccounts(data[0].split(/\n\s*\n/)); @@ -319,7 +319,7 @@ function users(callback) { result.push({ user: user.user, - tty: '', + tty: user.tty, date: `${dateTime.substr(0, 4)}-${dateTime.substr(4, 2)}-${dateTime.substr(6, 2)}`, time: `${dateTime.substr(8, 2)}:${dateTime.substr(10, 2)}`, ip: '', @@ -387,10 +387,13 @@ function parseWinUsers(userParts) { const domain = util.getValue(lines, 'domain', ':', true); const username = util.getValue(lines, 'username', ':', true); + const sessionid = util.getValue(lines, 'sessionid', ':', true); + if (username) { users.push({ domain, - user: username + user: username, + tty: sessionid }); } });