Skip to content

Commit d87b386

Browse files
committed
B #6704: Perform SG and spoofing on input traffic
When the VM generates traffic addressed to the hypervisor it is handled as routed (not bridged) and handle through the INPUT chain (not the FORWARD chain). In this case, none of the iptables rules are applied to it so bypassing all SG rules, including anti-spoofing ones. This commit applies the egress rules to the VM traffic in this case. L #-: Liniting of fw driver B #-: Update call to DriverLogger to new structure (cherry picked from commit 3cc6e7a)
1 parent 5599a24 commit d87b386

File tree

34 files changed

+126
-92
lines changed

34 files changed

+126
-92
lines changed

src/vnm_mad/remotes/802.1Q/clean

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ begin
3333
xpath_filter,
3434
deploy_id)
3535
filter_driver.run_hooks(ARGV, template64) if filter_driver.deactivate == 0
36-
rescue Exception => e
37-
OpenNebula.log_error(e.message)
38-
OpenNebula.log_error(e.backtrace)
36+
rescue StandardError => e
37+
OpenNebula::DriverLogger.log_error(e.message)
38+
OpenNebula::DriverLogger.log_error(e.backtrace)
3939
exit 1
4040
end

src/vnm_mad/remotes/802.1Q/post

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ begin
3737

3838
filter_driver.run_hooks(ARGV, template64) if filter_driver.activate == 0
3939
rescue StandardError => e
40-
OpenNebula.log_error(e.message)
41-
OpenNebula.log_error(e.backtrace)
40+
OpenNebula::DriverLogger.log_error(e.message)
41+
OpenNebula::DriverLogger.log_error(e.backtrace)
4242
exit 1
4343
end

src/vnm_mad/remotes/802.1Q/update_nic

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ begin
4444
# VF - Related changes
4545
filter_driver.update_vf(filter_driver.vm, vn_id)
4646
rescue StandardError => e
47-
OpenNebula.log_error(e.message)
48-
OpenNebula.log_error(e.backtrace)
47+
OpenNebula::DriverLogger.log_error(e.message)
48+
OpenNebula::DriverLogger.log_error(e.backtrace)
4949
exit 1
5050
end

src/vnm_mad/remotes/802.1Q/update_sg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ begin
3131
xpath_filter,
3232
deploy_id)
3333
filter_driver.activate(true)
34-
rescue Exception => e
35-
OpenNebula.log_error(e.message)
36-
OpenNebula.log_error(e.backtrace)
34+
rescue StandardError => e
35+
OpenNebula::DriverLogger.log_error(e.message)
36+
OpenNebula::DriverLogger.log_error(e.backtrace)
3737
exit 1
3838
end

src/vnm_mad/remotes/bridge/clean

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ xpath_filter = "TEMPLATE/NIC[VN_MAD='bridge']"
2828
begin
2929
hm = VNMMAD::NoVLANDriver.from_base64(template64, xpath_filter, deploy_id)
3030
hm.run_hooks(ARGV, template64) if hm.deactivate == 0
31-
rescue Exception => e
32-
OpenNebula.log_error(e.message)
33-
OpenNebula.log_error(e.backtrace)
31+
rescue StandardError => e
32+
OpenNebula::DriverLogger.log_error(e.message)
33+
OpenNebula::DriverLogger.log_error(e.backtrace)
3434
exit 1
3535
end
3636

src/vnm_mad/remotes/bridge/update_nic

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ begin
3434
# VF - Related changes
3535
hm.update_vf(hm.vm, vn_id)
3636
rescue StandardError => e
37-
OpenNebula.log_error(e.message)
38-
OpenNebula.log_error(e.backtrace)
37+
OpenNebula::DriverLogger.log_error(e.message)
38+
OpenNebula::DriverLogger.log_error(e.backtrace)
3939
exit 1
4040
end

src/vnm_mad/remotes/ebtables/clean

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ begin
3333
xpath_filter,
3434
deploy_id)
3535
filter_driver.run_hooks(ARGV, template64) if filter_driver.deactivate == 0
36-
rescue Exception => e
37-
OpenNebula.log_error(e.message)
38-
OpenNebula.log_error(e.backtrace)
36+
rescue StandardError => e
37+
OpenNebula::DriverLogger.log_error(e.message)
38+
OpenNebula::DriverLogger.log_error(e.backtrace)
3939
exit 1
4040
end

src/vnm_mad/remotes/ebtables/post

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ begin
3333
xpath_filter,
3434
deploy_id)
3535
filter_driver.run_hooks(ARGV, template64) if filter_driver.activate == 0
36-
rescue Exception => e
37-
OpenNebula.log_error(e.message)
38-
OpenNebula.log_error(e.backtrace)
36+
rescue StandardError => e
37+
OpenNebula::DriverLogger.log_error(e.message)
38+
OpenNebula::DriverLogger.log_error(e.backtrace)
3939
exit 1
4040
end

src/vnm_mad/remotes/ebtables/update_sg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ begin
3131
xpath_filter,
3232
deploy_id)
3333
filter_driver.activate(true)
34-
rescue Exception => e
35-
OpenNebula.log_error(e.message)
36-
OpenNebula.log_error(e.backtrace)
34+
rescue StandardError => e
35+
OpenNebula::DriverLogger.log_error(e.message)
36+
OpenNebula::DriverLogger.log_error(e.backtrace)
3737
exit 1
3838
end

src/vnm_mad/remotes/elastic/clean

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ begin
7272

7373
drv.run_hooks_remote(ARGV, template64) if drv.deactivate == 0
7474
rescue StandardError => e
75-
OpenNebula.log_error(e.message)
76-
OpenNebula.log_error(e.backtrace)
75+
OpenNebula::DriverLogger.log_error(e.message)
76+
OpenNebula::DriverLogger.log_error(e.backtrace)
7777
exit 1
7878
end

0 commit comments

Comments
 (0)