webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Das kleine AJAX-Bandbreitenmeter gefixt. Zeigte zu hohe Werte aufgrund eines Berechnungsfehlers an und die XML-Schnittstelle wurde nicht korrekt angesprochen.

Browse Source 
Bootsplash-Bilder entfernt.
Snort-Scripte nochmal getestet. Laedt die Updates korrekt und wird auch korrekt gestartet.
Snortctrl geschrieben, welche noch nicht aufgerufen wird.
Grub-Patch verschoben.
Clamav-Update.
CDRom-Auswurf getestet.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@606 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-06-04 16:50:12 +00:00
parent 8de160ffb9
commit 3ef6c343e0
20 changed files with 64 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
config/bootsplash/config/bootsplash-1024x768.cfg
View File

@@ -1,43 +0,0 @@
# This is the configuration file for the 1024x768 bootsplash picture.
#
# This file is necessary to specify the coordinates of the text box on
# the splash screen.
#
# Comments are welcome by stepan@suse.de
# config file version
version=3
# should the picture be displayed?
state=1
# fgcolor is the text forground color.
# bgcolor is the text background (i.e. transparent) color.
fgcolor=7
bgcolor=0
# (tx, ty) are the (x, y) coordinates of the text window in pixels.
# tw/th is the width/height of the text window in pixels.
tx=5
ty=110
tw=1014
th=658
# name of the picture file (full path recommended)
jpeg=/boot/splash/images/bootsplash-1024x768.jpg
silentjpeg=/boot/splash/images/silent-1024x768.jpg
progress_enable=1
# background
box silent noover 100 700 920 730 #515151
box silent inter 100 700 100 730 #ff0300 #fffa04 #ff0300 #fffa04
box silent 100 700 920 730 #ff0300 #fffa04 #ff0300 #fffa04
# black border
box silent 100 699 920 699 #b5b5b5
box silent 100 731 920 731 #b5b5b5
box silent 99 699 99 731 #b5b5b5
box silent 920 699 920 731 #b5b5b5
overpaintok=1

BIN
config/bootsplash/images/bootsplash-1024x768.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 23 KiB

BIN
config/bootsplash/images/silent-1024x768.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 82 KiB

2
config/rootfiles/common/misc-progs
View File

@@ -12,7 +12,7 @@ usr/local/bin/rebuildhosts
usr/local/bin/redctrl
usr/local/bin/monitorTraff
#usr/local/bin/restartapplejuice
usr/local/bin/restartsnort
usr/local/bin/snortctrl
usr/local/bin/restartssh
usr/local/bin/restartsyslogd
usr/local/bin/restartwireless

2
doc/language_issues.de
View File

@@ -264,6 +264,7 @@ WARNING: translation string unused: proxy no proxy local
WARNING: translation string unused: psk
WARNING: translation string unused: read sectors
WARNING: translation string unused: reboot schedule
WARNING: translation string unused: rebooting
WARNING: translation string unused: refresh update list
WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
@@ -284,6 +285,7 @@ WARNING: translation string unused: shaping list options
WARNING: translation string unused: shared memory
WARNING: translation string unused: shutdown control
WARNING: translation string unused: shutdown2
WARNING: translation string unused: shutting down
WARNING: translation string unused: sitekeyfile
WARNING: translation string unused: smbreload
WARNING: translation string unused: squid extension methods

2
doc/language_issues.en
View File

@@ -273,6 +273,7 @@ WARNING: translation string unused: psk
WARNING: translation string unused: quick control
WARNING: translation string unused: read sectors
WARNING: translation string unused: reboot schedule
WARNING: translation string unused: rebooting
WARNING: translation string unused: refresh update list
WARNING: translation string unused: released
WARNING: translation string unused: reportfile
@@ -292,6 +293,7 @@ WARNING: translation string unused: show areas
WARNING: translation string unused: show lines
WARNING: translation string unused: shutdown control
WARNING: translation string unused: shutdown2
WARNING: translation string unused: shutting down
WARNING: translation string unused: sitekeyfile
WARNING: translation string unused: smbreload
WARNING: translation string unused: squid extension methods

1
doc/packages-list.txt
View File

@@ -54,6 +54,7 @@
* cdrtools-2.01
* cftp-0.12
* clamav-0.90.2
* clamav-0.90.3
* coreutils-5.96
* cpio-2.6
* cups-1.2.2

4
html/cgi-bin/speed.cgi
View File

@@ -52,10 +52,10 @@ if(( $rxb_diff == $rxb_now ) && ( $txb_diff == $txb_now ))
else
{
$rx_kbs = $rxb_diff / 1024;
$rx_kbs = $rx_kbs / 2.2;
$rx_kbs = $rx_kbs / 3.2;
$rx_kbs = int($rx_kbs);
$tx_kbs = $txb_diff / 1024;
$tx_kbs = $tx_kbs / 2.2;
$tx_kbs = $tx_kbs / 3.2;
$tx_kbs = int($tx_kbs);
}

2
html/html/themes/ipfire/include/functions.pl
View File

@@ -202,7 +202,7 @@ END
document.forms['speed'].rxkb.value = root2_node.firstChild.data;
// document.getElementsByTagName("input")[0].style.color = "#00FF00";
url = "/cgi/bin/speed.cgi?rxb_last=" + root3_node.firstChild.data + "&txb_last=" + root4_node.firstChild.data;
url = "/cgi-bin/speed.cgi?rxb_last=" + root3_node.firstChild.data + "&txb_last=" + root4_node.firstChild.data;
window.setTimeout("LoadInetInfo(url)", 3000);
}

4
lfs/clamav
View File

@@ -26,7 +26,7 @@
include Config
VER = 0.90.2
VER = 0.90.3
THISAPP = clamav-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 39d1f07a399b551b55096b6ec7325c33
$(DL_FILE)_MD5 = d42ccf7a32daeb7c7cc3c8c23a7793ea
install : $(TARGET)

2
lfs/grub
View File

@@ -77,7 +77,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# This fails, but doesn't matter
-cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-disk_geometry-1.patch
cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/grub-0.97/grub-gfxmenu-v8.diff
cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/grub-gfxmenu-v8.diff
cd $(DIR_APP) && perl -pi -e 's,/usr/lib/grub/i386-pc,/usr/share/grub/i386-pc,' docs/grub.texi
cd $(DIR_APP) && sed -i 's/AM_INIT_AUTOMAKE/&\nAM_PROG_AS/' configure.ac

10
src/initscripts/init.d/snort
View File

@@ -55,32 +55,36 @@ DNS2=`cat /var/ipfire/red/dns2`
if [ "$DNS2" ]; then
echo "var DNS_SERVERS [$DNS1,$DNS2]" >> /etc/snort/vars
else
echo "car DNS_SERVERS $DNS1" >> /etc/snort/vars
echo "var DNS_SERVERS $DNS1" >> /etc/snort/vars
fi
case "$1" in
start)
for DEVICE in $DEVICES; do
boot_mesg "Starting Intrusion Detection System on $DEVICE..."
loadproc /usr/sbin/snort -c snort.conf -i $DEVICE -D -l /var/log/snort --pid-path /var/run/snort_$DEVICE.pid
/usr/sbin/snort -c /etc/snort/snort.conf -i $DEVICE -D -l /var/log/snort --pid-path /var/run/snort_$DEVICE.pid
evaluate_retval
done
;;
stop)
for DEVICE in $DEVICES; do
boot_mesg "Stopping Intrusion Detection System on $DEVICE..."
killproc -p /var/run/snort_$DEVICE.pid /var/run
done
;;
status)
statusproc /usr/sbin/snort
;;
restart)
$0 stop
$0 start
;;
*)
echo "Usage: $0 {start|stop|restart|status|update}"
echo "Usage: $0 {start|stop|restart|status}"
exit 1
;;
esac

3
src/install+setup/install/Makefile
View File

@@ -23,8 +23,7 @@ clean :
######
OBJS=main.o ide.o cdrom.o nic.o net.o config.o ../libsmooth/libsmooth.o \
usb.o scsi.o unattended.o
OBJS=main.o ide.o nic.o net.o config.o ../libsmooth/libsmooth.o usb.o scsi.o unattended.o
install: $(OBJS)
$(LINK) $(OBJS) -o $@ $(LIBS)

27
src/install+setup/install/cdrom.c
View File

@@ -1,27 +0,0 @@
/* SmoothWall install program.
*
* This program is distributed under the terms of the GNU General Public
* Licence. See the file COPYING for details.
*
* (c) Lawrence Manning, 2001
* CDROM menu. Get "misc" driver name etc.
*
*/
#include "install.h"
extern FILE *flog;
extern char *mylog;
extern char **ctr;
/* Ejects the CDROM. returns 0 for failure, 1 for success. */
int ejectcdrom(char *dev)
{
char command;
sprintf(command, "eject -r /dev/%s", dev);
if (mysystem(command))
return 0;
else
return 1;
}

3
src/install+setup/install/main.c
View File

@@ -606,7 +606,8 @@ int main(int argc, char *argv[])
mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
mysystem("umount /cdrom");
ejectcdrom(sourcedrive);
snprintf(commandstring, STRING_SIZE, "eject /dev/%s", sourcedrive);
mysystem(commandstring);
if (!unattended) {
sprintf(message, ctr[TR_CONGRATULATIONS_LONG],

6
src/misc-progs/Makefile
View File

@@ -6,7 +6,7 @@ COMPILE=$(CC) $(CFLAGS)
PROGS = iowrap
SUID_PROGS = setdmzholes setportfw setfilters setxtaccess \
squidctrl restartssh ipfirereboot setaliases \
ipsecctrl timectrl dhcpctrl restartsnort \
ipsecctrl timectrl dhcpctrl snortctrl \
monitorTraff restartapplejuice rebuildhosts \
restartsyslogd logwatch openvpnctrl \
restartwireless getipstat qosctrl launch-ether-wake \
@@ -100,8 +100,8 @@ restartssh: restartssh.c setuid.o ../install+setup/libsmooth/varval.o
squidctrl: squidctrl.c setuid.o ../install+setup/libsmooth/varval.o
$(COMPILE) -I../install+setup/libsmooth/ squidctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
restartsnort: restartsnort.c setuid.o ../install+setup/libsmooth/varval.o
$(COMPILE) -I../install+setup/libsmooth/ restartsnort.c setuid.o ../install+setup/libsmooth/varval.o -o $@
snortctrl: snortctrl.c setuid.o ../install+setup/libsmooth/varval.o
$(COMPILE) -I../install+setup/libsmooth/ snortctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
restartsyslogd: restartsyslogd.c setuid.o ../install+setup/libsmooth/varval.o
$(COMPILE) -I../install+setup/libsmooth/ restartsyslogd.c setuid.o ../install+setup/libsmooth/varval.o -o $@

326
src/misc-progs/restartsnort.c
View File

@@ -1,326 +0,0 @@
/* SmoothWall helper program - restartsnort
*
* This program is distributed under the terms of the GNU General Public
* Licence. See the file COPYING for details.
*
* (c) Lawrence Manning, 2001
* Restarting snort.
*
* $Id: restartsnort.c,v 1.8.2.3 2005/10/16 12:36:14 rkerr Exp $
*
*/
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <string.h>
#include <fcntl.h>
#include <signal.h>
#include "libsmooth.h"
#include "setuid.h"
struct keyvalue *kv = NULL;
FILE *varsfile = NULL;
void exithandler(void)
{
if (varsfile)
fclose (varsfile);
if (kv)
freekeyvalues(kv);
}
int killsnort(char *interface)
{
int fd;
char pidname[STRING_SIZE] = "";
char buffer[STRING_SIZE] = "";
int pid;
sprintf(pidname, "/var/run/snort_%s.pid", interface);
if ((fd = open(pidname, O_RDONLY)) != -1)
{
if (read(fd, buffer, STRING_SIZE - 1) == -1)
fprintf(stderr, "Couldn't read from pid file\n");
else
{
pid = atoi(buffer);
if (pid <= 1)
fprintf(stderr, "Bad pid value\n");
else
{
if (kill(pid, SIGTERM) == -1)
fprintf(stderr, "Unable to send SIGTERM\n");
close (fd);
return 0;
}
}
close(fd);
}
return 1;
}
int main(int argc, char *argv[])
{
int fd = -1;
FILE *ifacefile, *ipfile, *dns1file, *dns2file;
char iface[STRING_SIZE] = "";
char locip[STRING_SIZE] = "";
char dns1[STRING_SIZE] = "";
char dns2[STRING_SIZE] = "";
char command[STRING_SIZE] = "";
char greendev[STRING_SIZE] = "";
char orangedev[STRING_SIZE] = "";
char bluedev[STRING_SIZE] = "";
char greenip[STRING_SIZE] = "";
char orangeip[STRING_SIZE] = "";
char blueip[STRING_SIZE] = "";
struct stat st;
int i;
int restartred = 0, restartgreen = 0, restartblue = 0, restartorange = 0;
if (!(initsetuid()))
exit(1);
atexit(exithandler);
for (i=0; i<argc; i++) {
if (!strcmp(argv[i], "red"))
restartred = 1;
if (!strcmp(argv[i], "orange"))
restartorange = 1;
if (!strcmp(argv[i], "blue"))
restartblue = 1;
if (!strcmp(argv[i], "green"))
restartgreen = 1;
}
kv = initkeyvalues();
if (!(readkeyvalues(kv, CONFIG_ROOT "/ethernet/settings")))
exit(1);
if (! findkey(kv, "GREEN_DEV", greendev)) {
fprintf(stderr, "Couldn't find GREEN device\n");
exit(1);
}
if (! strlen (greendev) > 0) {
fprintf(stderr, "Couldn't find GREEN device\n");
exit(1);
}
if (!VALID_DEVICE(greendev))
{
fprintf(stderr, "Bad GREEN_DEV: %s\n", greendev);
exit(1);
}
if (!(findkey(kv, "GREEN_ADDRESS", greenip))) {
fprintf(stderr, "Couldn't find GREEN address\n");
exit(1);
}
if (!VALID_IP(greenip)) {
fprintf(stderr, "Bad GREEN_ADDRESS: %s\n", greenip);
exit(1);
}
if (findkey(kv, "ORANGE_DEV", orangedev) && strlen (orangedev) > 0) {
if (!VALID_DEVICE(orangedev))
{
fprintf(stderr, "Bad ORANGE_DEV: %s\n", orangedev);
exit(1);
}
if (!(findkey(kv, "ORANGE_ADDRESS", orangeip))) {
fprintf(stderr, "Couldn't find ORANGE address\n");
exit(1);
}
if (!VALID_IP(orangeip)) {
fprintf(stderr, "Bad ORANGE_ADDRESS: %s\n", orangeip);
exit(1);
}
}
if (findkey(kv, "BLUE_DEV", bluedev) && strlen (bluedev) > 0) {
if (!VALID_DEVICE(bluedev))
{
fprintf(stderr, "Bad BLUE_DEV: %s\n", bluedev);
exit(1);
}
if (!(findkey(kv, "BLUE_ADDRESS", blueip))) {
fprintf(stderr, "Couldn't find BLUE address\n");
exit(1);
}
if (!VALID_IP(blueip)) {
fprintf(stderr, "Bad BLUE_ADDRESS: %s\n", blueip);
exit(1);
}
}
stat(CONFIG_ROOT "/red/active", &st);
if (S_ISREG(st.st_mode)) {
if (!(ifacefile = fopen(CONFIG_ROOT "/red/iface", "r")))
{
fprintf(stderr, "Couldn't open iface file\n");
exit(0);
}
if (fgets(iface, STRING_SIZE, ifacefile))
{
if (iface[strlen(iface) - 1] == '\n')
iface[strlen(iface) - 1] = '\0';
}
fclose(ifacefile);
if (!VALID_DEVICE(iface))
{
fprintf(stderr, "Bad iface: %s\n", iface);
exit(0);
}
if (!(ipfile = fopen(CONFIG_ROOT "/red/local-ipaddress", "r")))
{
fprintf(stderr, "Couldn't open local ip file\n");
exit(0);
}
if (fgets(locip, STRING_SIZE, ipfile))
{
if (locip[strlen(locip) - 1] == '\n')
locip[strlen(locip) - 1] = '\0';
}
fclose (ipfile);
if (strlen(locip) && !VALID_IP(locip))
{
fprintf(stderr, "Bad local IP: %s\n", locip);
exit(1);
}
if (!(dns1file = fopen(CONFIG_ROOT "/red/dns1", "r")))
{
fprintf(stderr, "Couldn't open dns1 file\n");
exit(0);
}
if (fgets(dns1, STRING_SIZE, dns1file))
{
if (dns1[strlen(dns1) - 1] == '\n')
dns1[strlen(dns1) - 1] = '\0';
}
fclose (dns1file);
if (strlen(dns1) && !VALID_IP(dns1))
{
fprintf(stderr, "Bad DNS1 IP: %s\n", dns1);
exit(1);
}
if (!(dns2file = fopen(CONFIG_ROOT "/red/dns2", "r")))
{
fprintf(stderr, "Couldn't open dns2 file\n");
exit(1);
}
if (fgets(dns2, STRING_SIZE, dns2file))
{
if (dns2[strlen(dns2) - 1] == '\n')
dns2[strlen(dns2) - 1] = '\0';
}
fclose (dns2file);
if (strlen(dns2) && !VALID_IP(dns2))
{
fprintf(stderr, "Bad DNS2 IP: %s\n", dns2);
exit(1);
}
}
if (restartred)
killsnort(iface);
if (restartblue)
killsnort(bluedev);
if (restartorange)
killsnort(orangedev);
if (restartgreen)
killsnort(greendev);
if (!(varsfile = fopen("/etc/snort/vars", "w")))
{
fprintf(stderr, "Couldn't create vars file\n");
exit(1);
}
if (strlen(blueip)) {
if (strlen(orangeip)) {
if (strlen(locip)) {
fprintf(varsfile, "var HOME_NET [%s,%s,%s,%s]\n", greenip, orangeip, blueip, locip);
} else {
fprintf(varsfile, "var HOME_NET [%s,%s,%s]\n", greenip, orangeip, blueip);
}
} else {
if (strlen(locip)) {
fprintf(varsfile, "var HOME_NET [%s,%s,%s]\n", greenip, blueip, locip);
} else {
fprintf(varsfile, "var HOME_NET [%s,%s]\n", greenip, blueip);
}
}
} else {
if (strlen(orangeip)) {
if (strlen(locip)) {
fprintf(varsfile, "var HOME_NET [%s,%s,%s]\n", greenip, orangeip, locip);
} else {
fprintf(varsfile, "var HOME_NET [%s,%s]\n", greenip, orangeip);
}
} else {
if (strlen(locip)) {
fprintf(varsfile, "var HOME_NET [%s,%s]\n", greenip, locip);
} else {
fprintf(varsfile, "var HOME_NET [%s]\n", greenip);
}
}
}
if (strlen(dns1))
{
if (strlen(dns2))
fprintf(varsfile, "var DNS_SERVERS [%s,%s]\n", dns1, dns2);
else
fprintf(varsfile, "var DNS_SERVERS %s\n", dns1);
} else {
fprintf(varsfile, "var DNS_SERVERS []\n");
}
fclose(varsfile);
varsfile = NULL;
if (restartred && strlen(iface) && (fd = open(CONFIG_ROOT "/snort/enable", O_RDONLY)) != -1)
{
close(fd);
snprintf(command, STRING_SIZE -1,
"/usr/sbin/snort -c /etc/snort/snort.conf -D -u snort -g snort -d -e -o -p -b -A fast -m 022 -i %s",
iface);
safe_system(command);
}
if (restartblue && strlen(bluedev) && (fd = open(CONFIG_ROOT "/snort/enable_blue", O_RDONLY)) != -1 && bluedev)
{
close(fd);
snprintf(command, STRING_SIZE -1,
"/usr/sbin/snort -c /etc/snort/snort.conf -D -u snort -g snort -d -e -o -p -b -A fast -m 022 -i %s",
bluedev);
safe_system(command);
}
if (restartorange && strlen(orangedev) && (fd = open(CONFIG_ROOT "/snort/enable_orange", O_RDONLY)) != -1 && orangedev)
{
close(fd);
snprintf(command, STRING_SIZE -1,
"/usr/sbin/snort -c /etc/snort/snort.conf -D -u snort -g snort -d -e -o -p -b -A fast -m 022 -i %s",
orangedev);
safe_system(command);
}
if (restartgreen && (fd = open(CONFIG_ROOT "/snort/enable_green", O_RDONLY)) != -1)
{
close(fd);
snprintf(command, STRING_SIZE -1,
"/usr/sbin/snort -c /etc/snort/snort.conf -D -u snort -g snort -d -e -o -p -b -A fast -m 022 -i %s",
greendev);
safe_system(command);
}
return 0;
}

38
src/misc-progs/snortctrl.c Normal file
View File

@@ -0,0 +1,38 @@
/* This file is part of the IPFire Firewall.
*
* This program is distributed under the terms of the GNU General Public
* Licence. See the file COPYING for details.
*
*/
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <sys/types.h>
#include <fcntl.h>
#include "setuid.h"
int main(int argc, char *argv[]) {
if (!(initsetuid()))
exit(1);
if (argc < 2) {
fprintf(stderr, "\nNo argument given.\n\nsnortctrl (start|stop|restart)\n\n");
exit(1);
}
if (strcmp(argv[1], "start") == 0) {
safe_system("/etc/rc.d/init.d/snort start");
} else if (strcmp(argv[1], "stop") == 0) {
safe_system("/etc/rc.d/init.d/snort stop");
} else if (strcmp(argv[1], "restart") == 0) {
safe_system("/etc/rc.d/init.d/snort restart");
} else {
fprintf(stderr, "\nBad argument given.\n\nsnortctrl (start|stop|restart)\n\n");
exit(1);
}
return 0;
}

2
src/misc-progs/squidctrl.c
View File

@@ -38,7 +38,7 @@ int main(int argc, char *argv[]) {
} else if (strcmp(argv[1], "disable") == 0) {
safe_system("rm -f /etc/rc.d/rc*.d/*squid >/dev/null 2>&1");
} else {
fprintf(stderr, "\nBad argument given.\n\nredctrl (start|stop|restart|flush)\n\n");
fprintf(stderr, "\nBad argument given.\n\nsquidctrl (start|stop|restart|flush)\n\n");
exit(1);
}

0
src/patches/grub-0.97/grub-gfxmenu-v8.diff → src/patches/grub-gfxmenu-v8.diff
View File