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
if len(url.Scheme) == 0 { return false //No Scheme found
<mask> if err != nil { <mask> httpError(w, http.StatusInternalServerError, "Unable to marshal status json: %s", err) <mask> return <mask> } <mask> <mask> w.Header().Set("Content-Type", "application/json") <mask> _, err = w.Write(jsonVal) <mask> if err != nil { <mask> httpError(w, http.StatusInterna...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
return true } type filterAddJSON struct { Name string `json:"name"` URL string `json:"url"`
<mask> return false //No Scheme found <mask> } <mask> } <mask> <mask> func handleFilteringAddURL(w http.ResponseWriter, r *http.Request) { <mask> fj := filterAddJSON{} <mask> err := json.NewDecoder(r.Body).Decode(&fj) <mask> if err != nil { </s> filtering: refactor; change API; add "filters_update_int...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
fj := filterAddJSON{} err := json.NewDecoder(r.Body).Decode(&fj)
<mask> } <mask> } <mask> <mask> func handleFilteringAddURL(w http.ResponseWriter, r *http.Request) { <mask> f := filter{} <mask> err := json.NewDecoder(r.Body).Decode(&f) <mask> if err != nil { <mask> httpError(w, http.StatusBadRequest, "Failed to parse request body json: %s", err) <mask> return <mas...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
if !IsValidURL(fj.URL) { http.Error(w, "Invalid URL", http.StatusBadRequest)
<mask> httpError(w, http.StatusBadRequest, "Failed to parse request body json: %s", err) <mask> return <mask> } <mask> <mask> if len(f.URL) == 0 { <mask> http.Error(w, "URL parameter was not specified", http.StatusBadRequest) <mask> return <mask> } <mask> <mask> if valid := govalidator.IsRequest...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
if filterExists(fj.URL) { httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", fj.URL)
<mask> return <mask> } <mask> <mask> // Check for duplicates <mask> if filterExists(f.URL) { <mask> httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL) <mask> return <mask> } <mask> <mask> // Set necessary properties <mask> f.ID = assignUniqueFilterID() </s> filtering:...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
f := filter{ Enabled: true, URL: fj.URL, Name: fj.Name, }
<mask> <mask> // Set necessary properties <mask> f.ID = assignUniqueFilterID() <mask> <mask> // Download the filter contents <mask> ok, err := f.update() </s> filtering: refactor; change API; add "filters_update_interval" setting + config: "filters_update_interval" * add /control/filtering_info * remove...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
<mask> } <mask> <mask> // Set necessary properties <mask> f.ID = assignUniqueFilterID() <mask> f.Enabled = true <mask> <mask> // Download the filter contents <mask> ok, err := f.update() <mask> if err != nil { <mask> httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", f.URL...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
if !IsValidURL(req.URL) {
<mask> httpError(w, http.StatusBadRequest, "Failed to parse request body json: %s", err) <mask> return <mask> } <mask> <mask> if valid := govalidator.IsRequestURL(req.URL); !valid { <mask> http.Error(w, "URL parameter is not valid request URL", http.StatusBadRequest) <mask> return <mask> } <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
type filterURLJSON struct { URL string `json:"url"` Enabled bool `json:"enabled"` }
<mask> config.Unlock() <mask> httpUpdateConfigReloadDNSReturnOK(w, r) <mask> } <mask> <mask> func handleFilteringEnableURL(w http.ResponseWriter, r *http.Request) { <mask> parameters, err := parseParametersFromBody(r.Body) <mask> if err != nil { <mask> httpError(w, http.StatusBadRequest, "failed to parse...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
func handleFilteringSetURL(w http.ResponseWriter, r *http.Request) { fj := filterURLJSON{} err := json.NewDecoder(r.Body).Decode(&fj) if err != nil { httpError(w, http.StatusBadRequest, "json decode: %s", err)
<mask> httpError(w, http.StatusBadRequest, "failed to parse parameters from body: %s", err) <mask> return <mask> } <mask> <mask> url, ok := parameters["url"] <mask> if !ok { <mask> http.Error(w, "URL parameter was not specified", http.StatusBadRequest) <mask> return <mask> } <mask> <mask> if v...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
if !IsValidURL(fj.URL) { http.Error(w, "invalid URL", http.StatusBadRequest)
<mask> http.Error(w, "URL parameter was not specified", http.StatusBadRequest) <mask> return <mask> } <mask> <mask> if valid := govalidator.IsRequestURL(url); !valid { <mask> http.Error(w, "URL parameter is not valid request URL", http.StatusBadRequest) <mask> return <mask> } <mask> <mask> found...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
found := filterEnable(fj.URL, fj.Enabled)
<mask> http.Error(w, "URL parameter is not valid request URL", http.StatusBadRequest) <mask> return <mask> } <mask> <mask> found := filterEnable(url, true) <mask> if !found { <mask> http.Error(w, "URL parameter was not previously added", http.StatusBadRequest) <mask> return <mask> } <mask> </s>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
http.Error(w, "URL doesn't exist", http.StatusBadRequest)
<mask> } <mask> <mask> found := filterEnable(url, true) <mask> if !found { <mask> http.Error(w, "URL parameter was not previously added", http.StatusBadRequest) <mask> return <mask> } <mask> <mask> httpUpdateConfigReloadDNSReturnOK(w, r) <mask> } </s> filtering: refactor; change API; add "filter...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
func handleFilteringSetRules(w http.ResponseWriter, r *http.Request) { body, err := ioutil.ReadAll(r.Body)
<mask> <mask> httpUpdateConfigReloadDNSReturnOK(w, r) <mask> } <mask> <mask> func handleFilteringDisableURL(w http.ResponseWriter, r *http.Request) { <mask> parameters, err := parseParametersFromBody(r.Body) <mask> if err != nil { <mask> httpError(w, http.StatusBadRequest, "failed to parse parameters fro...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
httpError(w, http.StatusBadRequest, "Failed to read request body: %s", err)
<mask> <mask> func handleFilteringDisableURL(w http.ResponseWriter, r *http.Request) { <mask> parameters, err := parseParametersFromBody(r.Body) <mask> if err != nil { <mask> httpError(w, http.StatusBadRequest, "failed to parse parameters from body: %s", err) <mask> return <mask> } <mask> <mask> url,...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
config.UserRules = strings.Split(string(body), "\n") httpUpdateConfigReloadDNSReturnOK(w, r) }
<mask> httpError(w, http.StatusBadRequest, "failed to parse parameters from body: %s", err) <mask> return <mask> } <mask> <mask> url, ok := parameters["url"] <mask> if !ok { <mask> http.Error(w, "URL parameter was not specified", http.StatusBadRequest) <mask> return <mask> } <mask> <mask> if v...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
func handleFilteringRefresh(w http.ResponseWriter, r *http.Request) { updated := refreshFiltersIfNecessary(true) fmt.Fprintf(w, "OK %d filters updated\n", updated) } type filterJSON struct { ID int64 `json:"id"` Enabled bool `json:"enabled"` URL string `json:"url"` Name string `jso...
<mask> http.Error(w, "URL parameter was not specified", http.StatusBadRequest) <mask> return <mask> } <mask> <mask> if valid := govalidator.IsRequestURL(url); !valid { <mask> http.Error(w, "URL parameter is not valid request URL", http.StatusBadRequest) <mask> return <mask> } <mask> <mask> found...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
resp.UserRules = config.UserRules config.RUnlock()
<mask> } <mask> <mask> resp.Filters = append(resp.Filters, fj) <mask> } <mask> <mask> jsonVal, err := json.Marshal(resp) <mask> if err != nil { <mask> httpError(w, http.StatusInternalServerError, "json encode: %s", err) </s> filtering: refactor; change API; add "filters_update_interval" setting +...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
jsonVal, err := json.Marshal(resp) if err != nil { httpError(w, http.StatusInternalServerError, "json encode: %s", err)
<mask> http.Error(w, "URL parameter is not valid request URL", http.StatusBadRequest) <mask> return <mask> } <mask> <mask> found := filterEnable(url, false) <mask> if !found { <mask> http.Error(w, "URL parameter was not previously added", http.StatusBadRequest) <mask> return <mask> } <mask> <ma...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
w.Header().Set("Content-Type", "application/json") _, err = w.Write(jsonVal) if err != nil { httpError(w, http.StatusInternalServerError, "http write: %s", err) }
<mask> if !found { <mask> http.Error(w, "URL parameter was not previously added", http.StatusBadRequest) <mask> return <mask> } <mask> <mask> httpUpdateConfigReloadDNSReturnOK(w, r) <mask> } <mask> <mask> func handleFilteringSetRules(w http.ResponseWriter, r *http.Request) { <mask> body, err := iout...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
// Set filtering configuration func handleFilteringConfig(w http.ResponseWriter, r *http.Request) { req := filteringConfig{} err := json.NewDecoder(r.Body).Decode(&req)
<mask> <mask> httpUpdateConfigReloadDNSReturnOK(w, r) <mask> } <mask> <mask> func handleFilteringSetRules(w http.ResponseWriter, r *http.Request) { <mask> body, err := ioutil.ReadAll(r.Body) <mask> if err != nil { <mask> httpError(w, http.StatusBadRequest, "Failed to read request body: %s", err) <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
httpError(w, http.StatusBadRequest, "json decode: %s", err)
<mask> <mask> func handleFilteringSetRules(w http.ResponseWriter, r *http.Request) { <mask> body, err := ioutil.ReadAll(r.Body) <mask> if err != nil { <mask> httpError(w, http.StatusBadRequest, "Failed to read request body: %s", err) <mask> return <mask> } <mask> <mask> config.UserRules = strings.Spl...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
if !checkFiltersUpdateIntervalHours(req.Interval) { httpError(w, http.StatusBadRequest, "Unsupported interval") return } config.DNS.FilteringEnabled = req.Enabled config.DNS.FiltersUpdateIntervalHours = req.Interval
<mask> httpError(w, http.StatusBadRequest, "Failed to read request body: %s", err) <mask> return <mask> } <mask> <mask> config.UserRules = strings.Split(string(body), "\n") <mask> httpUpdateConfigReloadDNSReturnOK(w, r) <mask> } <mask> <mask> func handleFilteringRefresh(w http.ResponseWriter, r *http....
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
returnOK(w)
<mask> config.DNS.FiltersUpdateIntervalHours = req.Interval <mask> httpUpdateConfigReloadDNSReturnOK(w, r) <mask> } <mask> <mask> // RegisterFilteringHandlers - register handlers <mask> func RegisterFilteringHandlers() { </s> filtering: refactor; change API; add "filters_update_interval" setting + config: ...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
// RegisterFilteringHandlers - register handlers func RegisterFilteringHandlers() { httpRegister(http.MethodGet, "/control/filtering_info", handleFilteringInfo) httpRegister(http.MethodPost, "/control/filtering_config", handleFilteringConfig) httpRegister(http.MethodPost, "/control/filtering/add_url", handleFilterin...
<mask> config.UserRules = strings.Split(string(body), "\n") <mask> httpUpdateConfigReloadDNSReturnOK(w, r) <mask> } <mask> <mask> func handleFilteringRefresh(w http.ResponseWriter, r *http.Request) { <mask> updated := refreshFiltersIfNecessary(true) <mask> fmt.Fprintf(w, "OK %d filters updated\n", updated) ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_filtering.go
"path/filepath"
<mask> "fmt" <mask> "net" <mask> "net/http" <mask> "os/exec" <mask> "strconv" <mask> <mask> "github.com/AdguardTeam/golibs/log" <mask> ) </s> filtering: refactor; change API; add "filters_update_interval" setting + config: "filters_update_interval" * add /control/filtering_info * remove /control/filt...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_install.go
dnsBaseDir := filepath.Join(config.ourWorkingDir, dataDir) initDNSServer(dnsBaseDir)
<mask> config.DNS.Port = newSettings.DNS.Port <mask> config.AuthName = newSettings.Username <mask> config.AuthPass = newSettings.Password <mask> <mask> err = startDNSServer() <mask> if err != nil { <mask> config.firstRun = true <mask> copyInstallSettings(&config, &curConfig) </s> filtering: refactor;...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_install.go
<mask> httpError(w, http.StatusInternalServerError, "Couldn't write config: %s", err) <mask> return <mask> } <mask> <mask> go refreshFiltersIfNecessary(false) <mask> <mask> // this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block <mask> // until all requests are...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/control_install.go
initFiltering()
<mask> config.dnsServer = dnsforward.NewServer(config.stats, config.queryLog) <mask> <mask> initRDNS() <mask> } <mask> <mask> func isRunning() bool { <mask> return config.dnsServer != nil && config.dnsServer.IsRunning() </s> filtering: refactor; change API; add "filters_update_interval" setting + config...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/dns.go
if !config.filteringStarted { config.filteringStarted = true startRefreshFilters() }
<mask> } <mask> <mask> return nil <mask> } <mask> <mask> func reconfigureDNSServer() error { </s> filtering: refactor; change API; add "filters_update_interval" setting + config: "filters_update_interval" * add /control/filtering_info * remove /control/filtering/enable * remove /control/filtering/disable ...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/dns.go
Enabled bool URL string Name string `yaml:"name"` RulesCount int `yaml:"-"` LastUpdated time.Time `yaml:"-"`
<mask> ) <mask> <mask> // field ordering is important -- yaml fields will mirror ordering from here <mask> type filter struct { <mask> Enabled bool `json:"enabled"` <mask> URL string `json:"url"` <mask> Name string `json:"name" yaml:"name"` <mask> RulesCount int `json:"...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/filter.go
log.Error("Couldn't load filter %d contents due to %s", filter.ID, err)
<mask> } <mask> <mask> err := filter.load() <mask> if err != nil { <mask> // This is okay for the first start, the filter will be loaded later <mask> log.Debug("Couldn't load filter %d contents due to %s", filter.ID, err) <mask> } <mask> } <mask> } <mask> <mask> func deduplicateFilters() { ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/filter.go
for { time.Sleep(1 * time.Hour) if config.DNS.FiltersUpdateIntervalHours == 0 { continue }
<mask> } <mask> <mask> // Sets up a timer that will be checking for filters updates periodically <mask> func periodicallyRefreshFilters() { <mask> for range time.Tick(time.Minute) { <mask> refreshFiltersIfNecessary(false) <mask> } <mask> } <mask> <mask> // Checks filters updates if necessary </s> filte...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/filter.go
now := time.Now()
<mask> func refreshFiltersIfNecessary(force bool) int { <mask> var updateFilters []filter <mask> var updateFlags []bool // 'true' if filter data has changed <mask> <mask> if config.firstRun { <mask> return 0 <mask> } <mask> <mask> config.RLock() <mask> for i := range config.Filters { <mask> f := ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/filter.go
expireTime := f.LastUpdated.Unix() + int64(config.DNS.FiltersUpdateIntervalHours)*60*60 if !force && expireTime > now.Unix() {
<mask> if !f.Enabled { <mask> continue <mask> } <mask> <mask> if !force && time.Since(f.LastUpdated) <= updatePeriod { <mask> continue <mask> } <mask> <mask> var uf filter <mask> uf.ID = f.ID </s> filtering: refactor; change API; add "filters_update_interval" setting + config: "filters...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/filter.go
uf.LastUpdated = now
<mask> if err != nil { <mask> log.Printf("Failed to update filter %s: %s\n", uf.URL, err) <mask> continue <mask> } <mask> uf.LastUpdated = time.Now() <mask> if updated { <mask> updateCount++ <mask> } <mask> } <mask> </s> filtering: refactor; change API; add "filters_update_interval" se...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/filter.go
<mask> if args.bindPort != 0 { <mask> config.BindPort = args.bindPort <mask> } <mask> <mask> loadFilters() <mask> <mask> if !config.firstRun { <mask> // Save the updated config <mask> err := config.write() <mask> if err != nil { <mask> log.Fatal(err) </s> filtering: refactor; change API; ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/home.go
<mask> err := config.write() <mask> if err != nil { <mask> log.Fatal(err) <mask> } <mask> } <mask> <mask> // Init the DNS server instance before registering HTTP handlers <mask> dnsBaseDir := filepath.Join(config.ourWorkingDir, dataDir) <mask> initDNSServer(dnsBaseDir) <mask> </s> filtering: r...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/home.go
dnsBaseDir := filepath.Join(config.ourWorkingDir, dataDir) initDNSServer(dnsBaseDir)
<mask> log.Fatal(err) <mask> } <mask> } <mask> <mask> // Init the DNS server instance before registering HTTP handlers <mask> dnsBaseDir := filepath.Join(config.ourWorkingDir, dataDir) <mask> initDNSServer(dnsBaseDir) <mask> <mask> if !config.firstRun { <mask> err := startDNSServer() <mask> i...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/home.go
err = startDNSServer()
<mask> // Init the DNS server instance before registering HTTP handlers <mask> dnsBaseDir := filepath.Join(config.ourWorkingDir, dataDir) <mask> initDNSServer(dnsBaseDir) <mask> <mask> if !config.firstRun { <mask> err := startDNSServer() <mask> if err != nil { <mask> log.Fatal(err) <mask> } <mas...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/home.go
<mask> if len(args.pidFile) != 0 && writePIDFile(args.pidFile) { <mask> config.pidFileName = args.pidFile <mask> } <mask> <mask> // Update filters we've just loaded right away, don't wait for periodic update timer <mask> go func() { <mask> refreshFiltersIfNecessary(false) <mask> }() <mask> // Schedu...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
home/home.go
// create a new instance of the query log
<mask> cache []*logEntry <mask> lock sync.RWMutex <mask> } <mask> <mask> // newQueryLog creates a new instance of the query log <mask> func newQueryLog(conf Config) *queryLog { <mask> l := queryLog{} <mask> l.logFile = filepath.Join(conf.BaseDir, queryLogFileName) <mask> l.conf = conf <mask> go l.peri...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
querylog/qlog.go
<mask> func (l *queryLog) Configure(conf Config) { <mask> l.conf = conf <mask> } <mask> <mask> // Clear memory buffer and remove the file <mask> func (l *queryLog) Clear() { <mask> l.fileFlushLock.Lock() <mask> defer l.fileFlushLock.Unlock() <mask> <mask> l.logBufferLock.Lock() </s> filtering: refactor...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
querylog/qlog.go
<mask> go l.flushLogBuffer(false) // nolint <mask> } <mask> } <mask> <mask> // getQueryLogJson returns a map with the current query log ready to be converted to a JSON <mask> func (l *queryLog) GetData() []map[string]interface{} { <mask> l.lock.RLock() <mask> values := make([]*logEntry, len(l.cache)) <ma...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
querylog/qlog.go
// Close query log object
<mask> <mask> // QueryLog - main interface <mask> type QueryLog interface { <mask> Close() <mask> <mask> // Set new configuration at runtime <mask> // Currently only 'Interval' field is supported. <mask> Configure(conf Config) <mask> </s> filtering: refactor; change API; add "filters_update_interval"...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
querylog/querylog.go
// Add a log entry
<mask> // Set new configuration at runtime <mask> // Currently only 'Interval' field is supported. <mask> Configure(conf Config) <mask> <mask> Add(question *dns.Msg, answer *dns.Msg, result *dnsfilter.Result, elapsed time.Duration, addr net.Addr, upstream string) <mask> <mask> // Get log entries <mask> ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
querylog/querylog.go
// Get log entries
<mask> Configure(conf Config) <mask> <mask> // Add a log entry <mask> Add(question *dns.Msg, answer *dns.Msg, result *dnsfilter.Result, elapsed time.Duration, addr net.Addr, upstream string) <mask> GetData() []map[string]interface{} <mask> <mask> // Clear memory buffer and remove log files <mask> Clear(...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
querylog/querylog.go
// Clear memory buffer and remove log files
<mask> Add(question *dns.Msg, answer *dns.Msg, result *dnsfilter.Result, elapsed time.Duration, addr net.Addr, upstream string) <mask> <mask> // Get log entries <mask> GetData() []map[string]interface{} <mask> Clear() <mask> } <mask> <mask> // Config - configuration object <mask> type Config struct { </...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
querylog/querylog.go
// New - create a new instance of the query log
<mask> BaseDir string // directory where log file is stored <mask> Interval uint32 // interval to rotate logs (in hours) <mask> } <mask> <mask> // New - create instance <mask> func New(conf Config) QueryLog { <mask> return newQueryLog(conf) <mask> } </s> filtering: refactor; change API; add "filters_upd...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72
querylog/querylog.go
- 'last_updated'
<mask> 'description': 'Filter subscription info' <mask> 'required': <mask> - 'enabled' <mask> - 'id' <mask> - 'lastUpdated' <mask> - 'name' <mask> - 'rulesCount' <mask> - 'url' <mask> 'properties': <mask> 'enabled': </s> Pull request: openapi: fix...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb76aa9b88c2383f2c80cb1934b664439cccb8b
openapi/openapi.yaml
- 'rules_count'
<mask> - 'enabled' <mask> - 'id' <mask> - 'lastUpdated' <mask> - 'name' <mask> - 'rulesCount' <mask> - 'url' <mask> 'properties': <mask> 'enabled': <mask> 'type': 'boolean' <mask> 'id': </s> Pull request: openapi: fix naming in filter object...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb76aa9b88c2383f2c80cb1934b664439cccb8b
openapi/openapi.yaml
<mask> 'properties': <mask> 'enabled': <mask> 'type': 'boolean' <mask> 'id': <mask> 'type': 'integer' <mask> 'example': 1234 <mask> 'lastUpdated': <mask> 'type': 'string' <mask> 'format': 'date-time' <mask> 'example': '2...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb76aa9b88c2383f2c80cb1934b664439cccb8b
openapi/openapi.yaml
'format': 'int64' 'type': 'integer' 'last_updated':
<mask> 'type': 'boolean' <mask> 'id': <mask> 'type': 'integer' <mask> 'example': 1234 <mask> 'lastUpdated': <mask> 'type': 'string' <mask> 'format': 'date-time' <mask> 'example': '2018-10-30T12:18:57+03:00' <mask> 'name': <mas...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb76aa9b88c2383f2c80cb1934b664439cccb8b
openapi/openapi.yaml
'format': 'date-time'
<mask> 'lastUpdated': <mask> 'type': 'string' <mask> 'format': 'date-time' <mask> 'example': '2018-10-30T12:18:57+03:00' <mask> 'name': <mask> 'type': 'string' <mask> 'example': 'AdGuard Simplified Domain Names filter' <mask> 'rulesCount'...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb76aa9b88c2383f2c80cb1934b664439cccb8b
openapi/openapi.yaml
'name':
<mask> 'last_updated': <mask> 'example': '2018-10-30T12:18:57+03:00' <mask> 'format': 'date-time' <mask> 'type': 'string' <mask> 'example': 'AdGuard Simplified Domain Names filter' <mask> 'type': 'string' <mask> 'rules_count': <mask> 'e...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb76aa9b88c2383f2c80cb1934b664439cccb8b
openapi/openapi.yaml
'type': 'string' 'rules_count':
<mask> 'example': '2018-10-30T12:18:57+03:00' <mask> 'name': <mask> 'type': 'string' <mask> 'example': 'AdGuard Simplified Domain Names filter' <mask> 'rulesCount': <mask> 'type': 'integer' <mask> 'example': 5912 <mask> 'url': <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb76aa9b88c2383f2c80cb1934b664439cccb8b
openapi/openapi.yaml
'format': 'uint32' 'type': 'integer'
<mask> 'type': 'string' <mask> 'rules_count': <mask> 'example': 5912 <mask> 'url': <mask> 'type': 'string' <mask> 'example': > <mask> https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt <mask> 'FilterStatus': <mask> 't...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/adb76aa9b88c2383f2c80cb1934b664439cccb8b
openapi/openapi.yaml
cookie := Context.auth.httpCookie(req)
<mask> httpError(w, http.StatusBadRequest, "json decode: %s", err) <mask> return <mask> } <mask> <mask> cookie := config.auth.httpCookie(req) <mask> if len(cookie) == 0 { <mask> log.Info("Auth: invalid user name or password: name='%s'", req.Name) <mask> time.Sleep(1 * time.Second) <mask> http.Err...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/auth.go
Context.auth.RemoveSession(sess)
<mask> func handleLogout(w http.ResponseWriter, r *http.Request) { <mask> cookie := r.Header.Get("Cookie") <mask> sess := parseCookie(cookie) <mask> <mask> config.auth.RemoveSession(sess) <mask> <mask> w.Header().Set("Location", "/login.html") <mask> <mask> s := fmt.Sprintf("%s=; Path=/; HttpOnly; Expi...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/auth.go
authRequired := Context.auth != nil && Context.auth.AuthRequired()
<mask> return func(w http.ResponseWriter, r *http.Request) { <mask> <mask> if r.URL.Path == "/login.html" { <mask> // redirect to dashboard if already authenticated <mask> authRequired := config.auth != nil && config.auth.AuthRequired() <mask> cookie, err := r.Cookie(sessionCookieName) <mask> if ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/auth.go
r := Context.auth.CheckSession(cookie.Value)
<mask> // redirect to dashboard if already authenticated <mask> authRequired := config.auth != nil && config.auth.AuthRequired() <mask> cookie, err := r.Cookie(sessionCookieName) <mask> if authRequired && err == nil { <mask> r := config.auth.CheckSession(cookie.Value) <mask> if r == 0 { <mask...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/auth.go
} else if Context.auth != nil && Context.auth.AuthRequired() {
<mask> strings.HasPrefix(r.URL.Path, "/login.") || <mask> strings.HasPrefix(r.URL.Path, "/__locales/") { <mask> // process as usual <mask> <mask> } else if config.auth != nil && config.auth.AuthRequired() { <mask> // redirect to login page if not authenticated <mask> ok := false <mask> cook...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/auth.go
r := Context.auth.CheckSession(cookie.Value)
<mask> // redirect to login page if not authenticated <mask> ok := false <mask> cookie, err := r.Cookie(sessionCookieName) <mask> if err == nil { <mask> r := config.auth.CheckSession(cookie.Value) <mask> if r == 0 { <mask> ok = true <mask> } else if r < 0 { <mask> log.Info("Au...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/auth.go
u := Context.auth.UserFind(user, pass)
<mask> } else { <mask> // there's no Cookie, check Basic authentication <mask> user, pass, ok2 := r.BasicAuth() <mask> if ok2 { <mask> u := config.auth.UserFind(user, pass) <mask> if len(u.Name) != 0 { <mask> ok = true <mask> } else { <mask> log.Info("Auth: invalid Bas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/auth.go
u := Context.auth.UserFind(user, pass)
<mask> if err != nil { <mask> // there's no Cookie, check Basic authentication <mask> user, pass, ok := r.BasicAuth() <mask> if ok { <mask> u := config.auth.UserFind(user, pass) <mask> return u <mask> } <mask> return User{} <mask> } <mask> </s> *(global): refactoring - moved runtime proper...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/auth.go
Context.auth = InitAuth(fn, users, 60)
<mask> <mask> users := []User{ <mask> User{Name: "name", PasswordHash: "$2y$05$..vyzAECIhJPfaQiOK17IukcQnqEgKJHy0iETyYqxn3YXJl8yZuo2"}, <mask> } <mask> config.auth = InitAuth(fn, users, 60) <mask> <mask> handlerCalled := false <mask> handler := func(w http.ResponseWriter, r *http.Request) { <mask> h...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/auth_test.go
cookie := Context.auth.httpCookie(loginJSON{Name: "name", Password: "password"})
<mask> handler2(&w, &r) <mask> assert.True(t, handlerCalled) <mask> <mask> // perform login <mask> cookie := config.auth.httpCookie(loginJSON{Name: "name", Password: "password"}) <mask> assert.True(t, cookie != "") <mask> <mask> // get / <mask> handler2 = optionalAuth(handler) <mask> w.hdr = make(ht...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/auth_test.go
Context.auth.Close()
<mask> handler2(&w, &r) <mask> assert.True(t, handlerCalled) <mask> r.Header.Del("Cookie") <mask> <mask> config.auth.Close() <mask> } </s> *(global): refactoring - moved runtime properties to Context </s> remove cookie := config.auth.httpCookie(loginJSON{Name: "name", Password: "password"}) </s> add cook...
[ "keep", "keep", "keep", "keep", "replace", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/auth_test.go
<mask> // Raw file data to avoid re-reading of configuration file <mask> // It's reset after config is parsed <mask> fileData []byte <mask> <mask> ourConfigFilename string // Config filename (can be overridden via the command line arguments) <mask> ourWorkingDir string // Location of our directory, used...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/config.go
BindPort: 3000, BindHost: "0.0.0.0",
<mask> } <mask> <mask> // initialize to default values, will be changed later when reading config or parsing command line <mask> var config = configuration{ <mask> ourConfigFilename: "AdGuardHome.yaml", <mask> BindPort: 3000, <mask> BindHost: "0.0.0.0", <mask> DNS: dnsConfig{ <mask> Bi...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/config.go
<mask> } <mask> <mask> // initConfig initializes default configuration for the current OS&ARCH <mask> func initConfig() { <mask> config.transport = &http.Transport{ <mask> DialContext: customDialContext, <mask> } <mask> config.client = &http.Client{ <mask> Timeout: time.Minute * 5, <mask> Transpor...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/config.go
configFile, err := filepath.EvalSymlinks(Context.configFilename)
<mask> } <mask> <mask> // getConfigFilename returns path to the current config file <mask> func (c *configuration) getConfigFilename() string { <mask> configFile, err := filepath.EvalSymlinks(config.ourConfigFilename) <mask> if err != nil { <mask> if !os.IsNotExist(err) { <mask> log.Error("unexpected er...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/config.go
configFile = Context.configFilename
<mask> if err != nil { <mask> if !os.IsNotExist(err) { <mask> log.Error("unexpected error while config file path evaluation: %s", err) <mask> } <mask> configFile = config.ourConfigFilename <mask> } <mask> if !filepath.IsAbs(configFile) { <mask> configFile = filepath.Join(config.ourWorkingDir, conf...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/config.go
configFile = filepath.Join(Context.workDir, configFile)
<mask> } <mask> configFile = config.ourConfigFilename <mask> } <mask> if !filepath.IsAbs(configFile) { <mask> configFile = filepath.Join(config.ourWorkingDir, configFile) <mask> } <mask> return configFile <mask> } <mask> <mask> // getDataDir returns path to the directory where we store databases an...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/config.go
<mask> } <mask> return configFile <mask> } <mask> <mask> // getDataDir returns path to the directory where we store databases and filters <mask> func (c *configuration) getDataDir() string { <mask> return filepath.Join(c.ourWorkingDir, dataDir) <mask> } <mask> <mask> // getLogSettings reads logging setti...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/config.go
if Context.auth != nil { config.Users = Context.auth.GetUsers()
<mask> defer c.Unlock() <mask> <mask> Context.clients.WriteDiskConfig(&config.Clients) <mask> <mask> if config.auth != nil { <mask> config.Users = config.auth.GetUsers() <mask> } <mask> <mask> if Context.stats != nil { <mask> sdc := stats.DiskConfig{} <mask> Context.stats.WriteDiskConfig(&sdc) ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/config.go
u := Context.auth.GetCurrentUser(r)
<mask> } <mask> <mask> func handleGetProfile(w http.ResponseWriter, r *http.Request) { <mask> pj := profileJSON{} <mask> u := config.auth.GetCurrentUser(r) <mask> pj.Name = u.Name <mask> <mask> data, err := json.Marshal(pj) <mask> if err != nil { <mask> httpError(w, http.StatusInternalServerError, "j...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/control.go
Context.controlLock.Unlock()
<mask> enableFilters(true) <mask> } <mask> <mask> func handleFilteringRefresh(w http.ResponseWriter, r *http.Request) { <mask> config.controlLock.Unlock() <mask> nUpdated, err := refreshFilters() <mask> config.controlLock.Lock() <mask> if err != nil { <mask> httpError(w, http.StatusInternalServerError,...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/control_filtering.go
Context.controlLock.Lock()
<mask> <mask> func handleFilteringRefresh(w http.ResponseWriter, r *http.Request) { <mask> config.controlLock.Unlock() <mask> nUpdated, err := refreshFilters() <mask> config.controlLock.Lock() <mask> if err != nil { <mask> httpError(w, http.StatusInternalServerError, "%s", err) <mask> return <mask> }...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/control_filtering.go
Context.firstRun = false
<mask> <mask> var curConfig configuration <mask> copyInstallSettings(&curConfig, &config) <mask> <mask> config.firstRun = false <mask> config.BindHost = newSettings.Web.IP <mask> config.BindPort = newSettings.Web.Port <mask> config.DNS.BindHost = newSettings.DNS.IP <mask> config.DNS.Port = newSettings...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/control_install.go
Context.firstRun = true
<mask> closeDNSServer() <mask> } <mask> } <mask> if err != nil || err2 != nil { <mask> config.firstRun = true <mask> copyInstallSettings(&config, &curConfig) <mask> if err != nil { <mask> httpError(w, http.StatusInternalServerError, "Couldn't initialize DNS server: %s", err) <mask> } else { ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/control_install.go
Context.auth.UserAdd(&u, newSettings.Password)
<mask> } <mask> <mask> u := User{} <mask> u.Name = newSettings.Username <mask> config.auth.UserAdd(&u, newSettings.Password) <mask> <mask> err = config.write() <mask> if err != nil { <mask> config.firstRun = true <mask> copyInstallSettings(&config, &curConfig) </s> *(global): refactoring - moved ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/control_install.go
Context.firstRun = true
<mask> config.auth.UserAdd(&u, newSettings.Password) <mask> <mask> err = config.write() <mask> if err != nil { <mask> config.firstRun = true <mask> copyInstallSettings(&config, &curConfig) <mask> httpError(w, http.StatusInternalServerError, "Couldn't write config: %s", err) <mask> return <mask> } ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/control_install.go
if Context.disableUpdate {
<mask> <mask> // Get the latest available version from the Internet <mask> func handleGetVersionJSON(w http.ResponseWriter, r *http.Request) { <mask> <mask> if config.disableUpdate { <mask> return <mask> } <mask> <mask> req := getVersionJSONRequest{} <mask> err := json.NewDecoder(r.Body).Decode(&req)...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/control_update.go
Context.controlLock.Lock()
<mask> } <mask> <mask> now := time.Now() <mask> if !req.RecheckNow { <mask> config.controlLock.Lock() <mask> cached := now.Sub(config.versionCheckLastTime) <= versionCheckPeriod && len(config.versionCheckJSON) != 0 <mask> data := config.versionCheckJSON <mask> config.controlLock.Unlock() <mask> <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/control_update.go
Context.controlLock.Unlock()
<mask> if !req.RecheckNow { <mask> config.controlLock.Lock() <mask> cached := now.Sub(config.versionCheckLastTime) <= versionCheckPeriod && len(config.versionCheckJSON) != 0 <mask> data := config.versionCheckJSON <mask> config.controlLock.Unlock() <mask> <mask> if cached { <mask> log.Tracef("Retu...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/control_update.go
resp, err = Context.client.Get(versionCheckURL)
<mask> <mask> var resp *http.Response <mask> for i := 0; i != 3; i++ { <mask> log.Tracef("Downloading data from %s", versionCheckURL) <mask> resp, err = config.client.Get(versionCheckURL) <mask> if err != nil && strings.HasSuffix(err.Error(), "i/o timeout") { <mask> // This case may happen while we'r...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/control_update.go
Context.controlLock.Lock()
<mask> httpError(w, http.StatusBadGateway, "Couldn't read response body from %s: %s", versionCheckURL, err) <mask> return <mask> } <mask> <mask> config.controlLock.Lock() <mask> config.versionCheckLastTime = now <mask> config.versionCheckJSON = body <mask> config.controlLock.Unlock() <mask> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/control_update.go
Context.controlLock.Unlock()
<mask> <mask> config.controlLock.Lock() <mask> config.versionCheckLastTime = now <mask> config.versionCheckJSON = body <mask> config.controlLock.Unlock() <mask> <mask> w.Header().Set("Content-Type", "application/json") <mask> _, err = w.Write(getVersionResp(body)) <mask> if err != nil { <mask> http...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/control_update.go
workDir := Context.workDir
<mask> // Fill in updateInfo object <mask> func getUpdateInfo(jsonData []byte) (*updateInfo, error) { <mask> var u updateInfo <mask> <mask> workDir := config.ourWorkingDir <mask> <mask> versionJSON := make(map[string]interface{}) <mask> err := json.Unmarshal(jsonData, &versionJSON) <mask> if err != nil ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/control_update.go
resp, err := Context.client.Get(u.pkgURL)
<mask> } <mask> <mask> // Download package file and save it to disk <mask> func getPackageFile(u *updateInfo) error { <mask> resp, err := config.client.Get(u.pkgURL) <mask> if err != nil { <mask> return fmt.Errorf("HTTP request failed: %s", err) <mask> } <mask> if resp != nil && resp.Body != nil { <mas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/control_update.go
err = copySupportingFiles(files, Context.workDir, u.backupDir, true, true)
<mask> return fmt.Errorf("copyFile() failed: %s", err) <mask> } <mask> <mask> // ./README.md -> backup/README.md <mask> err = copySupportingFiles(files, config.ourWorkingDir, u.backupDir, true, true) <mask> if err != nil { <mask> return fmt.Errorf("copySupportingFiles(%s, %s) failed: %s", <mask> con...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/control_update.go
Context.workDir, u.backupDir, err)
<mask> // ./README.md -> backup/README.md <mask> err = copySupportingFiles(files, config.ourWorkingDir, u.backupDir, true, true) <mask> if err != nil { <mask> return fmt.Errorf("copySupportingFiles(%s, %s) failed: %s", <mask> config.ourWorkingDir, u.backupDir, err) <mask> } <mask> <mask> // update/[A...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/control_update.go
err = copySupportingFiles(files, u.updateDir, Context.workDir, false, true)
<mask> config.ourWorkingDir, u.backupDir, err) <mask> } <mask> <mask> // update/[AdGuardHome/]README.md -> ./README.md <mask> err = copySupportingFiles(files, u.updateDir, config.ourWorkingDir, false, true) <mask> if err != nil { <mask> return fmt.Errorf("copySupportingFiles(%s, %s) failed: %s", <mask...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/control_update.go
u.updateDir, Context.workDir, err)
<mask> // update/[AdGuardHome/]README.md -> ./README.md <mask> err = copySupportingFiles(files, u.updateDir, config.ourWorkingDir, false, true) <mask> if err != nil { <mask> return fmt.Errorf("copySupportingFiles(%s, %s) failed: %s", <mask> u.updateDir, config.ourWorkingDir, err) <mask> } <mask> <mask...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/control_update.go
if Context.runningAsService {
<mask> stopHTTPServer() <mask> cleanupAlways() <mask> <mask> if runtime.GOOS == "windows" { <mask> <mask> if config.runningAsService { <mask> // Note: <mask> // we can't restart the service via "kardianos/service" package - it kills the process first <mask> // we can't start a new instance - Wi...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/control_update.go
Context.workDir = "..." // set absolute path
<mask> <mask> func TestDoUpdate(t *testing.T) { <mask> <mask> config.DNS.Port = 0 <mask> config.ourWorkingDir = "..." // set absolute path <mask> newver := "v0.96" <mask> <mask> data := `{ <mask> "version": "v0.96", <mask> "announcement": "AdGuard Home v0.96 is now available!", </s> *(global): ref...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/control_update_test.go
pkgName: Context.workDir + "/agh-update-" + newver + "/AdGuardHome_linux_amd64.tar.gz",
<mask> } <mask> <mask> u := updateInfo{ <mask> pkgURL: "https://github.com/AdguardTeam/AdGuardHome/releases/download/" + newver + "/AdGuardHome_linux_amd64.tar.gz", <mask> pkgName: config.ourWorkingDir + "/agh-update-" + newver + "/AdGuardHome_linux_amd64.tar.gz", <mask> newVer: ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/control_update_test.go
updateDir: Context.workDir + "/agh-update-" + newver, backupDir: Context.workDir + "/agh-backup", configName: Context.workDir + "/AdGuardHome.yaml", updateConfigName: Context.workDir + "/agh-update-" + newver + "/AdGuardHome/AdGuardHome.yaml", curBinName: Context.workDir + "/AdGuardH...
<mask> u := updateInfo{ <mask> pkgURL: "https://github.com/AdguardTeam/AdGuardHome/releases/download/" + newver + "/AdGuardHome_linux_amd64.tar.gz", <mask> pkgName: config.ourWorkingDir + "/agh-update-" + newver + "/AdGuardHome_linux_amd64.tar.gz", <mask> newVer: newver, <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/control_update_test.go
baseDir := Context.getDataDir()
<mask> // initDNSServer creates an instance of the dnsforward.Server <mask> // Please note that we must do it even if we don't start it <mask> // so that we had access to the query log and the stats <mask> func initDNSServer() error { <mask> baseDir := config.getDataDir() <mask> <mask> err := os.MkdirAll(base...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/ae2990582defd8062b99c546b2a932a8ba06c35d
home/dns.go