mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-24 09:25:01 +00:00
Code Issues Releases Activity

(c) Rong-En Fan's, http://rafan.infor.org/patch/sshit.diff

Browse Source 
In the code, the author uses two level hash, and IPC::Shareable
will create a share memory for those anonymouse object (the second
level hash). Those share memory will not be removed when sshit exists
or when the rule is removed. Running sshit for a period of time,
the number of share memory and semaphore will reach the limit for
one process, then sshit.pl can not get more share memory, thus it
quits. The only solution is to manually remove all share memory and
semaphore.

This is somehow the limitation of using IPC::Shareable. To workaround
this problem. The patch will removes associated firewall rules when
syslogd closes the fd [1], and use IPC::Shareable->clean_up
to remove all shm/sem created by this process. I also set 'destroy'
to 1 so the shm tied to %list can be removed.

The second hunk is to fix a typo for ipfw2. Due to this typo,
ip in ipfw2's table cat not be removed. That means once blocked,
the client is blocked until reboot or admin cleanup the table.

[1] if any log files are rotated, newsyslog sends a HUP to syslogd,
    syslogd will close *all* current open fd and reopen them. At
    that time, the sshit.pl's stdin will be closed, thus the main
    program will exit.

PR:		ports/100726
Submitted by:	Alex Samorukov <samm at os2.kiev.ua>
Approved by:	Jui-Nan Eric Lin <jnlin at csie.NCTU.edu.tw> (maintainer)
Obtained from:	rafan
This commit is contained in:
Rong-En Fan 2006-07-27 10:32:56 +00:00
parent 56dbe82033
commit 0db78c0234
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=168871
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
security/sshit/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= sshit
PORTVERSION= 0.5
PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://anp.ath.cx/sshit/ \
${MASTER_SITE_LOCAL}

39
security/sshit/files/patch-sshit.pl Normal file
View File

@ -0,0 +1,39 @@
--- /usr/ports/security/sshit/work/sshit-0.5/sshit.pl Sat Dec 17 19:40:24 2005
+++ sshit.pl Sat Apr 29 08:39:06 2006
@@ -232,7 +232,7 @@
create => 1,
exclusive => 0,
mode => 0644,
- destroy => 0,
+ destroy => 1,
);
$handle = tie %list, 'IPC::Shareable', 'sshi', { %options };
@@ -266,7 +266,7 @@
{
system("$IPFW_CMD delete $list{$ip}{rulenr}");
} elsif ($FIREWALL_TYPE =~ /^ipfw2$/i) {
- system("$IPFW2_CMD table $IPFW_TABLE_NO delete $ip");
+ system("$IPFW2_CMD table $IPFW2_TABLE_NO delete $ip");
} elsif ($FIREWALL_TYPE =~ /^pf$/i) {
system("$PFCTL_CMD -t $PF_TABLE -Tdelete $ip");
}
@@ -337,3 +337,18 @@
}
}
}
+foreach $ip (keys %list) {
+ if($FIREWALL_TYPE =~ /^ipfw$/i)
+ {
+ system("$IPFW_CMD delete $list{$ip}{rulenr}");
+ } elsif ($FIREWALL_TYPE =~ /^ipfw2$/i) {
+ system("$IPFW2_CMD table $IPFW2_TABLE_NO delete $ip");
+ } elsif ($FIREWALL_TYPE =~ /^pf$/i) {
+ system("$PFCTL_CMD -t $PF_TABLE -Tdelete $ip");
+ }
+ syslog(LOG_ERR, "main removed block rule $list{$ip}{rulenr} for $ip (reset time of $RESET_IP seconds reached)\n");
+ delete($list{$ip});
+}
+
+# clear all SHM
+IPC::Shareable->clean_up;