Skip to content

Fix exclude-unlikely handling #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coj337 merged 1 commit into from
Jun 4, 2025
+17 −5
Merged

Fix exclude-unlikely handling #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Subdominator.Tests/FingerprintTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,16 @@ private string GenerateRandomSubdomain(string baseCname)

return $"{subdomain}.{baseCname}";
}

[TestMethod]
public async Task ShouldExcludeEdgeCaseFingerprints()
{
var hijack = new SubdomainHijack();
var allFingerprints = await hijack.GetFingerprintsAsync(false);
Assert.IsTrue(allFingerprints.Any(f => f.Status.ToLower() == "edge case"));

hijack = new SubdomainHijack();
var filteredFingerprints = await hijack.GetFingerprintsAsync(true);
Assert.IsFalse(filteredFingerprints.Any(f => f.Status.ToLower() == "edge case"));
}
}
6 changes: 3 additions & 3 deletions Subdominator/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ _____ _ _ _ _

await Parallel.ForEachAsync(domains, new ParallelOptions { MaxDegreeOfParallelism = maxConcurrentTasks }, async (domain, cancellationToken) =>
{
var isVulnerable = await CheckAndLogDomain(hijackChecker, domain, o.Validate, o.Verbose, o.Quiet);
var isVulnerable = await CheckAndLogDomain(hijackChecker, domain, o.Validate, o.Verbose, o.Quiet, o.ExcludeUnlikely);
if(isVulnerable)
{
Interlocked.Increment(ref vulnerableCount);
Expand Down Expand Up @@ -237,12 +237,12 @@ static async Task<IEnumerable<string>> FilterAndNormalizeDomains(List<string> do
return normalizedDomains.Where(d => d.IsValid).Select(d => d.Original);
}

static async Task<bool> CheckAndLogDomain(SubdomainHijack hijackChecker, string domain, bool validateResults, bool verbose, bool quiet)
static async Task<bool> CheckAndLogDomain(SubdomainHijack hijackChecker, string domain, bool validateResults, bool verbose, bool quiet, bool excludeUnlikely)
{
bool isFound = false;
try
{
var result = await hijackChecker.IsDomainVulnerable(domain, validateResults);
var result = await hijackChecker.IsDomainVulnerable(domain, validateResults, excludeUnlikely);
if (result.IsVulnerable || verbose)
{
if (result.IsVulnerable)
Expand Down
4 changes: 2 additions & 2 deletions Subdominator/SubdomainHijack.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,9 @@ public async Task<IEnumerable<Fingerprint>> GetFingerprintsAsync(bool excludeUnl
return _fingerprints;
}

public async Task<TakeoverResult> IsDomainVulnerable(string domain, bool validateResults, bool update = false)
public async Task<TakeoverResult> IsDomainVulnerable(string domain, bool validateResults, bool excludeUnlikely = false, bool update = false)
{
var fingerprints = await GetFingerprintsAsync(update);
var fingerprints = await GetFingerprintsAsync(excludeUnlikely: excludeUnlikely, update: update);

// DNS Lookup
var subdomainDns = await GetDnsForSubdomain(domain);
Expand Down
Loading