diff --git a/oneforall/data/srv_names.json b/oneforall/data/srv_prefixes.json similarity index 94% rename from oneforall/data/srv_names.json rename to oneforall/data/srv_prefixes.json index 4534086..8a44c66 100644 --- a/oneforall/data/srv_names.json +++ b/oneforall/data/srv_prefixes.json @@ -1,102 +1,102 @@ -[ -"_afpovertcp._tcp.", -"_aix._tcp.", -"_autodiscover._tcp.", -"_caldav._tcp.", -"_certificates._tcp.", -"_client._smtp.", -"_cmp._tcp.", -"_crls._tcp.", -"_crl._tcp.", -"_finger._tcp.", -"_ftp._tcp.", -"_gc._tcp.", -"_h323be._tcp.", -"_h323be._udp.", -"_h323cs._tcp.", -"_h323cs._udp.", -"_h323ls._tcp.", -"_h323ls._udp.", -"_h323rs._tcp.", -"_hkps._tcp.", -"_hkp._tcp.", -"_http._tcp.", -"_iax.udp.", -"_imaps._tcp.", -"_imap._tcp.", -"_jabber-client._tcp.", -"_jabber-client._udp.", -"_jabber._tcp.", -"_jabber._udp.", -"_kerberos-adm._tcp.", -"_kerberos._tcp.", -"_kerberos._tcp.dc._msdcs.", -"_kerberos._udp.", -"_kpasswd._tcp.", -"_kpasswd._udp.", -"_ldap._tcp.", -"_ldap._tcp.dc._msdcs.", -"_ldap._tcp.gc._msdcs.", -"_ldap._tcp.pdc._msdcs.", -"_msdcs.", -"_mysqlsrv._tcp.", -"_nntp._tcp.", -"_ntp._udp.", -"_ocsp._tcp.", -"_pgpkeys._tcp.", -"_pgprevokations._tcp.", -"_PKIXREP._tcp.", -"_pop3s._tcp.", -"_pop3._tcp.", -"_sipfederationtls._tcp.", -"_sipinternal._tcp.", -"_sipinternaltls._tcp.", -"_sips._tcp.", -"_sip._tcp.", -"_sip._tls.", -"_sip._udp.", -"_smtp._tcp.", -"_ssh._tcp.", -"_stun._tcp.", -"_stun._udp.", -"_svcp._tcp.", -"_tcp.", -"_telnet._tcp.", -"_test._tcp.", -"_tls.", -"_udp.", -"_vlmcs._tcp.", -"_vlmcs._udp.", -"_whois._tcp.", -"_wpad._tcp.", -"_xmpp-client._tcp.", -"_xmpp-client._udp.", -"_xmpp-server._tcp.", -"_xmpp-server._udp.", -"_https._tcp.", -"_imap.tcp.", -"_kerberos.tcp.dc._msdcs.", -"_ldap._tcp.ForestDNSZones.", -"_submission._tcp.", -"_caldavs._tcp.", -"_carddav._tcp.", -"_carddavs._tcp.", -"_x-puppet._tcp.", -"_x-puppet-ca._tcp.", -"_domainkey.", -"_pkixrep._tcp.", -"_cisco-phone-http.", -"_cisco-phone-tftp.", -"_cisco-uds._tcp.", -"_ciscowtp._tcp.", -"_collab-edge._tls.", -"_cuplogin._tcp.", -"_client._smtp._tcp.", -"_sftp._tcp.", -"_h323rs._udp.", -"_sql._tcp.", -"_sip._tcp.internal.", -"_snmp._udp.", -"_rdp._tcp.", -"_xmpp-server._udp." -] \ No newline at end of file +[ +"_afpovertcp._tcp.", +"_aix._tcp.", +"_autodiscover._tcp.", +"_caldav._tcp.", +"_certificates._tcp.", +"_client._smtp.", +"_cmp._tcp.", +"_crls._tcp.", +"_crl._tcp.", +"_finger._tcp.", +"_ftp._tcp.", +"_gc._tcp.", +"_h323be._tcp.", +"_h323be._udp.", +"_h323cs._tcp.", +"_h323cs._udp.", +"_h323ls._tcp.", +"_h323ls._udp.", +"_h323rs._tcp.", +"_hkps._tcp.", +"_hkp._tcp.", +"_http._tcp.", +"_iax.udp.", +"_imaps._tcp.", +"_imap._tcp.", +"_jabber-client._tcp.", +"_jabber-client._udp.", +"_jabber._tcp.", +"_jabber._udp.", +"_kerberos-adm._tcp.", +"_kerberos._tcp.", +"_kerberos._tcp.dc._msdcs.", +"_kerberos._udp.", +"_kpasswd._tcp.", +"_kpasswd._udp.", +"_ldap._tcp.", +"_ldap._tcp.dc._msdcs.", +"_ldap._tcp.gc._msdcs.", +"_ldap._tcp.pdc._msdcs.", +"_msdcs.", +"_mysqlsrv._tcp.", +"_nntp._tcp.", +"_ntp._udp.", +"_ocsp._tcp.", +"_pgpkeys._tcp.", +"_pgprevokations._tcp.", +"_PKIXREP._tcp.", +"_pop3s._tcp.", +"_pop3._tcp.", +"_sipfederationtls._tcp.", +"_sipinternal._tcp.", +"_sipinternaltls._tcp.", +"_sips._tcp.", +"_sip._tcp.", +"_sip._tls.", +"_sip._udp.", +"_smtp._tcp.", +"_ssh._tcp.", +"_stun._tcp.", +"_stun._udp.", +"_svcp._tcp.", +"_tcp.", +"_telnet._tcp.", +"_test._tcp.", +"_tls.", +"_udp.", +"_vlmcs._tcp.", +"_vlmcs._udp.", +"_whois._tcp.", +"_wpad._tcp.", +"_xmpp-client._tcp.", +"_xmpp-client._udp.", +"_xmpp-server._tcp.", +"_xmpp-server._udp.", +"_https._tcp.", +"_imap.tcp.", +"_kerberos.tcp.dc._msdcs.", +"_ldap._tcp.ForestDNSZones.", +"_submission._tcp.", +"_caldavs._tcp.", +"_carddav._tcp.", +"_carddavs._tcp.", +"_x-puppet._tcp.", +"_x-puppet-ca._tcp.", +"_domainkey.", +"_pkixrep._tcp.", +"_cisco-phone-http.", +"_cisco-phone-tftp.", +"_cisco-uds._tcp.", +"_ciscowtp._tcp.", +"_collab-edge._tls.", +"_cuplogin._tcp.", +"_client._smtp._tcp.", +"_sftp._tcp.", +"_h323rs._udp.", +"_sql._tcp.", +"_sip._tcp.internal.", +"_snmp._udp.", +"_rdp._tcp.", +"_xmpp-server._udp." +] diff --git a/oneforall/modules/dnsquery/srv.py b/oneforall/modules/dnsquery/srv.py index 3b3b8b4..a032e18 100644 --- a/oneforall/modules/dnsquery/srv.py +++ b/oneforall/modules/dnsquery/srv.py @@ -42,10 +42,10 @@ class BruteSRV(Module): """ 枚举域名的SRV记录 """ - names_path = data_storage_path.joinpath('srv_names.json') - with open(names_path) as fp: - names_dict = json.load(fp) - names = map(lambda prefix: prefix + self.domain, names_dict) + path = data_storage_path.joinpath('srv_prefixes.json') + with open(path) as file: + prefixes = json.load(file) + names = map(lambda prefix: prefix + self.domain, prefixes) tasks = [] for name in names: @@ -53,7 +53,6 @@ class BruteSRV(Module): loop = asyncio.get_event_loop() group = asyncio.gather(*tasks) results = loop.run_until_complete(group) - loop.close() for result in results: if result is None: continue @@ -87,4 +86,4 @@ def do(domain): # 统一入口名字 方便多线程调用 if __name__ == '__main__': do('zonetransfer.me') - do('example.com') + # do('example.com')