From 1d8ff8b02e65cb2a2546c9cb4c4499a917f4b6c2 Mon Sep 17 00:00:00 2001 From: Joern Muehlencord Date: Sun, 12 Jun 2022 01:01:08 +0200 Subject: [PATCH] improved whois --- .../shared/network/whois/ArinWhoisParser.java | 2 + .../network/whois/DefaultWhoisParser.java | 2 + .../network/whois/DefaultWhoisParserTest.java | 2 +- .../shared/network/187.93.176.2.txt | 48 +++++++++++++++++++ 4 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 network/src/test/resources/de/muehlencord/shared/network/187.93.176.2.txt diff --git a/network/src/main/java/de/muehlencord/shared/network/whois/ArinWhoisParser.java b/network/src/main/java/de/muehlencord/shared/network/whois/ArinWhoisParser.java index 3d33342..e6507b3 100644 --- a/network/src/main/java/de/muehlencord/shared/network/whois/ArinWhoisParser.java +++ b/network/src/main/java/de/muehlencord/shared/network/whois/ArinWhoisParser.java @@ -51,6 +51,8 @@ public class ArinWhoisParser extends AbstractWhoisParser implements WhoisParser throw new WhoisException("Allocated to LACNIC"); } else if (whoisString.contains ("NON-RIPE-NCC-MANAGED-ADDRESS-BLOCK")) { throw new WhoisException("Not managed by RIPE"); + } else if (whoisString.contains ("Not allocated by APNIC")) { + throw new WhoisException("Not allocated by APNIC"); } else if (whoisString.contains ("This network range is not allocated to APNIC")) { throw new WhoisException("Not allocated to APNIC"); } diff --git a/network/src/main/java/de/muehlencord/shared/network/whois/DefaultWhoisParser.java b/network/src/main/java/de/muehlencord/shared/network/whois/DefaultWhoisParser.java index cd82313..0cb04cc 100644 --- a/network/src/main/java/de/muehlencord/shared/network/whois/DefaultWhoisParser.java +++ b/network/src/main/java/de/muehlencord/shared/network/whois/DefaultWhoisParser.java @@ -43,6 +43,8 @@ public class DefaultWhoisParser extends AbstractWhoisParser implements WhoisPars throw new WhoisException("Allocated to LACNIC"); } else if (whoisString.contains ("NON-RIPE-NCC-MANAGED-ADDRESS-BLOCK")) { throw new WhoisException("Not managed by RIPE"); + } else if (whoisString.contains ("Not allocated by APNIC")) { + throw new WhoisException("Not allocated by APNIC"); } else if (whoisString.contains ("This network range is not allocated to APNIC")) { throw new WhoisException("Not allocated to APNIC"); } diff --git a/network/src/test/java/de/muehlencord/shared/network/whois/DefaultWhoisParserTest.java b/network/src/test/java/de/muehlencord/shared/network/whois/DefaultWhoisParserTest.java index 90a51af..33ec096 100644 --- a/network/src/test/java/de/muehlencord/shared/network/whois/DefaultWhoisParserTest.java +++ b/network/src/test/java/de/muehlencord/shared/network/whois/DefaultWhoisParserTest.java @@ -15,7 +15,7 @@ class DefaultWhoisParserTest extends BaseTest { @Test void parseWhoIsString() throws Exception { - String whoisInformation = this.readContentFromFile("90.63.251.1.txt"); + String whoisInformation = this.readContentFromFile("187.50.136.210.txt"); DefaultWhoisParser parser = new DefaultWhoisParser(); WhoisInformation information = parser.parseWhoIsString(whoisInformation); assertNotNull (information); diff --git a/network/src/test/resources/de/muehlencord/shared/network/187.93.176.2.txt b/network/src/test/resources/de/muehlencord/shared/network/187.93.176.2.txt new file mode 100644 index 0000000..3a89c5b --- /dev/null +++ b/network/src/test/resources/de/muehlencord/shared/network/187.93.176.2.txt @@ -0,0 +1,48 @@ +% Copyright (c) Nic.br +% The use of the data below is only permitted as described in +% full by the terms of use at https://registro.br/termo/en.html , +% being prohibited its distribution, commercialization or +% reproduction, in particular, to use it for advertising or +% any similar purpose. +% 2022-03-01T05:12:42-03:00 - IP: 2a00:e180:cafe:10:9afa:9bff:fe6b:ff2e + +inetnum: 187.92.0.0/15 +aut-num: AS10429 +abuse-c: CSTBR +owner: TELEF�NICA BRASIL S.A +ownerid: 02.558.157/0001-62 +responsible: Diretoria de Planejamento e Tecnologia +country: BR +owner-c: ARITE +tech-c: GRP95 +created: 20090909 +changed: 20190410 + +nic-hdl-br: ARITE +person: Administra��o Rede IP Telesp +e-mail: dominios-vivo.br@telefonica.com +country: BR +created: 20080407 +changed: 20220104 + +nic-hdl-br: CSTBR +person: CSIRT TELEFONICA BR +e-mail: abuse.br@telefonica.com +country: BR +created: 20180713 +changed: 20180713 + +nic-hdl-br: GRP95 +person: Grupo Provisionamento +e-mail: gestaoip@telesp.com.br +country: BR +created: 20031027 +changed: 20060809 + +% Security and mail abuse issues should also be addressed to +% cert.br, http://www.cert.br/ , respectivelly to cert@cert.br +% and mail-abuse@cert.br +% +% whois.registro.br accepts only direct match queries. Types +% of queries are: domain (.br), registrant (tax ID), ticket, +% provider, CIDR block, IP and ASN.