Project

General

Profile

« Previous | Next » 

Revision 3f2b92d2

Added by Scott Ullrich over 20 years ago

Add captive portal logging.

Patch-submitted-to-m0n0wall-list-by: Matt Juszczak <matt_AT_atopia.net>

View differences:

etc/inc/system.inc
195 195
		$syslogconf = <<<EOD
196 196
local0.*					%/var/log/filter.log
197 197
local3.*					%/var/log/vpn.log
198
local4.*					%/var/log/portalauth.log
198 199
local7.*					%/var/log/dhcpd.log
199
*.notice;kern.debug;lpr.info;mail.crit;news.err;local0.none;local3.none;local7.none %/var/log/system.log
200
*.notice;kern.debug;lpr.info;mail.crit;news.err;local0.none;local3.none;local4.none;local7.none %/var/log/system.log
200 201
security.*					%/var/log/system.log
201 202
auth.info;authpriv.info;daemon.info		%/var/log/system.log
202 203
*.emerg						*
......
213 214
		if (isset($syslogcfg['vpn'])) {
214 215
			$syslogconf .= <<<EOD
215 216
local3.*					@{$syslogcfg['remoteserver']}
217
EOD;
218
		}
219

  
216 220

  
221
		if (isset($syslogcfg['portalauth'])) {
222
			$syslogconf .= <<<EOD
223
local4.*					@{$syslogcfg['remoteserver']}
217 224
EOD;
218 225
		}
219 226

  
227

  
220 228
		if (isset($syslogcfg['dhcp'])) {
221 229
			$syslogconf .= <<<EOD
222 230
local7.*					@{$syslogcfg['remoteserver']}
223

  
224 231
EOD;
225 232
		}
226 233

  
227 234
		if (isset($syslogcfg['system'])) {
228 235
			$syslogconf .= <<<EOD
229
*.notice;kern.debug;lpr.info;mail.crit;news.err;local0.none;local7.none @{$syslogcfg['remoteserver']}
236
*.notice;kern.debug;lpr.info;mail.crit;news.err;local0.none;local3.none;local4.none;local7.none @{$syslogcfg['remoteserver']}
230 237
security.*					@{$syslogcfg['remoteserver']}
231 238
auth.info;authpriv.info;daemon.info		@{$syslogcfg['remoteserver']}
232 239
*.emerg						@{$syslogcfg['remoteserver']}
etc/rc
35 35
clog -i -s 262144 /var/log/filter.log
36 36
clog -i -s 32768 /var/log/dhcpd.log
37 37
clog -i -s 32768 /var/log/vpn.log
38
chmod 0600 /var/log/system.log /var/log/filter.log /var/log/dhcpd.log /var/log/vpn.log
38
clog -i -s 32768 /var/log/portalauth.log
39
chmod 0600 /var/log/system.log /var/log/filter.log /var/log/dhcpd.log /var/log/vpn.log /var/log/portalauth.log
39 40

  
40 41
adjkerntz -i
41 42

  
etc/syslog.conf
1 1
local0.*					%/var/log/filter.log
2 2
local3.*					%/var/log/vpn.log
3
local4.*					%/var/log/portalauth.log
3 4
local7.*					%/var/log/dhcpd.log
4
*.notice;kern.debug;lpr.info;mail.crit;news.err;local0.none;local3.none;local7.none	%/var/log/system.log
5
*.notice;kern.debug;lpr.info;mail.crit;news.err;local0.none;local3.none;local4.none;local7.none	%/var/log/system.log
5 6
security.*					%/var/log/system.log
6 7
auth.info;authpriv.info;daemon.info		%/var/log/system.log
7 8
*.emerg						*
etc/version
1
1.2b2
1
1.2b2-STOCKTON
usr/local/captiveportal/index.php
34 34
require("config.inc");
35 35
require("radius_authentication.inc") ;
36 36
require("radius_accounting.inc") ;
37
require("portal_log.inc") ;
37 38

  
38 39
header("Expires: 0");
39 40
header("Cache-Control: no-store, no-cache, must-revalidate");
......
73 74
							  			  $radiusservers[0]['port'],
74 75
							  			  $radiusservers[0]['key']);
75 76
		if ($auth_val == 2) {
77
			captiveportal_logportalauth($_POST['auth_user'],$clientmac,$clientip,TRUE);
76 78
			$sessionid = portal_allow($clientip, $clientmac, $_POST['auth_user']);
77 79
			if (isset($config['captiveportal']['radacct_enable']) && isset($radiusservers[0])) {
78 80
				$auth_val = RADIUS_ACCOUNTING_START($_POST['auth_user'],
......
82 84
													$radiusservers[0]['key']);
83 85
			}
84 86
		} else {
87
			captiveportal_logportalauth($_POST['auth_user'],$clientmac,$clientip,FALSE);
85 88
			readfile("{$g['varetc_path']}/captiveportal-error.html");
86 89
		}
