From 13d193c2f742f037ff4e87e373922d8b6e7c5749 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Mon, 14 Sep 2009 18:16:13 -0400 Subject: Add pfSense_BUILDER_BINARIES: and pfSense_MODULE:. Adjust Copyright to include 2009 on files that I have asserted (C) on --- usr/local/www/bandwidth_by_ip.php | 5 +++++ usr/local/www/carp_status.php | 4 ++++ usr/local/www/classes/maintable.inc | 7 ++++++- usr/local/www/diag_arp.php | 7 ++++++- usr/local/www/diag_backup.php | 8 ++++++-- usr/local/www/diag_confbak.php | 5 ++++- usr/local/www/diag_defaults.php | 7 +++++-- usr/local/www/diag_dhcp_leases.php | 14 +++++++------- usr/local/www/diag_dns.php | 4 ++++ usr/local/www/diag_dump_states.php | 10 +++++++--- usr/local/www/diag_ipsec.php | 8 +++++--- usr/local/www/diag_ipsec_sad.php | 8 ++++++-- usr/local/www/diag_ipsec_spd.php | 8 ++++++-- usr/local/www/diag_logs.php | 6 +++++- usr/local/www/diag_logs_auth.php | 8 ++++++-- usr/local/www/diag_logs_dhcp.php | 8 ++++++-- usr/local/www/diag_logs_filter.php | 9 +++++++-- usr/local/www/diag_logs_filter_dynamic.php | 7 ++++++- usr/local/www/diag_logs_filter_summary.php | 6 +++++- usr/local/www/diag_logs_ipsec.php | 9 +++++++-- usr/local/www/diag_logs_ntpd.php | 4 ++++ usr/local/www/diag_logs_openvpn.php | 6 +++++- usr/local/www/diag_logs_relayd.php | 4 ++++ usr/local/www/diag_logs_settings.php | 6 +++++- usr/local/www/diag_logs_slbd.php | 6 +++++- usr/local/www/diag_logs_vpn.php | 5 +++++ usr/local/www/diag_nanobsd.php | 14 ++++++++++---- usr/local/www/diag_packet_capture.php | 10 +++++++--- usr/local/www/diag_patterns.php | 12 ++++-------- usr/local/www/diag_ping.php | 12 +++++++++--- usr/local/www/diag_pkglogs.php | 7 +++++-- usr/local/www/diag_resetstate.php | 7 +++++-- usr/local/www/diag_routes.php | 6 +++++- usr/local/www/diag_showbogons.php | 9 +++++++-- usr/local/www/diag_system_activity.php | 9 +++++++-- usr/local/www/diag_system_pftop.php | 6 +++++- usr/local/www/diag_traceroute.php | 9 +++++++-- 37 files changed, 212 insertions(+), 68 deletions(-) (limited to 'usr') diff --git a/usr/local/www/bandwidth_by_ip.php b/usr/local/www/bandwidth_by_ip.php index 3fd01a6..8fc29e4 100755 --- a/usr/local/www/bandwidth_by_ip.php +++ b/usr/local/www/bandwidth_by_ip.php @@ -9,6 +9,11 @@ * */ +/* + pfSense_BUILDER_BINARIES: /usr/local/bin/rate + pfSense_MODULE: trafficgraph +*/ + require_once('guiconfig.inc'); require_once('interfaces.inc'); require_once('pfsense-utils.inc'); diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php index c4d9477..f2dd95a 100755 --- a/usr/local/www/carp_status.php +++ b/usr/local/www/carp_status.php @@ -33,6 +33,10 @@ ##|*MATCH=carp_status.php* ##|-PRIV +/* + pfSense_BUILDER_BINARIES: /sbin/sysctl + pfSense_MODULE: carp +*/ require_once("guiconfig.inc"); require_once("xmlparse.inc"); diff --git a/usr/local/www/classes/maintable.inc b/usr/local/www/classes/maintable.inc index ecfbcf6..d3d9995 100644 --- a/usr/local/www/classes/maintable.inc +++ b/usr/local/www/classes/maintable.inc @@ -28,6 +28,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: guiutils +*/ + /* DISABLE_PHP_LINT_CHECKING */ class MainTable { @@ -187,4 +191,5 @@ class MainTable { } } -?> + +?> \ No newline at end of file diff --git a/usr/local/www/diag_arp.php b/usr/local/www/diag_arp.php index 97db24c..a267899 100755 --- a/usr/local/www/diag_arp.php +++ b/usr/local/www/diag_arp.php @@ -2,7 +2,7 @@ /* diag_arp.php part of the pfSense project (http://www.pfsense.org) - Copyright (C) 2009 Scott Ullrich + Copyright (C) 2004-2009 Scott Ullrich originally part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2005 Paul Taylor (paultaylor@winndixie.com) and Manuel Kasper . @@ -30,6 +30,11 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: /bin/cat /usr/sbin/arp + pfSense_MODULE: arp +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-arptable ##|*NAME=Diagnostics: ARP Table page diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php index 714ca5b..c66af08 100755 --- a/usr/local/www/diag_backup.php +++ b/usr/local/www/diag_backup.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_backup.php - Copyright (C) 2004,2005,2006 Scott Ullrich + Copyright (C) 2004-2009 Scott Ullrich All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) @@ -31,6 +31,11 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: /sbin/shutdown + pfSense_MODULE: backup +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-backup/restore ##|*NAME=Diagnostics: Backup/restore page @@ -38,7 +43,6 @@ ##|*MATCH=diag_backup.php* ##|-PRIV - /* Allow additional execution time 0 = no limit. */ ini_set('max_execution_time', '0'); ini_set('max_input_time', '0'); diff --git a/usr/local/www/diag_confbak.php b/usr/local/www/diag_confbak.php index 0b87876..2015c91 100755 --- a/usr/local/www/diag_confbak.php +++ b/usr/local/www/diag_confbak.php @@ -27,6 +27,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: config +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-configurationhistory ##|*NAME=Diagnostics: Configuration History page @@ -34,7 +38,6 @@ ##|*MATCH=diag_confbak.php* ##|-PRIV - require("guiconfig.inc"); if($_GET['newver'] != "") { diff --git a/usr/local/www/diag_defaults.php b/usr/local/www/diag_defaults.php index 921a4e4..c462abd 100755 --- a/usr/local/www/diag_defaults.php +++ b/usr/local/www/diag_defaults.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_defaults.php - Copyright (C) 2004 Scott Ullrich + Copyright (C) 2004-2009 Scott Ullrich All rights reserved. originially part of m0n0wall (http://m0n0.ch/wall) @@ -31,6 +31,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: config +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-factorydefaults ##|*NAME=Diagnostics: Factory defaults page @@ -38,7 +42,6 @@ ##|*MATCH=diag_defaults.php* ##|-PRIV - require("guiconfig.inc"); if ($_POST) { diff --git a/usr/local/www/diag_dhcp_leases.php b/usr/local/www/diag_dhcp_leases.php index c79f309..1496685 100755 --- a/usr/local/www/diag_dhcp_leases.php +++ b/usr/local/www/diag_dhcp_leases.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_dhcp_leases.php - Copyright (C) 2004 Scott Ullrich + Copyright (C) 2004-2009 Scott Ullrich All rights reserved. originially part of m0n0wall (http://m0n0.ch/wall) @@ -31,6 +31,11 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: /usr/bin/awk /bin/cat /usr/sbin/arp /usr/bin/wc /usr/bin/grep + pfSense_MODULE: dhcpserver +*/ + ##|+PRIV ##|*IDENT=page-status-dhcpleases ##|*NAME=Status: DHCP leases page @@ -38,7 +43,6 @@ ##|*MATCH=diag_dhcp_leases.php* ##|-PRIV - require("guiconfig.inc"); $pgtitle = array("Status","DHCP leases"); @@ -111,9 +115,8 @@ $cleanpattern = "'{ gsub(\"#.*\", \"\");} { gsub(\";\", \"\"); print;}'"; $splitpattern = "'BEGIN { RS=\"}\";} {for (i=1; i<=NF; i++) printf \"%s \", \$i; printf \"}\\n\";}'"; /* stuff the leases file in a proper format into a array by line */ -exec("cat {$leasesfile} | {$awk} {$cleanpattern} | {$awk} {$splitpattern}", $leases_content); +exec("/bin/cat {$leasesfile} | {$awk} {$cleanpattern} | {$awk} {$splitpattern}", $leases_content); $leases_count = count($leases_content); - exec("/usr/sbin/arp -an", $rawdata); $arpdata = array(); foreach ($rawdata as $line) { @@ -272,9 +275,6 @@ foreach($config['interfaces'] as $ifname => $ifarr) { if ($_GET['order']) usort($leases, "leasecmp"); -?> - - 0) { ?> diff --git a/usr/local/www/diag_dns.php b/usr/local/www/diag_dns.php index d1be628..bc8dd6b 100644 --- a/usr/local/www/diag_dns.php +++ b/usr/local/www/diag_dns.php @@ -27,6 +27,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: dns +*/ + $pgtitle = "Diagnostics: DNS"; require("guiconfig.inc"); diff --git a/usr/local/www/diag_dump_states.php b/usr/local/www/diag_dump_states.php index 6c56b2f..c3818f6 100755 --- a/usr/local/www/diag_dump_states.php +++ b/usr/local/www/diag_dump_states.php @@ -1,7 +1,8 @@ . All rights reserved. @@ -31,6 +31,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: ipsec +*/ + ##|+PRIV ##|*IDENT=page-status-ipsec ##|*NAME=Status: IPsec page @@ -132,8 +136,6 @@ $sad = ipsec_dump_sad(); here. - - diff --git a/usr/local/www/diag_ipsec_sad.php b/usr/local/www/diag_ipsec_sad.php index 4d67869..c61359a 100755 --- a/usr/local/www/diag_ipsec_sad.php +++ b/usr/local/www/diag_ipsec_sad.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_ipsec_sad.php - Copyright (C) 2004 Scott Ullrich + Copyright (C) 2004-2009 Scott Ullrich All rights reserved. originially part of m0n0wall (http://m0n0.ch/wall) @@ -31,6 +31,11 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: /usr/local/sbin/setkey + pfSense_MODULE: ipsec +*/ + ##|+PRIV ##|*IDENT=page-status-ipsec-sad ##|*NAME=Status: IPsec: SAD page @@ -38,7 +43,6 @@ ##|*MATCH=diag_ipsec_sad.php* ##|-PRIV - require("guiconfig.inc"); $pgtitle = array("Status","IPsec","SAD"); diff --git a/usr/local/www/diag_ipsec_spd.php b/usr/local/www/diag_ipsec_spd.php index a910cae..7019c79 100755 --- a/usr/local/www/diag_ipsec_spd.php +++ b/usr/local/www/diag_ipsec_spd.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_ipsec_spd.php - Copyright (C) 2004 Scott Ullrich + Copyright (C) 2004-2009 Scott Ullrich All rights reserved. originially part of m0n0wall (http://m0n0.ch/wall) @@ -31,6 +31,11 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: /usr/local/sbin/setkey + pfSense_MODULE: ipsec +*/ + ##|+PRIV ##|*IDENT=page-status-ipsec-spd ##|*NAME=Status: IPsec: SPD page @@ -38,7 +43,6 @@ ##|*MATCH=diag_ipsec_spd.php* ##|-PRIV - require("guiconfig.inc"); $pgtitle = array("Status","IPsec","SPD"); diff --git a/usr/local/www/diag_logs.php b/usr/local/www/diag_logs.php index 637ff4c..9a647e8 100755 --- a/usr/local/www/diag_logs.php +++ b/usr/local/www/diag_logs.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_logs.php - Copyright (C) 2004 Scott Ullrich + Copyright (C) 2004-2009 Scott Ullrich All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) @@ -31,6 +31,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: system +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-logs-system ##|*NAME=Diagnostics: Logs: System page diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php index 413e223..ea12ac2 100755 --- a/usr/local/www/diag_logs_auth.php +++ b/usr/local/www/diag_logs_auth.php @@ -29,6 +29,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: captiveportal +*/ + ##|+PRIV ##|*IDENT=page-status-systemlogs-portalauth ##|*NAME=Status: System logs: Portal Auth page @@ -81,10 +85,10 @@ include("head.inc");
- + -
+ diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php index 07294cf..da0e3f8 100755 --- a/usr/local/www/diag_logs_dhcp.php +++ b/usr/local/www/diag_logs_dhcp.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_logs_dhcp.php - Copyright (C) 2004 Scott Ullrich + Copyright (C) 2004-2009 Scott Ullrich All rights reserved. originially part of m0n0wall (http://m0n0.ch/wall) @@ -31,6 +31,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: dhcpserver +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-logs-dhcp ##|*NAME=Diagnostics: Logs: DHCP page @@ -83,7 +87,7 @@ include("head.inc");
- +
diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index fa25c95..a09cdde 100755 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -2,11 +2,12 @@ /* $Id$ */ /* diag_logs_filter.php - part of pfSesne by Scott Ullrich + part of pfSense + Copyright (C) 2004-2009 Scott Ullrich originally based on m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2009 Manuel Kasper , - Jim Pingle @.org + Jim Pingle jim@pingle.org All rights reserved. Redistribution and use in source and binary forms, with or without @@ -31,6 +32,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: filter +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-logs-firewall ##|*NAME=Diagnostics: Logs: Firewall page diff --git a/usr/local/www/diag_logs_filter_dynamic.php b/usr/local/www/diag_logs_filter_dynamic.php index 3bcd9b0..b2f88ae 100755 --- a/usr/local/www/diag_logs_filter_dynamic.php +++ b/usr/local/www/diag_logs_filter_dynamic.php @@ -2,7 +2,8 @@ /* $Id$ */ /* diag_logs_filter.php - part of pfSesne by Scott Ullrich + part of pfSesne + Copyright (C) 2004-2009 Scott Ullrich originally based on m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2004 Manuel Kasper . @@ -30,6 +31,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: filter +*/ + ##|+PRIV ##|*IDENT=page-hidden-nolongerincluded ##|*NAME=Hidden: No longer included page diff --git a/usr/local/www/diag_logs_filter_summary.php b/usr/local/www/diag_logs_filter_summary.php index e0e5877..1b4cee1 100644 --- a/usr/local/www/diag_logs_filter_summary.php +++ b/usr/local/www/diag_logs_filter_summary.php @@ -1,7 +1,6 @@ [{$ph1ent['descr']}]: $2$3$4"; } /* collect all our own ip addresses */ -exec("/sbin/ifconfig|/usr/bin/awk '/inet / {print $2}'", $ip_address_list); +exec("/sbin/ifconfig | /usr/bin/awk '/inet / {print $2}'", $ip_address_list); foreach($ip_address_list as $address) { $search[] = "/(racoon: )([A-Z:].*?)({$address}\[[0-9].+\])(.*isakmp.*)/i"; $replace[] = "$1[Self]: $2$3$4"; diff --git a/usr/local/www/diag_logs_ntpd.php b/usr/local/www/diag_logs_ntpd.php index 3674813..f11d92d 100644 --- a/usr/local/www/diag_logs_ntpd.php +++ b/usr/local/www/diag_logs_ntpd.php @@ -29,6 +29,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: ntpd +*/ + ##|+PRIV ##|*IDENT=page-status-systemlogs-openntpd ##|*NAME=Status: System logs: OpenNTPD page diff --git a/usr/local/www/diag_logs_openvpn.php b/usr/local/www/diag_logs_openvpn.php index 5fdc7a3..a65367b 100644 --- a/usr/local/www/diag_logs_openvpn.php +++ b/usr/local/www/diag_logs_openvpn.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_logs.php - Copyright (C) 2004 Scott Ullrich + Copyright (C) 2004-2009 Scott Ullrich All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) @@ -31,6 +31,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: openvpn +*/ + ##|+PRIV ##|*IDENT=page-status-systemlogs-openvpn ##|*NAME=Status: System logs: OpenVPN page diff --git a/usr/local/www/diag_logs_relayd.php b/usr/local/www/diag_logs_relayd.php index 5d84eed..fae75b3 100755 --- a/usr/local/www/diag_logs_relayd.php +++ b/usr/local/www/diag_logs_relayd.php @@ -30,6 +30,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: routing +*/ + ##|+PRIV ##|*IDENT=page-status-systemlogs-loadbalancer ##|*NAME=Status: System logs: Load Balancer page diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index 6c38f7a..6cd7fac 100755 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_logs_settings.php - Copyright (C) 2004 Scott Ullrich + Copyright (C) 2004-2009 Scott Ullrich All rights reserved. originially part of m0n0wall (http://m0n0.ch/wall) @@ -31,6 +31,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: system +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-logs-settings ##|*NAME=Diagnostics: Logs: Settings page diff --git a/usr/local/www/diag_logs_slbd.php b/usr/local/www/diag_logs_slbd.php index fb69648..0afa403 100755 --- a/usr/local/www/diag_logs_slbd.php +++ b/usr/local/www/diag_logs_slbd.php @@ -30,6 +30,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: routing +*/ + ##|+PRIV ##|*IDENT=page-status-systemlogs-loadbalancer ##|*NAME=Status: System logs: Load Balancer page @@ -82,7 +86,7 @@ include("head.inc");
- +
diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php index 6f9965e..3d90cc4 100755 --- a/usr/local/www/diag_logs_vpn.php +++ b/usr/local/www/diag_logs_vpn.php @@ -29,6 +29,11 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: /usr/sbin/fifolog_reader /usr/sbin/clog + pfSense_MODULE: vpn +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-logs-pptpvpn ##|*NAME=Diagnostics: Logs: PPTP VPN page diff --git a/usr/local/www/diag_nanobsd.php b/usr/local/www/diag_nanobsd.php index 06f4c3e..754a354 100755 --- a/usr/local/www/diag_nanobsd.php +++ b/usr/local/www/diag_nanobsd.php @@ -26,6 +26,12 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: /sbin/mount /sbin/glabel /usr/bin/grep /usr/bin/cut /usr/bin/head /bin/cp + pfSense_BUILDER_BINARIES: /usr/sbin/boot0cfg /bin/mkdir /sbin/fsck_ufs /sbin/mount /sbin/sysctl /bin/dd /sbin/tunefs + pfSense_MODULE: nanobsd +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-nanobsd ##|*NAME=Diagnostics: NanoBSD @@ -131,7 +137,7 @@ EOF; EOF; file_put_contents("/tmp/{$AGLABEL_SLICE}/etc/fstab", $fstab); exec("/sbin/umount /tmp/{$AGLABEL_SLICE}"); - exec("sysctl kern.geom.debugflags=0"); + exec("/sbin/sysctl kern.geom.debugflags=0"); conf_mount_ro(); $savemsg = "The boot slice has been set to {$BOOT_DRIVE} {$AGLABEL_SLICE}"; // Survey slice info @@ -150,8 +156,8 @@ echo << -