Skip to content

Commit

Permalink
New version 0.2.25
Browse files Browse the repository at this point in the history
  • Loading branch information
@ak545
ak545 committed Mar 27, 2024
1 parent fa3b552 commit e92d765
Show file tree
Hide file tree
Showing 3 changed files with 162 additions and 26 deletions.
18 changes: 16 additions & 2 deletions README-RU.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,15 @@ Options:
-trim, --trim-long-whois-text
Trim long whois text of changes for a domain for Telegram (default is False)
-t, --use-telegram Send a warning message through the Telegram (default is False)
-p URL, --proxy URL Proxy link (for Telegram only), for example: socks5://127.0.0.1:9150 (default is None)
-p URL, --proxy URL Proxy link for Telegram only (default is None)
for example:
user:[email protected]:8080
socks5://127.0.0.1:9150
-piw URL, --proxy-internal-whois URL
Socks-proxy link for internal whois engine only (default is None)
for example:
user:[email protected]:8080
127.0.0.1:9150
-e EMAIL, --email-to EMAIL
Send a warning message to email address (default is None)
-subject STRING, --email-subject STRING
Expand All @@ -145,7 +153,7 @@ Options:
Use external whois utility for additional analysis (default is False)
-nb, --no-banner Do not print banner (default is False)

© AK545 (Andrey Klimov) 2019..2023, e-mail: ak545 at mail dot ru
© AK545 (Andrey Klimov) 2019..2024, e-mail: ak545 at mail dot ru
```

### Описание опций
Expand Down Expand Up @@ -299,6 +307,12 @@ youtube.com

Ссылка на прокси (только для Telegram), например: socks5://127.0.0.1:9150 (по умолчанию None).

**-piw URL, --proxy-internal-whois URL**

Ссылка на Socks-прокси только для внутреннего whois-движка, например: user:password@socksproxy.someplace.com:8080 или 127.0.0.1:9150 (по умолчанию None).

Не используйте опцию -oe/--use-only-external-whois с опцией -piw/--proxy-internal-whois.

**-e EMAIL, --email-to EMAIL**

Отправить предупреждение на адрес электронной почты (по умолчанию Нет). Здесь необходимо указать email адрес получателя.
Expand Down
18 changes: 16 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,15 @@ Options:
-trim, --trim-long-whois-text
Trim long whois text of changes for a domain for Telegram (default is False)
-t, --use-telegram Send a warning message through the Telegram (default is False)
-p URL, --proxy URL Proxy link (for Telegram only), for example: socks5://127.0.0.1:9150 (default is None)
-p URL, --proxy URL Proxy link for Telegram only (default is None)
for example:
user:[email protected]:8080
socks5://127.0.0.1:9150
-piw URL, --proxy-internal-whois URL
Socks-proxy link for internal whois engine only (default is None)
for example:
user:[email protected]:8080
127.0.0.1:9150
-e EMAIL, --email-to EMAIL
Send a warning message to email address (default is None)
-subject STRING, --email-subject STRING
Expand All @@ -141,7 +149,7 @@ Options:
Use external whois utility for additional analysis (default is False)
-nb, --no-banner Do not print banner (default is False)

© AK545 (Andrey Klimov) 2019..2023, e-mail: ak545 at mail dot ru
© AK545 (Andrey Klimov) 2019..2024, e-mail: ak545 at mail dot ru
```

### Description of options
Expand Down Expand Up @@ -297,6 +305,12 @@ Send a warning message through the Telegram (default is False)

Proxy link (for Telegram only), for example: socks5://127.0.0.1:9150 (default is None).

**-piw URL, --proxy-internal-whois URL**

Socks-proxy link for internal whois engine only, for example: user:password@socksproxy.someplace.com:8080 or 127.0.0.1:9150 (default is None).

Don't use option -oe/--use-only-external-whois with option -piw/--proxy-internal-whois.

**-e EMAIL, --email-to EMAIL**

Send a warning message to email address (default is None)
Expand Down
152 changes: 130 additions & 22 deletions ddec.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
# Leif (https://github.com/akhepcat)
# woodholly (https://github.com/woodholly)
#
# Current Version: 0.2.23
# Current Version: 0.2.25
# Creation Date: 2019-07-05
# Date of last changes: 2024-02-12
# Date of last changes: 2024-03-27
#
# License:
# This program is free software; you can redistribute it and/or modify
Expand All @@ -34,6 +34,7 @@
import os
import sys
import platform
import socket
import argparse
import time
import json
Expand Down Expand Up @@ -100,7 +101,7 @@
sys.exit(-1)