87 90
	} else {
usr/local/www/diag_logs.php
78 78
	<li class="tabact">System</li>
79 79
    <li class="tabinact"><a href="diag_logs_filter.php">Firewall</a></li>
80 80
    <li class="tabinact"><a href="diag_logs_dhcp.php">DHCP</a></li>
81
    <li class="tabinact"><a href="diag_logs_auth.php">Portal Auth</a></li>
81 82
    <li class="tabinact"><a href="diag_logs_vpn.php">PPTP VPN</a></li>
82 83
    <li class="tabinact"><a href="diag_logs_settings.php">Settings</a></li>
83 84
  </ul>
usr/local/www/diag_logs_dhcp.php
78 78
    <li class="tabinact"><a href="diag_logs.php">System</a></li>
79 79
    <li class="tabinact"><a href="diag_logs_filter.php">Firewall</a></li>
80 80
    <li class="tabact">DHCP</li>
81
    <li class="tabinact"><a href="diag_logs_auth.php">Portal Auth</a></li>
81 82
    <li class="tabinact"><a href="diag_logs_vpn.php">PPTP VPN</a></li>
82 83
    <li class="tabinact"><a href="diag_logs_settings.php">Settings</a></li>
83 84
  </ul>
usr/local/www/diag_logs_filter.php
135 135
    <li class="tabinact"><a href="diag_logs.php">System</a></li>
136 136
    <li class="tabact">Firewall</li>
137 137
    <li class="tabinact"><a href="diag_logs_dhcp.php">DHCP</a></li>
138
    <li class="tabinact"><a href="diag_logs_auth.php">Portal Auth</a></li>
138 139
    <li class="tabinact"><a href="diag_logs_vpn.php">PPTP VPN</a></li>
139 140
    <li class="tabinact"><a href="diag_logs_settings.php">Settings</a></li>
140 141
  </ul>
usr/local/www/diag_logs_settings.php
36 36
$pconfig['remoteserver'] = $config['syslog']['remoteserver'];
37 37
$pconfig['filter'] = isset($config['syslog']['filter']);
38 38
$pconfig['dhcp'] = isset($config['syslog']['dhcp']);
39
$pconfig['portalauth'] = isset($config['syslog']['portalauth']);
39 40
$pconfig['vpn'] = isset($config['syslog']['vpn']);
40 41
$pconfig['system'] = isset($config['syslog']['system']);
41 42
$pconfig['enable'] = isset($config['syslog']['enable']);
......
64 65
		$config['syslog']['remoteserver'] = $_POST['remoteserver'];
65 66
		$config['syslog']['filter'] = $_POST['filter'] ? true : false;
66 67
		$config['syslog']['dhcp'] = $_POST['dhcp'] ? true : false;
68
		$config['syslog']['portalauth'] = $_POST['portalauth'] ? true : false;
67 69
		$config['syslog']['vpn'] = $_POST['vpn'] ? true : false;
68 70
		$config['syslog']['system'] = $_POST['system'] ? true : false;
69 71
		$config['syslog']['enable'] = $_POST['enable'] ? true : false;
......
99 101
		document.iform.remoteserver.disabled = 0;
100 102
		document.iform.filter.disabled = 0;
101 103
		document.iform.dhcp.disabled = 0;
104
		document.iform.portalauth.disabled = 0;
102 105
		document.iform.vpn.disabled = 0;
103 106
		document.iform.system.disabled = 0;
104 107
	} else {
105 108
		document.iform.remoteserver.disabled = 1;
106 109
		document.iform.filter.disabled = 1;
107 110
		document.iform.dhcp.disabled = 1;
111
		document.iform.portalauth.disabled = 1;
108 112
		document.iform.vpn.disabled = 1;
109 113
		document.iform.system.disabled = 1;
110 114
	}
......
125 129
    <li class="tabinact"><a href="diag_logs.php">System</a></li>
126 130
    <li class="tabinact"><a href="diag_logs_filter.php">Firewall</a></li>
127 131
    <li class="tabinact"><a href="diag_logs_dhcp.php">DHCP</a></li>
132
    <li class="tabinact"><a href="diag_logs_auth.php">Portal Auth</a></li>
128 133
    <li class="tabinact"><a href="diag_logs_vpn.php">PPTP VPN</a></li>
129 134
    <li class="tabact">Settings</li>
130 135
  </ul>
......
171 176
                          IP address of remote syslog server<br> <br> <input name="system" id="system" type="checkbox" value="yes" onclick="enable_change(false)" <?php if ($pconfig['system']) echo "checked"; ?>>
172 177
                          system events <br> <input name="filter" id="filter" type="checkbox" value="yes" <?php if ($pconfig['filter']) echo "checked"; ?>>
173 178
                          firewall events<br> <input name="dhcp" id="dhcp" type="checkbox" value="yes" <?php if ($pconfig['dhcp']) echo "checked"; ?>>
174
                          DHCP service events<br> <input name="vpn" id="vpn" type="checkbox" value="yes" <?php if ($pconfig['vpn']) echo "checked"; ?>>
179
                          DHCP service events<br> <input name="portalauth" id="portalauth" type="checkbox" value="yes" <?php if ($pconfig['portalauth']) echo "checked"; ?>>
180
                          Portal Auth<br> <input name="vpn" id="vpn" type="checkbox" value="yes" <?php if ($pconfig['vpn']) echo "checked"; ?>>
175 181
                          PPTP VPN events</td>
176 182
                      </tr>
177 183
                      <tr> 
usr/local/www/diag_logs_vpn.php
82 82
    <li class="tabinact"><a href="diag_logs.php">System</a></li>
83 83
    <li class="tabinact"><a href="diag_logs_filter.php">Firewall</a></li>
84 84
    <li class="tabinact"><a href="diag_logs_dhcp.php">DHCP</a></li>
85
    <li class="tabinact"><a href="diag_logs_auth.php">Portal Auth</a></li>
85 86
    <li class="tabact">PPTP VPN</li>
86 87
    <li class="tabinact"><a href="diag_logs_settings.php">Settings</a></li>
87 88
  </ul>

Also available in: Unified diff