Skip to content

Commit 5332dc4

Browse files
author
Till Brehm
committed
Fixed: FS#3506 - Firewall rules get mirrored to slave servers
1 parent b740e1e commit 5332dc4

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

server/plugins-available/firewall_plugin.inc.php

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,29 +76,31 @@ public function update($event_name, $data) {
7676
global $app, $conf;
7777

7878
//* load the server configuration options
79-
$app->uses('getconf');
80-
$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
81-
if($server_config['firewall'] == 'ufw') {
82-
$this->ufw_update($event_name, $data);
83-
} else {
84-
$this->bastille_update($event_name, $data);
79+
if(!$data['mirrored']) {
80+
$app->uses('getconf');
81+
$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
82+
if($server_config['firewall'] == 'ufw') {
83+
$this->ufw_update($event_name, $data);
84+
} else {
85+
$this->bastille_update($event_name, $data);
86+
}
8587
}
86-
8788
}
8889

8990
public function delete($event_name, $data) {
9091
global $app, $conf;
9192

9293
//* load the server configuration options
93-
$app->uses('getconf');
94-
$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
94+
if(!$data['mirrored']) {
95+
$app->uses('getconf');
96+
$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
9597

96-
if($server_config['firewall'] == 'ufw') {
97-
$this->ufw_delete($event_name, $data);
98-
} else {
99-
$this->bastille_delete($event_name, $data);
98+
if($server_config['firewall'] == 'ufw') {
99+
$this->ufw_delete($event_name, $data);
100+
} else {
101+
$this->bastille_delete($event_name, $data);
102+
}
100103
}
101-
102104
}
103105

104106
private function ufw_update($event_name, $data) {

0 commit comments

Comments
 (0)