webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-11 19:55:52 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,121 Commits 2 Branches 1 Tag
c51a044a2a93042605fc599eaccf69f49fa7bc87
Commit Graph

12121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefan Schantl
c51a044a2a ids.cgi: Add check when altering the ruleset 
Add a check if the currently processing sid is nummeric, otherwise skip it.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2018-07-26 11:46:00 +02:00
Stefan Schantl
525998650a ids.cgi: Rework code for downloading/updating the ruleset 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2018-07-26 11:45:37 +02:00
Stefan Schantl
56dacb580e ids.cgi: Move call of oinkmaster to an own subfunction 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2018-07-26 11:45:17 +02:00
Stefan Schantl
376595057b ids.cgi: Always write config files for enabled/disabled rule files 
If a single sid has been activated and then disabled without doing
any other ruleset modifications only one of the oinkmaster files
for enabled / disabled rules has been modified.

In this case it was possible, that the same sid, was part of the
file for enabled rules and part of the file for disabled rules at the
same time.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2018-07-26 11:45:02 +02:00
Stefan Schantl
466c67794b ids.cgi: Process enabled rulefiles in an own loop 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2018-07-26 11:44:48 +02:00
Stefan Schantl
603334734a ids.cgi: Drop enabled/disabled rules from cgiparams hash 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2018-07-26 11:44:32 +02:00
Stefan Schantl
b65b5ef377 ids.cgi: Drop enabled rulefile from cgiparams hash after processing 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2018-07-26 11:44:12 +02:00
Stefan Schantl
e573807983 ids.cgi: Re-add code for enable/disable rulefiles 
The enabled rulefiles (rule categories) now will be added
to an own file, which will be included by the snort main config
file.

This will allow us to update snort and push the new main config file
without loosing the activated rulesets anymore.

* Introducing snort-used-rulefiles.conf

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2018-07-26 11:43:36 +02:00
Stefan Schantl
0b89daee93 ids.cgi: Code cleanup 
* Drop a lot of unused variables and code.
* Re-ordering some code parts.
* Add a lot of comments.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2018-07-26 11:43:22 +02:00
Stefan Schantl
298723b9db ids.cgi: Re-add code to save the ruleset. 
The manually enabled or disabled rules by the user now will be written
to own config files, which will be used by oinkmaster to keep these rules
in the same state after a rules update has been performed.

In short words, if you adjust your ruleset, the changes will not be lost
again if you perform an update of your ruleset.

* Grabbing and storing the cgi values now in an own hash (%cgiparams)
* Introducing oinkmaster config files for enabled and disabled rules.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2018-07-26 11:43:05 +02:00
Stefan Schantl
0b568bb965 ids.cgi: Drop unused css code 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2018-07-26 11:42:09 +02:00
Stefan Schantl
177266446a ids.cgi: Rework code for displaying the single rules 
The complete ruleset will be grouped as categories by it's
corresponding rulefile and printed in hidden tables.

They easiely can be displayed by klicking on the show link and
vice-versa.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2018-07-26 11:41:55 +02:00
Stefan Schantl
f7fcd1c020 ids.cgi: Always display ruleset 
Display the rule categories any time and do not hide them
if no instance of snort is runing.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2018-07-26 11:41:31 +02:00
Stefan Schantl
e3ab140634 ids.cgi: Remove comment lines for snort rules control 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2018-07-26 11:41:15 +02:00
Stefan Schantl
3da6e01bcf ids.cgi: Refactor reading-in rule files. 
Move the code for reading and parsing the snort rule files
into an own subfunction.

* Drop code for reading in and modifying the snort main config file.
* Rework code for parsing and adding the snort rules to the snortrules hash.
* Drop code for gathering a description for the rule files, which does not
  because of a file layout change and sadly there is not suitable description
  shipped anymore by the snort team.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2018-07-26 11:40:51 +02:00
