Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xavier Thompson
slapos.core
Commits
d74a450a
Commit
d74a450a
authored
Nov 29, 2023
by
Xavier Thompson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
format: Normalize netmasks everywhere
parent
db0afb58
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
8 deletions
+23
-8
slapos/format.py
slapos/format.py
+23
-8
No files found.
slapos/format.py
View file @
d74a450a
...
...
@@ -144,6 +144,19 @@ class AddressGenerationError(Exception):
)
def
getNormalizedIfaddresses
(
iface
,
inet
):
"""
Keep a single representation for netmasks, to avoid netmasks like
ffff:ffff:ffff:ffff:ffff:ffff::/96
"""
address_list
=
netifaces
.
ifaddresses
(
iface
)[
inet
]
for
q
in
address_list
:
try
:
q
[
'netmask'
]
=
q
[
'netmask'
].
split
(
'/'
)[
0
]
except
KeyError
:
pass
return
address_list
def
getPublicIPv4Address
():
test_list
=
[
{
"url"
:
'https://api.ipify.org/?format=json'
,
"json_key"
:
"ip"
},
...
...
@@ -194,7 +207,7 @@ def getIfaceAddressIPv4(iface):
raise
ValueError
(
'Could not find interface called %s to use as gateway '
\
'for tap network'
%
iface
)
try
:
addresses_list
=
netifaces
.
ifaddresses
(
iface
)[
socket
.
AF_INET
]
addresses_list
=
getNormalizedIfaddresses
(
iface
,
socket
.
AF_INET
)
if
len
(
addresses_list
)
>
0
:
addresses
=
addresses_list
[
0
].
copy
()
...
...
@@ -1056,14 +1069,16 @@ class Interface(object):
Returns currently configured local IPv4 addresses which are in
ipv4_local_network
"""
if
not
socket
.
AF_INET
in
netifaces
.
ifaddresses
(
self
.
name
):
try
:
address_list
=
getNormalizedIfaddresses
(
self
.
name
,
socket
.
AF_INET
)
except
KeyError
:
return
[]
return
[
{
'addr'
:
q
[
'addr'
],
'netmask'
:
q
[
'netmask'
]
}
for
q
in
netifaces
.
ifaddresses
(
self
.
name
)[
socket
.
AF_INET
]
'addr'
:
q
[
'addr'
],
'netmask'
:
q
[
'netmask'
]
}
for
q
in
address_list
if
netaddr
.
IPAddress
(
q
[
'addr'
],
4
)
in
netaddr
.
glob_to_iprange
(
netaddr
.
cidr_to_glob
(
self
.
ipv4_local_network
))
]
...
...
@@ -1074,7 +1089,7 @@ class Interface(object):
try
:
address_list
=
[
q
for
q
in
netifaces
.
ifaddresses
(
interface_name
)[
socket
.
AF_INET6
]
for
q
in
getNormalizedIfaddresses
(
interface_name
,
socket
.
AF_INET6
)
if
isGlobalScopeAddress
(
q
[
'addr'
].
split
(
'%'
)[
0
])
]
except
KeyError
:
...
...
@@ -1087,7 +1102,7 @@ class Interface(object):
try
:
address_list
+=
[
q
for
q
in
netifaces
.
ifaddresses
(
tap
.
name
)[
socket
.
AF_INET6
]
for
q
in
getNormalizedIfaddresses
(
tap
.
name
,
socket
.
AF_INET6
)
if
isGlobalScopeAddress
(
q
[
'addr'
].
split
(
'%'
)[
0
])
]
except
KeyError
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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