<?php
-// $Id: spam.php,v 1.159 2007/05/11 15:25:36 henoheno Exp $
+// $Id: spam.php,v 1.170 2007/06/09 02:22:13 henoheno Exp $
// Copyright (C) 2006-2007 PukiWiki Developers Team
// License: GPL v2 or (at your option) any later version
//
),
$binary);
} else {
+ // Remove "\0" etc. Preserve readable spaces if possible.
$binary = preg_replace('/(?:[^[:graph:][:space:]]|[\r])+/s', "\n", $binary);
}
if ($min_len > 1) {
$min_len = min(1024, intval($min_len));
- $binary =
- implode("\n",
- preg_grep('/^.{' . $min_len . ',}/S',
- explode("\n", $binary)
- )
- );
+ $regex = '/^.{' . $min_len . ',}/S';
+ if (is_array($binary)) {
+ foreach(array_keys($binary) as $key) {
+ $binary[$key] = implode("\n", preg_grep($regex, explode("\n", $binary[$key])));
+ }
+ } else {
+ $binary = implode("\n", preg_grep($regex, explode("\n", $binary)));
+ }
}
return $binary;
preg_match_all(
// scheme://userinfo@host:port/path/or/pathinfo/maybefile.and?query=string#fragment
// Refer RFC3986 (Regex below is not strict)
- '#(\b[a-z][a-z0-9.+-]{1,8}):/+' . // 1: Scheme
+ '#(\b[a-z][a-z0-9.+-]{1,8}):[/\\\]+' . // 1: Scheme
'(?:' .
'([^\s<>"\'\[\]/\#?@]*)' . // 2: Userinfo (Username)
'@)?' .
// 3: Host
'\[[0-9a-f:.]+\]' . '|' . // IPv6([colon-hex and dot]): RFC2732
'(?:[0-9]{1,3}\.){3}[0-9]{1,3}' . '|' . // IPv4(dot-decimal): 001.22.3.44
- '[a-z0-9.-]+' . // hostname(FQDN) : foo.example.org
+ '[a-z0-9][a-z0-9.-]+[a-z0-9]' . // hostname(FQDN) : foo.example.org
')' .
'(?::([0-9]*))?' . // 4: Port
'((?:/+[^\s<>"\'\[\]/\#]+)*/+)?' . // 5: Directory path or path-info
function get_blocklist($list = '')
{
- static $regexs;
+ static $regexes;
+
+ if ($list === NULL) {
+ $regexes = NULL; // Unset
+ return array();
+ }
- if (! isset($regexs)) {
- $regexs = array();
+ if (! isset($regexes)) {
+ $regexes = array();
if (file_exists(SPAM_INI_FILE)) {
$blocklist = array();
include(SPAM_INI_FILE);
// 'IANA-examples' => '#^(?:.*\.)?example\.(?:com|net|org)$#',
// );
if (isset($blocklist['list'])) {
- $regexs['list'] = & $blocklist['list'];
+ $regexes['list'] = & $blocklist['list'];
} else {
// Default
$blocklist['list'] = array(
if (! isset($blocklist[$_list])) continue;
foreach ($blocklist[$_list] as $key => $value) {
if (is_array($value)) {
- $regexs[$_list][$key] = array();
+ $regexes[$_list][$key] = array();
foreach($value as $_key => $_value) {
- get_blocklist_add($regexs[$_list][$key], $_key, $_value);
+ get_blocklist_add($regexes[$_list][$key], $_key, $_value);
}
} else {
- get_blocklist_add($regexs[$_list], $key, $value);
+ get_blocklist_add($regexes[$_list], $key, $value);
}
}
unset($blocklist[$_list]);
}
}
- if ($list == '') {
- return $regexs; // ALL
- } else if (isset($regexs[$list])) {
- return $regexs[$list];
- } else {
+ if ($list === '') {
+ return $regexes; // ALL
+ } else if (isset($regexes[$list])) {
+ return $regexes[$list];
+ } else {
return array();
}
}
}
// An array() to an array leaf
-function array_leaf($array = array('A', 'B', 'C.D'), $array_all = FALSE)
+function array_leaf($array = array('A', 'B', 'C.D'), $stem = FALSE, $edge = array())
{
$leaf = array();
$tmp = & $leaf;
$parent = & $tmp;
$tmp = & $tmp[$arg];
}
-
- if (! $array_all) $parent = key($parent);
+ if ($stem) {
+ $parent[key($parent)] = & $edge;
+ } else {
+ $parent = key($parent);
+ }
return $leaf; // array('A' => array('B' => 'C.D'))
}
foreach($progress['blocked'] as $list => $lvalue) {
foreach($lvalue as $group => $gvalue) {
$flat = implode(', ', array_flat_leaves($gvalue));
- if ($flat == $group) {
+ if ($flat === $group) {
$blocked[$list][] = $flat;
} else {
$blocked[$list][$group] = $flat;
! is_array($progress['hosts']) ||
empty($progress['hosts'])) return '';
- // Sort by domain
- $tmp = array();
- foreach($progress['hosts'] as $value) {
- $tmp[delimiter_reverse($value)] = $value;
+ $result = '';
+ if (FALSE) {
+ // Sort by domain
+ $tmp = array();
+ foreach($progress['hosts'] as $value) {
+ $tmp[delimiter_reverse($value)] = $value;
+ }
+ ksort($tmp, SORT_STRING);
+ $result = count($tmp) . ' (' .implode(', ', $tmp) . ')';
+ } else {
+ $tmp = array();
+ foreach($progress['hosts'] as $value) {
+ $tmp = array_merge_recursive(
+ $tmp,
+ array_leaf(explode('.', delimiter_reverse($value)), TRUE, $value)
+ );
+ }
+
+//var_dump($tmp);
+// TODO: IP address 1.2.3.4 => "0"-3-2-1 by array_shrinkbranch_leaves()
+
+ array_shrinkbranch_leaves($tmp, '.', TRUE); // "domain.tld"
+ array_joinbranch_leaf($tmp, '.', 0, TRUE);
+ foreach($tmp as $key => $value) {
+ if (is_array($value)) {
+ ksort($tmp[$key], SORT_STRING);
+ $tmp[$key] = implode(', ', array_flat_leaves($value));
+ }
+ }
+ ksort($tmp, SORT_STRING);
+
+ $result = var_export_shrink($tmp, TRUE, TRUE);
+ }
+
+ return $result;
+}
+
+
+function array_joinbranch_leaf(& $array, $delim = '.', $limit = 0, $reverse = FALSE)
+{
+ $result = array();
+
+ if (! is_array($array)) return $result; // Nothing to do
+
+ $limit = max(0, intval($limit));
+ $cstack = array();
+
+ foreach(array_keys($array) as $key) {
+ $kstack = array();
+ $k = -1;
+
+ $single = array($key => & $array[$key]); // Keep it single
+ $cursor = & $single;
+ while(is_array($cursor) && count($cursor) == 1) { // Once
+ ++$k;
+ $kstack[] = key($cursor);
+ $cursor = & $cursor[$kstack[$k]];
+ if ($limit != 0 && $k == $limit) break;
+ }
+
+ // Relink
+ if ($k != 0) {
+ if ($reverse) $kstack = array_reverse($kstack);
+ $joinkey = implode($delim, $kstack);
+
+ unset($array[$key]);
+ $array[$joinkey] = & $cursor;
+ $result[$joinkey] = $k + 1; // Key seems not an single array => joined length
+ }
+ }
+
+ return $result;
+}
+//$a = array(array()); //=> array()
+//$a = array('F' => array('B' => array('C' => array('d' => array('' => '6')))));
+//$b = array('R' => array('S' => array('T' => array('U' => array('' => '7')))));
+//$a = array('I' => $a, '@' => $b);
+//$a = array('F' => array(5), 0 => array('H'));
+//echo "<br>";
+//var_dump(array_joinbranch_leaf($a, '#', 0, 0));
+//var_export($a);
+//echo "<br>";
+//echo "<br>";
+
+
+// array('A' => array('B' => 'C')) to
+// array('A.B' => 'C')
+// array(
+// 'A' => array(
+// 'B' => array(
+// 'C' => array(
+// 'D' => '1'
+// ),
+// ),
+// ),
+// 'G' => array(
+// 'H' => '2'
+// ),
+// )
+// to
+// array (
+// 'G.H' => '2',
+// 'A.B.C.D' => '1',
+// )
+function array_shrinkbranch_leaves(& $array, $delim = '.', $reverse = FALSE, $recurse = FALSE)
+{
+ $result = 0;
+ if (! is_array($array) || empty($array)) return $result;
+
+ foreach(array_keys($array) as $key) {
+ $branch = & $array[$key];
+ if (! is_array($branch) || empty($branch)) continue;
+
+ foreach(array_keys($branch) as $bkey) {
+ $joinkey = $reverse ?
+ $bkey . $delim . $key :
+ $key . $delim . $bkey;
+ $array[$joinkey] = & $branch[$bkey];
+ unset($array[$key]);
+ ++$result;
+ }
+ }
+
+ // Rescan (Recurse)
+ if ($recurse && $result) {
+ $result = array_shrinkbranch_leaves($array, $delim, $reverse, $recurse);
}
- ksort($tmp);
- return count($tmp) . ' (' .implode(', ', $tmp) . ')';
+ return $result; // Tell me how many
}
+//$a = array (
+// 'edu' => array (
+// 'berkeley' => array (
+// 'polisci' => array (
+// '' => 'polisci.berkeley.edu',
+// ),
+// ),
+// 'cmich' => array (
+// 'rso' => array (
+// '' => 'rso.cmich.edu',
+// ),
+// ),
+// ),
+//);
+//array_shrinkbranch_leaves($a, '.', TRUE);
+//var_export($a);
+
+//$a = array (
+// '4' => array (
+// '5' => array (
+// '6' => array (
+// '' => '7.8.9',
+// ),
+// ),
+// ),
+//);
+//array_shrinkbranch_leaves($a, '.', TRUE);
+//var_export($a);
// ---------------------
// Exit
+// Freeing memories
+function spam_dispose()
+{
+ get_blocklist(NULL);
+}
+
// Common bahavior for blocking
// NOTE: Call this function from various blocking feature, to disgueise the reason 'why blocked'
function spam_exit($mode = '', $data = array())
{
+
+ $exit = TRUE;
switch ($mode) {
- case '': echo("\n"); break;
+ case '':
+ echo("\n");
+ break;
case 'dump':
echo('<pre>' . "\n");
echo htmlspecialchars(var_export($data, TRUE));
break;
};
- // Force exit
- exit;
+ if ($exit) exit; // Force exit
}
{
$progress = check_uri_spam($target, $method);
- if (! empty($progress['is_spam'])) {
- // Mail to administrator(s)
+ if (empty($progress['is_spam'])) {
+ spam_dispose();
+ } else {
+ $target = string($target, 0); // Removing "\0" etc
pkwk_spamnotify($action, $page, $target, $progress, $method);
-
- // Exit
spam_exit($exitmode, $progress);
}
}