Stefan Schantl
a70d269a9a ids.cgi: Move function to end of file 
Move the function for doing the page refresh stuff to the end of the file and
do some layout changes for better reading the code.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2018-07-26 11:40:30 +02:00
Stefan Schantl
422204ff08 ids.cgi: Use pure perl for directory listing 
Use pure perl for getting the filelist of available
rule files instead of using a sub-shell and unix commands.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2018-07-26 11:40:27 +02:00
Stefan Schantl
fbd430172f ids.cgi: Drop old code for uploading a ruleset 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2018-07-26 11:39:40 +02:00
Stefan Schantl
ca745a2978 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2018-07-21 14:14:53 +02:00
Michael Tremer
4e4c122c58 aws: Add support for a script that can be executed at first boot 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-20 16:19:46 +01:00
Michael Tremer
ba06294341 aws: Always exit the init script cleanly 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-20 16:05:15 +01:00
Michael Tremer
04441d8a3c asterisk: Don't optimise for builder 
Asterisk enables -march=native which renders the code
incompatible to most systems.

Fixes: #11793

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-20 14:22:59 +00:00
Michael Tremer
011204d963 fireinfo: Import latest patches 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-20 12:06:11 +00:00
Stefan Schantl
b5ea63f85c Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2018-07-19 18:10:23 +02:00
Arne Fitzenreiter
413149f80d kernel: aarch64: enable virtio drivers 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2018-07-19 13:26:06 +01:00
Arne Fitzenreiter
0487a49fec u-boot: boot aarch64 kernel without -multi extension 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2018-07-19 09:29:44 +01:00
Arne Fitzenreiter
66a29eaa02 kernel: apply multi arch patchset for aarch64 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2018-07-19 09:28:27 +01:00
Michael Tremer
6a7e6b4499 AWS: Give setup user permissions to read its own SSH keys 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-14 15:06:39 +01:00
Michael Tremer
87d7fc6609 aws: Unlock setup account 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-14 14:20:18 +01:00
Michael Tremer
53eb49180e aws: Install SSH keys only for setup user 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-14 14:20:18 +01:00
Michael Tremer
e2d9fe7e16 aws: setup user should not be a system user 
Login is not permitted for system users

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-14 14:20:18 +01:00
Michael Tremer
0927eadc52 Rootfile update for aarch64 kernel 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-14 13:43:13 +01:00
Michael Tremer
68a36e26b1 aarch64: Remove -multi suffix from kernel 
This gets in the way for authoring the CD and we will
never have any other kernels but the main one.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-12 14:03:03 +01:00
Michael Tremer
347db51aa5 linux: Simplify compiling and installing the kernel 
There was loads of duplicated code which could have been
made shorter by adding one variable.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-12 14:02:47 +01:00
Michael Tremer
820e90db0f iptables: Ship all modules 
These have been all disabled with the last update of
the iptables package.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-12 10:04:37 +01:00
Michael Tremer
7471256910 Rootfile update 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-12 10:03:34 +01:00
Michael Tremer
693208bf63 aws: Don't start ssh right away 
sshctrl calls sshd directly which won't work at time of the first boot
because no keys will be generated.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-12 09:59:31 +01:00
Erik Kapfer
32405d88b0 OpenVPN: Deleted mtu-disc completely since it has been dropped. 
Signed-off-by: Erik Kapfer <erik.kapfer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-10 18:40:39 +01:00
Matthias Fischer
b38c334a25 clamav: Update to 0.100.1 
For details see:
https://blog.clamav.net/2018/07/clamav-01001-has-been-released.html

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-10 18:40:15 +01:00
Michael Tremer
1413006b5b aws: Create "setup" user to run setup 
Amazon does not permit that a user logs in as root directly.
Instead they insist on using sudo.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-10 18:40:06 +01:00
Stefan Schantl
fb22c9ffd9 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2018-07-08 08:34:37 +02:00
Michael Tremer
9aefd1ed07 usbutils: Update rootfile 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-03 20:01:46 +01:00
Arne Fitzenreiter
716c4751e7 spice-protocol: rootfile update 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2018-07-03 16:03:37 +01:00
Arne Fitzenreiter
904ae7929a libgcrypt: rootfile update 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2018-07-03 16:01:35 +01:00
Michael Tremer
a51b877f69 Update translations 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-03 15:33:04 +01:00
Erik Kapfer
400c8afd98 OpenVPN: x509 and DH-parameter check with Warnings and error messages in WUI 
Changes includes:
Own crypto warning and error message in WUI (can be extended to configuration too).
Check if DH-parameter is < 2048 bit with an error message and howto fix it.
Check if md5 is still in use with an error message and suggestion how to proceed further to fix it.
Check for soon needed RFC3280 TLS rules compliants and suggestion how to proceed further to fix it.
Disabled 1024 bit DH-parameter upload.
Changed de and en language files for DH-parameter upload (deleted 1024 bit).
Added explanations to de and en language files for the above changes.
Fixed Typo in en language file.

Signed-off-by: Erik Kapfer <erik.kapfer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-03 15:32:48 +01:00
Michael Tremer
55d590518d Revert "OpenVPN: Clarify fundamental crypto errors but also warnings in WUI" 
This reverts commit 15a3aa45cf.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-03 15:32:42 +01:00
Arne Fitzenreiter
37458540bf collect: fix cpufreq graph on some machines. 
the file cpuinfo_cur_freq does not exist on all systems that support collect
cpufreq data.

fixes #11739
 2018-07-03 15:09:40 +02:00
Arne Fitzenreiter
64252706ce Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next 2018-07-03 11:52:18 +01:00
Arne Fitzenreiter
1ac0d5c598 Merge branch 'aarch64' into next 
Conflicts:
	config/rootfiles/core/121/filelists/acpid
	config/rootfiles/core/121/filelists/apache2
	config/rootfiles/core/121/filelists/apr
	config/rootfiles/core/121/filelists/aprutil
	config/rootfiles/core/121/filelists/armv5tel/files
	config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood
	config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi
	config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood
	config/rootfiles/core/121/filelists/armv5tel/linux-multi
	config/rootfiles/core/121/filelists/armv5tel/rpi-firmware
	config/rootfiles/core/121/filelists/armv5tel/u-boot
	config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood
	config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage
	config/rootfiles/core/121/filelists/beep
	config/rootfiles/core/121/filelists/cmake
	config/rootfiles/core/121/filelists/crda
	config/rootfiles/core/121/filelists/dhcp
	config/rootfiles/core/121/filelists/flex
	config/rootfiles/core/121/filelists/i586/grub
	config/rootfiles/core/121/filelists/i586/intel-microcode
	config/rootfiles/core/121/filelists/i586/linux
	config/rootfiles/core/121/filelists/i586/linux-initrd
	config/rootfiles/core/121/filelists/iw
	config/rootfiles/core/121/filelists/jwhois
	config/rootfiles/core/121/filelists/libidn
	config/rootfiles/core/121/filelists/multipath-tools
	config/rootfiles/core/121/filelists/pcre
	config/rootfiles/core/121/filelists/tar
	config/rootfiles/core/121/filelists/unbound
	config/rootfiles/core/121/filelists/wget
	config/rootfiles/core/121/filelists/x86_64/grub
	config/rootfiles/core/121/filelists/x86_64/intel-microcode
	config/rootfiles/core/121/filelists/x86_64/linux
	config/rootfiles/core/121/filelists/x86_64/linux-initrd
	config/rootfiles/core/122/filelists/aarch64/files
	config/rootfiles/core/122/filelists/acpid
	config/rootfiles/core/122/filelists/apache2
	config/rootfiles/core/122/filelists/apr
	config/rootfiles/core/122/filelists/aprutil
	config/rootfiles/core/122/filelists/armv5tel/linux-initrd-kirkwood
	config/rootfiles/core/122/filelists/armv5tel/linux-initrd-multi
	config/rootfiles/core/122/filelists/armv5tel/linux-kirkwood
	config/rootfiles/core/122/filelists/armv5tel/linux-multi
	config/rootfiles/core/122/filelists/armv5tel/rpi-firmware
	config/rootfiles/core/122/filelists/armv5tel/u-boot
	config/rootfiles/core/122/filelists/armv5tel/u-boot-kirkwood
	config/rootfiles/core/122/filelists/armv5tel/u-boot-mkimage
	config/rootfiles/core/122/filelists/beep
	config/rootfiles/core/122/filelists/cmake
	config/rootfiles/core/122/filelists/crda
	config/rootfiles/core/122/filelists/dhcp
	config/rootfiles/core/122/filelists/flex
	config/rootfiles/core/122/filelists/i586/grub
	config/rootfiles/core/122/filelists/i586/intel-microcode
	config/rootfiles/core/122/filelists/i586/linux
	config/rootfiles/core/122/filelists/i586/linux-initrd
	config/rootfiles/core/122/filelists/iw
	config/rootfiles/core/122/filelists/jwhois
	config/rootfiles/core/122/filelists/libidn
	config/rootfiles/core/122/filelists/multipath-tools
	config/rootfiles/core/122/filelists/pcre
	config/rootfiles/core/122/filelists/tar
	config/rootfiles/core/122/filelists/unbound
	config/rootfiles/core/122/filelists/wget
	config/rootfiles/core/122/filelists/x86_64/grub
	config/rootfiles/core/122/filelists/x86_64/intel-microcode
	config/rootfiles/core/122/filelists/x86_64/linux
	config/rootfiles/core/122/filelists/x86_64/linux-initrd
	config/rootfiles/core/123/filelists/unbound
	config/rootfiles/oldcore/121/filelists/acpid
	config/rootfiles/oldcore/121/filelists/apache2
	config/rootfiles/oldcore/121/filelists/apr
	config/rootfiles/oldcore/121/filelists/aprutil
	config/rootfiles/oldcore/121/filelists/armv5tel/files
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-kirkwood
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-multi
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-rpi
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-kirkwood
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-multi
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-rpi
	config/rootfiles/oldcore/121/filelists/armv5tel/rpi-firmware
	config/rootfiles/oldcore/121/filelists/armv5tel/u-boot
	config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-kirkwood
	config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-mkimage
	config/rootfiles/oldcore/121/filelists/beep
	config/rootfiles/oldcore/121/filelists/cmake
	config/rootfiles/oldcore/121/filelists/crda
	config/rootfiles/oldcore/121/filelists/dhcp
	config/rootfiles/oldcore/121/filelists/flex
	config/rootfiles/oldcore/121/filelists/i586/grub
	config/rootfiles/oldcore/121/filelists/i586/intel-microcode
	config/rootfiles/oldcore/121/filelists/i586/linux
	config/rootfiles/oldcore/121/filelists/i586/linux-initrd
	config/rootfiles/oldcore/121/filelists/iw
	config/rootfiles/oldcore/121/filelists/jwhois
	config/rootfiles/oldcore/121/filelists/libidn
	config/rootfiles/oldcore/121/filelists/multipath-tools
	config/rootfiles/oldcore/121/filelists/pcre
	config/rootfiles/oldcore/121/filelists/tar
	config/rootfiles/oldcore/121/filelists/wget
	config/rootfiles/oldcore/121/filelists/x86_64/grub
	config/rootfiles/oldcore/121/filelists/x86_64/intel-microcode
	config/rootfiles/oldcore/121/filelists/x86_64/linux
	config/rootfiles/oldcore/121/filelists/x86_64/linux-initrd
	make.sh
 2018-07-03 11:52:05 +01:00