Skip to content

Commit

Permalink
Checks if domain is authoritative, if true, then execute more tests l…
Browse files Browse the repository at this point in the history 
…ike LOC, IPV6, etc (Added new field 'authoritative' to database in table 'nameserver')
  • Loading branch information
@maitegm
maitegm committed Apr 6, 2022
1 parent 270dcf8 commit ee2caf1
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 60 deletions.
62 changes: 30 additions & 32 deletions dataCollector/dataCollector.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"sync"
"time"
)

var domain_list_size = 0

var concurrency = 100
Expand Down Expand Up @@ -101,7 +102,7 @@ func InitializeDontProbeList(dpf string) (dontProbeList []*net.IPNet) {
return dontProbeList
}

func StartCollect(input string, c int, dbname string, user string, password string, host string, port int, debugBool bool, verboseBool bool) (runId int){
func StartCollect(input string, c int, dbname string, user string, password string, host string, port int, debugBool bool, verboseBool bool) (runId int) {
url := fmt.Sprintf("postgres://%v:%v@%v:%v/%v?sslmode=disable",
user,
password,
Expand Down Expand Up @@ -164,19 +165,17 @@ func createCollectorRoutines(db *sql.DB, inputFile string, runId int) {
for i, domainName := range domainsList {
domainName := dns.Fqdn(domainName)
domainsQueue <- domainName
percentage := 100*i/domain_list_size
if percentage>last_fifth {
fmt.Println(last_fifth,"%")
percentage := 100 * i / domain_list_size
if percentage > last_fifth {
fmt.Println(last_fifth, "%")
last_fifth += 5

}
manageVerbosity(strings.Join([]string{"Collecting data " , domainName}, ""))
manageVerbosity(strings.Join([]string{"Collecting data ", domainName}, ""))
//fmt.Println(i)
}
fmt.Println("100%")



/*Close the queue*/
close(domainsQueue)

Expand All @@ -195,7 +194,7 @@ func manageError(err string) {
}
}

func manageVerbosity(str string){
func manageVerbosity(str string) {
if verbose {
fmt.Println(str)
}
Expand Down Expand Up @@ -231,7 +230,7 @@ func obtainNsIpv4Info(ip net.IP, domainName string, nameserverId int, runId int,
dbController.SaveNSIP(nameserverId, nameserverIpString, country, asn, dontProbe, runId, db)
return nameserverIpString
}
func obtainNsIpv6Info(ip net.IP, nameserverId int, runId int, db *sql.DB) (nameserverIpString string) {
func obtainNsIpv6Info(ip net.IP, nameserverId int, runId int, db *sql.DB) (nameserverIpString string) {
nameserverIpString = net.IP.String(ip)
country := geoIPUtils.GetIPCountry(nameserverIpString, geoipCountryDb)
asn := geoIPUtils.GetIPASN(nameserverIpString, geoipAsnDb)
Expand All @@ -258,7 +257,7 @@ func checkTCP(domainName string, ns string) (TCP bool) {
tcp, _, err := dnsUtils.GetRecordSetTCP(domainName, dns.TypeSOA, ns, dnsClient)
dnsClient.Net = "udp"
if err != nil {
manageError(strings.Join([]string{"TCP: ", domainName, ns, err.Error()},""))
manageError(strings.Join([]string{"TCP: ", domainName, ns, err.Error()}, ""))
return false
} else {
TCP = false
Expand Down Expand Up @@ -304,7 +303,7 @@ func checkLOCQuery(domainName string, ns string) (locQuery bool) {
return locQuery
}

func getAndSaveDomainIPv4(domainName string, domainNameServers []string, domainId int, runId int, db *sql.DB) (server string){
func getAndSaveDomainIPv4(domainName string, domainNameServers []string, domainId int, runId int, db *sql.DB) (server string) {
ipv4, err := dnsUtils.GetARecords(domainName, domainNameServers, dnsClient)
if err != nil {
manageError(strings.Join([]string{"get A record: ", domainName, err.Error()}, ""))
Expand Down Expand Up @@ -332,7 +331,7 @@ func getAndSaveDomainIPv6(domainName string, domainNameServers []string, domainI
}
}

func getAndSaveDomainSOA(domainName string, domainNameServers []string, domainId int, db *sql.DB) {
func getAndSaveDomainSOA(domainName string, domainNameServers []string, domainId int, db *sql.DB) {
/*check soa*/
SOA := false
soa, err := dnsUtils.CheckSOA(domainName, domainNameServers, dnsClient)
Expand Down Expand Up @@ -372,13 +371,12 @@ func checkAndSaveDSs(domain_name string, servers []string, domain_id int, run_id
}*/

func getAndSaveDNSSECinfo(domainName string, domainNameServers []string, domainId int, runId int, db *sql.DB) {

func getAndSaveDNSSECinfo(domainName string, domainNameServers []string, domainId int, runId int, db *sql.DB) {

/*check DNSSEC*/

/*ds*/
dss, _, err := dnsUtils.GetRecordSet(domainName, dns.TypeDS, configServers,dnsClient)
dss, _, err := dnsUtils.GetRecordSet(domainName, dns.TypeDS, configServers, dnsClient)
if err != nil {
manageError(strings.Join([]string{"DS record: ", domainName, err.Error()}, ""))
} else {
Expand All @@ -388,8 +386,8 @@ func getAndSaveDNSSECinfo(domainName string, domainNameServers []string, domainI
var dsRrset []dns.RR
for _, ds := range dss.Answer {
if ds1, ok := ds.(*dns.DS); ok {
dsFound =true
dsRrset = append(dsRrset,ds1)
dsFound = true
dsRrset = append(dsRrset, ds1)
var algorithm = int(ds1.Algorithm)
var keyTag = int(ds1.KeyTag)
var digestType = int(ds1.DigestType)
Expand Down Expand Up @@ -443,12 +441,9 @@ func getAndSaveDNSSECinfo(domainName string, domainNameServers []string, domainI
dbController.UpdateDomainDSInfo(domainId, dsFound, dsOk, db)
}


/*dnskeys*/



dnskeysLine, _, err := dnsUtils.GetRecordSetWithDNSSEC(domainName, dns.TypeDNSKEY, domainNameServers,dnsClient)
dnskeysLine, _, err := dnsUtils.GetRecordSetWithDNSSEC(domainName, dns.TypeDNSKEY, domainNameServers, dnsClient)
if err != nil {
manageError(strings.Join([]string{"dnskey: ", domainName, err.Error()}, ""))
} else {
Expand Down Expand Up @@ -596,8 +591,7 @@ func getAndSaveDNSSECinfo(domainName string, domainNameServers []string, domainI

dbController.UpdateNSEC(keyFound && verified && !expired, ncover, ncoverwc, niswc, nsecId, db)

} else
if nsec3, ok := ans.(*dns.NSEC3); ok {
} else if nsec3, ok := ans.(*dns.NSEC3); ok {
hashedName := nsec3.Hdr.Name
nextHashedName := nsec3.NextDomain
iterations := int(nsec3.Iterations)
Expand Down Expand Up @@ -659,7 +653,6 @@ func getAndSaveDNSSECinfo(domainName string, domainNameServers []string, domainI
}
}


dbController.UpdateNSEC3(keyFound && verified && !expired, keyFound, verified, expired, n3match, n3cover, n3coverwc, n3wc, nsec3Id, db)
}
}
Expand All @@ -672,7 +665,6 @@ func getAndSaveDNSSECinfo(domainName string, domainNameServers []string, domainI
// Collects info from a single domain (ran by a routine) and save it to the databses.
func collectSingleDomainInfo(domainName string, runId int, db *sql.DB) {


var domainId int
// Create domain and save it in database
domainId = dbController.SaveDomain(domainName, runId, db)
Expand All @@ -688,18 +680,26 @@ func collectSingleDomainInfo(domainName string, runId int, db *sql.DB) {
for _, nameserver := range domainsNameservers { //for each nameserver of the current domain_name
if ns, ok := nameserver.(*dns.NS); ok {
var nameserverId int
available, rtt, err := dnsUtils.CheckAvailability(domainName, ns, dnsClient) //check if IPv4 exists
resp, rtt, err := dnsUtils.CheckAvailability(domainName, ns, dnsClient) //check if IPv4 exists

available := true
authoritative := false
if err != nil {
available = false
} else {
authoritative = resp.Authoritative
}
nameserverId = dbController.CreateNS(ns, domainId, runId, db, available, authoritative) //create NS in database
if err != nil {
nameserverId = dbController.CreateNS(ns, domainId, runId, db, false)
manageError(strings.Join([]string{"checkAvailability: ", domainName, ns.Ns, err.Error(), rtt.String()}, ""))
} else if authoritative == false {
manageError(strings.Join([]string{"checkAvailability: ", domainName, ns.Ns, "Not Authoritative", rtt.String()}, ""))
} else {
nameserverId = dbController.CreateNS(ns, domainId, runId, db, available) //create NS in database

//get A records for NS
ipv4, err := dnsUtils.GetARecords(ns.Ns, configServers, dnsClient)
if err != nil {
manageError(strings.Join([]string{"getANS: ", domainName, ns.Ns, err.Error()}, ""))
} else {
} else { //If NS is ok then execute more tests
for _, ip := range ipv4 {
nameserverIpString := obtainNsIpv4Info(ip, domainName, nameserverId, runId, db)

Expand Down Expand Up @@ -772,5 +772,3 @@ func isIPInDontProbeList(ip net.IP) bool {
}
return false
}


40 changes: 19 additions & 21 deletions dbController/dbController.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"log"
"strings"
"time"

)

func CreateTables(db *sql.DB, drop bool) {
Expand All @@ -26,7 +25,7 @@ func CreateTables(db *sql.DB, drop bool) {
}

DropTable("nameserver", db, drop)
_, err = db.Exec("CREATE TABLE IF NOT EXISTS nameserver ( id SERIAL PRIMARY KEY, run_id integer REFERENCES runs(id), domain_id integer REFERENCES domain(id), name varchar(253), response bool, edns bool, recursivity bool, tcp bool, zone_transfer bool, loc_query bool)")
_, err = db.Exec("CREATE TABLE IF NOT EXISTS nameserver ( id SERIAL PRIMARY KEY, run_id integer REFERENCES runs(id), domain_id integer REFERENCES domain(id), name varchar(253), response bool, edns bool, recursivity bool, tcp bool, zone_transfer bool, loc_query bool, authoritative bool)")
if err != nil {
fmt.Println("OpenConnections", db.Stats())
panic(err)
Expand Down Expand Up @@ -135,41 +134,40 @@ func SaveDNSKEY(dnskey *dns.DNSKEY, dsok bool, domainId int, runId int, db *sql.
}
}


type DNSKEY struct {
PublicKey string
Owner string
Ttl int
KeyType int
Protocol int
Owner string
Ttl int
KeyType int
Protocol int
Algorithm int
KeyTag int
KeyTag int
}

func getDNSKEYs(domainId int, runId int, db *sql.DB, dnskeys []DNSKEY)(size int){
func getDNSKEYs(domainId int, runId int, db *sql.DB, dnskeys []DNSKEY) (size int) {
query := `SELECT public_key, owner, ttl, type, protocol, algorithm, keytag
from dnskey where run_id=$1 and domain_id=$2;`

rows, err:= db.Query(query, runId, domainId)
rows, err := db.Query(query, runId, domainId)

if err != nil {
panic(err)
}
defer rows.Close()
i:=0
publicKey:=""
owner:=""
ttl:=-1
keyType:=-1
protocol:=-1
algorithm :=-1
keyTag:=-1
i := 0
publicKey := ""
owner := ""
ttl := -1
keyType := -1
protocol := -1
algorithm := -1
keyTag := -1

for rows.Next() {
if err := rows.Scan(&publicKey, &owner, &ttl, &keyType, &protocol, &algorithm, &keyTag); err != nil {
log.Fatal(err)
}
dnskeys[i]=DNSKEY{PublicKey: publicKey, Owner: owner, Ttl: ttl, KeyType:keyType, Protocol: protocol, Algorithm: algorithm, KeyTag:keyTag}
dnskeys[i] = DNSKEY{PublicKey: publicKey, Owner: owner, Ttl: ttl, KeyType: keyType, Protocol: protocol, Algorithm: algorithm, KeyTag: keyTag}
i++
}
return i
Expand Down Expand Up @@ -200,10 +198,10 @@ func SaveDomainIp(ip string, domainid int, runId int, db *sql.DB) {
panic(err)
}
}
func CreateNS(ns *dns.NS, domainId int, runId int, db *sql.DB, available bool) int {
func CreateNS(ns *dns.NS, domainId int, runId int, db *sql.DB, available bool, authoritative bool) int {
var nameserverid int

err := db.QueryRow("INSERT INTO nameserver(name, domain_id, response, run_id) VALUES($1, $2, $3, $4) RETURNING id", ns.Ns, domainId, available, runId).Scan(&nameserverid)
err := db.QueryRow("INSERT INTO nameserver(name, domain_id, response, authoritative, run_id) VALUES($1, $2, $3, $4, $5) RETURNING id", ns.Ns, domainId, available, authoritative, runId).Scan(&nameserverid)
if err != nil {
fmt.Println("OpenConnections", db.Stats(), " DomainId: ", domainId)
panic(err)
Expand Down
10 changes: 4 additions & 6 deletions dnsUtils/dnsUtils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,10 @@ func CheckSOA(line string, servers []string, c *dns.Client) (*dns.Msg, error) {
}

// Checks if a domain name has an A record
func CheckAvailability(domain string, ns *dns.NS, c *dns.Client) (bool, time.Duration, error) {
_, rtt, err := GetRecordSet(domain, dns.TypeA, []string{ns.Ns}, c)
if err != nil {
return false, rtt, err
}
return true, rtt, nil
func CheckAvailability(domain string, ns *dns.NS, c *dns.Client) (*dns.Msg, time.Duration, error) {
resp, rtt, err := GetRecordSet(domain, dns.TypeA, []string{ns.Ns}, c)

return resp, rtt, err

}

Expand Down
3 changes: 2 additions & 1 deletion input-example.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ papelesandalien.cl
elcuartodigital.cl
puertolirquen.cl
yuyu.cl
nic.cl
nic.cl
wsp.cl

0 comments on commit ee2caf1

Please sign in to comment.