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
Klaus Wölfel
slapos.core
Commits
29ea31cf
Commit
29ea31cf
authored
Mar 25, 2015
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Computer partition firewall configuration
parent
e98e0734
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
157 additions
and
0 deletions
+157
-0
slapos/grid/slapgrid.py
slapos/grid/slapgrid.py
+142
-0
slapos/grid/templates/iptables-ipv4-firewall-add.in
slapos/grid/templates/iptables-ipv4-firewall-add.in
+0
-0
slapos/slap/interface/slap.py
slapos/slap/interface/slap.py
+6
-0
slapos/slap/slap.py
slapos/slap/slap.py
+9
-0
No files found.
slapos/grid/slapgrid.py
View file @
29ea31cf
...
@@ -59,6 +59,7 @@ from slapos.grid.svcbackend import (launchSupervisord,
...
@@ -59,6 +59,7 @@ from slapos.grid.svcbackend import (launchSupervisord,
from
slapos.grid.utils
import
(
md5digest
,
dropPrivileges
,
SlapPopen
)
from
slapos.grid.utils
import
(
md5digest
,
dropPrivileges
,
SlapPopen
)
from
slapos.human
import
human2bytes
from
slapos.human
import
human2bytes
import
slapos.slap
import
slapos.slap
from
netaddr
import
valid_ipv4
,
valid_ipv6
# XXX: should be moved to SLAP library
# XXX: should be moved to SLAP library
...
@@ -524,6 +525,137 @@ class Slapgrid(object):
...
@@ -524,6 +525,137 @@ class Slapgrid(object):
if
not
promise_present
:
if
not
promise_present
:
self
.
logger
.
info
(
"No promise."
)
self
.
logger
.
info
(
"No promise."
)
def
_checkAddFirewallRules
(
self
,
command_list
,
check_command_list
,
add
=
True
):
"""
"""
size
=
len
(
command_list
)
for
i
in
range
(
0
,
size
):
command
=
command_list
.
pop
()
check_command
=
check_command_list
.
pop
()
# Check if this rule exists in iptables
check_result
=
subprocess
.
call
(
check_command
)
self
.
logger
.
info
(
check_command
)
self
.
logger
.
info
(
' '
.
join
(
command
))
if
check_result
and
add
:
# Add rule when it doesn't exist in iptables
subprocess
.
check_call
(
command
)
elif
not
check_result
and
not
add
:
# Drop rule when it exists in iptables
subprocess
.
check_call
(
command
)
def
_addIPv4FirewallRules
(
self
,
ipv4
,
ipv4_list
):
"""
"""
command_list
=
[]
check_command_list
=
[]
for
ip
in
ipv4_list
:
# Configure INPUT rules
check_command_list
.
append
([
'iptables'
,
'-C'
,
'INPUT'
,
'-s'
,
'%s'
%
ip
,
'-d'
,
'%s'
%
ipv4
,
'-j'
,
'ACCEPT'
])
command_list
.
append
([
'iptables'
,
'-I'
,
'INPUT'
,
'-s'
,
'%s'
%
ip
,
'-d'
,
'%s'
%
ipv4
,
'-j'
,
'ACCEPT'
])
# Configure OUTPUT rules
check_command_list
.
append
([
'iptables'
,
'-C'
,
'OUTPUT'
,
'-s'
,
'%s'
%
ipv4
,
'-d'
,
'%s'
%
ip
,
'-j'
,
'ACCEPT'
])
command_list
.
append
([
'iptables'
,
'-I'
,
'OUTPUT'
,
'-s'
,
'%s'
%
ipv4
,
'-d'
,
'%s'
%
ip
,
'-j'
,
'ACCEPT'
])
# Configure FORWARD rules
check_command_list
.
append
([
'iptables'
,
'-C'
,
'FORWARD'
,
'-s'
,
'%s'
%
ip
,
'-d'
,
'%s'
%
ipv4
,
'-j'
,
'ACCEPT'
])
command_list
.
append
([
'iptables'
,
'-I'
,
'FORWARD'
,
'-s'
,
'%s'
%
ip
,
'-d'
,
'%s'
%
ipv4
,
'-j'
,
'ACCEPT'
])
# Cancel all other INPUT requests
check_command_list
.
append
([
'iptables'
,
'-C'
,
'INPUT'
,
'-d'
,
'%s'
%
ipv4
,
'-j'
,
'DROP'
])
command_list
.
append
([
'iptables'
,
'-A'
,
'INPUT'
,
'-d'
,
'%s'
%
ipv4
,
'-j'
,
'DROP'
])
# Cancel all other OUTPUT requests
check_command_list
.
append
([
'iptables'
,
'-C'
,
'OUTPUT'
,
'-s'
,
'%s'
%
ipv4
,
'-j'
,
'DROP'
])
command_list
.
append
([
'iptables'
,
'-A'
,
'OUTPUT'
,
'-s'
,
'%s'
%
ipv4
,
'-j'
,
'DROP'
])
# Cancel all other FORWARD requests
check_command_list
.
append
([
'iptables'
,
'-C'
,
'FORWARD'
,
'-d'
,
'%s'
%
ipv4
,
'-j'
,
'DROP'
])
command_list
.
append
([
'iptables'
,
'-A'
,
'FORWARD'
,
'-d'
,
'%s'
%
ipv4
,
'-j'
,
'DROP'
])
self
.
_checkAddFirewallRules
(
command_list
,
check_command_list
)
def
_dropIPv4FirewallRules
(
self
,
ipv4
,
ipv4_list
):
"""
"""
command_list
=
[]
check_command_list
=
[]
for
ip
in
ipv4_list
:
# Configure INPUT rules
check_command_list
.
append
([
'iptables'
,
'-C'
,
'INPUT'
,
'-s'
,
'%s'
%
ip
,
'-d'
,
'%s'
%
ipv4
,
'-j'
,
'ACCEPT'
])
command_list
.
append
([
'iptables'
,
'-D'
,
'INPUT'
,
'-s'
,
'%s'
%
ip
,
'-d'
,
'%s'
%
ipv4
,
'-j'
,
'ACCEPT'
])
# Configure OUTPUT rules
check_command_list
.
append
([
'iptables'
,
'-C'
,
'OUTPUT'
,
'-s'
,
'%s'
%
ipv4
,
'-d'
,
'%s'
%
ip
,
'-j'
,
'ACCEPT'
])
command_list
.
append
([
'iptables'
,
'-D'
,
'OUTPUT'
,
'-s'
,
'%s'
%
ipv4
,
'-d'
,
'%s'
%
ip
,
'-j'
,
'ACCEPT'
])
# Configure FORWARD rules
check_command_list
.
append
([
'iptables'
,
'-C'
,
'FORWARD'
,
'-s'
,
'%s'
%
ip
,
'-d'
,
'%s'
%
ipv4
,
'-j'
,
'ACCEPT'
])
command_list
.
append
([
'iptables'
,
'-D'
,
'FORWARD'
,
'-s'
,
'%s'
%
ip
,
'-d'
,
'%s'
%
ipv4
,
'-j'
,
'ACCEPT'
])
# Cancel all other INPUT requests
check_command_list
.
append
([
'iptables'
,
'-C'
,
'INPUT'
,
'-d'
,
'%s'
%
ipv4
,
'-j'
,
'DROP'
])
command_list
.
append
([
'iptables'
,
'-D'
,
'INPUT'
,
'-d'
,
'%s'
%
ipv4
,
'-j'
,
'DROP'
])
# Cancel all other OUTPUT requests
check_command_list
.
append
([
'iptables'
,
'-C'
,
'OUTPUT'
,
'-s'
,
'%s'
%
ipv4
,
'-j'
,
'DROP'
])
command_list
.
append
([
'iptables'
,
'-D'
,
'OUTPUT'
,
'-s'
,
'%s'
%
ipv4
,
'-j'
,
'DROP'
])
# Cancel all other FORWARD requests
check_command_list
.
append
([
'iptables'
,
'-C'
,
'FORWARD'
,
'-d'
,
'%s'
%
ipv4
,
'-j'
,
'DROP'
])
command_list
.
append
([
'iptables'
,
'-D'
,
'FORWARD'
,
'-d'
,
'%s'
%
ipv4
,
'-j'
,
'DROP'
])
self
.
_checkAddFirewallRules
(
command_list
,
check_command_list
,
add
=
False
)
def
_setupComputerPartitionFirewall
(
self
,
ip_list
,
hosting_ip_list
,
drop_entries
=
False
):
"""
Using linux iptables, limit access to IP of this partition to all
others partitions of the same Hosting Subscription
"""
ipv4_list
=
[]
ipv6_list
=
[]
hosting_ipv4_list
=
[]
hosting_ipv6_list
=
[]
for
iface
,
ip
in
ip_list
:
if
valid_ipv4
(
ip
):
ipv4_list
.
append
(
ip
)
elif
valid_ipv6
(
ip
):
ipv6_list
.
append
(
ip
)
for
iface
,
ip
in
hosting_ip_list
:
if
valid_ipv4
(
ip
):
if
not
ip
in
ipv4_list
:
hosting_ipv4_list
.
append
(
ip
)
elif
valid_ipv6
(
ip
):
if
not
ip
in
ipv6_list
:
hosting_ipv6_list
.
append
(
ip
)
if
not
drop_entries
:
# Add or updare firewall configuration
self
.
logger
.
info
(
"Configuring firewall..."
)
for
ip
in
ipv4_list
:
self
.
_addIPv4FirewallRules
(
ip
,
hosting_ipv4_list
)
else
:
# Remove firewall configuration
self
.
logger
.
info
(
"Removing firewall configuration..."
)
for
ip
in
ipv4_list
:
self
.
_dropIPv4FirewallRules
(
ip
,
hosting_ipv4_list
)
def
processComputerPartition
(
self
,
computer_partition
):
def
processComputerPartition
(
self
,
computer_partition
):
"""
"""
...
@@ -657,11 +789,17 @@ class Slapgrid(object):
...
@@ -657,11 +789,17 @@ class Slapgrid(object):
# XXX this line breaks 37 tests
# XXX this line breaks 37 tests
# self.logger.info(' Instance type: %s' % computer_partition.getType())
# self.logger.info(' Instance type: %s' % computer_partition.getType())
self
.
logger
.
info
(
' Instance status: %s'
%
computer_partition_state
)
self
.
logger
.
info
(
' Instance status: %s'
%
computer_partition_state
)
partition_ip_list
=
parameter_dict
[
'ip_list'
]
+
parameter_dict
.
get
(
'full_ip_list'
,
[])
full_hosting_ip_list
=
computer_partition
.
getFullHostingIpAddressList
()
if
computer_partition_state
==
COMPUTER_PARTITION_STARTED_STATE
:
if
computer_partition_state
==
COMPUTER_PARTITION_STARTED_STATE
:
local_partition
.
install
()
local_partition
.
install
()
computer_partition
.
available
()
computer_partition
.
available
()
local_partition
.
start
()
local_partition
.
start
()
self
.
_setupComputerPartitionFirewall
(
partition_ip_list
,
full_hosting_ip_list
)
self
.
_checkPromises
(
computer_partition
)
self
.
_checkPromises
(
computer_partition
)
computer_partition
.
started
()
computer_partition
.
started
()
elif
computer_partition_state
==
COMPUTER_PARTITION_STOPPED_STATE
:
elif
computer_partition_state
==
COMPUTER_PARTITION_STOPPED_STATE
:
...
@@ -670,12 +808,16 @@ class Slapgrid(object):
...
@@ -670,12 +808,16 @@ class Slapgrid(object):
# propagate the state to children if any.
# propagate the state to children if any.
local_partition
.
install
()
local_partition
.
install
()
computer_partition
.
available
()
computer_partition
.
available
()
self
.
_setupComputerPartitionFirewall
(
partition_ip_list
,
full_hosting_ip_list
)
finally
:
finally
:
# Instance has to be stopped even if buildout/reporting is wrong.
# Instance has to be stopped even if buildout/reporting is wrong.
local_partition
.
stop
()
local_partition
.
stop
()
computer_partition
.
stopped
()
computer_partition
.
stopped
()
elif
computer_partition_state
==
COMPUTER_PARTITION_DESTROYED_STATE
:
elif
computer_partition_state
==
COMPUTER_PARTITION_DESTROYED_STATE
:
local_partition
.
stop
()
local_partition
.
stop
()
self
.
_setupComputerPartitionFirewall
(
partition_ip_list
,
full_hosting_ip_list
,
drop_entries
=
True
)
try
:
try
:
computer_partition
.
stopped
()
computer_partition
.
stopped
()
except
(
SystemExit
,
KeyboardInterrupt
):
except
(
SystemExit
,
KeyboardInterrupt
):
...
...
slapos/grid/templates/iptables-ipv4-firewall-add.in
0 → 100644
View file @
29ea31cf
slapos/slap/interface/slap.py
View file @
29ea31cf
...
@@ -331,6 +331,12 @@ class IComputerPartition(IBuildoutController, IRequester):
...
@@ -331,6 +331,12 @@ class IComputerPartition(IBuildoutController, IRequester):
text -- message log of the status
text -- message log of the status
"""
"""
def
getFullHostingIpAddressList
():
"""
Returns a dictionnary containing the latest status of the
computer partition.
"""
class
IComputer
(
Interface
):
class
IComputer
(
Interface
):
"""
"""
Computer interface specification
Computer interface specification
...
...
slapos/slap/slap.py
View file @
29ea31cf
...
@@ -604,6 +604,15 @@ class ComputerPartition(SlapRequester):
...
@@ -604,6 +604,15 @@ class ComputerPartition(SlapRequester):
}
}
)
)
return
xml_marshaller
.
loads
(
xml
)
return
xml_marshaller
.
loads
(
xml
)
def
getFullHostingIpAddressList
(
self
):
xml
=
self
.
_connection_helper
.
GET
(
'getHostingSubscriptionIpList'
,
params
=
{
'computer_id'
:
self
.
_computer_id
,
'computer_partition_id'
:
self
.
_partition_id
,
}
)
return
xml_marshaller
.
loads
(
xml
)
def
_addIpv6Brackets
(
url
):
def
_addIpv6Brackets
(
url
):
# if master_url contains an ipv6 without bracket, add it
# if master_url contains an ipv6 without bracket, add it
...
...
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