darnellkeith/PEASS-ng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix winpeas

Browse Source
This commit is contained in:
carlospolop 2025-05-24 23:02:18 +02:00
parent c29fc553b5
commit f3e29a509f
4 changed files with 143 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
winPEAS/winPEASexe/winPEAS/Checks/NetworkInfo.cs
View File

@ -29,7 +29,8 @@ namespace winPEAS.Checks
{ {
Beaprint.GreatPrint("Network Information"); Beaprint.GreatPrint("Network Information");
var baseChecks = new List<Action> // Base checklist
var checks = new List<Action>
{ {
PrintNetShares, PrintNetShares,
PrintMappedDrivesWMI, PrintMappedDrivesWMI,
@ -39,15 +40,16 @@ namespace winPEAS.Checks
PrintFirewallRules, PrintFirewallRules,
PrintDNSCache, PrintDNSCache,
PrintInternetSettings, PrintInternetSettings,
PrintInternetConnectivity, PrintInternetConnectivity
}; };
// Only create hostnameCheck list if we want to run it // **Add hostname‑resolution check only when requested**
var allChecks = !Checks.DontCheckHostname if (!Checks.DontCheckHostname)
? baseChecks.Concat(new List<Action> { () => PrintHostnameResolution().GetAwaiter().GetResult() }) checks.Add(PrintHostnameResolution);
: baseChecks;
allChecks.ForEach(action => CheckRunner.Run(action, isDebug)); // **Run every selected check**
foreach (var action in checks)
CheckRunner.Run(action, isDebug);
} }
private void PrintNetShares() private void PrintNetShares()
@ -449,47 +451,36 @@ namespace winPEAS.Checks
var connectivityInfo = InternetConnectivity.CheckConnectivity(); var connectivityInfo = InternetConnectivity.CheckConnectivity();
// HTTP Access // HTTP Access
Beaprint.AnsiPrint($" HTTP (80) Access: {(connectivityInfo.HttpAccess ? Beaprint.ansi_color_good + "Yes" + Beaprint.NOCOLOR : Beaprint.ansi_color_bad + "No" + Beaprint.NOCOLOR)}"); var colorsBool = new Dictionary<string, string>
if (connectivityInfo.HttpAccess) {
{ "Accessible", Beaprint.ansi_color_good },
{ "Not Accessible", Beaprint.ansi_color_bad },
};
Beaprint.AnsiPrint($" HTTP (80) Access: {(connectivityInfo.HttpAccess ? "Accessible" : "Not Accessible")}", colorsBool);
if (!string.IsNullOrEmpty(connectivityInfo.HttpError))
{ {
Beaprint.AnsiPrint($" Successful IP: {connectivityInfo.SuccessfulHttpIp}"); Beaprint.PrintException($" Error: {connectivityInfo.HttpError}");
}
else if (!string.IsNullOrEmpty(connectivityInfo.HttpError))
{
Beaprint.AnsiPrint($" Error: {connectivityInfo.HttpError}");
} }
// HTTPS Access // HTTPS Access
Beaprint.AnsiPrint($" HTTPS (443) Access: {(connectivityInfo.HttpsAccess ? Beaprint.ansi_color_good + "Yes" + Beaprint.NOCOLOR : Beaprint.ansi_color_bad + "No" + Beaprint.NOCOLOR)}"); Beaprint.AnsiPrint($" HTTPS (443) Access: {(connectivityInfo.HttpsAccess ? "Accessible" : "Not Accessible")}", colorsBool);
if (connectivityInfo.HttpsAccess) if (!string.IsNullOrEmpty(connectivityInfo.HttpsError))
{ {
Beaprint.AnsiPrint($" Successful IP: {connectivityInfo.SuccessfulHttpsIp}"); Beaprint.PrintException($" Error: {connectivityInfo.HttpsError}");
}
else if (!string.IsNullOrEmpty(connectivityInfo.HttpsError))
{
Beaprint.AnsiPrint($" Error: {connectivityInfo.HttpsError}");
} }
// DNS Access // DNS Access
Beaprint.AnsiPrint($" DNS (53) Access: {(connectivityInfo.DnsAccess ? Beaprint.ansi_color_good + "Yes" + Beaprint.NOCOLOR : Beaprint.ansi_color_bad + "No" + Beaprint.NOCOLOR)}"); Beaprint.AnsiPrint($" DNS (53) Access: {(connectivityInfo.DnsAccess ? "Accessible" : "Not Accessible")}", colorsBool);
if (connectivityInfo.DnsAccess) if (!string.IsNullOrEmpty(connectivityInfo.DnsError))
{ {
Beaprint.AnsiPrint($" Successful IP: {connectivityInfo.SuccessfulDnsIp}"); Beaprint.PrintException($" Error: {connectivityInfo.DnsError}");
}
else if (!string.IsNullOrEmpty(connectivityInfo.DnsError))
{
Beaprint.AnsiPrint($" Error: {connectivityInfo.DnsError}");
} }
// ICMP Access // ICMP Access
Beaprint.AnsiPrint($" ICMP (ping) Access: {(connectivityInfo.IcmpAccess ? Beaprint.ansi_color_good + "Yes" + Beaprint.NOCOLOR : Beaprint.ansi_color_bad + "No" + Beaprint.NOCOLOR)}"); Beaprint.AnsiPrint($" ICMP (ping) Access: {(connectivityInfo.IcmpAccess ? "Accessible" : "Not Accessible")}", colorsBool);
if (connectivityInfo.IcmpAccess) if (!string.IsNullOrEmpty(connectivityInfo.IcmpError))
{ {
Beaprint.AnsiPrint($" Successful IP: {connectivityInfo.SuccessfulIcmpIp}"); Beaprint.PrintException($" Error: {connectivityInfo.IcmpError}");
}
else if (!string.IsNullOrEmpty(connectivityInfo.IcmpError))
{
Beaprint.AnsiPrint($" Error: {connectivityInfo.IcmpError}");
} }
} }
catch (Exception ex) catch (Exception ex)
@ -498,24 +489,23 @@ namespace winPEAS.Checks
} }
} }
private async Task PrintHostnameResolution() private void PrintHostnameResolution()
{ {
try try
{ {
Beaprint.MainPrint("Hostname Resolution"); Beaprint.MainPrint("Hostname Resolution");
Beaprint.LinkPrint("", "Checking if the hostname can be resolved externally"); Beaprint.LinkPrint("", "Checking if the hostname can be resolved externally");
var resolutionInfo = await HostnameResolution.CheckResolution(); var resolutionInfo = HostnameResolution.TryExternalCheck();
Beaprint.AnsiPrint($" Hostname: {resolutionInfo.Hostname}");
if (!string.IsNullOrEmpty(resolutionInfo.ExternalCheckResult)) if (!string.IsNullOrEmpty(resolutionInfo.ExternalCheckResult))
{ {
Beaprint.AnsiPrint($" External Check Result: {resolutionInfo.ExternalCheckResult}"); Beaprint.GoodPrint($" External Check Result:");
Beaprint.NoColorPrint(resolutionInfo.ExternalCheckResult);
} }
else if (!string.IsNullOrEmpty(resolutionInfo.Error)) else if (!string.IsNullOrEmpty(resolutionInfo.Error))
{ {
Beaprint.AnsiPrint($" {Beaprint.ansi_color_bad}{resolutionInfo.Error}{Beaprint.NOCOLOR}"); Beaprint.BadPrint($" {resolutionInfo.Error}");
} }
} }
catch (Exception ex) catch (Exception ex)

70
winPEAS/winPEASexe/winPEAS/Info/NetworkInfo/HostnameResolution.cs Normal file
View File

@ -0,0 +1,70 @@
using System;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Text.Json;
namespace winPEAS.Info.NetworkInfo
{
public class HostnameResolutionInfo
{
public string Hostname { get; set; }
public string ExternalCheckResult { get; set; }
public string Error { get; set; }
}
public static class HostnameResolution
{
private const int INTERNET_SEARCH_TIMEOUT = 15;
private static readonly HttpClient httpClient = new HttpClient();
/// <summary>
/// Attempts to resolve the local hostname via the external lambda.
/// Always returns a populated <see cref="HostnameResolutionInfo"/> object.
/// </summary>
public static HostnameResolutionInfo TryExternalCheck()
{
var info = new HostnameResolutionInfo();
try
{
// 1. Determine hostname
info.Hostname = Dns.GetHostName();
if (string.IsNullOrEmpty(info.Hostname))
info.Hostname = Environment.MachineName;
// 2. Prepare JSON body
var payload = new StringContent(
JsonSerializer.Serialize(new { hostname = info.Hostname }),
Encoding.UTF8,
"application/json");
// 3. Configure HttpClient (header added once)
if (!httpClient.DefaultRequestHeaders.Contains("User-Agent"))
httpClient.DefaultRequestHeaders.Add("User-Agent", "winpeas");
httpClient.Timeout = TimeSpan.FromSeconds(INTERNET_SEARCH_TIMEOUT);
// 4. Call external checker
var resp = httpClient
.PostAsync("https://2e6ppt7izvuv66qmx2r3et2ufi0mxwqs.lambda-url.us-east-1.on.aws/", payload)
.GetAwaiter().GetResult();
if (resp.IsSuccessStatusCode)
{
info.ExternalCheckResult = resp.Content.ReadAsStringAsync()
.GetAwaiter().GetResult();
}
else
{
info.Error = $"External check failed (HTTP {(int)resp.StatusCode})";
}
}
catch (Exception ex)
{
info.Error = $"Error during hostname check: {ex.Message}";
}
return info;
}
}
}

57
winPEAS/winPEASexe/winPEAS/Info/NetworkInfo/NetworkScanner/InternetConnectivity.cs → winPEAS/winPEASexe/winPEAS/Info/NetworkInfo/InternetConnectivity.cs
View File

@ -1,12 +1,15 @@
using System; using System;
using System.Net;
using System.Net.NetworkInformation;
using System.Threading.Tasks;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Net.NetworkInformation;
using System.Net.Sockets; using System.Net.Sockets;
using System.Text; using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace winPEAS.Info.NetworkInfo.NetworkScanner namespace winPEAS.Info.NetworkInfo
{ {
public class InternetConnectivityInfo public class InternetConnectivityInfo
{ {
@ -37,13 +40,20 @@ namespace winPEAS.Info.NetworkInfo.NetworkScanner
{ {
try try
{ {
using (var client = new WebClient()) using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(HTTP_TIMEOUT));
using var client = new HttpClient { Timeout = TimeSpan.FromSeconds(HTTP_TIMEOUT) };
var resp = client.GetAsync($"http://{ip}", cts.Token)
.GetAwaiter().GetResult();
if (resp.IsSuccessStatusCode)
{ {
client.Timeout = HTTP_TIMEOUT;
client.DownloadString($"http://{ip}");
error = null; error = null;
return true; return true;
} }
error = $"HTTP status {(int)resp.StatusCode}";
return false;
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -56,13 +66,20 @@ namespace winPEAS.Info.NetworkInfo.NetworkScanner
{ {
try try
{ {
using (var client = new WebClient()) using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(HTTP_TIMEOUT));
using var client = new HttpClient { Timeout = TimeSpan.FromSeconds(HTTP_TIMEOUT) };
var resp = client.GetAsync($"https://{ip}", cts.Token)
.GetAwaiter().GetResult();
if (resp.IsSuccessStatusCode)
{ {
client.Timeout = HTTP_TIMEOUT;
client.DownloadString($"https://{ip}");
error = null; error = null;
return true; return true;
} }
error = $"HTTPS status {(int)resp.StatusCode}";
return false;
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -75,15 +92,24 @@ namespace winPEAS.Info.NetworkInfo.NetworkScanner
{ {
try try
{ {
using (var client = new WebClient()) using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(HTTP_TIMEOUT));
using var client = new HttpClient { Timeout = TimeSpan.FromSeconds(HTTP_TIMEOUT) };
var req = new HttpRequestMessage(HttpMethod.Get, LAMBDA_URL);
req.Headers.UserAgent.ParseAdd("winpeas");
req.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
var resp = client.SendAsync(req, cts.Token)
.GetAwaiter().GetResult();
if (resp.IsSuccessStatusCode)
{ {
client.Timeout = HTTP_TIMEOUT;
client.Headers.Add("User-Agent", "winpeas");
client.Headers.Add("Content-Type", "application/json");
client.DownloadString(LAMBDA_URL);
error = null; error = null;
return true; return true;
} }
error = $"Lambda status {(int)resp.StatusCode}";
return false;
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -92,6 +118,7 @@ namespace winPEAS.Info.NetworkInfo.NetworkScanner
} }
} }
private static bool TryDnsAccess(string ip, out string error) private static bool TryDnsAccess(string ip, out string error)
{ {
try try

69
winPEAS/winPEASexe/winPEAS/Info/NetworkInfo/NetworkScanner/HostnameResolution.cs
View File

@ -1,69 +0,0 @@
using System;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using System.Text.Json;
using System.Text;
namespace winPEAS.Info.NetworkInfo.NetworkScanner
{
public class HostnameResolutionInfo
{
public string Hostname { get; set; }
public string ExternalCheckResult { get; set; }
public string Error { get; set; }
}
public static class HostnameResolution
{
private const int INTERNET_SEARCH_TIMEOUT = 15;
private static readonly HttpClient httpClient = new HttpClient();
public static async Task<HostnameResolutionInfo> CheckResolution()
{
var result = new HostnameResolutionInfo();
try
{
// Get the current hostname
result.Hostname = Dns.GetHostName();
// Environment.MachineName if hostname empty
if (string.IsNullOrEmpty(result.Hostname))
{
result.Hostname = Environment.MachineName;
}
// Prepare the request
var content = new StringContent(
JsonSerializer.Serialize(new { hostname = result.Hostname }),
Encoding.UTF8,
"application/json"
);
httpClient.DefaultRequestHeaders.Add("User-Agent", "winpeas");
httpClient.Timeout = TimeSpan.FromSeconds(INTERNET_SEARCH_TIMEOUT);
// Make the request to the same endpoint as Linux version
var response = await httpClient.PostAsync(
"https://2e6ppt7izvuv66qmx2r3et2ufi0mxwqs.lambda-url.us-east-1.on.aws/",
content
);
if (response.IsSuccessStatusCode)
{
result.ExternalCheckResult = await response.Content.ReadAsStringAsync();
}
else
{
result.ExternalCheckResult = $"External check failed with status code: {response.StatusCode}";
}
}
catch (Exception ex)
{
result.Error = $"Error during hostname check: {ex.Message}";
}
return result;
}
}
}