mael/sacrebleu-dns
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Switched sql funcs returns from int to bool

Browse source
This commit is contained in:
Mael G. 2020-12-22 20:20:06 -04:00
parent 02ee609cc4
commit 3737e17ecf
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
utils/queries.go
View file

@ -15,7 +15,7 @@ func GetRecord(entry Record) Record {
redisKey := entry.Fqdn + "--" + fmt.Sprint(entry.Qtype) redisKey := entry.Fqdn + "--" + fmt.Sprint(entry.Qtype)
result, redisErr := redisCheckForRecord(redisKey, entry) result, redisErr := redisCheckForRecord(redisKey, entry)
var sqlErr int //The err returned for sqlCheckForRecord or sqlCheckForReverse6Wildcard var sqlErr bool //The err returned for sqlCheckForRecord or sqlCheckForReverse6Wildcard
//If reverse DNS //If reverse DNS
reverseCheck := IsReverse(entry.Fqdn) reverseCheck := IsReverse(entry.Fqdn)
@ -26,7 +26,7 @@ func GetRecord(entry Record) Record {
//Check for it in the SQL database //Check for it in the SQL database
logrus.Debug("QUERIES : Check for strict reverse in MySQL") logrus.Debug("QUERIES : Check for strict reverse in MySQL")
result, sqlErr = sqlCheckForRecord(redisKey, entry.Fqdn, entry) result, sqlErr = sqlCheckForRecord(redisKey, entry.Fqdn, entry)
if sqlErr == 1 { if sqlErr {
//Check for wildcard reverse in the SQL //Check for wildcard reverse in the SQL
logrus.Debug("QUERIES : Check for wildcard reverse in MySQL") logrus.Debug("QUERIES : Check for wildcard reverse in MySQL")
result, _ = sqlCheckForReverse6Wildcard(redisKey, entry.Fqdn, entry) result, _ = sqlCheckForReverse6Wildcard(redisKey, entry.Fqdn, entry)
@ -57,7 +57,7 @@ func GetRecord(entry Record) Record {
//Check for strict record in mysql //Check for strict record in mysql
logrus.Debug("QUERIES : Check for strict record in MSQL") logrus.Debug("QUERIES : Check for strict record in MSQL")
result, sqlErr = sqlCheckForRecord(redisKey, entry.Fqdn, entry) result, sqlErr = sqlCheckForRecord(redisKey, entry.Fqdn, entry)
if sqlErr == 1 { if sqlErr {
//Check for wildcard record in mysql //Check for wildcard record in mysql
logrus.Debug("QUERIES : Check for wildcard in MSQL") logrus.Debug("QUERIES : Check for wildcard in MSQL")
result, _ = sqlCheckForRecord(redismdKey, fmt.Sprint(mainDomainKey), entry) result, _ = sqlCheckForRecord(redismdKey, fmt.Sprint(mainDomainKey), entry)

6
utils/sql.go
View file

@ -35,7 +35,7 @@ func SQLDatabase(conf *Conf) {
} }
//Check for a record in the SQL database //Check for a record in the SQL database
func sqlCheckForRecord(redisKey string, dKey string, entry Record) (Record, int) { func sqlCheckForRecord(redisKey string, dKey string, entry Record) (Record, bool) {
db.Where("name = ? AND type = ?", dKey, entry.Qtype).First(&entry) db.Where("name = ? AND type = ?", dKey, entry.Qtype).First(&entry)
logrus.Debugf("SQL : %s => %s", entry.Fqdn, entry.Content) //log the result logrus.Debugf("SQL : %s => %s", entry.Fqdn, entry.Content) //log the result
@ -44,10 +44,10 @@ func sqlCheckForRecord(redisKey string, dKey string, entry Record) (Record, int)
//Cache the request in Redis if any result //Cache the request in Redis if any result
logrus.Debugf("REDIS : Set entry for %s", redisKey) logrus.Debugf("REDIS : Set entry for %s", redisKey)
_ = redisSet(redisDb, redisKey, 30*time.Second, entry) //Set it in the Redis database for 30sec _ = redisSet(redisDb, redisKey, 30*time.Second, entry) //Set it in the Redis database for 30sec
return entry, 0 return entry, false
} }
//Else return 1 for err //Else return 1 for err
return entry, 1 return entry, true
} }