mirrors/dnscrypt-proxy
1
0
Fork 0
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git synced 2025-04-05 06:07:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add automatic log files rotation

Browse source 
Fixes #172
This commit is contained in:
Frank Denis 2018-03-02 10:34:00 +01:00
parent 97156c3ad3
commit b643a816cc
19 changed files with 1994 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dnscrypt-proxy/config.go
View file

@ -52,6 +52,9 @@ type Config struct {
FallbackResolver string `toml:"fallback_resolver"`
IgnoreSystemDNS bool `toml:"ignore_system_dns"`
AllWeeklyRanges map[string]WeeklyRangesStr `toml:"schedules"`
LogMaxSize int `toml:"log_files_max_size"`
LogMaxAge int `toml:"log_files_max_age"`
LogMaxBackups int `toml:"log_files_max_backups"`
}
func newConfig() Config {
@ -75,6 +78,9 @@ func newConfig() Config {
MaxClients: 250,
FallbackResolver: DefaultFallbackResolver,
IgnoreSystemDNS: false,
LogMaxSize: 10,
LogMaxAge: 7,
LogMaxBackups: 1,
}
}
@ -169,6 +175,9 @@ func ConfigLoad(proxy *Proxy, svcFlag *string) error {
} else if config.LogFile != nil {
dlog.UseLogFile(*config.LogFile)
}
proxy.logMaxSize = config.LogMaxSize
proxy.logMaxAge = config.LogMaxAge
proxy.logMaxBackups = config.LogMaxBackups
proxy.xTransport.fallbackResolver = config.FallbackResolver
if len(config.FallbackResolver) > 0 {
proxy.xTransport.ignoreSystemDNS = config.IgnoreSystemDNS

22
dnscrypt-proxy/plugin_block_ip.go
View file

@ -5,22 +5,20 @@ import (
"fmt"
"io/ioutil"
"net"
"os"
"strings"
"sync"
"time"
"unicode"
"github.com/hashicorp/go-immutable-radix"
"github.com/jedisct1/dlog"
"github.com/miekg/dns"
"gopkg.in/natefinch/lumberjack.v2"
)
type PluginBlockIP struct {
sync.Mutex
blockedPrefixes *iradix.Tree
blockedIPs map[string]interface{}
outFd *os.File
logger *lumberjack.Logger
format string
}
@ -75,13 +73,7 @@ func (plugin *PluginBlockIP) Init(proxy *Proxy) error {
if len(proxy.blockIPLogFile) == 0 {
return nil
}
plugin.Lock()
defer plugin.Unlock()
outFd, err := os.OpenFile(proxy.blockIPLogFile, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0644)
if err != nil {
return err
}
plugin.outFd = outFd
plugin.logger = &lumberjack.Logger{LocalTime: true, MaxSize: proxy.logMaxSize, MaxAge: proxy.logMaxAge, MaxBackups: proxy.logMaxBackups, Filename: proxy.blockIPLogFile, Compress: true}
plugin.format = proxy.blockIPFormat
return nil
@ -126,7 +118,7 @@ func (plugin *PluginBlockIP) Eval(pluginsState *PluginsState, msg *dns.Msg) erro
}
if reject {
pluginsState.action = PluginsActionReject
if plugin.outFd != nil {
if plugin.logger != nil {
questions := msg.Question
if len(questions) != 1 {
return nil
@ -153,12 +145,10 @@ func (plugin *PluginBlockIP) Eval(pluginsState *PluginsState, msg *dns.Msg) erro
} else {
dlog.Fatalf("Unexpected log format: [%s]", plugin.format)
}
plugin.Lock()
if plugin.outFd == nil {
if plugin.logger == nil {
return errors.New("Log file not initialized")
}
plugin.outFd.WriteString(line)
defer plugin.Unlock()
plugin.logger.Write([]byte(line))
}
}
return nil

22
dnscrypt-proxy/plugin_block_name.go
View file

@ -5,17 +5,16 @@ import (
"fmt"
"io/ioutil"
"net"
"os"
"path/filepath"
"strconv"
"strings"
"sync"
"time"
"unicode"
"github.com/hashicorp/go-immutable-radix"
"github.com/jedisct1/dlog"
"github.com/miekg/dns"
lumberjack "gopkg.in/natefinch/lumberjack.v2"
)
type PluginBlockType int
@ -29,14 +28,13 @@ const (
)
type PluginBlockName struct {
sync.Mutex
blockedPrefixes *iradix.Tree
blockedSuffixes *iradix.Tree
allWeeklyRanges *map[string]WeeklyRanges
weeklyRangesIndirect map[string]*WeeklyRanges
blockedSubstrings []string
blockedPatterns []string
outFd *os.File
logger *lumberjack.Logger
format string
}
@ -157,13 +155,7 @@ func (plugin *PluginBlockName) Init(proxy *Proxy) error {
if len(proxy.blockNameLogFile) == 0 {
return nil
}
plugin.Lock()
defer plugin.Unlock()
outFd, err := os.OpenFile(proxy.blockNameLogFile, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0644)
if err != nil {
return err
}
plugin.outFd = outFd
plugin.logger = &lumberjack.Logger{LocalTime: true, MaxSize: proxy.logMaxSize, MaxAge: proxy.logMaxAge, MaxBackups: proxy.logMaxBackups, Filename: proxy.blockNameLogFile, Compress: true}
plugin.format = proxy.blockNameFormat
return nil
@ -236,7 +228,7 @@ func (plugin *PluginBlockName) Eval(pluginsState *PluginsState, msg *dns.Msg) er
}
if reject {
pluginsState.action = PluginsActionReject
if plugin.outFd != nil {
if plugin.logger != nil {
var clientIPStr string
if pluginsState.clientProto == "udp" {
clientIPStr = (*pluginsState.clientAddr).(*net.UDPAddr).IP.String()
@ -255,12 +247,10 @@ func (plugin *PluginBlockName) Eval(pluginsState *PluginsState, msg *dns.Msg) er
} else {
dlog.Fatalf("Unexpected log format: [%s]", plugin.format)
}
plugin.Lock()
if plugin.outFd == nil {
if plugin.logger == nil {
return errors.New("Log file not initialized")
}
plugin.outFd.WriteString(line)
defer plugin.Unlock()
plugin.logger.Write([]byte(line))
}
}
return nil

22
dnscrypt-proxy/plugin_nx_log.go
View file

@ -4,18 +4,16 @@ import (
"errors"
"fmt"
"net"
"os"
"sync"
"time"
"github.com/jedisct1/dlog"
"github.com/miekg/dns"
lumberjack "gopkg.in/natefinch/lumberjack.v2"
)
type PluginNxLog struct {
sync.Mutex
outFd *os.File
format string
logger *lumberjack.Logger
format string
}
func (plugin *PluginNxLog) Name() string {
@ -27,13 +25,7 @@ func (plugin *PluginNxLog) Description() string {
}
func (plugin *PluginNxLog) Init(proxy *Proxy) error {
plugin.Lock()
defer plugin.Unlock()
outFd, err := os.OpenFile(proxy.nxLogFile, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0644)
if err != nil {
return err
}
plugin.outFd = outFd
plugin.logger = &lumberjack.Logger{LocalTime: true, MaxSize: proxy.logMaxSize, MaxAge: proxy.logMaxAge, MaxBackups: proxy.logMaxBackups, Filename: proxy.nxLogFile, Compress: true}
plugin.format = proxy.nxLogFormat
return nil
@ -81,12 +73,10 @@ func (plugin *PluginNxLog) Eval(pluginsState *PluginsState, msg *dns.Msg) error
} else {
dlog.Fatalf("Unexpected log format: [%s]", plugin.format)
}
plugin.Lock()
if plugin.outFd == nil {
if plugin.logger == nil {
return errors.New("Log file not initialized")
}
plugin.outFd.WriteString(line)
defer plugin.Unlock()
plugin.logger.Write([]byte(line))
return nil
}

20
dnscrypt-proxy/plugin_query_log.go
View file

@ -4,18 +4,16 @@ import (
"errors"
"fmt"
"net"
"os"
"strings"
"sync"
"time"
"github.com/jedisct1/dlog"
"github.com/miekg/dns"
lumberjack "gopkg.in/natefinch/lumberjack.v2"
)
type PluginQueryLog struct {
sync.Mutex
outFd *os.File
logger *lumberjack.Logger
format string
ignoredQtypes []string
}
@ -29,13 +27,7 @@ func (plugin *PluginQueryLog) Description() string {
}
func (plugin *PluginQueryLog) Init(proxy *Proxy) error {
plugin.Lock()
defer plugin.Unlock()
outFd, err := os.OpenFile(proxy.queryLogFile, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0644)
if err != nil {
return err
}
plugin.outFd = outFd
plugin.logger = &lumberjack.Logger{LocalTime: true, MaxSize: proxy.logMaxSize, MaxAge: proxy.logMaxAge, MaxBackups: proxy.logMaxBackups, Filename: proxy.queryLogFile, Compress: true}
plugin.format = proxy.queryLogFormat
plugin.ignoredQtypes = proxy.queryLogIgnoredQtypes
@ -88,11 +80,9 @@ func (plugin *PluginQueryLog) Eval(pluginsState *PluginsState, msg *dns.Msg) err
} else {
dlog.Fatalf("Unexpected log format: [%s]", plugin.format)
}
plugin.Lock()
if plugin.outFd == nil {
if plugin.logger == nil {
return errors.New("Log file not initialized")
}
plugin.outFd.WriteString(line)
defer plugin.Unlock()
plugin.logger.Write([]byte(line))
return nil
}

3
dnscrypt-proxy/proxy.go
View file

@ -52,6 +52,9 @@ type Proxy struct {
maxClients uint32
xTransport *XTransport
allWeeklyRanges *map[string]WeeklyRanges
logMaxSize int
logMaxAge int
logMaxBackups int
}
func (proxy *Proxy) StartProxy() {