sean-m
/
wifi-sitter
mirror of https://github.com/sean-m/wifi-sitter.git
1
0
Fork 0
Code Issues Releases Activity

Implementing NIC whitelist as registry configuration, currently fails reading configuration but creates keys/values on install.

servicizing
Sean McArdle 2016-03-29 15:29:13 -07:00
parent 36201c72cf
commit da556f71d8
2 changed files with 63 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
WifiSitter/NetworkState.cs
View File

@ -15,20 +15,24 @@ namespace WifiSitter
private bool _checkNet;
private bool _netAvailable;
private bool _processingState;
private string[] _ignoreAdapters; // List of Nic names to ignore during normal operation
#endregion // fields
#region constructor
public NetworkState() {
this.Nics = QueryNetworkAdapters();
public NetworkState(string[] NicWhitelist) {
if (NicWhitelist == null)
NicWhitelist = new string[] { };
this.Nics = QueryNetworkAdapters(NicWhitelist);
_ignoreAdapters = NicWhitelist;
Initialize();
}
public NetworkState(List<SitterNic> Nics) {
public NetworkState(List<SitterNic> Nics, string[] NicWhitelist) {
this.Nics = Nics;
_ignoreAdapters = NicWhitelist;
Initialize();
}
private void Initialize() {
@ -58,15 +62,13 @@ namespace WifiSitter
public void UpdateNics(List<SitterNic> Nics) {
this.Nics = Nics;
}
internal static List<SitterNic> QueryNetworkAdapters() {
internal static List<SitterNic> QueryNetworkAdapters(string[] WhiteList) {
List<SitterNic> result = new List<SitterNic>();
foreach (var n in NetworkInterface.GetAllNetworkInterfaces().Where(x => (x.NetworkInterfaceType != NetworkInterfaceType.Loopback
&& x.NetworkInterfaceType != NetworkInterfaceType.Tunnel
&& !x.Description.ToLower().Contains("bluetooth")
&& !x.Description.StartsWith("Microsoft Wi-Fi Direct") // TODO make this configurable via registry
&& !x.Description.StartsWith("VirtualBox Host")))) {
&& !WhiteList.Any(y => x.Description.StartsWith(y))))) {
result.Add(new SitterNic(n));
}
return result;

60
WifiSitter/WifiSitter.cs
View File

@ -7,6 +7,7 @@ using System.Net.NetworkInformation;
using System.Threading;
using System.ServiceProcess;
using System.Diagnostics;
using Microsoft.Win32;
namespace WifiSitter
{
@ -19,6 +20,7 @@ namespace WifiSitter
private Guid _uninstGuid;
private Thread _thread;
private ManualResetEvent _shutdownEvent = new ManualResetEvent(false);
private static string[] _ignoreNics;
private volatile bool _paused;
#endregion // fields
@ -28,6 +30,7 @@ namespace WifiSitter
public WifiSitter () : base(_serviceName) {
_paused = false;
_ignoreNics = new string[] { };
if (this.ServiceExecutionMode != ServiceExecutionMode.Console) {
this.AutoLog = true;
this.CanPauseAndContinue = true;
@ -66,7 +69,7 @@ namespace WifiSitter
/// <summary>
/// Do initial nic discovery and netsh trickery
/// </summary>
private static void Intialize() {
private void Intialize() {
try {
Console.WindowWidth = 120;
}
@ -76,16 +79,39 @@ namespace WifiSitter
// Check if there are any interfaces not detected by GetAllNetworkInterfaces()
// That method will not show disabled interfaces
netstate = new NetworkState(DiscoverAllNetworkDevices(false));
_ignoreNics = ReadNicWhitelist();
if (_ignoreNics.Count() < 1) {
WriteLog(LogType.info, "No network adapter whitelist configured.");
}
netstate = new NetworkState(DiscoverAllNetworkDevices(false), _ignoreNics);
LogLine("Initialized...");
}
private string[] ReadNicWhitelist() {
List<string> results = new List<string>();
try {
RegistryKey key = Registry.LocalMachine.OpenSubKey(String.Format(@"SYSTEM\CurrentControlSet\services\{0}\NicWhiteList", ServiceName),
RegistryKeyPermissionCheck.ReadSubTree,
System.Security.AccessControl.RegistryRights.EnumerateSubKeys);
if (key != null) {
var names = key.GetValueNames();
foreach (var n in names) {
results.Add(key.GetValue(n).ToString());
}
}
}
catch (Exception e) {
WriteLog(LogType.error, String.Concat("Failed reading NIC whitelist from registry. \n", e.Message));
}
return results.ToArray();
}
public static List<SitterNic> DiscoverAllNetworkDevices(bool quiet = true) {
if (!quiet) LogLine(ConsoleColor.Yellow, "Discovering all devices.");
var nics = NetworkState.QueryNetworkAdapters();
var nics = NetworkState.QueryNetworkAdapters(_ignoreNics);
List<SitterNic> nicsPost;
var netsh = NetshHelper.GetInterfaces()?.Where(x => !(nics.Select(y => y.Nic.Name).Contains(x.InterfaceName))).ToList();
@ -99,12 +125,12 @@ namespace WifiSitter
// Turn on disabled interfaces
foreach (var nic in disabledInterfaces) {
if (!nic.InterfaceName.Contains("VirtualBox")) // TODO make this configurable via registry
if (!_ignoreNics.Any(x => nic.InterfaceName.StartsWith(x)))
NetshHelper.EnableInterface(nic.InterfaceName);
}
// Query for network interfaces again
nicsPost = NetworkState.QueryNetworkAdapters();
nicsPost = NetworkState.QueryNetworkAdapters(_ignoreNics);
// Disable nics again
foreach (var nic in disabledInterfaces) {
@ -296,11 +322,29 @@ namespace WifiSitter
}
internal override void CreateRegKeys() {
throw new NotImplementedException();
// HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\WifiSitter
RegistryKey sitterConfigKey;
try {
sitterConfigKey = Registry.LocalMachine.CreateSubKey(String.Format(@"SYSTEM\CurrentControlSet\services\{0}\NicWhiteList", ServiceName));
if (sitterConfigKey != null) {
sitterConfigKey.SetValue("0", "Microsoft Wi-Fi Direct", RegistryValueKind.String);
sitterConfigKey.SetValue("1", "VirtualBox Host", RegistryValueKind.String);
}
}
catch {
WriteLog(LogType.error, "Could not create configuration registry values!");
}
}
internal override void RemoveRegKeys() {
throw new NotImplementedException();
try {
Registry.LocalMachine.DeleteSubKeyTree(String.Format(@"SYSTEM\CurrentControlSet\services\{0}\NicWhiteList", ServiceName));
}
catch {
WriteLog(LogType.error, "Could not remove configuration registry values!");
}
}
#endregion // overrides