# Global constants
__version__: str = '0.2.23'
__version__: str = '0.2.25'

FR: str = Fore.RESET

Expand Down Expand Up @@ -167,13 +168,13 @@
# 'https': 'socks5://127.0.0.1:9150',
# }

# # Get help from https://core.telegram.org/bots
# # token that can be generated talking with @BotFather on telegram
# Get help from https://core.telegram.org/bots
# token that can be generated talking with @BotFather on telegram
TELEGRAM_TOKEN: str = '<INSERT YOUR TOKEN>'
#
# # channel id for telegram

# channel id for telegram
TELEGRAM_CHAT_ID: str = '<INSERT YOUR CHANNEL ID>'
#

# # url for post request to api.telegram.org
TELEGRAM_URL: str = f'https://api.telegram.org/bot{TELEGRAM_TOKEN}/'

Expand All @@ -185,7 +186,7 @@
REQUEST_HEADERS: Dict = {
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) '
'AppleWebKit/537.36 (KHTML, like Gecko) '
'Chrome/122.0.0.0 Safari/537.36'
'Chrome/124.0.0.0 Safari/537.36'
}

# Options for an external utility whois
Expand Down Expand Up @@ -277,8 +278,8 @@
G_DOMAINS_LIST: List = []

# Currency symbol
# G_CURRENCY_SYMBOL: str = '₽'
G_CURRENCY_SYMBOL: str = '¥'
G_CURRENCY_SYMBOL: str = '₽'
# G_CURRENCY_SYMBOL: str = '¥'
# G_CURRENCY_SYMBOL: str = '£'
# G_CURRENCY_SYMBOL: str = '€'
# G_CURRENCY_SYMBOL: str = '$'
Expand Down Expand Up @@ -1109,15 +1110,15 @@ def make_report_for_email() -> None:
border-color: rgb(31, 31, 31) !important;
background-color: rgba(24,103,194,0.81);
'''
body_html: str = """
body_html: str = f"""
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<style>
a:link { text-decoration: none !important; color: #FFF !important; }
a:visited { text-decoration: none !important; color: #FFF !important; }
a:hover { text-decoration: none !important; color: #F9E79F !important; }
a:active { text-decoration: none !important; color: #FFF !important; }
a:link {{ text-decoration: none !important; color: #FFF !important; }}
a:visited {{ text-decoration: none !important; color: #FFF !important; }}
a:hover {{ text-decoration: none !important; color: #F9E79F !important; }}
a:active {{ text-decoration: none !important; color: #FFF !important; }}
</style>
</head>
<html>
Expand All @@ -1131,6 +1132,23 @@ def make_report_for_email() -> None:
-webkit-text-size-adjust:none;
-ms-text-size-adjust:none;">
<div
style="
font-size: 0px;
color: #ffffff;
line-height: 1px;
mso-line-height-rule: exactly;
display: none;
max-width: 0px;
max-height: 0px;
opacity: 0;
overflow: hidden;
mso-hide: all;
"
>
{subject}, Exp: {G_DOMAINS_EXPIRE}, Soon:{G_DOMAINS_SOON}{"&#8199;&#65279;&#847;" * 150}
</div>
<div style="width: auto;
color:#FFFFFF;
border-color: #A80333 !important;
Expand Down Expand Up @@ -1575,6 +1593,36 @@ def error(self, message):
sys.exit(2)


def check_positive(value):
"""
Check for positive integer input
:param value: str
:return: str
"""
try:
value = int(value)
if value <= 0:
raise argparse.ArgumentTypeError(f'{FLR}{value}{FRC} is not a positive integer')
except ValueError:
raise argparse.ArgumentTypeError(f'{FLR}{value}{FRC} is not an integer')
return value


def check_float_positive_or_zero(value):
"""
Check for positive or zero float input
:param value: str
:return: str
"""
try:
value = float(value)
if value < 0.00:
raise argparse.ArgumentTypeError(f'{FLR}{value}{FRC} is not a positive or zero float')
except ValueError:
raise argparse.ArgumentTypeError(f'{FLR}{value}{FRC} is not an float')
return value


def process_cli():
"""
parses the CLI arguments and returns a domain or
Expand All @@ -1589,7 +1637,7 @@ def process_cli():
\t{FLBC}A simple python script to display or notify a user by email and/or via Telegram
\tabout the status of the domain and the expiration date.{FR}""",
epilog=f'{FLBC}© AK545 (Andrey Klimov) 2019..2023, e-mail: ak545 at mail dot ru\n{FR}',
epilog=f'{FLBC}© AK545 (Andrey Klimov) 2019..2024, e-mail: ak545 at mail dot ru\n{FR}',
add_help=False,
)
parent_group = process_parser.add_argument_group(
Expand Down Expand Up @@ -1638,23 +1686,23 @@ def process_cli():
'-i',
'--interval-time',
default=60,
type=int,
type=check_positive,
metavar='SECONDS',
help='Time to sleep between whois queries (in seconds, default is 60)'
)
parent_group.add_argument(
'-x',
'--expire-days',
default=60,
type=int,
type=check_positive,
metavar='DAYS',
help='Expiration threshold to check against (in days, default is 60)'
)
parent_group.add_argument(
'-s',
'--cost-per-domain',
default=0.00,
type=float,
type=check_float_positive_or_zero,
metavar='FLOAT',
help='The cost per one domain (in your currency, default is 0.00)'
)
Expand Down Expand Up @@ -1690,8 +1738,21 @@ def process_cli():
'-p',
'--proxy',
help=(
'Proxy link (for Telegram only), '
'for example: socks5://127.0.0.1:9150 (default is None)'
'Proxy link for Telegram only (default is None)\n'
f'{FLBC}for example:\n'
'user:[email protected]:8080\n'
f'socks5://127.0.0.1:9150{FR}'
),
metavar='URL'
)
parent_group.add_argument(
'-piw',
'--proxy-internal-whois',
help=(
'Socks-proxy link for internal whois engine only (default is None)\n'
f'{FLBC}for example:\n'
'user:[email protected]:8080\n'
f'127.0.0.1:9150{FR}'
),
metavar='URL'
)
Expand Down Expand Up @@ -1779,6 +1840,7 @@ def print_namespase() -> None:
f'\tMessage : {CLI.split_long_message}\n'
f'\tUse Telegram : {CLI.use_telegram}\n'
f'\tProxy for Telegram : {CLI.proxy}\n'
f'\tSocks for internal whois : {CLI.proxy_internal_whois}\n'
f'\tEmail to : {CLI.email_to}\n'
f'\tEmail subject : {CLI.email_subject}\n'
f'\tEmail SSL : {CLI.email_ssl}\n'
Expand Down Expand Up @@ -2736,6 +2798,52 @@ def check_cli_logic() -> None:
TELEGRAM_PROXIES['http'] = CLI.proxy
TELEGRAM_PROXIES['https'] = CLI.proxy

if CLI.proxy_internal_whois and CLI.use_only_external_whois:
print(
f"{FRC}The Socks-proxy setting is for internal whois engine only. "
f"Don't use option {FLR}-oe{FRC}/{FLR}--use-only-external-whois{FRC} "
f"with option {FLR}-piw{FRC}/{FLR}--proxy-internal-whois"
)
sys.exit(-1)

if CLI.proxy_internal_whois and not CLI.use_only_external_whois:
os.environ['SOCKS']: str = CLI.proxy_internal_whois.strip()
socks_user, socks_password = None, None
if '@' in os.environ['SOCKS']:
creds, proxy = os.environ['SOCKS'].split('@')
socks_user, socks_password = creds.split(':')
else:
proxy = os.environ['SOCKS']
socksproxy, port = proxy.split(':')
socks_proto = socket.AF_INET

try:
if socket.AF_INET6 in [
sock[0] for sock in socket.getaddrinfo(socksproxy, port)
]:
socks_proto = socket.AF_INET6
except socket.error as e:
print(
f'{FLR}{str(e)}'
)

s = socks.socksocket(socks_proto)
s.set_proxy(
socks.SOCKS5, socksproxy, int(port), True, socks_user, socks_password
)
s.settimeout(10)
try:
s.connect(('google.com', 443))
s.close()
except socket.error as e:
print(
f'{FLR}{str(e)}\n'
f'{FRC}Check the availability of SOCKS5 proxy '
f'{FLR}{CLI.proxy_internal_whois.strip()}{FRC}\n'
)
s.close()
sys.exit(-1)

if CLI.print_to_console:
print_heading()

Expand Down

0 comments on commit e92d765

Please sign in to comment.