Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
gsauthof-utility
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
external
gsauthof-utility
Commits
63df339e
Commit
63df339e
authored
3 years ago
by
Georg Sauthoff
Browse files
Options
Downloads
Patches
Plain Diff
switch to non-deprecated API
parent
d9f1bd79
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
check-dnsbl.py
+12
-12
12 additions, 12 deletions
check-dnsbl.py
gms-utils.spec
+1
-1
1 addition, 1 deletion
gms-utils.spec
with
13 additions
and
13 deletions
check-dnsbl.py
+
12
−
12
View file @
63df339e
...
...
@@ -189,7 +189,7 @@ def get_addrs(dest, mx=True):
domains
=
[
dest
]
if
mx
:
try
:
r
=
dns
.
resolver
.
query
(
dest
,
'
mx
'
)
r
=
dns
.
resolver
.
resolve
(
dest
,
'
mx
'
,
search
=
True
)
domains
=
[
answer
.
exchange
for
answer
in
r
]
log
.
debug
(
'
destinatin {} has MXs: {}
'
.
format
(
dest
,
'
,
'
.
join
([
str
(
d
)
for
d
in
domains
])))
...
...
@@ -199,7 +199,7 @@ def get_addrs(dest, mx=True):
for
domain
in
domains
:
for
t
in
[
'
a
'
,
'
aaaa
'
]:
try
:
r
=
dns
.
resolver
.
query
(
domain
,
t
)
r
=
dns
.
resolver
.
resolve
(
domain
,
t
,
search
=
True
)
except
dns
.
resolver
.
NoAnswer
:
continue
xs
=
[
(
answer
.
address
,
domain
)
for
answer
in
r
]
...
...
@@ -216,12 +216,12 @@ def check_dnsbl(addr, bl):
rev
=
dns
.
reversename
.
from_address
(
addr
)
domain
=
str
(
rev
.
split
(
3
)[
0
])
+
'
.
'
+
bl
try
:
r
=
dns
.
resolver
.
query
(
domain
,
'
a
'
)
r
=
dns
.
resolver
.
resolve
(
domain
,
'
a
'
,
search
=
True
)
except
(
dns
.
resolver
.
NXDOMAIN
,
dns
.
resolver
.
NoNameservers
,
dns
.
resolver
.
NoAnswer
):
return
0
address
=
list
(
r
)[
0
].
address
try
:
r
=
dns
.
resolver
.
query
(
domain
,
'
txt
'
)
r
=
dns
.
resolver
.
resolve
(
domain
,
'
txt
'
,
search
=
True
)
txt
=
list
(
r
)[
0
].
to_text
()
except
(
dns
.
resolver
.
NoAnswer
,
dns
.
resolver
.
NXDOMAIN
):
txt
=
''
...
...
@@ -237,7 +237,7 @@ def check_rdns(addrs):
log
.
debug
(
'
Check if there is a reverse DNS record that maps address {} to {}
'
.
format
(
addr
,
domain
))
try
:
r
=
dns
.
resolver
.
query
(
dns
.
reversename
.
from_address
(
addr
),
'
ptr
'
)
r
=
dns
.
resolver
.
resolve
(
dns
.
reversename
.
from_address
(
addr
),
'
ptr
'
,
search
=
True
)
a
=
list
(
r
)[
0
]
target
=
str
(
a
.
target
).
lower
()
source
=
str
(
domain
).
lower
()
...
...
@@ -316,7 +316,7 @@ if __name__ == '__main__':
#
## In[ ]:
#
#r = dns.resolver.
query
(dns.reversename.from_address('89.238.75.224'), 'ptr')
#r = dns.resolver.
resolve
(dns.reversename.from_address('89.238.75.224'), 'ptr'
, search=True
)
#a = list(r)[0]
#a.target.to_text()
#
...
...
@@ -360,7 +360,7 @@ if __name__ == '__main__':
## In[ ]:
#
## as of 2016-11, listed
#r = dns.resolver.
query
('39.227.103.116.zen.spamhaus.org', 'txt')
#r = dns.resolver.
resolve
('39.227.103.116.zen.spamhaus.org', 'txt'
, search=True
)
#answer = list(r)[0]
#answer.to_text()
#
...
...
@@ -388,7 +388,7 @@ if __name__ == '__main__':
#
## In[ ]:
#
#a = dns.resolver.
query
('georg.so', 'MX')
#a = dns.resolver.
resolve
('georg.so', 'MX'
, search=True
)
#
#
## In[ ]:
...
...
@@ -404,7 +404,7 @@ if __name__ == '__main__':
## In[ ]:
#
#[ x.exchange for x in a]
#dns.resolver.
query
(list(a)[0].exchange, 'a')
#dns.resolver.
resolve
(list(a)[0].exchange, 'a'
, search=True
)
#
#
## In[ ]:
...
...
@@ -416,14 +416,14 @@ if __name__ == '__main__':
## In[ ]:
#
## should throw NoAnswer
#a = dns.resolver.
query
('escher.lru.li', 'mx')
#a = dns.resolver.
resolve
('escher.lru.li', 'mx'
, search=True
)
##b = list(a)
#a
#
#
## In[ ]:
#
#a = dns.resolver.
query
('georg.so', 'a')
#a = dns.resolver.
resolve
('georg.so', 'a'
, search=True
)
#b = list(a)[0]
#b.address
#dns.reversename.from_address(b.address)
...
...
@@ -433,7 +433,7 @@ if __name__ == '__main__':
#
## should throw NXDOMAIN
#rs = str(r.split(3)[0])
#dns.resolver.
query
(rs + '.zen.spamhaus.org', 'A' )
#dns.resolver.
resolve
(rs + '.zen.spamhaus.org', 'A'
, search=True
)
#
#
## In[ ]:
...
...
This diff is collapsed.
Click to expand it.
gms-utils.spec
+
1
−
1
View file @
63df339e
...
...
@@ -12,7 +12,7 @@
%endif
Name: gms-utils
Version: 0.5.
5
Version: 0.5.
6
Release: 1%{?dist}
Summary: Collection of command line utilities
URL: https://github.com/gsauthof/utility
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment