From 3576806af6e71a778efc011c5c1b0ce714398a7f Mon Sep 17 00:00:00 2001 From: Ermal Date: Mon, 9 Jul 2012 16:59:26 +0000 Subject: Remove all snort layout customizations since they cause issues allover and remove all unneeded files anymore. --- config/snort/css/sexybuttons.css | 342 -------------------- config/snort/css/style.css | 206 ------------ config/snort/images/alert.jpg | Bin 13730 -> 0 bytes config/snort/images/arrow_down.png | Bin 379 -> 0 bytes config/snort/images/awesome-overlay-sprite.png | Bin 214 -> 0 bytes config/snort/images/down.gif | Bin 54 -> 0 bytes config/snort/images/down2.gif | Bin 60 -> 0 bytes config/snort/images/footer.jpg | Bin 57411 -> 0 bytes config/snort/images/footer2.jpg | Bin 31878 -> 0 bytes config/snort/images/icon-table-sort-asc.png | Bin 2906 -> 0 bytes config/snort/images/icon-table-sort-desc.png | Bin 2913 -> 0 bytes config/snort/images/icon-table-sort.png | Bin 3025 -> 0 bytes config/snort/images/icon_excli.png | Bin 5280 -> 0 bytes config/snort/images/logo.jpg | Bin 74306 -> 0 bytes config/snort/images/logo22.png | Bin 27841 -> 0 bytes config/snort/images/page_white_text.png | Bin 342 -> 0 bytes config/snort/images/up.gif | Bin 54 -> 0 bytes config/snort/images/up2.gif | Bin 60 -> 0 bytes config/snort/snort.inc | 28 +- config/snort/snort.xml | 8 +- config/snort/snort_alerts.php | 1 - config/snort/snort_barnyard.php | 62 +--- config/snort/snort_blocked.php | 2 - config/snort/snort_define_servers.php | 111 +++---- config/snort/snort_download_updates.php | 4 +- config/snort/snort_gui.inc | 203 ------------ config/snort/snort_interfaces.php | 17 +- config/snort/snort_interfaces_edit.php | 295 +++++++---------- config/snort/snort_interfaces_global.php | 387 +++++++++++------------ config/snort/snort_interfaces_suppress.php | 124 ++++---- config/snort/snort_interfaces_suppress_edit.php | 198 ++++-------- config/snort/snort_interfaces_whitelist.php | 15 +- config/snort/snort_interfaces_whitelist_edit.php | 322 +++++++++---------- config/snort/snort_preprocessors.php | 386 ++++++++++------------ config/snort/snort_rules.php | 131 +++----- config/snort/snort_rules_edit.php | 25 +- config/snort/snort_rulesets.php | 7 +- 37 files changed, 881 insertions(+), 1993 deletions(-) delete mode 100644 config/snort/css/sexybuttons.css delete mode 100644 config/snort/css/style.css delete mode 100644 config/snort/images/alert.jpg delete mode 100644 config/snort/images/arrow_down.png delete mode 100644 config/snort/images/awesome-overlay-sprite.png delete mode 100644 config/snort/images/down.gif delete mode 100644 config/snort/images/down2.gif delete mode 100644 config/snort/images/footer.jpg delete mode 100644 config/snort/images/footer2.jpg delete mode 100644 config/snort/images/icon-table-sort-asc.png delete mode 100644 config/snort/images/icon-table-sort-desc.png delete mode 100644 config/snort/images/icon-table-sort.png delete mode 100644 config/snort/images/icon_excli.png delete mode 100644 config/snort/images/logo.jpg delete mode 100644 config/snort/images/logo22.png delete mode 100644 config/snort/images/page_white_text.png delete mode 100644 config/snort/images/up.gif delete mode 100644 config/snort/images/up2.gif delete mode 100644 config/snort/snort_gui.inc (limited to 'config') diff --git a/config/snort/css/sexybuttons.css b/config/snort/css/sexybuttons.css deleted file mode 100644 index c3834b44..00000000 --- a/config/snort/css/sexybuttons.css +++ /dev/null @@ -1,342 +0,0 @@ -/* - * Sexy Buttons - * - * DESCRIPTION: - * Sexy, skinnable HTML/CSS buttons with icons. - * - * PROJECT URL: - * http://code.google.com/p/sexybuttons/ - * - * AUTHOR: - * Richard Davies - * http://www.richarddavies.us - * Richard@richarddavies.us - * - * VERSION: - * 1.1 - * - * LICENSE: - * Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0) - * Creative Commons 3.0 Attribution (http://creativecommons.org/licenses/by/3.0/) - * - * CREDITS: - * Inspired by, derived from, and thanks to: - * http://www.p51labs.com/simply-buttons-v2/ - * http://www.oscaralexander.com/tutorials/how-to-make-sexy-buttons-with-css.html - * http://www.zurb.com/article/266/super-awesome-buttons-with-css3-and-rgba - * http://www.elctech.com/snippets/make-your-buttons-look-super-awesome - * - * USAGE: - * Simply add class="sexybutton [skin]" to a - */ - - -/* - * Generic styles for all Sexy Buttons - */ - -.sexybutton { - display: inline-block; - margin: 0; - padding: 0; - font: bold 13px "Helvetica Neue", Helvetica, Arial !important; - text-decoration: none !important; - text-shadow: 1px 1px 2px rgba(0,0,0,0.20); - background: none; - border: none; - white-space: nowrap; - cursor: pointer; - user-select: none; - -moz-user-select: none; - - /* Fix extra width padding in IE */ - _width: 0; - overflow: visible; -} - -.sexybutton span { - display: block; /* Prevents :active from working in IE--oh well! */ - height: 24px; - padding-right: 12px; - background-repeat: no-repeat; - background-position: right top; -} - -.sexybutton span span { - padding-right: 0; - padding-left: 12px; - line-height: 24px; - background-position: left top; -} - -.sexybutton span span span { - padding-left: 21px; - background-image: none; - background-repeat: no-repeat; - background-position: left center; - /* IE6 still requires a PNG transparency fix */ - /* _background-image: none; Or just hide icons from the undeserving IE6 */ - /* _padding-left: 0; Or just hide icons from the undeserving IE6 */ -} - -.sexybutton span span span.after { - padding-left: 0px; - padding-right: 21px; - background-position: right center; - /* IE6 still requires a PNG transparency fix */ - /* _padding-right: 0; Or just hide icons from the undeserving IE6 */ -} - -.sexybutton[disabled], -.sexybutton[disabled]:hover, -.sexybutton[disabled]:focus, -.sexybutton[disabled]:active, -.sexybutton.disabled, -.sexybutton.disabled:hover, -.sexybutton.disabled:focus, -.sexybutton.disabled:active { - color: #333 !important; - cursor: inherit; - text-shadow: none; - opacity: 0.33; -} - -.sexybutton:hover span, -.sexybutton:focus span { - background-position: 100% -24px; -} - -.sexybutton:hover span span, -.sexybutton:focus span span { - background-position: 0% -24px; -} - -.sexybutton:active span { - background-position: 100% -48px; -} - -.sexybutton:active span span { - background-position: 0% -48px; -} - -.sexybutton[disabled] span, -.sexybutton.disabled span { - background-position: 100% -72px; -} - -.sexybutton[disabled] span span, -.sexybutton.disabled span span { - background-position: 0% -72px; -} - -.sexybutton:hover span span span, -.sexybutton:focus span span span, -.sexybutton:active span span span, -.sexybutton[disabled] span span span, -.sexybutton.disabled span span span { - background-position: left center; -} - -.sexybutton:hover span span span.after, -.sexybutton:focus span span span.after, -.sexybutton:active span span span.after, -.sexybutton[disabled] span span span.after, -.sexybutton.disabled span span span.after { - background-position: right center; -} - -.sexybutton img { - margin-right: 5px; - vertical-align: text-top; - /* IE6 Hack */ - _margin-top: 4px; - _vertical-align: text-bottom; - /* IE6 still requires a PNG transparency fix */ - /* _display: none; Or just hide icons from the undeserving IE6 */ -} - -.sexybutton img.after { - margin-right: 0; - margin-left: 5px; - /* IE6 still requires a PNG transparency fix */ - /* _margin-left: 0; Or just hide icons from the undeserving IE6 */ -} - -.sexybutton.sexysmalls { font-size:.8em !important; } -.sexybutton.sexymedium { font-size: 15px !important; } -.sexybutton.sexylarge { font-size: 18px !important; } - - -/* - * Button Skins - * - * .PNG background images with alpha transparency are also supplied if you'd rather use them instead of the - * default .GIF images. (Just beware of IE6's lack of support.) - * - * Additional skins can be added below. The images/skins/ButtonTemplate.psd can be used to create new skins. - * Prefix the skin name with "sexy" to avoid any potential conflicts with other class names. - */ - -/* - * Simple Skin Buttons - */ - -.sexybutton.sexysimple { - position: relative; - padding: 5px 10px 5px; - font: inherit; - font-size: .85em !important; - font-style: normal !important; - font-weight: bold !important; - color: #fff !important; - line-height: 1; - background-image: url(/snort/images//awesome-overlay-sprite.png); - background-repeat: repeat-x; - background-position: 0 0; - - /* Special effects */ - text-shadow: 0 -1px 1px rgba(0,0,0,0.25), -2px 0 1px rgba(0,0,0,0.25); - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - -moz-box-shadow: 0 1px 2px rgba(0,0,0,0.5); - -webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.5); - - /* IE only stuff */ - border-bottom: 1px solid transparent\9; - _background-image: none; - - /* Cross browser inline block hack - http://blog.mozilla.com/webdev/2009/02/20/cross-browser-inline-block/ */ - display: -moz-inline-stack; - display: inline-block; - vertical-align: middle; - *display: inline !important; - position: relative; - - /* Force hasLayout in IE */ - zoom: 1; - - /* Disable text selection (Firefox only)*/ - -moz-user-select: none; -} - -.sexybutton.sexysimple::selection { - background: transparent; -} - -.sexybutton.sexysimple:hover, -.sexybutton.sexysimple:focus { - background-position: 0 -50px; - color: #fff !important; -} - -.sexybutton.sexysimple:active { - background-position: 0 -100px; - -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,0.7); - /* Unfortunately, Safari doesn't support inset yet */ - -webkit-box-shadow: none; - - /* IE only stuff */ - border-bottom: 0\9; - border-top: 1px solid #666\9; -} - -.sexybutton.sexysimple[disabled], -.sexybutton.sexysimple.disabled { - background-position: 0 -150px; - color: #333 !important; - text-shadow: none; -} - -.sexybutton.sexysimple[disabled]:hover, -.sexybutton.sexysimple[disabled]:focus, -.sexybutton.sexysimple[disabled]:active, -.sexybutton.sexysimple.disabled:hover, -.sexybutton.sexysimple.disabled:focus, -.sexybutton.sexysimple.disabled:active { - -moz-box-shadow: 0 1px 2px rgba(0,0,0,0.5); - -webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.5); -} - -.sexybutton.sexysimple span { - height: auto; - padding-left: 24px; - padding-right: 0; - background-position: left center; - background-repeat: no-repeat; - /* IE6 still requires a PNG transparency fix */ - /* _padding-left: 0; Or just hide icons from the undeserving IE6 */ -} - -.sexybutton.sexysimple span.after { - padding-left: 0; - padding-right: 24px; - background-position: right center; - /* IE6 still requires a PNG transparency fix */ - /* _padding-right: 0; Or just hide icons from the undeserving IE6 */ -} - -/* Simple button colors */ -.sexybutton.sexysimple { background-color: #333; } /* Default */ -.sexybutton.sexysimple.sexyblack { background-color: #333; } -.sexybutton.sexysimple.sexyred { background-color: #a90118; } -.sexybutton.sexysimple.sexyorange { background-color: #ff8a00; } -.sexybutton.sexysimple.sexyyellow { background-color: #ffb515; } -.sexybutton.sexysimple.sexygreen { background-color: #59a901; } -.sexybutton.sexysimple.sexyblue { background-color: #015ea9; } -.sexybutton.sexysimple.sexyteal { background-color: #2daebf; } -.sexybutton.sexysimple.sexymagenta { background-color: #a9014b; } -.sexybutton.sexysimple.sexypurple { background-color: #9d01a9; } - -/* Simple button sizes */ -.sexybutton.sexysimple.sexysmall { padding: 4px 7px 5px; font-size: 10px !important; } -.sexybutton.sexysimple.sexysmall:active { padding: 5px 7px 4px; } -.sexybutton.sexysimple { /* default */ } -.sexybutton.sexysimple:active { padding: 6px 10px 4px; } -.sexybutton.sexysimple.sexymedium { /* default */ } -.sexybutton.sexysimple.sexymedium:active { padding: 6px 10px 4px; } -.sexybutton.sexysimple.sexylarge { padding: 8px 14px 8px; font-size: 14px !important; } -.sexybutton.sexysimple.sexylarge:active { padding: 9px 14px 7px; } -.sexybutton.sexysimple.sexyxl { padding: 8px 14px 8px; font-size: 16px !important; } -.sexybutton.sexysimple.sexyxl:active { padding: 9px 14px 7px; } -.sexybutton.sexysimple.sexyxxl { padding: 8px 14px 8px; font-size: 20px !important; } -.sexybutton.sexysimple.sexyxxl:active { padding: 9px 14px 7px; } -.sexybutton.sexysimple.sexyxxxl { padding: 8px 14px 8px; font-size: 26px !important; } -.sexybutton.sexysimple.sexyxxxl:active { padding: 9px 14px 7px; } - -.sexybutton.sexysimple.sexysmall[disabled]:active, -.sexybutton.sexysimple.sexysmall.disabled:active { padding: 4px 7px 5px; } -.sexybutton.sexysimple[disabled]:active, -.sexybutton.sexysimple.disabled:active { padding: 5px 10px 5px; } -.sexybutton.sexysimple.sexymedium[disabled]:active, -.sexybutton.sexysimple.sexymedium.disabled:active { padding: 6px 10px 4px; } -.sexybutton.sexysimple.sexylarge[disabled]:active, -.sexybutton.sexysimple.sexylarge.disabled:active { padding: 8px 14px 8px; } -.sexybutton.sexysimple.sexyxl[disabled]:active, -.sexybutton.sexysimple.sexyxl.disabled:active { padding: 8px 14px 8px; } -.sexybutton.sexysimple.sexyxxl[disabled]:active, -.sexybutton.sexysimple.sexyxxl.disabled:active { padding: 8px 14px 8px; } -.sexybutton.sexysimple.sexyxxxl[disabled]:active, -.sexybutton.sexysimple.sexyxxxl.disabled:active { padding: 8px 14px 8px; } - - -/* - * Icon Definitions - */ - -/* Silk Icons - http://www.famfamfam.com/lab/icons/silk/ */ -/* (Obviously not all Silk icons are defined here. Feel free to define any other icons that you may need.) */ - -.sexybutton span.ok { background-image: url(/snort/images//tick.png) !important; } -.sexybutton span.cancel { background-image: url(/snort/images//cross.png) !important; } -.sexybutton span.add { background-image: url(/snort/images//add.png) !important; } -.sexybutton span.delete { background-image: url(/snort/images//delete.png) !important; } -.sexybutton span.download { background-image: url(/snort/images//arrow_down.png) !important; } -.sexybutton span.pwhitetxt { background-image: url(/snort/images//page_white_text.png) !important; } - diff --git a/config/snort/css/style.css b/config/snort/css/style.css deleted file mode 100644 index b484966c..00000000 --- a/config/snort/css/style.css +++ /dev/null @@ -1,206 +0,0 @@ -.alert { - position:absolute; - top:10px; - left:0px; - width:94%; -background:#FCE9C0; -background-position: 15px; -border-top:2px solid #DBAC48; -border-bottom:2px solid #DBAC48; -padding: 15px 10px 85% 50px; -} - -.formpre { -font-family:arial; -font-size: 1.1em; -} - -#download_rules { -font-family: arial; -font-size: 13px; -font-weight: bold; -text-align: center -} - -#download_rules_td { -font-family: arial; -font-size: 13px; -font-weight: bold; -text-align: center -} - -/* hack fix the hard coded fbegin link */ -#header-left2 { -position: absolute; -background-position: center center; -height: 67px; -width: 147px; -top: -77px; -left: 8px; -float: left; -z-index:999; -} -#header-left2 #status-link2 { - position: relative; - top: 3px; - left: 2px; -} -/* end of fbegin hack */ - -.body2 { -font-family:arial; -font-size:12px; -} - - - - -/* Start of main css Pfsense */ -/* Start of main css Pfsense */ - -@charset "utf-8"; -.textstyle { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - font-style: normal; - background-color: #666; - color: #CCC; -} -.textstyle p2 a { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - font-style: normal; - color: #CCC; -} - -.textstyle p { - font-family: Arial, Helvetica, sans-serif; - font-size: 24px; - font-weight: bold; - color: #FFF; - text-decoration: underline; -} -.textstyle p2 { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - color: #CCC; -} - -/* Start of main css for table sort */ -/* Start of main css for table sort */ - -table { - margin: 0; - padding: 0; - border: 0; - font-weight: inherit; - font-style: inherit; - font-size: 9; - font-family: Arial, Helvetica, sans-serif; - vertical-align: baseline; -} - -/* Tables still need 'cellspacing="0"' in the markup. */ -table { border-collapse: separate; border-spacing: 0; } -caption, th, td { text-align: left; font-weight:400; } - -/* Remove possible quote marks (") from ,
. */ -blockquote:before, blockquote:after, q:before, q:after { content: ""; } -blockquote, q { quotes: "" ""; } - -#container { - width: auto; - margin: 0px; - padding-top: 10px; - padding-bottom: 10px; -} - - - -/************************************************************** - - Sortable Table - v 1.4 - -**************************************************************/ - - - -th { - background-color: #eee; - background: #eee url(/snort/images/icon-table-sort.png) no-repeat 2px 8px; - padding: 4px 4px 4px 14px; -} - -.allRow { - background-color: #eee; - padding: 4px; -} - -tr.altRow { - background-color: #fff; -} - -.leftAlign { - text-align: left; -} - -.centerAlign { - text-align: center; -} - -.rightAlign { - text-align: right; -} - -.sortedASC { - background: url(/snort/images/icon-table-sort-asc.png) no-repeat 2px 4px #eee; -} - -.sortedDESC { - background: url(/snort/images/icon-table-sort-desc.png) no-repeat 2px 10px #eee; -} - -.tableHeaderOver { - cursor: pointer; - color: #354158; -} - - -tr.selected { - background-color: 9999ff; - color: #000000; -} - -tr.over { - background-color: #993333; - color: #fff; - cursor: pointer; -} - -tr.hide { - display: none; -} -/***************************/ - -.mainTableFilter { - position: absolute; - top: 0; - left: -10px; - width: auto; -} - -.tableFilter { - border: 1px solid #ccc; - padding: 2px; - margin: 5px 0 10px 0; -} - -.tableFilter input { - border: 1px solid #ccc; -} - -.tableFilter select { - border: 1px solid #ccc; -} - diff --git a/config/snort/images/alert.jpg b/config/snort/images/alert.jpg deleted file mode 100644 index 96c24e35..00000000 Binary files a/config/snort/images/alert.jpg and /dev/null differ diff --git a/config/snort/images/arrow_down.png b/config/snort/images/arrow_down.png deleted file mode 100644 index 2c4e2793..00000000 Binary files a/config/snort/images/arrow_down.png and /dev/null differ diff --git a/config/snort/images/awesome-overlay-sprite.png b/config/snort/images/awesome-overlay-sprite.png deleted file mode 100644 index c3af7dd9..00000000 Binary files a/config/snort/images/awesome-overlay-sprite.png and /dev/null differ diff --git a/config/snort/images/down.gif b/config/snort/images/down.gif deleted file mode 100644 index 2b3c99fc..00000000 Binary files a/config/snort/images/down.gif and /dev/null differ diff --git a/config/snort/images/down2.gif b/config/snort/images/down2.gif deleted file mode 100644 index 71bf92eb..00000000 Binary files a/config/snort/images/down2.gif and /dev/null differ diff --git a/config/snort/images/footer.jpg b/config/snort/images/footer.jpg deleted file mode 100644 index 4af05707..00000000 Binary files a/config/snort/images/footer.jpg and /dev/null differ diff --git a/config/snort/images/footer2.jpg b/config/snort/images/footer2.jpg deleted file mode 100644 index 3332e085..00000000 Binary files a/config/snort/images/footer2.jpg and /dev/null differ diff --git a/config/snort/images/icon-table-sort-asc.png b/config/snort/images/icon-table-sort-asc.png deleted file mode 100644 index 0c127919..00000000 Binary files a/config/snort/images/icon-table-sort-asc.png and /dev/null differ diff --git a/config/snort/images/icon-table-sort-desc.png b/config/snort/images/icon-table-sort-desc.png deleted file mode 100644 index 5c52f2d0..00000000 Binary files a/config/snort/images/icon-table-sort-desc.png and /dev/null differ diff --git a/config/snort/images/icon-table-sort.png b/config/snort/images/icon-table-sort.png deleted file mode 100644 index 3cae604b..00000000 Binary files a/config/snort/images/icon-table-sort.png and /dev/null differ diff --git a/config/snort/images/icon_excli.png b/config/snort/images/icon_excli.png deleted file mode 100644 index 4b54fa31..00000000 Binary files a/config/snort/images/icon_excli.png and /dev/null differ diff --git a/config/snort/images/logo.jpg b/config/snort/images/logo.jpg deleted file mode 100644 index fa01d818..00000000 Binary files a/config/snort/images/logo.jpg and /dev/null differ diff --git a/config/snort/images/logo22.png b/config/snort/images/logo22.png deleted file mode 100644 index 64ed9d75..00000000 Binary files a/config/snort/images/logo22.png and /dev/null differ diff --git a/config/snort/images/page_white_text.png b/config/snort/images/page_white_text.png deleted file mode 100644 index 813f712f..00000000 Binary files a/config/snort/images/page_white_text.png and /dev/null differ diff --git a/config/snort/images/up.gif b/config/snort/images/up.gif deleted file mode 100644 index 89596771..00000000 Binary files a/config/snort/images/up.gif and /dev/null differ diff --git a/config/snort/images/up2.gif b/config/snort/images/up2.gif deleted file mode 100644 index 21c5a254..00000000 Binary files a/config/snort/images/up2.gif and /dev/null differ diff --git a/config/snort/snort.inc b/config/snort/snort.inc index a3b94a15..533cc856 100644 --- a/config/snort/snort.inc +++ b/config/snort/snort.inc @@ -423,29 +423,6 @@ function snort_postinstall() mwexec('/usr/sbin/chown snort:snort /tmp/snort*', true); mwexec('/usr/sbin/chown snort:snort /var/db/whitelist', true); - /* move files around, make it look clean */ - mwexec('/bin/mkdir -p /usr/local/www/snort/css'); - mwexec('/bin/mkdir -p /usr/local/www/snort/images'); - - chdir ("/usr/local/www/snort/css/"); - exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/css/style.css'); - exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/css/sexybuttons.css'); - chdir("/usr/local/www/snort/images/"); - exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/alert.jpg'); - exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/down.gif'); - exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/down2.gif'); - exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/icon-table-sort.png'); - exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/icon-table-sort-asc.png'); - exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/icon-table-sort-desc.png'); - exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/up.gif'); - exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/up2.gif'); - exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/logo.jpg'); - exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/icon_excli.png'); - exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/arrow_down.png'); - exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/awesome-overlay-sprite.png'); - exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/logo22.png'); - exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/page_white_text.png'); - /* remake saved settings */ if ($config['installedpackages']['snortglobal']['forcekeepsettings'] == 'on') { update_status(gettext("Saved settings detected...")); @@ -473,7 +450,7 @@ function snort_snortloglimit_install_cron($should_install) { $x=0; $is_installed = false; foreach($config['cron']['item'] as $item) { - if (strstr($item['command'], '/usr/local/pkg/snort/snort_check_cron_misc.inc')) { + if (strstr($item['command'], 'snort_check_cron_misc.inc')) { $is_installed = true; break; } @@ -1124,10 +1101,9 @@ function snort_deinstall() { snort_deinstall_cron("snort2c"); snort_deinstall_cron("snort_check_for_rule_updates.php"); - snort_deinstall_cron("/usr/local/pkg/snort/snort_check_cron_misc.inc"); + snort_deinstall_cron("snort_check_cron_misc.inc"); configure_cron(); - /* Unset snort registers in conf.xml IMPORTANT snort will not start with out this */ /* Keep this as a last step */ if ($config['installedpackages']['snortglobal']['forcekeepsettings'] != 'on') unset($config['installedpackages']['snortglobal']); diff --git a/config/snort/snort.xml b/config/snort/snort.xml index db6c3366..c9026489 100644 --- a/config/snort/snort.xml +++ b/config/snort/snort.xml @@ -59,8 +59,7 @@ snort snort.sh snort - Snort is the most widely deployed IDS/IPS technology - worldwide. + Snort is the most widely deployed IDS/IPS technology worldwide. @@ -69,11 +68,6 @@ 077 http://www.pfsense.com/packages/config/snort/snort.inc - - /usr/local/pkg/snort/ - 077 - http://www.pfsense.com/packages/config/snort/snort_gui.inc - /usr/local/pkg/snort/ 077 diff --git a/config/snort/snort_alerts.php b/config/snort/snort_alerts.php index ae441131..54bb8217 100644 --- a/config/snort/snort_alerts.php +++ b/config/snort/snort_alerts.php @@ -35,7 +35,6 @@ */ require_once("guiconfig.inc"); -require_once("/usr/local/pkg/snort/snort_gui.inc"); require_once("/usr/local/pkg/snort/snort.inc"); /* load only javascript that is needed */ diff --git a/config/snort/snort_barnyard.php b/config/snort/snort_barnyard.php index b647c007..da7af754 100644 --- a/config/snort/snort_barnyard.php +++ b/config/snort/snort_barnyard.php @@ -30,16 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - -TODO: Nov 12 09 -Clean this code up its ugly -Important add error checking - -*/ - require_once("guiconfig.inc"); -require_once("/usr/local/pkg/snort/snort_gui.inc"); require_once("/usr/local/pkg/snort/snort.inc"); global $g; @@ -139,19 +130,9 @@ include_once("head.inc"); ' . $pgtitle . '

';}?> - + - -
- - - - -
+ @@ -209,7 +184,7 @@ function enable_change(enable_change) { Settings - + - + -
EnableEnable onClick="enable_change(false)"> Enable Barnyard2
@@ -219,7 +194,7 @@ function enable_change(enable_change) { 		Mysql Settings
Log to a Mysql DatabaseLog to a Mysql Database
@@ -232,7 +207,7 @@ function enable_change(enable_change) { 		Advanced Settings
Advanced configuration + Advanced configuration pass through @@ -256,9 +231,6 @@ function enable_change(enable_change) {
- -
- ' . "\n"; - -/* general css code */ -$snort_general_css = ' - - ' . "\n"; - - -/* general css code for snort_interface.php */ -$snort_interfaces_css = ' - -' . "\n"; - -?> diff --git a/config/snort/snort_interfaces.php b/config/snort/snort_interfaces.php index 93b0050d..0f08b9d9 100644 --- a/config/snort/snort_interfaces.php +++ b/config/snort/snort_interfaces.php @@ -32,7 +32,6 @@ POSSIBILITY OF SUCH DAMAGE. $nocsrf = true; require_once("guiconfig.inc"); -require_once("/usr/local/pkg/snort/snort_gui.inc"); require_once("/usr/local/pkg/snort/snort.inc"); global $g; @@ -134,9 +133,6 @@ include_once("head.inc"); ' . $pgtitle . '

'; @@ -156,16 +152,16 @@ enable JavaScript to view this content print_input_errors($input_errors); // TODO: add checks if ($savemsg) - print_info_box2($savemsg); + print_info_box($savemsg); //if (file_exists($d_snortconfdirty_path)) { if ($d_snortconfdirty_path_ls != '') { echo '

'; if($savemsg) - print_info_box_np2("{$savemsg}"); + print_info_box_np("{$savemsg}"); else { - print_info_box_np2(' + print_info_box_np(' The Snort configuration has changed for one or more interfaces.
You must apply the changes in order for them to take effect.
'); @@ -239,7 +235,7 @@ enable JavaScript to view this content title="click to toggle start/stop snort"> - - -   @@ -388,7 +384,6 @@ enable JavaScript to view this content diff --git a/config/snort/snort_interfaces_edit.php b/config/snort/snort_interfaces_edit.php index dd60af68..76ee9aaf 100644 --- a/config/snort/snort_interfaces_edit.php +++ b/config/snort/snort_interfaces_edit.php @@ -31,7 +31,6 @@ */ require_once("guiconfig.inc"); -require_once("/usr/local/pkg/snort/snort_gui.inc"); require_once("/usr/local/pkg/snort/snort.inc"); global $g; @@ -327,20 +326,12 @@ if (isset($_GET['dup'])) $pgtitle = "Snort: Interface Edit: $id $snort_uuid $if_real"; include_once("head.inc"); - ?> - -

Please -enable JavaScript to view this content
- + + ' . $pgtitle . '

';}?> - - -
" method="post" enctype="multipart/form-data" name="iform" id="iform"> '; - - if($savemsg) - print_info_box_np2("{$savemsg}"); - else { - print_info_box_np2(' - The Snort configuration has changed and snort needs to be restarted on this interface.
- You must apply the changes in order for them to take effect.
- '); - } + print_info_box($savemsg); } ?> +" method="post" name="iform" id="iform"> - +
+
+ - + + + + - + + + + + + + + + + + + + + + +
+ General Settings
Enable  +   Enable or Disable\n"; ?> +
- - - - - - - - - - - - - - + + + + + - - - + reference (not parsed).

+ + + - - + memory, high performance. +
+ + - - - + + + - - - + friendly ips that the firewall cant see.
+ + + - - - + setting at default.
+ + + - - - + + + - - - + + + - - - + + + - @@ -659,7 +599,7 @@ function enable_change(enable_change) { logs snort should create. - - + - - - - - - - - - - - - - - - - - -
General Settings
Enable  - // care with spaces - if ($pconfig['enable'] == "on") - $checked = checked; - - $onclick_enable = "onClick=\"enable_change(false)\">"; - - echo " - \n\n"; - ?>
Interface -
- Choose which interface this rule applies to.
- Hint: in most cases, you'll want to use WAN here.
DescriptionInterface +
+ Choose which interface this rule applies to.
+ Hint: in most cases, you'll want to use WAN here.

Description
+ value="">
You may enter a description here for your - reference (not parsed).
Memory Performance
Memory Performance
Choose the networks snort should inspect and whitelist.
Home net
Home net
+
Choose the home net you will like this rule to - use.  
Note: Default home + use.
 
Note: Default home net adds only local networks.
Hint: Most users add a list of - friendly ips that the firewall cant see.
External net
External net
Block offenders
Block offenders onClick="enable_blockoffenders()">
Checking this option will automatically block hosts that generate a Snort alert.
Kill states
Kill states >
Should firewall states be killed for the blocked ip
Which ip to block
Which ip to block
Whitelist
Whitelist
Choose the whitelist you will like this rule to - use.  
Note: Default + use.
 
Note:
 Default whitelist adds only local networks.
- Note: This option will only be used when block offenders is on. + Note:
 This option will only be used when block offenders is on.
Suppression and + Suppression and filtering
Choose the suppression or filtering file you - will like this rule to use.  
Note: Default + will like this rule to use.
 
Note:
 Default option disables suppression and filtering.
Send alerts to main + Send alerts to main System logs
Log to a Tcpdump fileLog to a Tcpdump file onClick="enable_change(false)">
Snort will log packets to a tcpdump-formatted file. The file then can be analyzed by an application such as Wireshark which - understands pcap file formats. WARNING: + understands pcap file formats. WARNING:
File may become large.
Log Alerts to a snort + Log Alerts to a snort unified2 file onClick="enable_change(false)">
- Snort will log Alerts to a file in the UNIFIED2 format. This is a - requirement for barnyard2.
Arguments here will - be automatically inserted into the snort configuration.
Advanced configuration - pass through -
- - -
 Note: -
- Please save your settings before you click start.
- + Snort will log Alerts to a file in the UNIFIED2 format. This is a + requirement for barnyard2.
Arguments here will + be automatically inserted into the snort configuration.
Advanced configuration pass through + +
+ + +
 Note:
+
+ Please save your settings before you click start.
- - diff --git a/config/snort/snort_interfaces_global.php b/config/snort/snort_interfaces_global.php index 55249460..59b725ab 100644 --- a/config/snort/snort_interfaces_global.php +++ b/config/snort/snort_interfaces_global.php @@ -35,7 +35,6 @@ require_once("guiconfig.inc"); -require_once("/usr/local/pkg/snort/snort_gui.inc"); require_once("/usr/local/pkg/snort/snort.inc"); global $g; @@ -189,23 +188,12 @@ include_once("head.inc"); ' . $pgtitle . '

'; ?> - - -
You must apply the changes in order for them to take effect.
'); @@ -221,8 +209,9 @@ enable JavaScript to view this content } ?> + -
+
- - - - - - - - + +
Please Choose The - Type Of Rules You Wish To Download
Install Snort.org rules - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -
> + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + +
Please Choose The + Type Of Rules You Wish To Download
Install Snort.org rules + + + - - - - - - - -
> Do NOT Install
> Install - Basic Rules or Premium rules
-          Sign Up for a - Basic Rule Account
-          Sign Up for Sourcefire VRT Certified Premium - Rules. This Is Highly Recommended
 
- - - - - - - - -
Oinkmaster code
Code
- Obtain a snort.org Oinkmaster code and paste here.
- -
Install Emergingthreats - rules - onClick="enable_change(false)">
- Emerging Threats is an open source community that produces fastest - moving and diverse Snort Rules.
Update rules - automatically -
- Please select the update times for rules.
- Hint: in most cases, every 12 hours is a good choice.
General Settings
Log Directory Size - Limit
-
-
-
-
-
- Note:
- Available space is MB		 - - - - - - - - - - -
> - Enable directory size limit (Default)
> Disable - directory size limit
-
- Warning: Nanobsd - should use no more than 10MB of space.
 
- - - - - -
Size in MB - Default is 20% of available space.
- -
Remove blocked hosts - every -
- Please select the amount of time you would like - hosts to be blocked for.
- Hint: in most cases, 1 hour is a good choice.
Alerts file description - type -
- Please choose the type of Alert logging you will - like see in your alert file.
- Hint: Best pratice is to chose full logging. WARNING: On - change, alert file will be cleared.
Keep snort settings - after deinstall - onClick="enable_change(false)">
- Settings will not be removed during deinstall.
 WARNING:
- This will reset all global and interface settings.		 -
 Note:
- Changing any settings on this page will affect all - interfaces. Please, double check if your oink code is correct and +
> Install + Basic Rules or Premium rules
+          Sign Up for a + Basic Rule Account
+          Sign Up for Sourcefire VRT Certified Premium + Rules. This Is Highly Recommended
 
+ + + + + + + + +
Oinkmaster code
Code
+ Obtain a snort.org Oinkmaster code and paste here.
+ +
Install Emergingthreats + rules + onClick="enable_change(false)">
+ Emerging Threats is an open source community that produces fastest + moving and diverse Snort Rules.
Update rules + automatically +
+ Please select the update times for rules.
+ Hint: in most cases, every 12 hours is a good choice.
General Settings
Log Directory Size + Limit
+
+
+ Note:
+ Available space is MB		 + + + + + + + + + + +
> + Enable directory size limit (Default)
> Disable + directory size limit
+
+ Warning: Nanobsd + should use no more than 10MB of space.
 
+ + + + + +
Size in MB + Default is 20% of available space.
+ +
Remove blocked hosts + every +
+ Please select the amount of time you would like + hosts to be blocked for.
+ Hint: in most cases, 1 hour is a good choice.
Alerts file description + type +
+ Please choose the type of Alert logging you will + like see in your alert file.
+ Hint: Best pratice is to chose full logging. WARNING: On + change, alert file will be cleared.
Keep snort settings + after deinstall + onClick="enable_change(false)">
+ Settings will not be removed during deinstall.
 WARNING:
+ This will reset all global and interface settings.		 +
 Note:
+ Changing any settings on this page will affect all + interfaces. Please, double check if your oink code is correct and the type of snort.org account you hold.
-
+
- - - - - - - + diff --git a/config/snort/snort_interfaces_suppress.php b/config/snort/snort_interfaces_suppress.php index b0d83e67..eb66b652 100644 --- a/config/snort/snort_interfaces_suppress.php +++ b/config/snort/snort_interfaces_suppress.php @@ -36,10 +36,8 @@ */ require_once("guiconfig.inc"); -require_once("/usr/local/pkg/snort/snort_gui.inc"); require_once("/usr/local/pkg/snort/snort.inc"); - if (!is_array($config['installedpackages']['snortglobal']['suppress'])) $config['installedpackages']['snortglobal']['suppress'] = array(); if (!is_array($config['installedpackages']['snortglobal']['suppress']['item'])) @@ -70,10 +68,9 @@ include_once("head.inc"); -
' . $pgtitle . '

';}?> +' . $pgtitle . '

';}?>
@@ -93,78 +90,67 @@ echo $snort_general_css; $tab_array[6] = array(gettext("Suppress"), true, "/snort/snort_interfaces_suppress.php"); display_top_tabs($tab_array); ?> - - - - - - - - - - - - - - - - - - - - - - - - - -
File NameDescription
- -   - - - - - - -
-
- - - - - -
 
-
- - + + + + + + + + + + + + + + + + + + + + +
File NameDescription
+ +   + + + + + + +
+
+ + + + + +
 
+
-
- - + + +
Note: +
Note:

Here you can create event filtering and suppression for your snort package rules.
Please note that you must restart a running rule so that changes can take effect.

-
- -
- diff --git a/config/snort/snort_interfaces_suppress_edit.php b/config/snort/snort_interfaces_suppress_edit.php index 7bb7efd1..ce81a270 100644 --- a/config/snort/snort_interfaces_suppress_edit.php +++ b/config/snort/snort_interfaces_suppress_edit.php @@ -36,7 +36,6 @@ */ require_once("guiconfig.inc"); -require_once("/usr/local/pkg/snort/snort_gui.inc"); require_once("/usr/local/pkg/snort/snort.inc"); if (!is_array($config['installedpackages']['snortglobal']['suppress'])) @@ -66,8 +65,6 @@ if (is_array($config['installedpackages']['snortglobal']['suppress']['item'][$id } } -$d_snort_suppress_dirty_path = '/var/run/snort_suppress.dirty'; - /* returns true if $name is a valid name for a whitelist file name or ip */ function is_validwhitelistname($name) { if (!is_string($name)) @@ -150,145 +147,86 @@ include_once("head.inc"); -
' . $pgtitle . '

';}?> +' . $pgtitle . '

';}?> -
- -
'; - - if($savemsg) { - print_info_box_np2("{$savemsg}"); - }else{ - print_info_box_np2(' - The Snort configuration has changed and snort needs to be restarted on this interface.
- You must apply the changes in order for them to take effect.
- '); - } - } - ?> - - - - - - - - - + +
- -
- -
- -
- - - - - - - - +?> + +
Add the name and - description of the file.
Name
- The list name may only consist of the - characters a-z, A-Z and 0-9. Note: No - Spaces.
+ + + + + + + + + + + + +
Add the name and description of the file.
Name
+ The list name may only consist of the + characters a-z, A-Z and 0-9. Note: No + Spaces.
Description
+ You may enter a description here for your + reference (not parsed).
+
+ - - + +
Description
- You may enter a description here for your - reference (not parsed). 		   NOTE: +   The threshold keyword + is deprecated as of version 2.8.5. Use the event_filter keyword + instead.
- -
- - - - - - - - - - - - - - - + + + + + + + + + + + + + - -
-
- - - - - -
   NOTE: -   The threshold keyword - is deprecated as of version 2.8.5. Use the event_filter keyword - instead.
-
-
Apply suppression or - filters to rules. Valid keywords are 'suppress', 'event_filter' and - 'rate_filter'.
Example 1; - suppress gen_id 1, sig_id 1852, track by_src, ip 10.1.1.54
- Example 2; event_filter gen_id 1, sig_id 1851, type limit, - track by_src, count 1, seconds 60
- Example 3; rate_filter gen_id 135, sig_id 1, track by_src, - count 100, seconds 1, new_action log, timeout 10
-
+ +
Apply suppression or + filters to rules. Valid keywords are 'suppress', 'event_filter' and + 'rate_filter'.
Example 1; + suppress gen_id 1, sig_id 1852, track by_src, ip 10.1.1.54
+ Example 2; event_filter gen_id 1, sig_id 1851, type limit, + track by_src, count 1, seconds 60
+ Example 3; rate_filter gen_id 135, sig_id 1, track by_src, + count 100, seconds 1, new_action log, timeout 10
+
  -
-
-
- -
- - - + + diff --git a/config/snort/snort_interfaces_whitelist.php b/config/snort/snort_interfaces_whitelist.php index 872b69c1..805fffe9 100644 --- a/config/snort/snort_interfaces_whitelist.php +++ b/config/snort/snort_interfaces_whitelist.php @@ -37,7 +37,6 @@ */ require_once("guiconfig.inc"); -require_once("/usr/local/pkg/snort/snort_gui.inc"); require_once("/usr/local/pkg/snort/snort.inc"); @@ -76,16 +75,14 @@ include_once("head.inc"); -
' . $pgtitle . '

';}?> +' . $pgtitle . '

';}?> -

You must apply the changes in order for them to take effect.");?> - +
- +
@@ -168,7 +165,7 @@ echo $snort_general_css;
File Name

-
Note:

Here you can create whitelist files for your @@ -178,11 +175,7 @@ echo $snort_general_css; Remember that the default whitelist only includes local networks.
Be careful, it is very easy to get locked out of you system.
- - - - diff --git a/config/snort/snort_interfaces_whitelist_edit.php b/config/snort/snort_interfaces_whitelist_edit.php index a546c642..965dd4be 100644 --- a/config/snort/snort_interfaces_whitelist_edit.php +++ b/config/snort/snort_interfaces_whitelist_edit.php @@ -37,7 +37,6 @@ */ require_once("guiconfig.inc"); -require_once("/usr/local/pkg/snort/snort_gui.inc"); require_once("/usr/local/pkg/snort/snort.inc"); if (!is_array($config['installedpackages']['snortglobal']['whitelist']['item'])) @@ -205,7 +204,6 @@ include_once("head.inc"); @@ -223,186 +221,174 @@ echo $snort_general_css; ' . $pgtitle . '

';}?> -
-
- + +
+ + + + + + + + + + + + + + + + + + + + + + -
Add the name and + description of the file.
Name
+ The list name may only consist of the + characters a-z, A-Z and 0-9. Note: No + Spaces.
Description
+ You may enter a description here for your + reference (not parsed).
List Type + +
WHITELIST:   This + list specifies addresses that Snort Package should not block.
+
+ NETLIST:   This list is for defining + addresses as $HOME_NET or $EXTERNAL_NET in the snort.conf file.
+ +    Choose the type of + list you will like see in your Interface Edit Tab. +
Add auto generated + ips.
WAN IPs /> + Add WAN IPs to the list.
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +
Add the name and - description of the file.
Name
- The list name may only consist of the - characters a-z, A-Z and 0-9. Note: No - Spaces.
Description
- You may enter a description here for your - reference (not parsed).
List Type - -
WHITELIST:   This - list specifies addresses that Snort Package should not block.
-
- NETLIST:   This list is for defining - addresses as $HOME_NET or $EXTERNAL_NET in the snort.conf file.
- -    Choose the type of - list you will like see in your Interface Edit Tab. -
Add auto generated - ips.
WAN IPs /> - Add WAN IPs to the list.
Wan Gateways /> - Add WAN Gateways to the list.
Wan DNS servers /> - Add WAN DNS servers to the list.
Virtual IP Addresses /> - Add Virtual IP Addresses to the list.
VPNs /> - Add VPN Addresses to the list.
Add your own custom - ips.
-
IP or CIDR items
- 		- - - - - - - - - - - ""): - $item = explode(" ", $address); - $item3 = explode("||", $pconfig['detail']); - foreach($item as $ww): - $address = $item[$counter]; - $item4 = $item3[$counter]; - ?> - - - - - - - -
-
For WHITELIST's enter ONLY - IPs not CIDRs. Example: 192.168.4.1
-
- For NETLIST's you may enter IPs and - CIDRs. Example: 192.168.4.1 or 192.168.4.0/24
-
-
IP or CIDR
- 		-
Add a Description or leave blank and a date - will be added.
-
- "; ?> -
-
  - - - -
Wan Gateways /> + Add WAN Gateways to the list.
Wan DNS servers /> + Add WAN DNS servers to the list.
Virtual IP Addresses /> + Add Virtual IP Addresses to the list.
VPNs /> + Add VPN Addresses to the list.
Add your own custom + ips.
+
IP or CIDR items
+ 		+ + + + + + + + + + + ""): + $item = explode(" ", $address); + $item3 = explode("||", $pconfig['detail']); + foreach($item as $ww): + $address = $item[$counter]; + $item4 = $item3[$counter]; + ?> + + + + + + +
+
For WHITELIST's enter ONLY + IPs not CIDRs. Example: 192.168.4.1
+
+ For NETLIST's you may enter IPs and + CIDRs. Example: 192.168.4.1 or 192.168.4.0/24
+
+
IP or CIDR
+ 		+
Add a Description or leave blank and a date + will be added.
+
+ "; ?> +
+
  + + +