added multiple abuse email address detection

This commit is contained in:
sparc 2005-10-15 09:52:45 +00:00
parent d74746f230
commit 2007a81730
3 changed files with 25 additions and 14 deletions

View file

@ -1,4 +1,9 @@
2005/10/142 David Saez <david@ols.es>
2005/10/15 David Saez <david@ols.es>
- added missing example for .ag
- added multiple abuse email address detection
in arin ip queries
2005/10/14 David Saez <david@ols.es>
- clean some messy ripe records
- added handler for .name

View file

@ -27,8 +27,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
/* arin.whois 1.0 David Saez 7/6/2002 */
if (!defined("__ARIN_HANDLER__"))
define("__ARIN_HANDLER__", 1);
if (!defined('__ARIN_HANDLER__'))
define('__ARIN_HANDLER__', 1);
require_once('whois.parser.php');
@ -38,13 +38,13 @@ class arin_handler
function parse($data_str, $query)
{
$items = array(
"OrgName:" => "owner.organization",
"OrgID:" => "owner.handle",
"Address:" => "owner.address.street",
"City:" => "owner.address.city",
"StateProv:" => "owner.address.state",
"PostalCode:" => "owner.address.pcode",
"Country:" => "owner.address.country",
'OrgName:' => 'owner.organization',
'OrgID:' => 'owner.handle',
'Address:' => 'owner.address.street',
'City:' => 'owner.address.city',
'StateProv:' => 'owner.address.state',
'PostalCode:' => 'owner.address.pcode',
'Country:' => 'owner.address.country',
"NetRange:" => "network.inetnum",
"NetName:" => "network.name",
"NetHandle:" => "network.handle",
@ -64,11 +64,11 @@ class arin_handler
"OrgAbuseName:" => "abuse.name",
"OrgAbuseHandle:" => "abuse.handle",
"OrgAbusePhone:" => "abuse.phone",
"OrgAbuseEmail:" => "abuse.email",
"OrgAbuseEmail:" => "abuse.email.",
'ReferralServer:' => 'rwhois'
);
$r = generic_parser_b($data_str, $items, 'ymd', false);
$r = generic_parser_b($data_str, $items, 'ymd', false, true);
if (isset($r['AS']))
{
@ -77,6 +77,9 @@ class arin_handler
$r['AS']['handle'] = $ash;
unset($r['network']);
}
if (isset($r['abuse']['email']))
$r['abuse']['email'] = implode(',',$r['abuse']['email']);
return $r;
}

View file

@ -118,7 +118,7 @@ return $ret;
//-------------------------------------------------------------------------
function generic_parser_b ( $rawdata, $items, $dateformat='mdy', $hasreg=true )
function generic_parser_b ( $rawdata, $items, $dateformat='mdy', $hasreg=true, $scanall=false )
{
$r='';
@ -145,9 +145,12 @@ while (list($key,$val)=each($rawdata))
{
$var = "\$r".getvarname($field);
$itm = trim(substr($val,$pos+strlen($match)));
if ($itm!='')
eval($var."=\"".str_replace('"','\"',$itm)."\";");
break;
if (!$scanall)
break;
}
}
}