diff --git a/brute.py b/brute.py index db2e768..16d5534 100644 --- a/brute.py +++ b/brute.py @@ -157,7 +157,7 @@ def query_domain_ns_a(ns_list): def query_domain_ns(domain): logger.log('INFOR', f'Querying NS records of {domain}') - domain = utils.get_maindomain(domain) + domain = utils.get_main_domain(domain) resolver = utils.dns_resolver() try: answer = resolver.query(domain, 'NS') @@ -508,7 +508,7 @@ class Brute(Module): if self.place is None: self.place = '*.' + domain wordlist = self.wordlist - main_domain = self.get_maindomain(domain) + main_domain = utils.get_main_domain(domain) if domain != main_domain: wordlist = self.recursive_nextlist if self.word: diff --git a/common/module.py b/common/module.py index c213a9e..4130d9e 100644 --- a/common/module.py +++ b/common/module.py @@ -213,16 +213,6 @@ class Module(object): def match_subdomains(self, html, distinct=True, fuzzy=True): return utils.match_subdomains(self.domain, html, distinct, fuzzy) - @staticmethod - def get_maindomain(domain): - """ - Get main domain - - :param str domain: domain - :return: main domain - """ - return Domain(domain).registered() - def save_json(self): """ Save the results of each module as a json file diff --git a/common/utils.py b/common/utils.py index d357f00..45b6b56 100644 --- a/common/utils.py +++ b/common/utils.py @@ -622,7 +622,7 @@ def check_version(local): logger.log('INFOR', f'The current version {local} is already the latest version') -def get_maindomain(domain): +def get_main_domain(domain): return Domain(domain).registered() diff --git a/modules/certificates/censys_api.py b/modules/certificates/censys_api.py index 04f8306..e3a1768 100644 --- a/modules/certificates/censys_api.py +++ b/modules/certificates/censys_api.py @@ -6,7 +6,7 @@ from config.log import logger class CensysAPI(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Certificate' self.source = "CensysAPIQuery" self.addr = 'https://www.censys.io/api/v1/search/certificates' diff --git a/modules/certificates/crtsh.py b/modules/certificates/crtsh.py index 54abb2d..f666f0e 100644 --- a/modules/certificates/crtsh.py +++ b/modules/certificates/crtsh.py @@ -4,7 +4,7 @@ from common.query import Query class Crtsh(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Certificate' self.source = 'CrtshQuery' self.addr = 'https://crt.sh/' diff --git a/modules/certificates/google.py b/modules/certificates/google.py index dbf7b7d..f95349b 100644 --- a/modules/certificates/google.py +++ b/modules/certificates/google.py @@ -4,7 +4,7 @@ from common.query import Query class Google(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Certificate' self.source = 'GoogleQuery' self.addr = 'https://transparencyreport.google.com/' \ diff --git a/modules/check/axfr.py b/modules/check/axfr.py index 5babfcb..b5c0f24 100644 --- a/modules/check/axfr.py +++ b/modules/check/axfr.py @@ -22,7 +22,7 @@ class CheckAXFR(Module): def __init__(self, domain: str): Module.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Check' self.source = 'AXFRCheck' self.results = [] diff --git a/modules/check/cdx.py b/modules/check/cdx.py index 69be5b3..6b44a54 100644 --- a/modules/check/cdx.py +++ b/modules/check/cdx.py @@ -11,7 +11,7 @@ class CheckCDX(Module): """ def __init__(self, domain: str): Module.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Check' self.source = "CrossDomainXml" diff --git a/modules/check/cert.py b/modules/check/cert.py index 9b82fe0..018c3a6 100644 --- a/modules/check/cert.py +++ b/modules/check/cert.py @@ -13,7 +13,7 @@ from config.log import logger class CheckCert(Module): def __init__(self, domain): Module.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.port = 443 # ssl port self.module = 'Check' self.source = 'CertInfo' diff --git a/modules/check/csp.py b/modules/check/csp.py index 518abfb..3c25127 100644 --- a/modules/check/csp.py +++ b/modules/check/csp.py @@ -13,7 +13,7 @@ class CheckCSP(Module): """ def __init__(self, domain, header): Module.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Check' self.source = 'ContentSecurityPolicy' self.csp_header = header diff --git a/modules/check/nsec.py b/modules/check/nsec.py index 51c33fd..a5e55e6 100644 --- a/modules/check/nsec.py +++ b/modules/check/nsec.py @@ -8,7 +8,7 @@ from common import utils class CheckNSEC(Module): def __init__(self, domain): Module.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'check' self.source = "CheckNSEC" diff --git a/modules/check/robots.py b/modules/check/robots.py index 6a37e7f..e717588 100644 --- a/modules/check/robots.py +++ b/modules/check/robots.py @@ -10,7 +10,7 @@ class CheckRobots(Module): """ def __init__(self, domain): Module.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Check' self.source = 'Robots' diff --git a/modules/check/sitemap.py b/modules/check/sitemap.py index 5696f53..b7f2d10 100644 --- a/modules/check/sitemap.py +++ b/modules/check/sitemap.py @@ -10,7 +10,7 @@ class CheckRobots(Module): """ def __init__(self, domain): Module.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Check' self.source = 'Sitemap' diff --git a/modules/collect.py b/modules/collect.py index 70ae21a..aa8e281 100644 --- a/modules/collect.py +++ b/modules/collect.py @@ -5,6 +5,7 @@ import importlib import dbexport from config.log import logger from config import setting +from common import utils class Collect(object): @@ -13,7 +14,7 @@ class Collect(object): """ def __init__(self, domain, export=True): - self.domain = domain + self.domain = utils.get_main_domain(domain) self.elapse = 0.0 self.modules = [] self.collect_funcs = [] diff --git a/modules/datasets/binaryedge_api.py b/modules/datasets/binaryedge_api.py index 51b5d28..b85807d 100644 --- a/modules/datasets/binaryedge_api.py +++ b/modules/datasets/binaryedge_api.py @@ -5,7 +5,7 @@ from common.query import Query class BinaryEdgeAPI(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = 'BinaryEdgeAPIQuery' self.addr = 'https://api.binaryedge.io/v2/query/domains/subdomain/' diff --git a/modules/datasets/bufferover.py b/modules/datasets/bufferover.py index c58d94f..4007394 100644 --- a/modules/datasets/bufferover.py +++ b/modules/datasets/bufferover.py @@ -6,7 +6,7 @@ from config.log import logger class BufferOver(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = 'BufferOverQuery' self.addr = 'https://dns.bufferover.run/dns?q=' diff --git a/modules/datasets/cebaidu.py b/modules/datasets/cebaidu.py index c529871..233a32f 100644 --- a/modules/datasets/cebaidu.py +++ b/modules/datasets/cebaidu.py @@ -4,7 +4,7 @@ from common.query import Query class CeBaidu(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = 'CeBaiduQuery' self.addr = 'https://ce.baidu.com/index/getRelatedSites' diff --git a/modules/datasets/chinaz.py b/modules/datasets/chinaz.py index 6b0b655..d781b78 100644 --- a/modules/datasets/chinaz.py +++ b/modules/datasets/chinaz.py @@ -4,7 +4,7 @@ from common.query import Query class Chinaz(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = 'ChinazQuery' self.addr = 'https://alexa.chinaz.com/' diff --git a/modules/datasets/chinaz_api.py b/modules/datasets/chinaz_api.py index 038d791..e8e8738 100644 --- a/modules/datasets/chinaz_api.py +++ b/modules/datasets/chinaz_api.py @@ -5,7 +5,7 @@ from common.query import Query class ChinazAPI(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = 'ChinazAPIQuery' self.addr = 'https://apidata.chinaz.com/CallAPI/Alexa' diff --git a/modules/datasets/circl_api.py b/modules/datasets/circl_api.py index 5b9f3d2..fa912b1 100644 --- a/modules/datasets/circl_api.py +++ b/modules/datasets/circl_api.py @@ -5,7 +5,7 @@ from common.query import Query class CirclAPI(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = 'CirclAPIQuery' self.addr = 'https://www.circl.lu/pdns/query/' diff --git a/modules/datasets/dnsdb_api.py b/modules/datasets/dnsdb_api.py index 0fc2f45..fe51a6c 100644 --- a/modules/datasets/dnsdb_api.py +++ b/modules/datasets/dnsdb_api.py @@ -5,7 +5,7 @@ from common.query import Query class DNSdbAPI(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = 'DNSdbAPIQuery' self.addr = 'https://api.dnsdb.info/lookup/rrset/name/' diff --git a/modules/datasets/dnsdumpster.py b/modules/datasets/dnsdumpster.py index 4822db8..eebc4fd 100644 --- a/modules/datasets/dnsdumpster.py +++ b/modules/datasets/dnsdumpster.py @@ -4,7 +4,7 @@ from common.query import Query class DNSdumpster(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = "DNSdumpsterQuery" self.addr = 'https://dnsdumpster.com/' diff --git a/modules/datasets/hackertarget.py b/modules/datasets/hackertarget.py index 0bfd7e4..2dc75d8 100644 --- a/modules/datasets/hackertarget.py +++ b/modules/datasets/hackertarget.py @@ -4,7 +4,7 @@ from common.query import Query class HackerTarget(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = "HackerTargetQuery" self.addr = 'https://api.hackertarget.com/hostsearch/' diff --git a/modules/datasets/ip138.py b/modules/datasets/ip138.py index da1cc79..6c9d13a 100644 --- a/modules/datasets/ip138.py +++ b/modules/datasets/ip138.py @@ -4,7 +4,7 @@ from common.query import Query class IP138(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = 'IP138Query' self.addr = 'https://site.ip138.com/{domain}/domain.htm' diff --git a/modules/datasets/ipv4info_api.py b/modules/datasets/ipv4info_api.py index ad605b8..691b74d 100644 --- a/modules/datasets/ipv4info_api.py +++ b/modules/datasets/ipv4info_api.py @@ -6,7 +6,7 @@ from config.log import logger class IPv4InfoAPI(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = 'IPv4InfoAPIQuery' self.addr = ' http://ipv4info.com/api_v1/' diff --git a/modules/datasets/netcraft.py b/modules/datasets/netcraft.py index de81156..9994a9f 100644 --- a/modules/datasets/netcraft.py +++ b/modules/datasets/netcraft.py @@ -9,7 +9,7 @@ from common.query import Query class NetCraft(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = 'NetCraftQuery' self.init = 'https://searchdns.netcraft.com/' diff --git a/modules/datasets/passivedns_api.py b/modules/datasets/passivedns_api.py index 987daba..70faf81 100644 --- a/modules/datasets/passivedns_api.py +++ b/modules/datasets/passivedns_api.py @@ -5,7 +5,7 @@ from common.query import Query class PassiveDnsAPI(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = 'PassiveDnsQuery' self.addr = api.passivedns_api_addr or 'http://api.passivedns.cn' diff --git a/modules/datasets/phonebook.py b/modules/datasets/phonebook.py index 065dd83..df04346 100644 --- a/modules/datasets/phonebook.py +++ b/modules/datasets/phonebook.py @@ -5,7 +5,7 @@ from common.query import Query class PhoneBook(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = 'PhoneBookQuery' diff --git a/modules/datasets/rapiddns.py b/modules/datasets/rapiddns.py index 105be91..e77d64e 100644 --- a/modules/datasets/rapiddns.py +++ b/modules/datasets/rapiddns.py @@ -4,7 +4,7 @@ from common.query import Query class RapidDNS(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = 'RapidDNSQuery' diff --git a/modules/datasets/riddler.py b/modules/datasets/riddler.py index 8d21540..a39502c 100644 --- a/modules/datasets/riddler.py +++ b/modules/datasets/riddler.py @@ -4,7 +4,7 @@ from common.query import Query class Riddler(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = 'RiddlerQuery' self.addr = 'https://riddler.io/search' diff --git a/modules/datasets/robtex.py b/modules/datasets/robtex.py index 4358b02..aad33f9 100644 --- a/modules/datasets/robtex.py +++ b/modules/datasets/robtex.py @@ -7,7 +7,7 @@ from common.query import Query class Robtex(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = "RobtexQuery" self.addr = 'https://freeapi.robtex.com/pdns/' diff --git a/modules/datasets/securitytrails_api.py b/modules/datasets/securitytrails_api.py index 8b52bfb..d770b61 100644 --- a/modules/datasets/securitytrails_api.py +++ b/modules/datasets/securitytrails_api.py @@ -5,7 +5,7 @@ from common.query import Query class SecurityTrailsAPI(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = 'SecurityTrailsAPIQuery' self.addr = 'https://api.securitytrails.com/v1/domain/' diff --git a/modules/datasets/sitedossier.py b/modules/datasets/sitedossier.py index 923160d..359d159 100644 --- a/modules/datasets/sitedossier.py +++ b/modules/datasets/sitedossier.py @@ -5,7 +5,7 @@ from common.query import Query class SiteDossier(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = 'SiteDossierQuery' self.addr = 'http://www.sitedossier.com/parentdomain/' diff --git a/modules/datasets/sublist3r.py b/modules/datasets/sublist3r.py index a96eb9b..ff5ade8 100644 --- a/modules/datasets/sublist3r.py +++ b/modules/datasets/sublist3r.py @@ -4,7 +4,7 @@ from common.query import Query class Sublist3r(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = 'Sublist3rQuery' diff --git a/modules/datasets/threatcrowd.py b/modules/datasets/threatcrowd.py index 523de7d..7cd064b 100644 --- a/modules/datasets/threatcrowd.py +++ b/modules/datasets/threatcrowd.py @@ -7,7 +7,7 @@ from config.log import logger class ThreatCrowd(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = 'ThreatCrowdQuery' self.addr = 'https://www.threatcrowd.org/searchApi' \ diff --git a/modules/datasets/wzpc.py b/modules/datasets/wzpc.py index 5be8255..6788c0d 100644 --- a/modules/datasets/wzpc.py +++ b/modules/datasets/wzpc.py @@ -6,7 +6,7 @@ from common.query import Query class WZPCQuery(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = 'WZPCQuery' diff --git a/modules/datasets/ximcx.py b/modules/datasets/ximcx.py index 8e104f4..d8533b9 100644 --- a/modules/datasets/ximcx.py +++ b/modules/datasets/ximcx.py @@ -4,7 +4,7 @@ from common.query import Query class Ximcx(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Dataset' self.source = 'XimcxQuery' self.addr = 'http://sbd.ximcx.cn/DomainServlet' diff --git a/modules/dnsquery/mx.py b/modules/dnsquery/mx.py index b2a5514..ebbe69c 100644 --- a/modules/dnsquery/mx.py +++ b/modules/dnsquery/mx.py @@ -4,7 +4,7 @@ from common.lookup import Lookup class QueryMX(Lookup): def __init__(self, domain): Lookup.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'dnsquery' self.source = "QueryMX" self.type = 'MX' # 利用的DNS记录的MX记录收集子域 diff --git a/modules/dnsquery/ns.py b/modules/dnsquery/ns.py index b79e232..a44b4c3 100644 --- a/modules/dnsquery/ns.py +++ b/modules/dnsquery/ns.py @@ -4,7 +4,7 @@ from common.lookup import Lookup class QueryNS(Lookup): def __init__(self, domain): Lookup.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'dnsquery' self.source = "QueryNS" self.type = 'NS' # 利用的DNS记录的NS记录收集子域 diff --git a/modules/dnsquery/soa.py b/modules/dnsquery/soa.py index b688cfa..8aad164 100644 --- a/modules/dnsquery/soa.py +++ b/modules/dnsquery/soa.py @@ -4,7 +4,7 @@ from common.lookup import Lookup class QuerySOA(Lookup): def __init__(self, domain): Lookup.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'dnsquery' self.source = "QuerySOA" self.type = 'SOA' # 利用的DNS记录的SOA记录收集子域 diff --git a/modules/dnsquery/spf.py b/modules/dnsquery/spf.py index 8bc89d1..0d2d6ea 100644 --- a/modules/dnsquery/spf.py +++ b/modules/dnsquery/spf.py @@ -4,7 +4,7 @@ from common.lookup import Lookup class QuerySPF(Lookup): def __init__(self, domain): Lookup.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'dnsquery' self.source = "QuerySPF" self.type = 'SPF' # 利用的DNS记录的SPF记录收集子域 diff --git a/modules/dnsquery/srv.py b/modules/dnsquery/srv.py index fa29780..aa90fdc 100644 --- a/modules/dnsquery/srv.py +++ b/modules/dnsquery/srv.py @@ -14,7 +14,7 @@ from config.setting import data_storage_dir class BruteSRV(Module): def __init__(self, domain): Module.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'dnsquery' self.source = "BruteSRV" self.type = 'SRV' # 利用的DNS记录的SRV记录查询子域 diff --git a/modules/dnsquery/txt.py b/modules/dnsquery/txt.py index c7ce963..a016fcf 100644 --- a/modules/dnsquery/txt.py +++ b/modules/dnsquery/txt.py @@ -4,7 +4,7 @@ from common.lookup import Lookup class QueryTXT(Lookup): def __init__(self, domain): Lookup.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'dnsquery' self.source = "QueryTXT" self.type = 'TXT' # 利用的DNS记录的TXT记录收集子域 diff --git a/modules/intelligence/alienvault.py b/modules/intelligence/alienvault.py index ee2d8c8..fc592c8 100644 --- a/modules/intelligence/alienvault.py +++ b/modules/intelligence/alienvault.py @@ -4,7 +4,7 @@ from common.query import Query class AlienVault(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Intelligence' self.source = 'AlienVaultQuery' diff --git a/modules/intelligence/riskiq_api.py b/modules/intelligence/riskiq_api.py index 6ec320c..da4598f 100644 --- a/modules/intelligence/riskiq_api.py +++ b/modules/intelligence/riskiq_api.py @@ -5,7 +5,7 @@ from common.query import Query class RiskIQ(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Intelligence' self.source = 'RiskIQAPIQuery' self.addr = 'https://api.passivetotal.org/v2/enrichment/subdomains' diff --git a/modules/intelligence/threatbook_api.py b/modules/intelligence/threatbook_api.py index 87f1161..d2dc81b 100644 --- a/modules/intelligence/threatbook_api.py +++ b/modules/intelligence/threatbook_api.py @@ -5,7 +5,7 @@ from common.query import Query class ThreatBookAPI(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Intelligence' self.source = 'ThreatBookAPIQuery' self.addr = 'https://api.threatbook.cn/v3/domain/sub_domains' diff --git a/modules/intelligence/threatminer.py b/modules/intelligence/threatminer.py index 98a2294..9c6c69e 100644 --- a/modules/intelligence/threatminer.py +++ b/modules/intelligence/threatminer.py @@ -4,7 +4,7 @@ from common.query import Query class ThreatMiner(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Intelligence' self.source = 'ThreatMinerQuery' self.addr = 'https://www.threatminer.org/getData.php' diff --git a/modules/intelligence/virustotal.py b/modules/intelligence/virustotal.py index 2307d9e..b2bfe0e 100644 --- a/modules/intelligence/virustotal.py +++ b/modules/intelligence/virustotal.py @@ -11,7 +11,7 @@ class VirusTotal(Query): self.source = 'VirusTotalQuery' self.module = 'Intelligence' self.addr = 'https://www.virustotal.com/ui/domains/{}/subdomains' - self.domain = self.get_maindomain(domain) + self.domain = domain def query(self): """ diff --git a/modules/intelligence/virustotal_api.py b/modules/intelligence/virustotal_api.py index 93649b4..3f03a81 100644 --- a/modules/intelligence/virustotal_api.py +++ b/modules/intelligence/virustotal_api.py @@ -5,7 +5,7 @@ from common.query import Query class VirusTotalAPI(Query): def __init__(self, domain): Query.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Intelligence' self.source = 'VirusTotalAPIQuery' self.addr = 'https://www.virustotal.com/vtapi/v2/domain/report' diff --git a/modules/search/gitee.py b/modules/search/gitee.py index 9eef654..028b402 100644 --- a/modules/search/gitee.py +++ b/modules/search/gitee.py @@ -10,7 +10,7 @@ class Gitee(Search): self.source = 'GiteeSearch' self.module = 'Search' self.addr = 'https://search.gitee.com/' - self.domain = self.get_maindomain(domain) + self.domain = domain self.header = self.get_header() def search(self, full_search=False): diff --git a/modules/search/github_api.py b/modules/search/github_api.py index 3559d8b..713f8c5 100644 --- a/modules/search/github_api.py +++ b/modules/search/github_api.py @@ -10,7 +10,7 @@ class GithubAPI(Search): self.source = 'GithubAPISearch' self.module = 'Search' self.addr = 'https://api.github.com/search/code' - self.domain = self.get_maindomain(domain) + self.domain = domain self.session = requests.Session() self.auth_url = 'https://api.github.com' self.token = api.github_api_token diff --git a/modules/search/shodan_api.py b/modules/search/shodan_api.py index 909462b..37def1e 100644 --- a/modules/search/shodan_api.py +++ b/modules/search/shodan_api.py @@ -5,7 +5,7 @@ from common.search import Search class ShodanAPI(Search): def __init__(self, domain): Search.__init__(self) - self.domain = self.get_maindomain(domain) + self.domain = domain self.module = 'Search' self.source = 'ShodanAPISearch' self.addr = 'https://api.shodan.io/shodan/host/search'