docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
Context.auth = InitAuth(sessFilename, config.Users, config.WebSessionTTLHours*60*60)
if Context.auth == nil { | <mask> return fmt.Errorf("dnsServer.Prepare: %s", err)
<mask> }
<mask>
<mask> sessFilename := filepath.Join(baseDir, "sessions.db")
<mask> config.auth = InitAuth(sessFilename, config.Users, config.WebSessionTTLHours*60*60)
<mask> if config.auth == nil {
<mask> closeDNSServer()
<mask> return fmt.Error... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/dns.go |
if Context.auth != nil {
Context.auth.Close()
Context.auth = nil | <mask> Context.queryLog.Close()
<mask> Context.queryLog = nil
<mask> }
<mask>
<mask> if config.auth != nil {
<mask> config.auth.Close()
<mask> config.auth = nil
<mask> }
<mask>
<mask> log.Debug("Closed all DNS modules")
<mask> }
</s> *(global): refactoring - moved runtime properties to Context... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/dns.go |
resp, err := Context.client.Get(filter.URL) | <mask> // Perform upgrade on a filter
<mask> func (filter *filter) update() (bool, error) {
<mask> log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
<mask>
<mask> resp, err := config.client.Get(filter.URL)
<mask> if resp != nil && resp.Body != nil {
<mask> defer resp.Body.Close(... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/filter.go |
return filepath.Join(Context.getDataDir(), filterDir, strconv.FormatInt(filter.ID, 10)+".txt") | <mask> }
<mask>
<mask> // Path to the filter contents
<mask> func (filter *filter) Path() string {
<mask> return filepath.Join(config.getDataDir(), filterDir, strconv.FormatInt(filter.ID, 10)+".txt")
<mask> }
<mask>
<mask> // LastTimeUpdated returns the time when the filter was last time updated
<mask> func... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/filter.go |
Context.client = &http.Client{ | <mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> func TestFilters(t *testing.T) {
<mask> config.client = &http.Client{
<mask> Timeout: time.Minute * 5,
<mask> }
<mask>
<mask> f := filter{
<mask> URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt",
</s> *(glob... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/filter_test.go |
Context.controlLock.Lock()
defer Context.controlLock.Unlock() | <mask> return
<mask> }
<mask>
<mask> if method == "POST" || method == "PUT" || method == "DELETE" {
<mask> config.controlLock.Lock()
<mask> defer config.controlLock.Unlock()
<mask> }
<mask>
<mask> handler(w, r)
<mask> }
<mask> }
</s> *(global): refactoring - moved runtime properties to C... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/helpers.go |
configfile := Context.configFilename | <mask> // -------------------
<mask> // first run / install
<mask> // -------------------
<mask> func detectFirstRun() bool {
<mask> configfile := config.ourConfigFilename
<mask> if !filepath.IsAbs(configfile) {
<mask> configfile = filepath.Join(config.ourWorkingDir, config.ourConfigFilename)
<mask> }
<ma... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/helpers.go |
configfile = filepath.Join(Context.workDir, Context.configFilename) | <mask> // -------------------
<mask> func detectFirstRun() bool {
<mask> configfile := config.ourConfigFilename
<mask> if !filepath.IsAbs(configfile) {
<mask> configfile = filepath.Join(config.ourWorkingDir, config.ourConfigFilename)
<mask> }
<mask> _, err := os.Stat(configfile)
<mask> if !os.IsNotExist(... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/helpers.go |
if !Context.firstRun { | <mask>
<mask> // preInstall lets the handler run only if firstRun is true, no redirects
<mask> func preInstall(handler func(http.ResponseWriter, *http.Request)) func(http.ResponseWriter, *http.Request) {
<mask> return func(w http.ResponseWriter, r *http.Request) {
<mask> if !config.firstRun {
<mask> // if ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/helpers.go |
if Context.firstRun && | <mask> // postInstall lets the handler run only if firstRun is false, and redirects to /install.html otherwise
<mask> // it also enforces HTTPS if it is enabled and configured
<mask> func postInstall(handler func(http.ResponseWriter, *http.Request)) func(http.ResponseWriter, *http.Request) {
<mask> return func(w h... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/helpers.go |
// Modules
// --
| <mask>
<mask> // Global context
<mask> type homeContext struct {
<mask> clients clientsContainer // per-client-settings module
<mask> stats stats.Stats // statistics module
<mask> queryLog querylog.QueryLog // query log module
<mask> dnsServer *dnsforward.Server // DNS modul... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home.go |
auth *Auth // HTTP authentication module | <mask> dnsFilter *dnsfilter.Dnsfilter // DNS filtering module
<mask> dhcpServer *dhcpd.Server // DHCP module
<mask> httpServer *http.Server // HTTP module
<mask> httpsServer HTTPSServer // HTTPS module
<mask>
<mask> // Runtime properties
</s> *(global): refactoring - moved runti... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home.go |
Context.appSignalChannel = make(chan os.Signal)
signal.Notify(Context.appSignalChannel, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP, syscall.SIGQUIT)
go func() {
<-Context.appSignalChannel
cleanup()
cleanupAlways()
os.Exit(0)
}()
| <mask> return
<mask> }
<mask>
<mask> // run the protection
<mask> run(args)
<mask> }
<mask>
<mask> // run initializes configuration and runs the AdGuard Home
</s> *(global): refactoring - moved runtime properties to Context </s> remove // run is a blocking method and it won't exit until the service is s... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home.go |
// run is a blocking method! | <mask> run(args)
<mask> }
<mask>
<mask> // run initializes configuration and runs the AdGuard Home
<mask> // run is a blocking method and it won't exit until the service is stopped!
<mask> // nolint
<mask> func run(args options) {
<mask> // config file path can be overridden by command-line arguments:
<mask... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home.go |
Context.configFilename = args.configFilename
} else {
// Default config file name
Context.configFilename = "AdGuardHome.yaml"
}
// Init some of the Context fields right away
Context.transport = &http.Transport{
DialContext: customDialContext,
}
Context.client = &http.Client{
Timeout: time.Minute * 5,... | <mask> // nolint
<mask> func run(args options) {
<mask> // config file path can be overridden by command-line arguments:
<mask> if args.configFilename != "" {
<mask> config.ourConfigFilename = args.configFilename
<mask> }
<mask>
<mask> // configure working dir and config path
<mask> initWorkingDir(args... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home.go |
log.Debug("Current working directory is %s", Context.workDir) | <mask> if ARMVersion != "" {
<mask> msg = msg + " v" + ARMVersion
<mask> }
<mask> log.Printf(msg, versionString, updateChannel, runtime.GOOS, runtime.GOARCH, ARMVersion)
<mask> log.Debug("Current working directory is %s", config.ourWorkingDir)
<mask> if args.runningAsService {
<mask> log.Info("AdGuard H... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home.go |
Context.runningAsService = args.runningAsService
Context.disableUpdate = args.disableUpdate | <mask> log.Debug("Current working directory is %s", config.ourWorkingDir)
<mask> if args.runningAsService {
<mask> log.Info("AdGuard Home is running as a service")
<mask> }
<mask> config.runningAsService = args.runningAsService
<mask> config.disableUpdate = args.disableUpdate
<mask>
<mask> config.first... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home.go |
Context.firstRun = detectFirstRun()
if Context.firstRun { | <mask> }
<mask> config.runningAsService = args.runningAsService
<mask> config.disableUpdate = args.disableUpdate
<mask>
<mask> config.firstRun = detectFirstRun()
<mask> if config.firstRun {
<mask> requireAdminRights()
<mask> }
<mask>
<mask> config.appSignalChannel = make(chan os.Signal)
<mask> si... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home.go |
<mask> if config.firstRun {
<mask> requireAdminRights()
<mask> }
<mask>
<mask> config.appSignalChannel = make(chan os.Signal)
<mask> signal.Notify(config.appSignalChannel, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP, syscall.SIGQUIT)
<mask> go func() {
<mask> <-config.appSignalChannel
<mask> cl... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home.go | |
if !Context.firstRun { | <mask>
<mask> initConfig()
<mask> initServices()
<mask>
<mask> if !config.firstRun {
<mask> // Do the upgrade if necessary
<mask> err := upgradeConfig()
<mask> if err != nil {
<mask> log.Fatal(err)
<mask> }
</s> *(global): refactoring - moved runtime properties to Context </s> remove config.... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home.go |
config.DHCP.WorkDir = Context.workDir | <mask> os.Exit(0)
<mask> }
<mask> }
<mask>
<mask> config.DHCP.WorkDir = config.ourWorkingDir
<mask> config.DHCP.HTTPRegister = httpRegister
<mask> config.DHCP.ConfigModified = onConfigModified
<mask> Context.dhcpServer = dhcpd.Create(config.DHCP)
<mask> Context.clients.Init(config.Clients, Context.... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home.go |
if !Context.firstRun { | <mask> if args.bindPort != 0 {
<mask> config.BindPort = args.bindPort
<mask> }
<mask>
<mask> if !config.firstRun {
<mask> // Save the updated config
<mask> err := config.write()
<mask> if err != nil {
<mask> log.Fatal(err)
<mask> }
</s> *(global): refactoring - moved runtime properties to Co... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home.go |
Context.pidFileName = args.pidFile | <mask> }
<mask> }
<mask>
<mask> if len(args.pidFile) != 0 && writePIDFile(args.pidFile) {
<mask> config.pidFileName = args.pidFile
<mask> }
<mask>
<mask> // Initialize and run the admin Web interface
<mask> box := packr.NewBox("../build/static")
<mask>
</s> *(global): refactoring - moved runtime ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home.go |
if Context.firstRun { | <mask> http.Handle("/", postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(http.FileServer(box)))))
<mask> registerControlHandlers()
<mask>
<mask> // add handlers for /install paths, we only need them when we're not configured yet
<mask> if config.firstRun {
<mask> log.Info("This is the first l... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home.go |
// initWorkingDir initializes the workDir | <mask> }
<mask> return true
<mask> }
<mask>
<mask> // initWorkingDir initializes the ourWorkingDir
<mask> // if no command-line arguments specified, we use the directory where our binary file is located
<mask> func initWorkingDir(args options) {
<mask> exec, err := os.Executable()
<mask> if err != nil {
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home.go |
execPath, err := os.Executable() | <mask>
<mask> // initWorkingDir initializes the ourWorkingDir
<mask> // if no command-line arguments specified, we use the directory where our binary file is located
<mask> func initWorkingDir(args options) {
<mask> exec, err := os.Executable()
<mask> if err != nil {
<mask> panic(err)
<mask> }
<mask>
<... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home.go |
Context.workDir = args.workDir | <mask> }
<mask>
<mask> if args.workDir != "" {
<mask> // If there is a custom config file, use it's directory as our working dir
<mask> config.ourWorkingDir = args.workDir
<mask> } else {
<mask> config.ourWorkingDir = filepath.Dir(exec)
<mask> }
<mask> }
<mask>
</s> *(global): refactoring - moved... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home.go |
Context.workDir = filepath.Dir(execPath) | <mask> if args.workDir != "" {
<mask> // If there is a custom config file, use it's directory as our working dir
<mask> config.ourWorkingDir = args.workDir
<mask> } else {
<mask> config.ourWorkingDir = filepath.Dir(exec)
<mask> }
<mask> }
<mask>
<mask> // configureLogger configures logger level and o... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home.go |
logFilePath := filepath.Join(Context.workDir, ls.LogFile) | <mask> if err != nil {
<mask> log.Fatalf("cannot initialize syslog: %s", err)
<mask> }
<mask> } else {
<mask> logFilePath := filepath.Join(config.ourWorkingDir, ls.LogFile)
<mask> if filepath.IsAbs(ls.LogFile) {
<mask> logFilePath = ls.LogFile
<mask> }
<mask>
<mask> file, err := os.OpenFil... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home.go |
if len(Context.pidFileName) != 0 {
_ = os.Remove(Context.pidFileName) | <mask> }
<mask>
<mask> // This function is called before application exits
<mask> func cleanupAlways() {
<mask> if len(config.pidFileName) != 0 {
<mask> os.Remove(config.pidFileName)
<mask> }
<mask> log.Info("Stopped")
<mask> }
<mask>
<mask> // command-line arguments
</s> *(global): refactoring - mov... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home.go |
for i := 0; i < 5; i++ {
// Waiting until the DNS server is up and running
if !isRunning() {
time.Sleep(1 * time.Second)
}
}
| <mask> go run(args)
<mask>
<mask> var err error
<mask> var resp *http.Response
<mask> h := http.Client{}
<mask>
<mask> resp, err = h.Get("http://127.0.0.1:3000/")
<mask> assert.Truef(t, err == nil, "%s", err)
</s> *(global): refactoring - moved runtime properties to Context </s> remove for i := 0; i !... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home_test.go |
resp, err = h.Get("http://127.0.0.1:3000/") | <mask>
<mask> var err error
<mask> var resp *http.Response
<mask> h := http.Client{}
<mask> for i := 0; i != 5; i++ {
<mask> resp, err = h.Get("http://127.0.0.1:3000/")
<mask> if err == nil && resp.StatusCode != 404 {
<mask> break
<mask> }
<mask> time.Sleep(1 * time.Second)
<mask> }
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home_test.go |
assert.Nil(t, err) | <mask>
<mask> // test DNS over UDP
<mask> r := upstream.NewResolver("127.0.0.1:5354", 3*time.Second)
<mask> addrs, err := r.LookupIPAddr(context.TODO(), "static.adguard.com")
<mask> assert.Truef(t, err == nil, "%s", err)
<mask> haveIP := len(addrs) != 0
<mask> assert.True(t, haveIP)
<mask>
<mask> // t... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home_test.go |
assert.Nil(t, err) | <mask> assert.True(t, err == nil, "%s", err)
<mask> assert.True(t, resp.StatusCode == http.StatusOK)
<mask> response := dns.Msg{}
<mask> err = response.Unpack(body)
<mask> assert.True(t, err == nil, "%s", err)
<mask> addrs = nil
<mask> proxyutil.AppendIPAddrs(&addrs, response.Answer)
<mask> haveIP = len... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/home_test.go |
if Context.appSignalChannel == nil { | <mask>
<mask> // Stop stops the program
<mask> func (p *program) Stop(s service.Service) error {
<mask> // Stop should not block. Return with a few seconds.
<mask> if config.appSignalChannel == nil {
<mask> os.Exit(0)
<mask> }
<mask> config.appSignalChannel <- syscall.SIGINT
<mask> return nil
<mask> }... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/service.go |
Context.appSignalChannel <- syscall.SIGINT | <mask> // Stop should not block. Return with a few seconds.
<mask> if config.appSignalChannel == nil {
<mask> os.Exit(0)
<mask> }
<mask> config.appSignalChannel <- syscall.SIGINT
<mask> return nil
<mask> }
<mask>
<mask> // Check the service's status
<mask> // Note: on OpenWrt 'service' utility may not... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/service.go |
dnsFilterPath := filepath.Join(Context.workDir, "dnsfilter.txt") | <mask> // No more "dnsfilter.txt", filters are now kept in data/filters/
<mask> func upgradeSchema0to1(diskConfig *map[string]interface{}) error {
<mask> log.Printf("%s(): called", _Func())
<mask>
<mask> dnsFilterPath := filepath.Join(config.ourWorkingDir, "dnsfilter.txt")
<mask> if _, err := os.Stat(dnsFilte... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/upgrade.go |
coreFilePath := filepath.Join(Context.workDir, "Corefile") | <mask> // delete 'Corefile', since we don't use that anymore
<mask> func upgradeSchema1to2(diskConfig *map[string]interface{}) error {
<mask> log.Printf("%s(): called", _Func())
<mask>
<mask> coreFilePath := filepath.Join(config.ourWorkingDir, "Corefile")
<mask> if _, err := os.Stat(coreFilePath); !os.IsNotEx... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d | home/upgrade.go |
found := filterEnable(url, true) | <mask> http.Error(w, "URL parameter is not valid request URL", http.StatusBadRequest)
<mask> return
<mask> }
<mask>
<mask> found := false
<mask> config.Lock()
<mask> for i := range config.Filters {
<mask> filter := &config.Filters[i] // otherwise we will be operating on a copy
<mask> if filter.URL... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2c7d00a95d67f21c72eac9c915701313b3646b | control.go |
<mask> http.Error(w, "URL parameter was not previously added", http.StatusBadRequest)
<mask> return
<mask> }
<mask>
<mask> // kick off refresh of rules from new URLs
<mask> refreshFiltersIfNecessary(false)
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> func handleFilteringDisa... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2c7d00a95d67f21c72eac9c915701313b3646b | control.go | |
found := filterEnable(url, false) | <mask> http.Error(w, "URL parameter is not valid request URL", http.StatusBadRequest)
<mask> return
<mask> }
<mask>
<mask> found := false
<mask> config.Lock()
<mask> for i := range config.Filters {
<mask> filter := &config.Filters[i] // otherwise we will be operating on a copy
<mask> if filter.URL... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2c7d00a95d67f21c72eac9c915701313b3646b | control.go |
// Clear filter rules
func (filter *filter) unload() {
filter.Rules = []string{}
filter.RulesCount = 0
}
| <mask>
<mask> return nil
<mask> }
<mask>
<mask> // Path to the filter contents
<mask> func (filter *filter) Path() string {
<mask> return filepath.Join(config.ourWorkingDir, dataDir, filterDir, strconv.FormatInt(filter.ID, 10)+".txt")
<mask> }
<mask>
<mask> // LastTimeUpdated returns the time when the fi... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae2c7d00a95d67f21c72eac9c915701313b3646b | filter.go |
github.com/AdguardTeam/dnsproxy v0.49.2 | <mask>
<mask> go 1.19
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.49.1
<mask> github.com/AdguardTeam/golibs v0.13.2
<mask> github.com/AdguardTeam/urlfilter v0.16.1
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.7
<mask> github.com/digineo... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae7bd79a6c2dba0061db4d5d46b9069e4bd3f22c | go.mod |
github.com/AdguardTeam/dnsproxy v0.49.2 h1:DAFhLpz8KOvw9r6F3H1jK/JFYKzXY2RkqWSjkfwZMqU=
github.com/AdguardTeam/dnsproxy v0.49.2/go.mod h1:Y7g7jRTd/u7+KJ/QvnGI2PCE8vnisp6EsW47/Sz0DZw= | <mask> github.com/AdguardTeam/dnsproxy v0.49.1 h1:JpStBK05uCgA3ldleaNLRmIwE9V7vRg7/kVJQSdnQYg=
<mask> github.com/AdguardTeam/dnsproxy v0.49.1/go.mod h1:Y7g7jRTd/u7+KJ/QvnGI2PCE8vnisp6EsW47/Sz0DZw=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/Ad... | [
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae7bd79a6c2dba0061db4d5d46b9069e4bd3f22c | go.sum |
<mask> github.com/digineo/go-ipset/v2 v2.2.1 h1:k6skY+0fMqeUjjeWO/m5OuWPSZUAn7AucHMnQ1MX77g=
<mask> github.com/digineo/go-ipset/v2 v2.2.1/go.mod h1:wBsNzJlZlABHUITkesrggFnZQtgW5wkqw1uo8Qxe0VU=
<mask> github.com/dimfeld/httptreemux/v5 v5.5.0 h1:p8jkiMrCuZ0CmhwYLcbNbl7DDo21fozhKHQ2PccwOFQ=
<mask> github.com/dimfeld/h... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae7bd79a6c2dba0061db4d5d46b9069e4bd3f22c | go.sum | |
<mask> github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
<mask> github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
<mask> github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
<mask> github.com/google/go-cmp v0.2.0/go.mod h1:o... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae7bd79a6c2dba0061db4d5d46b9069e4bd3f22c | go.sum | |
<mask> github.com/google/renameio v1.0.1/go.mod h1:t/HQoYBZSsWSNK35C6CO/TpPLDVWvxOHboWUAweKUpk=
<mask> github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
<mask> github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
<mask> github.com/google/uuid v1.3.0/go.mod... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae7bd79a6c2dba0061db4d5d46b9069e4bd3f22c | go.sum | |
<mask> github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
<mask> github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
<mask> github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
<mask> github... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae7bd79a6c2dba0061db4d5d46b9069e4bd3f22c | go.sum | |
<mask> github.com/josharian/native v1.0.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
<mask> github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
<mask> github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86 h1:elKwZS1OcdQ0WwEDBe... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae7bd79a6c2dba0061db4d5d46b9069e4bd3f22c | go.sum | |
<mask> github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
<mask> github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
<mask> github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
<mask> github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkid... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae7bd79a6c2dba0061db4d5d46b9069e4bd3f22c | go.sum | |
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
<mask> github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118 h1:2oDp6OOhLxQ9JBoUuysVz9UZ9uI6oLUbvAZu0x8o+vE=
<mask> github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118/g... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae7bd79a6c2dba0061db4d5d46b9069e4bd3f22c | go.sum | |
<mask> github.com/mdlayher/netlink v1.7.1/go.mod h1:nKO5CSjE/DJjVhk/TNp6vCE1ktVxEA8VEh8drhZzxsQ=
<mask> github.com/mdlayher/packet v1.0.0/go.mod h1:eE7/ctqDhoiRhQ44ko5JZU2zxB88g+JH/6jmnjzPjOU=
<mask> github.com/mdlayher/packet v1.1.1 h1:7Fv4OEMYqPl7//uBm04VgPpnSNi8fbBZznppgh6WMr8=
<mask> github.com/mdlayher/packet ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae7bd79a6c2dba0061db4d5d46b9069e4bd3f22c | go.sum | |
<mask> github.com/quic-go/quic-go v0.33.0 h1:ItNoTDN/Fm/zBlq769lLJc8ECe9gYaW40veHCCco7y0=
<mask> github.com/quic-go/quic-go v0.33.0/go.mod h1:YMuhaAV9/jIu0XclDXwZPAsP/2Kgr5yMYhe9oxhhOFA=
<mask> github.com/shirou/gopsutil/v3 v3.21.8 h1:nKct+uP0TV8DjjNiHanKf8SAuub+GNsbrOtM9Nl9biA=
<mask> github.com/shirou/gopsutil/v3... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae7bd79a6c2dba0061db4d5d46b9069e4bd3f22c | go.sum | |
<mask> github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev3vTo=
<mask> github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
<mask> github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2biQ=
<mask> github.com/tklauser/numcpu... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae7bd79a6c2dba0061db4d5d46b9069e4bd3f22c | go.sum | |
<mask> go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
<mask> go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
<mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
<mask> golang.org/x/crypto v0.0.0-... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae7bd79a6c2dba0061db4d5d46b9069e4bd3f22c | go.sum | |
<mask> golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
<mask> golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
<mask> golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-2019... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae7bd79a6c2dba0061db4d5d46b9069e4bd3f22c | go.sum | |
<mask> golang.org/x/net v0.0.0-20190419010253-1f3472d942ba/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5p... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae7bd79a6c2dba0061db4d5d46b9069e4bd3f22c | go.sum | |
<mask> golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae7bd79a6c2dba0061db4d5d46b9069e4bd3f22c | go.sum | |
<mask> golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190322080309-f49334f85ddc/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpK... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae7bd79a6c2dba0061db4d5d46b9069e4bd3f22c | go.sum | |
<mask> golang.org/x/sys v0.0.0-20190418153312-f0ce4c0180be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190606122018-79a91cf218c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpK... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae7bd79a6c2dba0061db4d5d46b9069e4bd3f22c | go.sum | |
<mask> golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpK... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae7bd79a6c2dba0061db4d5d46b9069e4bd3f22c | go.sum | |
<mask> golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
<mask> golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
<mask> golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
<mask> golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/g... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae7bd79a6c2dba0061db4d5d46b9069e4bd3f22c | go.sum | |
`couldn't communicate with upstream: exchanging with ` +
badUps + ` over tcp: dns: id mismatch`, | <mask> "upstream_dns": []string{badUps},
<mask> },
<mask> wantResp: map[string]any{
<mask> badUps: `upstream "` + badUps + `" fails to exchange: ` +
<mask> `couldn't communicate with upstream: dns: id mismatch`,
<mask> },
<mask> name: "broken",
<mask> }, {
<mask> body: map[string]any{
<ma... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae7bd79a6c2dba0061db4d5d46b9069e4bd3f22c | internal/dnsforward/http_test.go |
`couldn't communicate with upstream: exchanging with ` +
badUps + ` over tcp: dns: id mismatch`, | <mask> },
<mask> wantResp: map[string]any{
<mask> goodUps: "OK",
<mask> badUps: `upstream "` + badUps + `" fails to exchange: ` +
<mask> `couldn't communicate with upstream: dns: id mismatch`,
<mask> },
<mask> name: "both",
<mask> }}
<mask>
<mask> for _, tc := range testCases {
</s> Pull... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ae7bd79a6c2dba0061db4d5d46b9069e4bd3f22c | internal/dnsforward/http_test.go |
dnsServer *dnsforward.Server | <mask> // cached version.json to avoid hammering github.io for each page reload
<mask> versionCheckJSON []byte
<mask> versionCheckLastTime time.Time
<mask>
<mask> dhcpServer dhcpd.Server
<mask> httpServer *http.Server
<mask> httpsServer HTTPSServer
<mask>
</s> * move "dnsServer" to "config" </s> ... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/af21a5f17bc1243c4ae8e44e424e0f1d264187f0 | home/config.go |
data := config.dnsServer.GetQueryLog() | <mask> }
<mask>
<mask> func handleQueryLog(w http.ResponseWriter, r *http.Request) {
<mask> log.Tracef("%s %v", r.Method, r.URL)
<mask> data := dnsServer.GetQueryLog()
<mask>
<mask> jsonVal, err := json.Marshal(data)
<mask> if err != nil {
<mask> httpError(w, http.StatusInternalServerError, "Couldn't m... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/af21a5f17bc1243c4ae8e44e424e0f1d264187f0 | home/control.go |
s := config.dnsServer.GetStatsTop() | <mask> }
<mask>
<mask> func handleStatsTop(w http.ResponseWriter, r *http.Request) {
<mask> log.Tracef("%s %v", r.Method, r.URL)
<mask> s := dnsServer.GetStatsTop()
<mask>
<mask> // use manual json marshalling because we want maps to be sorted by value
<mask> statsJSON := bytes.Buffer{}
<mask> statsJSON... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/af21a5f17bc1243c4ae8e44e424e0f1d264187f0 | home/control.go |
config.dnsServer.PurgeStats() | <mask>
<mask> // handleStatsReset resets the stats caches
<mask> func handleStatsReset(w http.ResponseWriter, r *http.Request) {
<mask> log.Tracef("%s %v", r.Method, r.URL)
<mask> dnsServer.PurgeStats()
<mask> _, err := fmt.Fprintf(w, "OK\n")
<mask> if err != nil {
<mask> httpError(w, http.StatusInternal... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/af21a5f17bc1243c4ae8e44e424e0f1d264187f0 | home/control.go |
summed := config.dnsServer.GetAggregatedStats() | <mask>
<mask> // handleStats returns aggregated stats data for the 24 hours
<mask> func handleStats(w http.ResponseWriter, r *http.Request) {
<mask> log.Tracef("%s %v", r.Method, r.URL)
<mask> summed := dnsServer.GetAggregatedStats()
<mask>
<mask> statsJSON, err := json.Marshal(summed)
<mask> if err != ni... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/af21a5f17bc1243c4ae8e44e424e0f1d264187f0 | home/control.go |
data, err := config.dnsServer.GetStatsHistory(timeUnit, startTime, endTime) | <mask> httpError(w, http.StatusBadRequest, "Must specify valid end_time parameter: %s", err)
<mask> return
<mask> }
<mask>
<mask> data, err := dnsServer.GetStatsHistory(timeUnit, startTime, endTime)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Cannot get stats history: %s", err)
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/af21a5f17bc1243c4ae8e44e424e0f1d264187f0 | home/control.go |
_ = config.dnsServer.Stop() | <mask>
<mask> // Stop DNS server:
<mask> // we close urlfilter object which in turn closes file descriptors to filter files.
<mask> // Otherwise, Windows won't allow us to remove the file which is being currently used.
<mask> _ = dnsServer.Stop()
<mask>
<mask> // go through each element and delete if url... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/af21a5f17bc1243c4ae8e44e424e0f1d264187f0 | home/control.go |
config.dnsServer.ServeHTTP(w, r) | <mask> httpError(w, http.StatusInternalServerError, "DNS server is not running")
<mask> return
<mask> }
<mask>
<mask> dnsServer.ServeHTTP(w, r)
<mask> }
<mask>
<mask> // ------------------------
<mask> // registration of handlers
<mask> // ------------------------
</s> * move "dnsServer" to "config" ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/af21a5f17bc1243c4ae8e44e424e0f1d264187f0 | home/control.go |
<mask> "github.com/joomcode/errorx"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> var dnsServer *dnsforward.Server
<mask>
<mask> const (
<mask> rdnsTimeout = 3 * time.Second // max time to wait for rDNS response
<mask> )
<mask>
<mask> type dnsContext struct {
</s> * move "dnsServer" to "config"... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/af21a5f17bc1243c4ae8e44e424e0f1d264187f0 | home/dns.go | |
config.dnsServer = dnsforward.NewServer(baseDir) | <mask> if err != nil {
<mask> log.Fatalf("Cannot create DNS data dir at %s: %s", baseDir, err)
<mask> }
<mask>
<mask> dnsServer = dnsforward.NewServer(baseDir)
<mask>
<mask> bindhost := config.DNS.BindHost
<mask> if config.DNS.BindHost == "0.0.0.0" {
<mask> bindhost = "127.0.0.1"
<mask> }
</s> * ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/af21a5f17bc1243c4ae8e44e424e0f1d264187f0 | home/dns.go |
return config.dnsServer != nil && config.dnsServer.IsRunning() | <mask> go asyncRDNSLoop()
<mask> }
<mask>
<mask> func isRunning() bool {
<mask> return dnsServer != nil && dnsServer.IsRunning()
<mask> }
<mask>
<mask> func beginAsyncRDNS(ip string) {
<mask> if config.clients.Exists(ip) {
<mask> return
</s> * move "dnsServer" to "config" </s> remove config, err := g... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/af21a5f17bc1243c4ae8e44e424e0f1d264187f0 | home/dns.go |
err = config.dnsServer.Start(&newconfig) | <mask> newconfig, err := generateServerConfig()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't start forwarding DNS server")
<mask> }
<mask> err = dnsServer.Start(&newconfig)
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't start forwarding DNS server")
<mask> }... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/af21a5f17bc1243c4ae8e44e424e0f1d264187f0 | home/dns.go |
top := config.dnsServer.GetStatsTop() | <mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't start forwarding DNS server")
<mask> }
<mask>
<mask> top := dnsServer.GetStatsTop()
<mask> for k := range top.Clients {
<mask> beginAsyncRDNS(k)
<mask> }
<mask>
<mask> return nil
</s> * move "dnsServer" to "config" </s> remove e... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/af21a5f17bc1243c4ae8e44e424e0f1d264187f0 | home/dns.go |
newconfig, err := generateServerConfig() | <mask> return nil
<mask> }
<mask>
<mask> func reconfigureDNSServer() error {
<mask> config, err := generateServerConfig()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't start forwarding DNS server")
<mask> }
<mask> err = dnsServer.Reconfigure(&config)
<mask> if err != nil {
</s>... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/af21a5f17bc1243c4ae8e44e424e0f1d264187f0 | home/dns.go |
err = config.dnsServer.Reconfigure(&newconfig) | <mask> config, err := generateServerConfig()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't start forwarding DNS server")
<mask> }
<mask> err = dnsServer.Reconfigure(&config)
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't start forwarding DNS server")
<mask> }... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/af21a5f17bc1243c4ae8e44e424e0f1d264187f0 | home/dns.go |
err := config.dnsServer.Stop() | <mask> if !isRunning() {
<mask> return nil
<mask> }
<mask>
<mask> err := dnsServer.Stop()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't stop forwarding DNS server")
<mask> }
<mask>
<mask> return nil
</s> * move "dnsServer" to "config" </s> remove err = dnsServer.Reconfigure... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/af21a5f17bc1243c4ae8e44e424e0f1d264187f0 | home/dns.go |
_ = config.dnsServer.Stop() | <mask> }
<mask>
<mask> stopped := false
<mask> if updateCount != 0 {
<mask> _ = dnsServer.Stop()
<mask> stopped = true
<mask> }
<mask>
<mask> updateCount = 0
<mask> for i := range updateFilters {
</s> * move "dnsServer" to "config" </s> remove _ = dnsServer.Stop()
</s> add _ = config.dnsServer... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/af21a5f17bc1243c4ae8e44e424e0f1d264187f0 | home/filter.go |
"default": "Default", | <mask> "query_log_retention_confirm": "Are you sure you want to change query log retention? If you decrease the interval value, some data will be lost",
<mask> "dns_config": "DNS server configuration",
<mask> "blocking_mode": "Blocking mode",
<mask> "nxdomain": "NXDOMAIN",
<mask> "null_ip": "Nu... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/b01af453cc27cdb89ac0482ec68108ec8a2835a5 | client/src/__locales/en.json |
{Object.values(BLOCKING_MODES).map(mode => (
<li key={mode}>
<Trans >{`blocking_mode_${mode}`}</Trans>
</li>
))} | <mask> <label className="form__label form__label--with-desc">
<mask> <Trans>blocking_mode</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
<mask> <Trans components={[<div key="0">t... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/b01af453cc27cdb89ac0482ec68108ec8a2835a5 | client/src/components/Settings/Dns/Config/Form.js |
default: 'default', | <mask>
<mask> export const FILTERS_INTERVALS_HOURS = [0, 1, 12, 24, 72, 168];
<mask>
<mask> export const BLOCKING_MODES = {
<mask> nxdomain: 'nxdomain',
<mask> null_ip: 'null_ip',
<mask> custom_ip: 'custom_ip',
<mask> };
<mask>
<mask> export const WHOIS_ICONS = {
</s> + client: handle default ... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/b01af453cc27cdb89ac0482ec68108ec8a2835a5 | client/src/helpers/constants.js |
blocking_mode: BLOCKING_MODES.default, | <mask> },
<mask> {
<mask> processingGetConfig: false,
<mask> processingSetConfig: false,
<mask> blocking_mode: BLOCKING_MODES.nxdomain,
<mask> ratelimit: 20,
<mask> blocking_ipv4: DEFAULT_BLOCKING_IPV4,
<mask> blocking_ipv6: DEFAULT_BLOCKING_IPV6,
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/b01af453cc27cdb89ac0482ec68108ec8a2835a5 | client/src/reducers/dnsConfig.js |
name := hex.EncodeToString(data) | <mask>
<mask> // store session data in file
<mask> func (a *Auth) addSession(data []byte, s *session) {
<mask> a.lock.Lock()
<mask> a.sessions[name] = s
<mask> a.lock.Unlock()
<mask> if a.storeSession(data, s) {
</s> * auth: improve logging
Write info log messages for login attempts (both successful and n... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/b03b36e47e1f230567fce0936ee1285b6861350a | home/auth.go |
a.sessions[name] = s | <mask>
<mask> // store session data in file
<mask> func (a *Auth) addSession(data []byte, s *session) {
<mask> a.lock.Lock()
<mask> a.sessions[hex.EncodeToString(data)] = s
<mask> a.lock.Unlock()
<mask> a.storeSession(data, s)
<mask> }
<mask>
<mask> // store session data in file
</s> * auth: improve lo... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/b03b36e47e1f230567fce0936ee1285b6861350a | home/auth.go |
if a.storeSession(data, s) {
log.Info("Auth: created session %s: expire=%d", name, s.expire)
} | <mask> func (a *Auth) addSession(data []byte, s *session) {
<mask> a.lock.Lock()
<mask> a.sessions[hex.EncodeToString(data)] = s
<mask> a.lock.Unlock()
<mask> a.storeSession(data, s)
<mask> }
<mask>
<mask> // store session data in file
<mask> func (a *Auth) storeSession(data []byte, s *session) {
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/b03b36e47e1f230567fce0936ee1285b6861350a | home/auth.go |
func (a *Auth) storeSession(data []byte, s *session) bool { | <mask> a.storeSession(data, s)
<mask> }
<mask>
<mask> // store session data in file
<mask> func (a *Auth) storeSession(data []byte, s *session) {
<mask> tx, err := a.db.Begin(true)
<mask> if err != nil {
<mask> log.Error("Auth: bbolt.Begin: %s", err)
<mask> return
<mask> }
</s> * auth: improve loggi... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/b03b36e47e1f230567fce0936ee1285b6861350a | home/auth.go |
return false | <mask> func (a *Auth) storeSession(data []byte, s *session) {
<mask> tx, err := a.db.Begin(true)
<mask> if err != nil {
<mask> log.Error("Auth: bbolt.Begin: %s", err)
<mask> return
<mask> }
<mask> defer func() {
<mask> _ = tx.Rollback()
<mask> }()
<mask>
</s> * auth: improve logging
Write info l... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/b03b36e47e1f230567fce0936ee1285b6861350a | home/auth.go |
return false | <mask>
<mask> bkt, err := tx.CreateBucketIfNotExists(bucketName())
<mask> if err != nil {
<mask> log.Error("Auth: bbolt.CreateBucketIfNotExists: %s", err)
<mask> return
<mask> }
<mask> err = bkt.Put(data, s.serialize())
<mask> if err != nil {
<mask> log.Error("Auth: bbolt.Put: %s", err)
<mask> r... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/b03b36e47e1f230567fce0936ee1285b6861350a | home/auth.go |
return false | <mask> }
<mask> err = bkt.Put(data, s.serialize())
<mask> if err != nil {
<mask> log.Error("Auth: bbolt.Put: %s", err)
<mask> return
<mask> }
<mask>
<mask> err = tx.Commit()
<mask> if err != nil {
<mask> log.Error("Auth: bbolt.Commit: %s", err)
</s> * auth: improve logging
Write info log messag... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/b03b36e47e1f230567fce0936ee1285b6861350a | home/auth.go |
return false | <mask>
<mask> err = tx.Commit()
<mask> if err != nil {
<mask> log.Error("Auth: bbolt.Commit: %s", err)
<mask> return
<mask> }
<mask>
<mask> log.Debug("Auth: stored session in DB")
<mask> }
<mask>
</s> * auth: improve logging
Write info log messages for login attempts (both successful and not) </s... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/b03b36e47e1f230567fce0936ee1285b6861350a | home/auth.go |
return true | <mask> if err != nil {
<mask> log.Error("Auth: bbolt.Commit: %s", err)
<mask> return
<mask> }
<mask>
<mask> log.Debug("Auth: stored session in DB")
<mask> }
<mask>
<mask> // remove session from file
<mask> func (a *Auth) removeSession(sess []byte) {
<mask> tx, err := a.db.Begin(true)
</s> * auth: ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/b03b36e47e1f230567fce0936ee1285b6861350a | home/auth.go |
if a.storeSession(key, s) {
log.Debug("Auth: updated session %s: expire=%d", sess, s.expire)
} | <mask> a.lock.Unlock()
<mask>
<mask> if update {
<mask> key, _ := hex.DecodeString(sess)
<mask> a.storeSession(key, s)
<mask> }
<mask>
<mask> return 0
<mask> }
<mask>
</s> * auth: improve logging
Write info log messages for login attempts (both successful and not) </s> remove return
</s> add ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/b03b36e47e1f230567fce0936ee1285b6861350a | home/auth.go |
log.Info("Auth: invalid user name or password: name='%s'", req.Name) | <mask>
<mask> cookie := config.auth.httpCookie(req)
<mask> if len(cookie) == 0 {
<mask> time.Sleep(1 * time.Second)
<mask> http.Error(w, "invalid user name or password", http.StatusBadRequest)
<mask> return
<mask> }
</s> * auth: improve logging
Write info log messages for login attempts (both success... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/b03b36e47e1f230567fce0936ee1285b6861350a | home/auth.go |
http.Error(w, "invalid user name or password", http.StatusBadRequest) | <mask>
<mask> cookie := config.auth.httpCookie(req)
<mask> if len(cookie) == 0 {
<mask> time.Sleep(1 * time.Second)
<mask> httpError(w, http.StatusBadRequest, "invalid login or password")
<mask> return
<mask> }
<mask>
<mask> w.Header().Set("Set-Cookie", cookie)
<mask>
</s> * auth: improve loggin... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/b03b36e47e1f230567fce0936ee1285b6861350a | home/auth.go |
log.Info("Auth: invalid cookie value: %s", cookie) | <mask> w.Header().Set("Location", "/")
<mask> w.WriteHeader(http.StatusFound)
<mask> return
<mask> } else if r < 0 {
<mask> log.Debug("Auth: invalid cookie value: %s", cookie)
<mask> }
<mask> }
<mask>
<mask> } else if r.URL.Path == "/favicon.png" ||
<mask> strings.HasPrefi... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/b03b36e47e1f230567fce0936ee1285b6861350a | home/auth.go |
log.Info("Auth: invalid cookie value: %s", cookie) | <mask> r := config.auth.CheckSession(cookie.Value)
<mask> if r == 0 {
<mask> ok = true
<mask> } else if r < 0 {
<mask> log.Debug("Auth: invalid cookie value: %s", cookie)
<mask> }
<mask> } else {
<mask> // there's no Cookie, check Basic authentication
<mask> user, pass, ok2... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/b03b36e47e1f230567fce0936ee1285b6861350a | home/auth.go |
} else {
log.Info("Auth: invalid Basic Authorization value") | <mask> u := config.auth.UserFind(user, pass)
<mask> if len(u.Name) != 0 {
<mask> ok = true
<mask> }
<mask> }
<mask> }
<mask> if !ok {
</s> * auth: improve logging
Write info log messages for login attempts (both successful and not) </s> remove log.Debug("Auth: invalid cookie... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/b03b36e47e1f230567fce0936ee1285b6861350a | home/auth.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.