logger
This commit is contained in:
parent
d7859bcc52
commit
dd58154c07
5
go.mod
5
go.mod
@ -5,10 +5,13 @@ go 1.21
|
|||||||
require (
|
require (
|
||||||
github.com/IGLOU-EU/go-wildcard/v2 v2.0.2
|
github.com/IGLOU-EU/go-wildcard/v2 v2.0.2
|
||||||
github.com/coreos/go-iptables v0.7.0
|
github.com/coreos/go-iptables v0.7.0
|
||||||
|
github.com/rs/zerolog v1.33.0
|
||||||
github.com/vishvananda/netlink v1.3.0
|
github.com/vishvananda/netlink v1.3.0
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
github.com/mattn/go-colorable v0.1.13 // indirect
|
||||||
|
github.com/mattn/go-isatty v0.0.20 // indirect
|
||||||
github.com/vishvananda/netns v0.0.4 // indirect
|
github.com/vishvananda/netns v0.0.4 // indirect
|
||||||
golang.org/x/sys v0.10.0 // indirect
|
golang.org/x/sys v0.24.0 // indirect
|
||||||
)
|
)
|
||||||
|
2
group.go
2
group.go
@ -45,7 +45,7 @@ DomainSearch:
|
|||||||
Replace: true,
|
Replace: true,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to assign address %s with %s ipset: %w", address, g.ipsetName, err)
|
return fmt.Errorf("failed to assign address: %w", err)
|
||||||
}
|
}
|
||||||
break DomainSearch
|
break DomainSearch
|
||||||
}
|
}
|
||||||
|
17
kvas2.go
17
kvas2.go
@ -4,7 +4,6 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
|
||||||
"net"
|
"net"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
@ -12,6 +11,8 @@ import (
|
|||||||
"kvas2-go/models"
|
"kvas2-go/models"
|
||||||
"kvas2-go/pkg/dns-proxy"
|
"kvas2-go/pkg/dns-proxy"
|
||||||
"kvas2-go/pkg/iptables-helper"
|
"kvas2-go/pkg/iptables-helper"
|
||||||
|
|
||||||
|
"github.com/rs/zerolog/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -150,6 +151,12 @@ func (a *App) ListInterfaces() ([]net.Interface, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (a *App) processARecord(aRecord dnsProxy.Address) {
|
func (a *App) processARecord(aRecord dnsProxy.Address) {
|
||||||
|
log.Trace().
|
||||||
|
Str("name", aRecord.Name.String()).
|
||||||
|
Str("address", aRecord.Address.String()).
|
||||||
|
Int("ttl", int(aRecord.TTL)).
|
||||||
|
Msg("processing a record")
|
||||||
|
|
||||||
ttlDuration := time.Duration(aRecord.TTL) * time.Second
|
ttlDuration := time.Duration(aRecord.TTL) * time.Second
|
||||||
if ttlDuration < a.Config.MinimalTTL {
|
if ttlDuration < a.Config.MinimalTTL {
|
||||||
ttlDuration = a.Config.MinimalTTL
|
ttlDuration = a.Config.MinimalTTL
|
||||||
@ -161,8 +168,12 @@ func (a *App) processARecord(aRecord dnsProxy.Address) {
|
|||||||
for _, group := range a.Groups {
|
for _, group := range a.Groups {
|
||||||
err := group.HandleIPv4(names, aRecord.Address, ttlDuration)
|
err := group.HandleIPv4(names, aRecord.Address, ttlDuration)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// TODO: Error log level
|
log.Error().
|
||||||
log.Printf("failed to handle address: %v", err)
|
Str("name", aRecord.Name.String()).
|
||||||
|
Str("address", aRecord.Address.String()).
|
||||||
|
Int("group", group.ID).
|
||||||
|
Err(err).
|
||||||
|
Msg("failed to handle address")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
18
main.go
18
main.go
@ -2,15 +2,18 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"github.com/rs/zerolog"
|
||||||
"log"
|
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"syscall"
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/rs/zerolog/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
|
||||||
|
|
||||||
app, err := New(Config{
|
app, err := New(Config{
|
||||||
MinimalTTL: time.Hour,
|
MinimalTTL: time.Hour,
|
||||||
ChainPostfix: "KVAS2_",
|
ChainPostfix: "KVAS2_",
|
||||||
@ -19,7 +22,7 @@ func main() {
|
|||||||
ListenPort: 7548,
|
ListenPort: 7548,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("failed to initialize application: %v", err)
|
log.Fatal().Err(err).Msg("failed to initialize application")
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx, cancel := context.WithCancel(context.Background())
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
@ -31,7 +34,7 @@ func main() {
|
|||||||
|
|
||||||
}()
|
}()
|
||||||
|
|
||||||
fmt.Println("Started service...")
|
log.Info().Msg("starting service")
|
||||||
|
|
||||||
c := make(chan os.Signal, 1)
|
c := make(chan os.Signal, 1)
|
||||||
signal.Notify(c, os.Interrupt, syscall.SIGTERM)
|
signal.Notify(c, os.Interrupt, syscall.SIGTERM)
|
||||||
@ -39,13 +42,12 @@ func main() {
|
|||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case appErrs, _ := <-appErrsChan:
|
case appErrs, _ := <-appErrsChan:
|
||||||
for _, err := range appErrs {
|
for _, err = range appErrs {
|
||||||
// TODO: Error log level
|
log.Error().Err(err).Msg("failed to start application")
|
||||||
log.Printf("failed to start application: %v", err)
|
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
case <-c:
|
case <-c:
|
||||||
fmt.Println("Graceful shutdown...")
|
log.Info().Msg("shutting down service")
|
||||||
cancel()
|
cancel()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,10 +4,11 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
|
||||||
"net"
|
"net"
|
||||||
"os"
|
"os"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/rs/zerolog/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@ -40,7 +41,7 @@ func (p DNSProxy) Listen(ctx context.Context) error {
|
|||||||
if p.udpConn != nil {
|
if p.udpConn != nil {
|
||||||
err := p.udpConn.Close()
|
err := p.udpConn.Close()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("failed to close UDP connection: %v", err)
|
log.Error().Err(err).Msg("failed to close UDP connection")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
@ -53,7 +54,7 @@ func (p DNSProxy) Listen(ctx context.Context) error {
|
|||||||
buffer := make([]byte, DNSMaxUDPPackageSize)
|
buffer := make([]byte, DNSMaxUDPPackageSize)
|
||||||
n, clientAddr, err := p.udpConn.ReadFromUDP(buffer)
|
n, clientAddr, err := p.udpConn.ReadFromUDP(buffer)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("failed to read UDP packet: %v", err)
|
log.Error().Err(err).Msg("failed to read UDP packet")
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -65,22 +66,20 @@ func (p DNSProxy) Listen(ctx context.Context) error {
|
|||||||
func (p DNSProxy) handleDNSRequest(clientAddr *net.UDPAddr, buffer []byte) {
|
func (p DNSProxy) handleDNSRequest(clientAddr *net.UDPAddr, buffer []byte) {
|
||||||
conn, err := net.Dial("udp", p.targetDNSServerAddress)
|
conn, err := net.Dial("udp", p.targetDNSServerAddress)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("failed to dial target DNS: %v", err)
|
log.Error().Err(err).Msg("failed to dial target DNS")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer conn.Close()
|
defer conn.Close()
|
||||||
|
|
||||||
_, err = conn.Write(buffer)
|
_, err = conn.Write(buffer)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// TODO: Error log level
|
log.Error().Err(err).Msg("failed to send request to target DNS")
|
||||||
log.Printf("failed to send request to target DNS: %v", err)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
err = conn.SetReadDeadline(time.Now().Add(5 * time.Second))
|
err = conn.SetReadDeadline(time.Now().Add(5 * time.Second))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// TODO: Error log level
|
log.Error().Err(err).Msg("failed to set read deadline")
|
||||||
log.Printf("failed to set read deadline: %v", err)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -92,8 +91,7 @@ func (p DNSProxy) handleDNSRequest(clientAddr *net.UDPAddr, buffer []byte) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Error log level
|
log.Error().Err(err).Msg("failed to read response from target DNS")
|
||||||
log.Printf("failed to read response from target DNS: %v", err)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -103,14 +101,12 @@ func (p DNSProxy) handleDNSRequest(clientAddr *net.UDPAddr, buffer []byte) {
|
|||||||
p.MsgHandler(msg)
|
p.MsgHandler(msg)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// TODO: Warn log level
|
log.Warn().Err(err).Msg("error while parsing DNS message")
|
||||||
log.Printf("error while parsing DNS message: %v", err)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = p.udpConn.WriteToUDP(response[:n], clientAddr)
|
_, err = p.udpConn.WriteToUDP(response[:n], clientAddr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// TODO: Error log level
|
log.Error().Err(err).Msg("failed to send DNS message")
|
||||||
log.Printf("failed to send DNS message: %v", err)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user