Skip to content

use whois.validTlds() instead of hardcoded valid tlds #1067

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
AlyaGomaa merged 1 commit into from
Nov 17, 2024
Merged

use whois.validTlds() instead of hardcoded valid tlds #1067

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
115 changes: 5 additions & 110 deletions modules/ip_info/ip_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
import asyncio
import multiprocessing


from modules.ip_info.jarm import JARM
from slips_files.common.flow_classifier import FlowClassifier
from slips_files.core.helpers.whitelist.whitelist import Whitelist
from .asn_info import ASN
from slips_files.common.abstracts.module import IModule
from slips_files.common.slips_utils import utils
Expand Down Expand Up @@ -60,109 +62,7 @@ def init(self):
# update asn every 1 month
self.update_period = 2592000
self.is_gw_mac_set = False
# we can only getthe age of these tlds
self.valid_tlds = [
".ac_uk",
".am",
".amsterdam",
".ar",
".at",
".au",
".bank",
".be",
".biz",
".br",
".by",
".ca",
".cc",
".cl",
".club",
".cn",
".co",
".co_il",
".co_jp",
".com",
".com_au",
".com_tr",
".cr",
".cz",
".de",
".download",
".edu",
".education",
".eu",
".fi",
".fm",
".fr",
".frl",
".game",
".global_",
".hk",
".id_",
".ie",
".im",
".in_",
".info",
".ink",
".io",
".ir",
".is_",
".it",
".jp",
".kr",
".kz",
".link",
".lt",
".lv",
".me",
".mobi",
".mu",
".mx",
".name",
".net",
".ninja",
".nl",
".nu",
".nyc",
".nz",
".online",
".org",
".pe",
".pharmacy",
".pl",
".press",
".pro",
".pt",
".pub",
".pw",
".rest",
".ru",
".ru_rf",
".rw",
".sale",
".se",
".security",
".sh",
".site",
".space",
".store",
".tech",
".tel",
".theatre",
".tickets",
".trade",
".tv",
".ua",
".uk",
".us",
".uz",
".video",
".website",
".wiki",
".work",
".xyz",
".za",
]
self.whitelist = Whitelist(self.logger, self.db)
self.is_running_non_stop: bool = self.db.is_running_non_stop()

async def open_dbs(self):
Expand Down Expand Up @@ -348,13 +248,8 @@ def get_age(self, domain):
if domain.endswith(".arpa") or domain.endswith(".local"):
return False

# make sure whois supports the given tld
for tld in self.valid_tlds:
if domain.endswith(tld):
# valid tld
break
else:
# tld not supported
domain_tld: str = self.whitelist.domain_analyzer.get_tld(domain)
if domain_tld not in whois.validTlds():
return False

cached_data = self.db.get_domain_data(domain)
Expand Down
Loading