Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
DNS testing tools
Remoh
Commits
7296c3b5
Commit
7296c3b5
authored
Mar 20, 2020
by
Alexandre
Browse files
Define dot var in parent Connection object only
parent
2357797f
Changes
1
Hide whitespace changes
Inline
Side-by-side
homer.py
View file @
7296c3b5
...
...
@@ -230,13 +230,14 @@ class RequestDoH(Request):
class
Connection
:
def
__init__
(
self
,
server
,
servername
=
None
,
connect
=
None
,
forceIPv4
=
False
,
forceIPv6
=
False
,
dot
=
False
,
verbose
=
verbose
,
insecure
=
insecure
):
dot
=
dot
,
verbose
=
verbose
,
insecure
=
insecure
):
if
dot
and
not
is_valid_hostname
(
server
):
error
(
"DoT requires a host name or IP address, not
\"
%s
\"
"
%
server
)
if
not
dot
and
not
is_valid_url
(
url
):
error
(
"DoH requires a valid HTTPS URL, not
\"
%s
\"
"
%
server
)
if
forceIPv4
and
forceIPv6
:
raise
CustomException
(
"Force IPv4 *or* IPv6 but not both"
)
self
.
dot
=
dot
self
.
server
=
server
self
.
servername
=
servername
if
self
.
servername
is
not
None
:
...
...
@@ -274,9 +275,9 @@ class Connection:
class
ConnectionDoT
(
Connection
):
def
__init__
(
self
,
server
,
servername
=
None
,
connect
=
None
,
forceIPv4
=
False
,
forceIPv6
=
False
,
dot
=
False
,
verbose
=
verbose
,
insecure
=
insecure
):
verbose
=
verbose
,
insecure
=
insecure
):
Connection
.
__init__
(
self
,
server
,
servername
=
servername
,
connect
=
connect
,
forceIPv4
=
forceIPv4
,
forceIPv6
=
forceIPv6
,
dot
=
dot
,
forceIPv4
=
forceIPv4
,
forceIPv6
=
forceIPv6
,
dot
=
True
,
verbose
=
verbose
,
insecure
=
insecure
)
self
.
check_ip_address
(
self
.
server
)
self
.
hasher
=
hashlib
.
sha256
()
...
...
@@ -351,9 +352,9 @@ class ConnectionDoT(Connection):
class
ConnectionDoH
(
Connection
):
def
__init__
(
self
,
server
,
servername
=
None
,
connect
=
None
,
forceIPv4
=
False
,
forceIPv6
=
False
,
dot
=
False
,
verbose
=
verbose
,
insecure
=
insecure
):
verbose
=
verbose
,
insecure
=
insecure
):
Connection
.
__init__
(
self
,
server
,
servername
=
servername
,
connect
=
connect
,
forceIPv4
=
forceIPv4
,
forceIPv6
=
forceIPv6
,
dot
=
dot
,
forceIPv4
=
forceIPv4
,
forceIPv6
=
forceIPv6
,
dot
=
False
,
verbose
=
verbose
,
insecure
=
insecure
)
self
.
url
=
server
self
.
connect
=
connect
...
...
@@ -637,11 +638,11 @@ try:
else
:
extracheck
=
None
if
dot
:
conn
=
ConnectionDoT
(
url
,
dot
=
dot
,
servername
=
extracheck
,
connect
=
connectTo
,
verbose
=
verbose
,
conn
=
ConnectionDoT
(
url
,
servername
=
extracheck
,
connect
=
connectTo
,
verbose
=
verbose
,
forceIPv4
=
forceIPv4
,
forceIPv6
=
forceIPv6
,
insecure
=
insecure
)
else
:
conn
=
ConnectionDoH
(
url
,
dot
=
dot
,
servername
=
extracheck
,
connect
=
connectTo
,
verbose
=
verbose
,
conn
=
ConnectionDoH
(
url
,
servername
=
extracheck
,
connect
=
connectTo
,
verbose
=
verbose
,
forceIPv4
=
forceIPv4
,
forceIPv6
=
forceIPv6
,
insecure
=
insecure
)
except
TimeoutError
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment