chore: Batching, more QOL

This commit is contained in:
Artёm Mishin committed 2024-02-03 08:33:03 +03:00
1 parent 0a6b8eddbb
commit 6cdf2b579d
1 file changed
+41 -18
+41 -18
View File
@@ -22,8 +22,14 @@ import (
"time" "time"
) )
type QueueAddr struct {
IP net.IP
Time time.Time
Server string
}
var ( var (
blacklistQueue []net.IP blacklistQueue []QueueAddr
isUpdated = atomic.Bool{} isUpdated = atomic.Bool{}
) )
@@ -78,14 +84,13 @@ func updateRunner() {
} }
for { for {
log.Info("Checking for updates")
if isUpdated.Load() { if isUpdated.Load() {
isUpdated.Store(false) isUpdated.Store(false)
update(repository, branch, auth, fileName) update(repository, branch, auth, fileName)
} }
// Sleep for 1 minute // Sleep for 1 minute
time.Sleep(5 * time.Second) time.Sleep(1 * time.Minute)
} }
} }
@@ -179,7 +184,7 @@ func update(repository *git.Repository, branch string, auth transport.AuthMethod
} }
toAdd := blacklistQueue toAdd := blacklistQueue
blacklistQueue = []net.IP{} blacklistQueue = []QueueAddr{}
isAlreadyPresent := func(s net.IP) bool { isAlreadyPresent := func(s net.IP) bool {
// check if the address is already present in the list // check if the address is already present in the list
@@ -232,13 +237,23 @@ func update(repository *git.Repository, branch string, auth transport.AuthMethod
return false return false
} }
added := make([]net.IP, 0) added := make([]QueueAddr, 0)
for _, v := range toAdd { for _, v := range toAdd {
if !isAlreadyPresent(v) { if !isAlreadyPresent(v.IP) {
alreadyBlacklisted = append(alreadyBlacklisted, v.String()) // check if the address is already present in the list
isPresent := false
for _, candidate := range added {
if v.IP.String() == candidate.IP.String() {
isPresent = true
break
}
}
if !isPresent {
alreadyBlacklisted = append(alreadyBlacklisted, v.IP.String())
added = append(added, v) added = append(added, v)
} }
} }
}
if len(added) < 1 { if len(added) < 1 {
log.Info("No new addresses to add") log.Info("No new addresses to add")
@@ -250,20 +265,20 @@ func update(repository *git.Repository, branch string, auth transport.AuthMethod
commitMessage := strings.Builder{} commitMessage := strings.Builder{}
commitMessage.WriteString(fmt.Sprintf("Add %d new addresses\n-------------------------------\n", len(added))) commitMessage.WriteString(fmt.Sprintf("Add %d new addresses\n-------------------------------\n", len(added)))
for _, v := range added { for _, v := range added {
logMessages.WriteString(fmt.Sprintf("%s ", time.Now().Format(time.RFC3339))) logMessages.WriteString(fmt.Sprintf("%s ", v.Time.Format(time.RFC3339)))
logMessages.WriteString(fmt.Sprintf("addr='%s'", v.String())) logMessages.WriteString(fmt.Sprintf("server='%s' addr='%s'", v.Server, v.IP.String()))
commitMessage.WriteString(v.String()) commitMessage.WriteString(v.IP.String())
reverseDNSNames, err := net.LookupAddr(v.String()) reverseDNSNames, err := net.LookupAddr(v.IP.String())
if err == nil { if err == nil {
line := fmt.Sprintf(" hostname='%s'", reverseDNSNames[0]) line := fmt.Sprintf(" hostname='%s'", reverseDNSNames[0])
commitMessage.WriteString(line) commitMessage.WriteString(line)
logMessages.WriteString(line) logMessages.WriteString(line)
} else { } else {
log.Warnf("Failed to lookup reverse DNS for %s: %s", v.String(), err.Error()) log.Warnf("Failed to lookup reverse DNS for %s: %s", v.IP.String(), err.Error())
} }
geo, err := geoLookup(v) geo, err := geoLookup(v.IP)
if err == nil { if err == nil {
line := fmt.Sprintf( line := fmt.Sprintf(
" country='%s' city='%s' postal='%s'", " country='%s' city='%s' postal='%s'",
@@ -274,10 +289,10 @@ func update(repository *git.Repository, branch string, auth transport.AuthMethod
commitMessage.WriteString(line) commitMessage.WriteString(line)
logMessages.WriteString(line) logMessages.WriteString(line)
} else { } else {
log.Warnf("Failed to lookup geo for %s: %s", v.String(), err.Error()) log.Warnf("Failed to lookup geo for %s: %s", v.IP.String(), err.Error())
} }
asn, err := asnLookup(v) asn, err := asnLookup(v.IP)
if err == nil { if err == nil {
line := fmt.Sprintf( line := fmt.Sprintf(
" asn.id='%d' asn.name='%s'", " asn.id='%d' asn.name='%s'",
@@ -287,7 +302,7 @@ func update(repository *git.Repository, branch string, auth transport.AuthMethod
commitMessage.WriteString(line) commitMessage.WriteString(line)
logMessages.WriteString(line) logMessages.WriteString(line)
} else { } else {
log.Warnf("Failed to lookup ASN for %s: %s", v.String(), err.Error()) log.Warnf("Failed to lookup ASN for %s: %s", v.IP.String(), err.Error())
} }
commitMessage.WriteString("\n") commitMessage.WriteString("\n")
@@ -423,8 +438,16 @@ func listen(addr string) {
} }
_ = conn.Close() _ = conn.Close()
log.Infof("Got request from %s, blacklisting", remoteAddr) log.
blacklistQueue = append(blacklistQueue, ip) WithField("ip", ip.String()).
WithField("remote", remoteAddr).
WithField("server", addr).
Infof("Got request from %s, blacklisting", remoteAddr)
blacklistQueue = append(blacklistQueue, QueueAddr{
IP: ip,
Time: time.Now(),
Server: addr,
})
isUpdated.Store(true) isUpdated.Store(true)
} }
} }