paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added ip address to $f2b_options['perm_bans'] and $f2b_options['active_bans'] to fail2ban.inc (#4152) 

added link to bgp.he.net/ip/ in admin fail2ban overview
master
prey87 2021-06-28 07:07:29 +02:00 committed by GitHub
parent a78eb5cefe
commit f767a27859
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/web/admin.php
View File

@ -846,7 +846,7 @@ if (!isset($_SESSION['gal']) && $license_cache = $redis->Get('LICENSE_STATUS_CAC
if (!empty($f2b_data['active_bans'])): if (!empty($f2b_data['active_bans'])):
foreach ($f2b_data['active_bans'] as $active_bans): foreach ($f2b_data['active_bans'] as $active_bans):
?> ?>
<p><span class="label label-info" style="padding:4px;font-size:85%;"><i class="bi bi-funnel-fill"></i> <?=$active_bans['network'];?> (<?=$active_bans['banned_until'];?>) - <p><span class="label label-info" style="padding:4px;font-size:85%;"><i class="bi bi-funnel-fill"></i><a href="https://bgp.he.net/ip/<?=$active_bans['ip'];?>" target="_blank" style="color:white"> <?=$active_bans['network'];?></a>(<?=$active_bans['banned_until'];?>) -
<?php <?php
if ($active_bans['queued_for_unban'] == 0): if ($active_bans['queued_for_unban'] == 0):
?> ?>
@ -870,7 +870,7 @@ if (!isset($_SESSION['gal']) && $license_cache = $redis->Get('LICENSE_STATUS_CAC
if (!empty($f2b_data['perm_bans'])): if (!empty($f2b_data['perm_bans'])):
foreach ($f2b_data['perm_bans'] as $perm_bans): foreach ($f2b_data['perm_bans'] as $perm_bans):
?> ?>
<span class="label label-danger" style="padding: 0.1em 0.4em 0.1em;"><i class="bi bi-funnel-fill"></i> <?=$perm_bans?></span> <span class="label label-danger" style="padding: 0.1em 0.4em 0.1em;"><i class="bi bi-funnel-fill"></i><a href="https://bgp.he.net/ip/<?=$perm_bans['ip'];?>" target="_blank" style="color:white"> <?=$perm_bans['network'];?></a></span>
<?php <?php
endforeach; endforeach;
endif; endif;

7
data/web/inc/functions.fail2ban.inc.php
View File

@ -46,7 +46,11 @@ function fail2ban($_action, $_data = null) {
$pb = $redis->hGetAll('F2B_PERM_BANS'); $pb = $redis->hGetAll('F2B_PERM_BANS');
if (is_array($pb)) { if (is_array($pb)) {
foreach ($pb as $key => $value) { foreach ($pb as $key => $value) {
$f2b_options['perm_bans'][] = $key; $f2b_options['perm_bans'][] = array(
'network'=>$key,
'ip' => strtok($key,'/')
);
} }
} }
else { else {
@ -61,6 +65,7 @@ function fail2ban($_action, $_data = null) {
$f2b_options['active_bans'][] = array( $f2b_options['active_bans'][] = array(
'queued_for_unban' => $queued_for_unban, 'queued_for_unban' => $queued_for_unban,
'network' => $network, 'network' => $network,
'ip' => strtok($network,'/'),
'banned_until' => sprintf('%02dh %02dm %02ds', ($difference/3600), ($difference/60%60), $difference%60) 'banned_until' => sprintf('%02dh %02dm %02ds', ($difference/3600), ($difference/60%60), $difference%60)
); );
} }