cmaffio/pannello
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix acl

Browse Source
This commit is contained in:
cmaffio
2016-05-05 11:23:24 +02:00
parent 4dea08e88c
commit 10655c1693
4 changed files with 58 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
proxy/acl_edit.php
View File

@@ -14,24 +14,24 @@ if (isset($_POST['rif']) && $_POST['rif'] != "") {
idacllist = $id,
rif = '$rif',
attivo = 1,
data = NOW();
dflt = $dflt,
data = NOW()
";
$res = mysql_query( $query, $DB_ID );
} elseif (isset($_POST['id'])) {
$id = $_POST['id'];
$nome = $_POST['nome'];
$dflt = $_POST['dflt'];
if ($id) {
$query = " UPDATE
proxy_acl_list
SET
nome = '$nome',
dflt = $dflt,
data = NOW()
WHERE
id = $id
id = $id";
$res = mysql_query( $query, $DB_ID );
";
} else {
$query = " INSERT INTO
proxy_acl_list
@@ -39,6 +39,7 @@ if (isset($_POST['rif']) && $_POST['rif'] != "") {
nome = '$nome',
attivo = 1,
sys = 0,
dflt = $dflt,
data = NOW()
";
$res = mysql_query( $query, $DB_ID );
@@ -102,29 +103,43 @@ if ($dato['attivo']) {
<td class="colip"><input type="text" size="16" name=nome value="<?php print $dato['nome'] ?>"></td>
<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
<td class="colip"><?php print $dato['data'] ?></td>
<td colspan=3class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
</tr>
<tr><td class="spazioh" colspan=8><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
<tr>
<td colspan=2 class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
<td>
<table cellpadding="0" cellspacing="0" border="0">
<tr>
<td rowspan=2 class="descrizione_c">Default</td>
<td class="descrizione_c">Nega</td>
<td class="descrizione_c">Ignora</td>
<td class="descrizione_c">Autorizza</td>
</tr>
<tr>
<td class="radio"><input type="radio" name="dflt" value=-1 <?php if ($dflt == -1) { print "checked=\"checked\""; } ?> ></td>
<td class="radio"><input type="radio" name="dflt" value=0 <?php if ($dflt == 0) { print "checked=\"checked\""; } ?> ></td>
<td class="radio"><input type="radio" name="dflt" value=1 <?php if ($dflt == 1) { print "checked=\"checked\""; } ?> ></td>
</tr>
</table>
</td>
<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
<td><input type="submit" value="Conferma"></td>
<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
<td colspan=3 class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
</tr>
<tr><td class="spaziov" colspan=9><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
<tr><td class="spaziov" colspan=8><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
<?php if ($id) { ?>
<tr>
<td rowspan=2 colspan=2 class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
<td class="descrizione">Nuova destinazione</td>
<td rowspan=2 colspan=2 class="spazioh"><input type="image" src="<?php print $CONF['base_url'] ?>/img/add_link.png" border="0" alt="Submit" /></td>
<td rowspan=2 colspan=3 class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
</tr>
<tr>
<td class="colip"><input type="text" size="32" name=rif></td>
</tr>
<tr><td class="spaziov" colspan=9><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
<tr><td class="spaziov" colspan=8><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td></tr>
<?php while ($dato = mysql_fetch_array ( $res )) { ?>
<tr>
@@ -139,10 +154,8 @@ if ($dato['attivo']) {
<td class="colip"><?php print $dato['data']?></td>
<td colspan=3 class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
</tr>
<?php }
} ?>
</table>
</form>
<img src="<?php print $CONF['base_url'] ?>/img/spazio.gif" width="1" height="20" alt="">

2
proxy/pool_acl.php
View File

@@ -57,7 +57,7 @@ $query = " SELECT
proxy_acl_list.id,
proxy_acl_list.nome,
proxy_acl_list.sys,
0
proxy_acl_list.dflt
FROM
proxy_acl_list
WHERE

34
proxy/squid_acl/squid_acl.pl
View File

@@ -44,13 +44,9 @@ while($limit) {
print "OK\n";
} else {
print LOG "$param[0] - $param[1] - $param[2] - ERR\n";
print "DENY\n";
print "DENY2\n";
}
}
# next if ($query eq "");
}
exit;
@@ -109,6 +105,31 @@ sub cerca {
proxy_acl_list.nome = 'ALL'
WHERE
proxy_pool.ip = '$ip'
UNION DISTINCT SELECT
1
FROM
proxy_acl
JOIN
proxy_acl_list
ON
proxy_acl_list.id = proxy_acl.idacllist
WHERE
LOCATE(proxy_acl.rif, '$url') > 0
AND
proxy_acl_list.dflt = $stato
AND
proxy_acl_list.id NOT IN (
SELECT
proxy_acl_ip.idacllist
FROM
proxy_acl_ip
JOIN
proxy_pool
ON
proxy_pool.id = proxy_acl_ip.idpool
WHERE
proxy_pool.ip = '$ip'
)
";
# print "$query\n";
@@ -120,7 +141,4 @@ sub cerca {
} else {
return 0;
}
}