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 clients.dhcpServer == nil { return Client{}, false } macFound := clients.dhcpServer.FindMACbyIP(ipAddr)
<mask> } <mask> } <mask> } <mask> <mask> macFound := config.dhcpServer.FindMACbyIP(ipAddr) <mask> if macFound == nil { <mask> return Client{}, false <mask> } <mask> for _, c = range clients.list { <mask> for _, id := range c.IDs { </s> * dhcp,clients: DHCP server module is passed to Clients mo...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/149fcc0f2dccbe0018122f1efa5b8977cf6ff273
home/clients.go
if clients.dhcpServer == nil { return } leases := clients.dhcpServer.Leases()
<mask> } <mask> <mask> // add clients from DHCP that have non-empty Hostname property <mask> func (clients *clientsContainer) addFromDHCP() { <mask> leases := config.dhcpServer.Leases() <mask> n := 0 <mask> for _, l := range leases { <mask> if len(l.Hostname) == 0 { <mask> continue <mask> } </s> *...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/149fcc0f2dccbe0018122f1efa5b8977cf6ff273
home/clients.go
ok, _ := clients.AddHost(l.IP.String(), l.Hostname, ClientSourceDHCP)
<mask> for _, l := range leases { <mask> if len(l.Hostname) == 0 { <mask> continue <mask> } <mask> ok, _ := config.clients.AddHost(l.IP.String(), l.Hostname, ClientSourceDHCP) <mask> if ok { <mask> n++ <mask> } <mask> } <mask> log.Debug("Added %d client aliases from DHCP", n) </s> * dhcp,c...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/149fcc0f2dccbe0018122f1efa5b8977cf6ff273
home/clients.go
clients.Init(nil, nil)
<mask> var e error <mask> var b bool <mask> clients := clientsContainer{} <mask> <mask> clients.Init(nil) <mask> <mask> // add <mask> c = Client{ <mask> IDs: []string{"1.1.1.1", "aa:aa:aa:aa:aa:aa"}, <mask> Name: "client1", </s> * dhcp,clients: DHCP server module is passed to Clients module duri...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/149fcc0f2dccbe0018122f1efa5b8977cf6ff273
home/clients_test.go
clients.Init(nil, nil)
<mask> <mask> func TestClientsWhois(t *testing.T) { <mask> var c Client <mask> clients := clientsContainer{} <mask> clients.Init(nil) <mask> <mask> whois := [][]string{{"orgname", "orgname-val"}, {"country", "country-val"}} <mask> // set whois info on new client <mask> clients.SetWhoisInfo("1.1.1.255",...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/149fcc0f2dccbe0018122f1efa5b8977cf6ff273
home/clients_test.go
dhcpServer *dhcpd.Server
<mask> <mask> dnsctx dnsContext <mask> dnsFilter *dnsfilter.Dnsfilter <mask> dnsServer *dnsforward.Server <mask> dhcpServer dhcpd.Server <mask> httpServer *http.Server <mask> httpsServer HTTPSServer <mask> <mask> BindHost string `yaml:"bind_host"` // BindHost is the IP address of th...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/149fcc0f2dccbe0018122f1efa5b8977cf6ff273
home/config.go
if config.dhcpServer != nil { c := dhcpd.ServerConfig{} config.dhcpServer.WriteDiskConfig(&c) config.DHCP = c }
<mask> config.DNS.DnsfilterConf = c <mask> } <mask> <mask> configFile := config.getConfigFilename() <mask> log.Debug("Writing YAML file: %s", configFile) <mask> yamlText, err := yaml.Marshal(&config) <mask> config.Clients = nil <mask> if err != nil { <mask> log.Error("Couldn't generate YAML file: %s...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/149fcc0f2dccbe0018122f1efa5b8977cf6ff273
home/config.go
"github.com/AdguardTeam/AdGuardHome/dhcpd"
<mask> "syscall" <mask> "time" <mask> <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/NYTimes/gziphandler" <mask> "github.com/gobuffalo/packr" <mask> ) <mask> </s> * dhcp,clients: DHCP server module is passed to Clients module during initialization. </s> remove config.clients.Init(config....
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/149fcc0f2dccbe0018122f1efa5b8977cf6ff273
home/home.go
config.dhcpServer = dhcpd.Create(config.DHCP) config.clients.Init(config.Clients, config.dhcpServer)
<mask> os.Exit(0) <mask> } <mask> } <mask> <mask> config.clients.Init(config.Clients) <mask> config.Clients = nil <mask> <mask> if (runtime.GOOS == "linux" || runtime.GOOS == "darwin") && <mask> config.RlimitNoFile != 0 { <mask> setRlimit(config.RlimitNoFile) </s> * dhcp,clients: DHCP server m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/149fcc0f2dccbe0018122f1efa5b8977cf6ff273
home/home.go
"example_upstream_doq": "encrypted <0>DNS-over-QUIC</0>",
<mask> "example_regex_meaning": "block access to the domains matching the specified regular expression", <mask> "example_upstream_regular": "regular DNS (over UDP)", <mask> "example_upstream_dot": "encrypted <0>DNS-over-TLS</0>", <mask> "example_upstream_doh": "encrypted <0>DNS-over-HTTPS</0>", <ma...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14bc5297ac6cb7c6dbc74d55239eeb16c041c048
client/src/__locales/en.json
"encryption_doq": "DNS-over-QUIC port", "encryption_doq_desc": "If this port is configured, AdGuard Home will run a DNS-over-QUIC server on this port. It's experimental and may not be reliable at the moment. The only DNS provider that supports it now is AdGuard DNS",
<mask> "encryption_https": "HTTPS port", <mask> "encryption_https_desc": "If HTTPS port is configured, AdGuard Home admin interface will be accessible via HTTPS, and it will also provide DNS-over-HTTPS on '/dns-query' location.", <mask> "encryption_dot": "DNS-over-TLS port", <mask> "encryption_dot_d...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14bc5297ac6cb7c6dbc74d55239eeb16c041c048
client/src/__locales/en.json
<<<<<<< Updated upstream
<mask> "setup_config_to_enable_dhcp_server": "Setup config to enable DHCP server", <mask> "original_response": "Original response", <mask> "click_to_view_queries": "Click to view queries", <mask> "port_53_faq_link": "Port 53 is often occupied by \"DNSStubListener\" or \"systemd-resolved\" services. ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14bc5297ac6cb7c6dbc74d55239eeb16c041c048
client/src/__locales/en.json
values.port_dns_over_quic = values.port_dns_over_quic || 0;
<mask> values.certificate_chain = btoa(values.certificate_chain); <mask> values.private_key = btoa(values.private_key); <mask> values.port_https = values.port_https || 0; <mask> values.port_dns_over_tls = values.port_dns_over_tls || 0; <mask> <mask> const response = await ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14bc5297ac6cb7c6dbc74d55239eeb16c041c048
client/src/actions/encryption.js
values.port_dns_over_quic = values.port_dns_over_quic || 0;
<mask> values.port_https = values.port_https || 0; <mask> values.port_dns_over_tls = values.port_dns_over_tls || 0; <mask> <mask> const response = await apiClient.validateTlsConfig(values); <mask> response.certificate_chain = atob(response.certificate_chain); <mask> respon...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14bc5297ac6cb7c6dbc74d55239eeb16c041c048
client/src/actions/encryption.js
import { validateIsSafePort, validatePort, validatePortQuic, validatePortTLS, } from '../../../helpers/validators';
<mask> renderCheckboxField, <mask> renderRadioField, <mask> toNumber, <mask> } from '../../../helpers/form'; <mask> import { validateIsSafePort, validatePort, validatePortTLS } from '../../../helpers/validators'; <mask> import i18n from '../../../i18n'; <mask> import KeyStatus from './KeyStatus'; <m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14bc5297ac6cb7c6dbc74d55239eeb16c041c048
client/src/components/Settings/Encryption/Form.js
import { DNS_OVER_QUIC_PORT, DNS_OVER_TLS_PORT, FORM_NAME, STANDARD_HTTPS_PORT, } from '../../../helpers/constants';
<mask> import { validateIsSafePort, validatePort, validatePortTLS } from '../../../helpers/validators'; <mask> import i18n from '../../../i18n'; <mask> import KeyStatus from './KeyStatus'; <mask> import CertificateStatus from './CertificateStatus'; <mask> import { DNS_OVER_TLS_PORT, FORM_NAME, STANDARD_HTTPS_PORT ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14bc5297ac6cb7c6dbc74d55239eeb16c041c048
client/src/components/Settings/Encryption/Form.js
port_dns_over_quic: DNS_OVER_QUIC_PORT,
<mask> port_https: STANDARD_HTTPS_PORT, <mask> port_dns_over_tls: DNS_OVER_TLS_PORT, <mask> server_name: '', <mask> force_https: false, <mask> enabled: false, <mask> }; </s> + client: Add experimental DNS-over-QUIC support </s> remove import { DNS_OVER_TLS_PORT, FORM_N...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14bc5297ac6cb7c6dbc74d55239eeb16c041c048
client/src/components/Settings/Encryption/Form.js
port_dns_over_quic,
<mask> force_https, <mask> port_https, <mask> port_dns_over_tls, <mask> certificate_chain, <mask> private_key, <mask> certificate_path, <mask> private_key_path, <mask> } = encryption; <mask> </s> + client: Add experim...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14bc5297ac6cb7c6dbc74d55239eeb16c041c048
client/src/components/Settings/Encryption/index.js
port_dns_over_quic,
<mask> server_name, <mask> force_https, <mask> port_https, <mask> port_dns_over_tls, <mask> certificate_chain, <mask> private_key, <mask> certificate_path, <mask> private_key_path, <mask> }); <mask> </s> ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14bc5297ac6cb7c6dbc74d55239eeb16c041c048
client/src/components/Settings/Encryption/index.js
color: #cd201f;
<mask> font-size: 11px; <mask> } <mask> <mask> .form__message--error { <mask> color: var(--red); <mask> } <mask> <mask> .form__message--left-pad { <mask> padding-left: 0.85rem; <mask> } </s> + client: Add experimental DNS-over-QUIC support </s> remove import { validateIsSafePort, validatePort, ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14bc5297ac6cb7c6dbc74d55239eeb16c041c048
client/src/components/Settings/Settings.css
export const DNS_OVER_QUIC_PORT = 784;
<mask> export const STANDARD_HTTPS_PORT = 443; <mask> export const DNS_OVER_TLS_PORT = 853; <mask> export const MAX_PORT = 65535; <mask> <mask> export const EMPTY_DATE = '0001-01-01T00:00:00Z'; <mask> </s> + client: Add experimental DNS-over-QUIC support </s> remove import { DNS_OVER_TLS_PORT, FORM_NAME, STAND...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14bc5297ac6cb7c6dbc74d55239eeb16c041c048
client/src/helpers/constants.js
/** * @param value {number} * @returns {undefined|string} */ export const validatePortQuic = validatePortTLS;
<mask> }; <mask> <mask> /** <mask> * @param value {number} <mask> * @returns {undefined|string} <mask> */ <mask> export const validateIsSafePort = (value) => { <mask> if (UNSAFE_PORTS.includes(value)) { </s> + client: Add experimental DNS-over-QUIC support </s> remove import { DNS_OVER_TLS_PORT, FORM_N...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14bc5297ac6cb7c6dbc74d55239eeb16c041c048
client/src/helpers/validators.js
s.processDHCPHosts,
<mask> s.processRecursion, <mask> s.processInitial, <mask> s.processDDRQuery, <mask> s.processDetermineLocal, <mask> s.processInternalHosts, <mask> s.processRestrictLocal, <mask> s.processInternalIPAddrs, <mask> s.processFilteringBeforeRequest, <mask> s.processLocalPTR, <mask> s.processUps...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dns.go
s.processDHCPAddrs,
<mask> s.processDDRQuery, <mask> s.processDetermineLocal, <mask> s.processInternalHosts, <mask> s.processRestrictLocal, <mask> s.processInternalIPAddrs, <mask> s.processFilteringBeforeRequest, <mask> s.processLocalPTR, <mask> s.processUpstream, <mask> s.processFilteringAfterResponse, <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dns.go
lowhost := strings.ToLower(l.Hostname + "." + s.localDomainSuffix) ip := netutil.CloneIP(l.IP)
<mask> err, <mask> ) <mask> } <mask> <mask> lowhost := strings.ToLower(l.Hostname) <mask> <mask> ipToHost.Set(l.IP, lowhost) <mask> <mask> ip := make(net.IP, 4) <mask> copy(ip, l.IP.To4()) </s> Pull request: 4699 dhcp ptr Merge in DNS/adguard-home from 4699-dhcp-ptr to master Clo...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dns.go
ipToHost.Set(ip, lowhost)
<mask> } <mask> <mask> lowhost := strings.ToLower(l.Hostname) <mask> <mask> ipToHost.Set(l.IP, lowhost) <mask> <mask> ip := make(net.IP, 4) <mask> copy(ip, l.IP.To4()) <mask> hostToIP[lowhost] = ip <mask> } <mask> <mask> log.Debug("dns: added %d A/PTR entries from DHCP", ipToHost.L...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dns.go
// processDHCPHosts respond to A requests if the target hostname is known to
<mask> <mask> return ip, true <mask> } <mask> <mask> // processInternalHosts respond to A requests if the target hostname is known to <mask> // the server. <mask> // <mask> // TODO(a.garipov): Adapt to AAAA as well. <mask> func (s *Server) processInternalHosts(dctx *dnsContext) (rc resultCode) { <mask> if...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dns.go
func (s *Server) processDHCPHosts(dctx *dnsContext) (rc resultCode) {
<mask> // processInternalHosts respond to A requests if the target hostname is known to <mask> // the server. <mask> // <mask> // TODO(a.garipov): Adapt to AAAA as well. <mask> func (s *Server) processInternalHosts(dctx *dnsContext) (rc resultCode) { <mask> if !s.dhcpServer.Enabled() { <mask> return resultCod...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dns.go
reqHost := strings.ToLower(q.Name[:len(q.Name)-1])
<mask> if q.Qtype != dns.TypeA && q.Qtype != dns.TypeAAAA { <mask> return resultCodeSuccess <mask> } <mask> <mask> reqHost := strings.ToLower(q.Name) <mask> // TODO(a.garipov): Move everything related to DHCP local domain to the DHCP <mask> // server. <mask> host := strings.TrimSuffix(reqHost, s.localD...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dns.go
if !strings.HasSuffix(reqHost, s.localDomainSuffix) {
<mask> <mask> reqHost := strings.ToLower(q.Name) <mask> // TODO(a.garipov): Move everything related to DHCP local domain to the DHCP <mask> // server. <mask> host := strings.TrimSuffix(reqHost, s.localDomainSuffix) <mask> if host == reqHost { <mask> return resultCodeSuccess <mask> } <mask> <mask> d...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dns.go
ip, ok := s.hostToIP(reqHost)
<mask> // Do not even put into query log. <mask> return resultCodeFinish <mask> } <mask> <mask> ip, ok := s.hostToIP(host) <mask> if !ok { <mask> // TODO(e.burkov): Inspect special cases when user want to apply some <mask> // rules handled by other processors to the hosts with TLD. <mask> d.Res =...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dns.go
// don't need to be accessible externally.
<mask> } <mask> <mask> // Restrict an access to local addresses for external clients. We also <mask> // assume that all the DHCP leases we give are locally-served or at least <mask> // don't need to be inaccessible externally. <mask> if !s.privateNets.Contains(ip) { <mask> log.Debug("dns: addr %s is not...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dns.go
func (s *Server) processDHCPAddrs(ctx *dnsContext) (rc resultCode) {
<mask> } <mask> <mask> // Respond to PTR requests if the target IP is leased by our DHCP server and the <mask> // requestor is inside the local network. <mask> func (s *Server) processInternalIPAddrs(ctx *dnsContext) (rc resultCode) { <mask> d := ctx.proxyCtx <mask> if d.Res != nil { <mask> return resultCo...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dns.go
func TestServer_ProcessDHCPHosts_localRestriction(t *testing.T) {
<mask> }) <mask> } <mask> } <mask> <mask> func TestServer_ProcessInternalHosts_localRestriction(t *testing.T) { <mask> knownIP := net.IP{1, 2, 3, 4} <mask> <mask> testCases := []struct { <mask> name string <mask> host string </s> Pull request: 4699 dhcp ptr Merge in DNS/adguard-home f...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dns_test.go
"example." + defaultLocalDomainSuffix: knownIP,
<mask> s := &Server{ <mask> dhcpServer: &testDHCP{}, <mask> localDomainSuffix: defaultLocalDomainSuffix, <mask> tableHostToIP: hostToIPTable{ <mask> "example": knownIP, <mask> }, <mask> } <mask> <mask> req := &dns.Msg{ <mask> MsgHdr: dns.MsgHdr{ </s> Pull request: 46...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dns_test.go
res := s.processDHCPHosts(dctx)
<mask> }, <mask> isLocalClient: tc.isLocalCli, <mask> } <mask> <mask> res := s.processInternalHosts(dctx) <mask> require.Equal(t, tc.wantRes, res) <mask> pctx := dctx.proxyCtx <mask> if tc.wantRes == resultCodeFinish { <mask> require.NotNil(t, pctx.Res) <mask> </s> Pull request: ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dns_test.go
func TestServer_ProcessDHCPHosts(t *testing.T) {
<mask> }) <mask> } <mask> } <mask> <mask> func TestServer_ProcessInternalHosts(t *testing.T) { <mask> const ( <mask> examplecom = "example.com" <mask> examplelan = "example.lan" <mask> ) <mask> </s> Pull request: 4699 dhcp ptr Merge in DNS/adguard-home from 4699-dhcp-ptr to master Closes #4699. ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dns_test.go
examplelan = "example." + defaultLocalDomainSuffix
<mask> <mask> func TestServer_ProcessInternalHosts(t *testing.T) { <mask> const ( <mask> examplecom = "example.com" <mask> examplelan = "example.lan" <mask> ) <mask> <mask> knownIP := net.IP{1, 2, 3, 4} <mask> testCases := []struct { <mask> name string </s> Pull request: 4699 dhcp ptr Merge i...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dns_test.go
suffix: "custom",
<mask> qtyp: dns.TypeAAAA, <mask> }, { <mask> name: "success_custom_suffix", <mask> host: "example.custom", <mask> suffix: ".custom.", <mask> wantIP: knownIP, <mask> wantRes: resultCodeSuccess, <mask> qtyp: dns.TypeA, <mask> }} <mask> </s> Pull request: 4699 dhcp ptr Merge in ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dns_test.go
s := &Server{ dhcpServer: &testDHCP{}, localDomainSuffix: tc.suffix, tableHostToIP: hostToIPTable{ "example." + tc.suffix: knownIP, }, }
<mask> qtyp: dns.TypeA, <mask> }} <mask> <mask> for _, tc := range testCases { <mask> t.Run(tc.name, func(t *testing.T) { <mask> s := &Server{ <mask> dhcpServer: &testDHCP{}, <mask> localDomainSuffix: tc.suffix, <mask> tableHostToIP: hostToIPTable{ <mask> "example": knownI...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dns_test.go
req := &dns.Msg{ MsgHdr: dns.MsgHdr{ Id: 1234, }, Question: []dns.Question{{ Name: dns.Fqdn(tc.host), Qtype: tc.qtyp, Qclass: dns.ClassINET, }}, }
<mask> "example": knownIP, <mask> }, <mask> } <mask> <mask> req := &dns.Msg{ <mask> MsgHdr: dns.MsgHdr{ <mask> Id: 1234, <mask> }, <mask> Question: []dns.Question{{ <mask> Name: dns.Fqdn(tc.host), <mask> Qtype: tc.qtyp, <mask> Qclass: dns.ClassINET, <mask>...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dns_test.go
dctx := &dnsContext{ proxyCtx: &proxy.DNSContext{ Req: req, }, isLocalClient: true, }
<mask> Qclass: dns.ClassINET, <mask> }}, <mask> } <mask> <mask> dctx := &dnsContext{ <mask> proxyCtx: &proxy.DNSContext{ <mask> Req: req, <mask> }, <mask> isLocalClient: true, <mask> } <mask> <mask> res := s.processInternalHosts(dctx) <mask> pctx := dctx.proxyCtx ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dns_test.go
t.Run(tc.name, func(t *testing.T) { res := s.processDHCPHosts(dctx)
<mask> }, <mask> isLocalClient: true, <mask> } <mask> <mask> res := s.processInternalHosts(dctx) <mask> pctx := dctx.proxyCtx <mask> assert.Equal(t, tc.wantRes, res) <mask> if tc.wantRes == resultCodeFinish { <mask> require.NotNil(t, pctx.Res) <mask> assert.Equal(t, dns.RcodeNa...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dns_test.go
const defaultLocalDomainSuffix = "lan"
<mask> // defaultLocalDomainSuffix is the default suffix used to detect internal hosts <mask> // when no suffix is provided. <mask> // <mask> // See the documentation for Server.localDomainSuffix. <mask> const defaultLocalDomainSuffix = ".lan." <mask> <mask> // DNSCreateParams are parameters to create a new ser...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dnsforward.go
<mask> Anonymizer *aghnet.IPMut <mask> LocalDomain string <mask> } <mask> <mask> // domainNameToSuffix converts a domain name into a local domain suffix. <mask> func domainNameToSuffix(tld string) (suffix string) { <mask> l := len(tld) + 2 <mask> b := make([]byte, l) <mask> b[0] = '.' <mask> copy(b[1:...
[ "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/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dnsforward.go
localDomainSuffix = p.LocalDomain
<mask> if err != nil { <mask> return nil, fmt.Errorf("local domain: %w", err) <mask> } <mask> <mask> localDomainSuffix = domainNameToSuffix(p.LocalDomain) <mask> } <mask> <mask> if p.Anonymizer == nil { <mask> p.Anonymizer = aghnet.NewIPMut(nil) <mask> } </s> Pull request: 4699 dhcp ptr Merg...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dnsforward.go
const localDomain = "lan"
<mask> <mask> func TestPTRResponseFromDHCPLeases(t *testing.T) { <mask> s, err := NewServer(DNSCreateParams{ <mask> DNSFilter: filtering.New(&filtering.Config{}, nil), <mask> DHCPServer: &testDHCP{}, <mask> PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), </s> Pull request: 4699 dhcp ptr ...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dnsforward_test.go
LocalDomain: localDomain,
<mask> s, err := NewServer(DNSCreateParams{ <mask> DNSFilter: filtering.New(&filtering.Config{}, nil), <mask> DHCPServer: &testDHCP{}, <mask> PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), <mask> }) <mask> require.NoError(t, err) <mask> <mask> s.conf.UDPListenAddrs = []*net.UDPAddr{{...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dnsforward_test.go
require.NoErrorf(t, err, "%s", addr)
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP) <mask> req := createTestMessageWithType("34.12.168.192.in-addr.arpa.", dns.TypePTR) <mask> <mask> resp, err := dns.Exchange(req, addr.String()) <mask> require.NoError(t, err) <mask> <mask> require.Len(t, resp.Answer, 1) <mask> <mask> assert.Equal(t, dns.T...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dnsforward_test.go
assert.Equal(t, dns.Fqdn("myhost."+localDomain), ptr.Ptr)
<mask> assert.Equal(t, "34.12.168.192.in-addr.arpa.", resp.Answer[0].Header().Name) <mask> <mask> ptr, ok := resp.Answer[0].(*dns.PTR) <mask> require.True(t, ok) <mask> assert.Equal(t, "myhost.", ptr.Ptr) <mask> } <mask> <mask> func TestPTRResponseFromHosts(t *testing.T) { <mask> // Prepare test hosts f...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14d8f58592cbb192216cfe98e28e9b38e40a97c5
internal/dnsforward/dnsforward_test.go
import ar from './__locales/ar.json';
<mask> <mask> import { LANGUAGES, BASE_LOCALE } from './helpers/twosky'; <mask> <mask> import be from './__locales/be.json'; <mask> import bg from './__locales/bg.json'; <mask> import cs from './__locales/cs.json'; <mask> import da from './__locales/da.json'; <mask> import de from './__locales/de.json'; <mas...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14fd995ae9a4a9f8e4a56f2d0a33aadc7bc42035
client/src/i18n.js
ar: { translation: ar },
<mask> import { setHtmlLangAttr } from './helpers/helpers'; <mask> <mask> const resources = { <mask> be: { translation: be }, <mask> bg: { translation: bg }, <mask> cs: { translation: cs }, <mask> da: { translation: da }, <mask> de: { translation: de }, <mask> en: { translation: en }, ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14fd995ae9a4a9f8e4a56f2d0a33aadc7bc42035
client/src/i18n.js
"ar",
<mask> <mask> // TODO(a.garipov): Get rid of a global or generate from .twosky.json. <mask> var allowedLanguages = stringutil.NewSet( <mask> "be", <mask> "bg", <mask> "cs", <mask> "da", </s> Pull request: add-ar-i18n Merge in DNS/adguard-home from add-ar-i18n to master Squashed commit of the following: ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14fd995ae9a4a9f8e4a56f2d0a33aadc7bc42035
internal/home/i18n.go
func handleI18nCurrentLanguage(w http.ResponseWriter, _ *http.Request) {
<mask> "zh-hk", <mask> "zh-tw", <mask> ) <mask> <mask> func handleI18nCurrentLanguage(w http.ResponseWriter, r *http.Request) { <mask> w.Header().Set("Content-Type", "text/plain") <mask> log.Printf("config.Language is %s", config.Language) <mask> _, err := fmt.Fprintf(w, "%s\n", config.Language) <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14fd995ae9a4a9f8e4a56f2d0a33aadc7bc42035
internal/home/i18n.go
// InitModule() - manually initialize blocked services map func InitModule() { initBlockedServices() }
<mask> } <mask> <mask> // New creates properly initialized DNS Filter that is ready to be used <mask> func New(c *Config, blockFilters []Filter) *Dnsfilter { <mask> <mask> if c != nil { <mask> cacheConf := cache.Config{ </s> Merge: - blocked-services: settings were reset on restart Close #1624 Squashed co...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14ffd1a3f52049931b21abe4ebce5bd22ece715b
dnsfilter/dnsfilter.go
<mask> bsvcs = append(bsvcs, s) <mask> } <mask> d.BlockedServices = bsvcs <mask> <mask> initBlockedServices() <mask> <mask> if blockFilters != nil { <mask> err := d.initFiltering(nil, blockFilters) <mask> if err != nil { <mask> log.Error("Can't initialize filtering subsystem: %s", err) <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14ffd1a3f52049931b21abe4ebce5bd22ece715b
dnsfilter/dnsfilter.go
// 'clients' module uses 'dnsfilter' module's static data (dnsfilter.BlockedSvcKnown()), // so we have to initialize dnsfilter's static data first, // but also avoid relying on automatic Go init() function dnsfilter.InitModule()
<mask> } <mask> } <mask> <mask> config.DHCP.WorkDir = Context.workDir <mask> config.DHCP.HTTPRegister = httpRegister <mask> config.DHCP.ConfigModified = onConfigModified <mask> Context.dhcpServer = dhcpd.Create(config.DHCP) </s> Merge: - blocked-services: settings were reset on restart Close #1624 Squa...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/14ffd1a3f52049931b21abe4ebce5bd22ece715b
home/home.go
if !ok { return "", false }
<mask> var v interface{} <mask> v, ok = s.tableIPToHost.Get(ip) <mask> <mask> if host, ok = v.(string); !ok { <mask> log.Error("dns: bad type %T in tableIPToHost for %s", v, ip) <mask> <mask> return "", false </s> Pull request #1238: dnsforward: fix panic Updates #3318. Squashed commit of the followi...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1571609e5975be22e31d3ef7336a4ac6b1f08880
internal/dnsforward/dns.go
if host, ok = v.(string); !ok {
<mask> <mask> var v interface{} <mask> v, ok = s.tableIPToHost.Get(ip) <mask> <mask> var typOK bool <mask> if host, typOK = v.(string); !typOK { <mask> log.Error("dns: bad type %T in tableIPToHost for %s", v, ip) <mask> <mask> return "", false <mask> } <mask> </s> Pull request #1238: dnsforward...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1571609e5975be22e31d3ef7336a4ac6b1f08880
internal/dnsforward/dns.go
return host, true
<mask> <mask> return "", false <mask> } <mask> <mask> return host, ok <mask> } <mask> <mask> // Respond to PTR requests if the target IP is leased by our DHCP server and the <mask> // requestor is inside the local network. <mask> func (s *Server) processInternalIPAddrs(ctx *dnsContext) (rc resultCode) ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1571609e5975be22e31d3ef7336a4ac6b1f08880
internal/dnsforward/dns.go
// ParseCipherIDs returns a set of cipher suites with the cipher names provided func ParseCipherIDs(ciphers []string) (userCiphers []uint16) {
<mask> <mask> return safe <mask> } <mask> <mask> func UserPreferredCipherSuites(ciphers []string) (userCiphers []uint16) { <mask> for _, s := range tls.CipherSuites() { <mask> if slices.Contains(ciphers, s.Name) { <mask> userCiphers = append(userCiphers, s.ID) <mask> log.Debug("user specified ciphe...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15b19ff7268da689933dd369862930afc98fcc8e
internal/aghtls/aghtls.go
} else { log.Error("unknown cipher : %s ", s)
<mask> userCiphers = append(userCiphers, s.ID) <mask> log.Debug("user specified cipher : %s, ID : %d", s.Name, s.ID) <mask> } <mask> } <mask> <mask> return userCiphers <mask> } </s> changes done as per review comments </s> remove func UserPreferredCipherSuites(ciphers []string) (userCiphers []uint16)...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15b19ff7268da689933dd369862930afc98fcc8e
internal/aghtls/aghtls.go
// OverrideTLSCiphers holds the cipher names. If the slice is empty // default set of ciphers are used for https listener, else this is // considered. OverrideTLSCiphers []string `yaml:"override_tls_ciphers" json:"-"`
<mask> cert tls.Certificate <mask> // DNS names from certificate (SAN) or CN value from Subject <mask> dnsNames []string <mask> <mask> // ciphers specified by user <mask> TLSCiphers []string `yaml:"tls_ciphers" json:"-"` <mask> } <mask> <mask> // DNSCryptConfig is the DNSCrypt server configuration struc...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15b19ff7268da689933dd369862930afc98fcc8e
internal/dnsforward/config.go
tlsCiphers: getTLSCiphers(),
<mask> clientFS: clientFS, <mask> clientBetaFS: clientBetaFS, <mask> <mask> serveHTTP3: config.DNS.ServeHTTP3, <mask> tlsCiphers: config.TLS.TLSCiphers, <mask> } <mask> <mask> web = newWeb(&webConf) <mask> if web == nil { <mask> return nil, fmt.Errorf("initializing web: %w", err) </s> chan...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15b19ff7268da689933dd369862930afc98fcc8e
internal/home/home.go
// getTLSCiphers check for overriden tls ciphers, if the slice is // empty, then default safe ciphers are used func getTLSCiphers() []uint16 { var cipher []uint16 if len(config.TLS.OverrideTLSCiphers) == 0 { cipher = aghtls.SaferCipherSuites() } else { cipher = aghtls.ParseCipherIDs(config.TLS.OverrideTLSCipher...
<mask> type jsonError struct { <mask> // Message is the error message, an opaque string. <mask> Message string `json:"message"` <mask> } </s> changes done as per review comments </s> remove // ciphers specified by user tlsCiphers []string </s> add </s> remove func (web *Web) mustStartHTTP3(address string, c...
[ "keep", "keep", "keep", "add" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15b19ff7268da689933dd369862930afc98fcc8e
internal/home/home.go
<mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghhttp" <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet" <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtls" <mask> "github.com/AdguardTeam/golibs/errors" <mask> "github.com/AdguardTeam/golibs/log" <mask> "githu...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15b19ff7268da689933dd369862930afc98fcc8e
internal/home/web.go
// Ciphers that are used for https listener tlsCiphers []uint16
<mask> writeTimeout = 60 * time.Second <mask> ) <mask> <mask> type webConfig struct { <mask> clientFS fs.FS <mask> clientBetaFS fs.FS <mask> <mask> BindHost net.IP </s> changes done as per review comments </s> remove // ciphers specified by user tlsCiphers []string </s> add </s> remove var...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15b19ff7268da689933dd369862930afc98fcc8e
internal/home/web.go
<mask> <mask> firstRun bool <mask> <mask> serveHTTP3 bool <mask> <mask> // ciphers specified by user <mask> tlsCiphers []string <mask> } <mask> <mask> // httpsServer contains the data for the HTTPS server. <mask> type httpsServer struct { <mask> // server is the pre-HTTP/3 HTTPS server. </s> chang...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15b19ff7268da689933dd369862930afc98fcc8e
internal/home/web.go
<mask> } <mask> <mask> web.httpsServer.cond.L.Unlock() <mask> <mask> var cipher []uint16 <mask> <mask> if len(web.conf.tlsCiphers) == 0 { <mask> cipher = aghtls.SaferCipherSuites() <mask> } else { <mask> cipher = aghtls.UserPreferredCipherSuites(web.conf.tlsCiphers) <mask> } <mask> <m...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15b19ff7268da689933dd369862930afc98fcc8e
internal/home/web.go
CipherSuites: web.conf.tlsCiphers,
<mask> Addr: addr, <mask> TLSConfig: &tls.Config{ <mask> Certificates: []tls.Certificate{web.httpsServer.cert}, <mask> RootCAs: Context.tlsRoots, <mask> CipherSuites: cipher, <mask> MinVersion: tls.VersionTLS12, <mask> }, <mask> Handler: withMiddlewares(Context.m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15b19ff7268da689933dd369862930afc98fcc8e
internal/home/web.go
go web.mustStartHTTP3(addr)
<mask> <mask> printHTTPAddresses(aghhttp.SchemeHTTPS) <mask> <mask> if web.conf.serveHTTP3 { <mask> go web.mustStartHTTP3(addr, cipher) <mask> } <mask> <mask> log.Debug("web: starting https server") <mask> err := web.httpsServer.server.ListenAndServeTLS("", "") <mask> if !errors.Is(err, http...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15b19ff7268da689933dd369862930afc98fcc8e
internal/home/web.go
func (web *Web) mustStartHTTP3(address string) {
<mask> } <mask> } <mask> } <mask> <mask> func (web *Web) mustStartHTTP3(address string, ciphers []uint16) { <mask> defer log.OnPanic("web: http3") <mask> <mask> web.httpsServer.server3 = &http3.Server{ <mask> // TODO(a.garipov): See if there is a way to use the error log as <mask> // well as timeou...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15b19ff7268da689933dd369862930afc98fcc8e
internal/home/web.go
CipherSuites: web.conf.tlsCiphers,
<mask> Addr: address, <mask> TLSConfig: &tls.Config{ <mask> Certificates: []tls.Certificate{web.httpsServer.cert}, <mask> RootCAs: Context.tlsRoots, <mask> CipherSuites: ciphers, <mask> MinVersion: tls.VersionTLS12, <mask> }, <mask> Handler: withMiddlewares(Context.mux, limitRequestBo...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15b19ff7268da689933dd369862930afc98fcc8e
internal/home/web.go
github.com/AdguardTeam/golibs v0.13.2
<mask> go 1.19 <mask> <mask> require ( <mask> github.com/AdguardTeam/dnsproxy v0.48.3 <mask> github.com/AdguardTeam/golibs v0.13.1 <mask> github.com/AdguardTeam/urlfilter v0.16.1 <mask> github.com/NYTimes/gziphandler v1.1.1 <mask> github.com/ameshkov/dnscrypt/v2 v2.2.6 <mask> github.com/digineo/go-ipset...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
go.mod
github.com/AdguardTeam/golibs v0.13.2 h1:BPASsyQKmb+b8VnvsNOHp7bKfcZl9Z+Z2UhPjOiupSc= github.com/AdguardTeam/golibs v0.13.2/go.mod h1:7ylQLv2Lqsc3UW3jHoITynYk6Y1tYtgEMkR09ppfsN8=
<mask> github.com/AdguardTeam/dnsproxy v0.48.3 h1:h9xgDSmd1MqsPFNApyaPVXolmSTtzOWOcfWvPeDEP6s= <mask> github.com/AdguardTeam/dnsproxy v0.48.3/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...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
go.sum
"github.com/AdguardTeam/golibs/httphdr"
<mask> "net/http" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/version" <mask> "github.com/AdguardTeam/golibs/log" <mask> ) <mask> <mask> // HTTP scheme constants. <mask> const ( <mask> SchemeHTTP = "http" </s> Pull request 1807: upd-golibs Merge in DNS/adguard-home from upd-golibs to ma...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/aghhttp/aghhttp.go
if r.Header.Get(httphdr.ContentType) != HdrValTextPlain {
<mask> // WriteTextPlainDeprecated responds to the request with a message about <mask> // deprecation and removal of a plain-text API if the request is made with the <mask> // "text/plain" content-type. <mask> func WriteTextPlainDeprecated(w http.ResponseWriter, r *http.Request) (isPlainText bool) { <mask> if r.H...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/aghhttp/aghhttp.go
w.Header().Set(httphdr.ContentType, HdrValApplicationJSON)
<mask> // WriteJSONResponseCode is like [WriteJSONResponse] but adds the ability to <mask> // redefine the status code. <mask> func WriteJSONResponseCode(w http.ResponseWriter, r *http.Request, code int, resp any) (err error) { <mask> w.WriteHeader(code) <mask> w.Header().Set(HdrNameContentType, HdrValApplicatio...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/aghhttp/aghhttp.go
// HTTP headers
<mask> package aghhttp <mask> <mask> // HTTP Headers <mask> <mask> // HTTP header name constants. <mask> // <mask> // TODO(a.garipov): Remove unused. <mask> const ( <mask> HdrNameAcceptEncoding = "Accept-Encoding" <mask> HdrNameAccessControlAllowOrigin = "Access-Control-Allow-Origin" <mask> Hd...
[ "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/aghhttp/header.go
"github.com/AdguardTeam/golibs/httphdr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet" <mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering" <mask> "github.com/AdguardTeam/golibs/netutil" <mask> "github.com/AdguardTeam/golibs/testutil" <mask> "github.com/miekg/dns" <mask> "github.com/stretchr/testify/assert" <mask> "github...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/dnsforward/http_test.go
cType := w.Header().Get(httphdr.ContentType)
<mask> <mask> s.conf = tc.conf() <mask> s.handleGetConfig(w, nil) <mask> <mask> cType := w.Header().Get(aghhttp.HdrNameContentType) <mask> assert.Equal(t, aghhttp.HdrValApplicationJSON, cType) <mask> assert.JSONEq(t, string(caseWant), w.Body.String()) <mask> }) <mask> } <mask> } </s> Pull...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/dnsforward/http_test.go
"github.com/AdguardTeam/golibs/httphdr"
<mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghhttp" <mask> "github.com/AdguardTeam/golibs/errors" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/AdguardTeam/golibs/netutil" <mask> "github.com/AdguardTeam/golibs/timeutil" <mask> "go.etcd.io/bbolt" </s> Pull request 1807: upd...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/home/auth.go
httphdr.CFConnectingIP, httphdr.TrueClientIP, httphdr.XRealIP,
<mask> // <mask> // TODO(a.garipov): Support header Forwarded from RFC 7329. <mask> func realIP(r *http.Request) (ip net.IP, err error) { <mask> proxyHeaders := []string{ <mask> "CF-Connecting-IP", <mask> "True-Client-IP", <mask> "X-Real-IP", <mask> } <mask> <mask> for _, h := range proxyHeaders { ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/home/auth.go
s := r.Header.Get(httphdr.XForwardedFor)
<mask> } <mask> <mask> // If none of the above yielded any results, get the leftmost IP address <mask> // from the X-Forwarded-For header. <mask> s := r.Header.Get("X-Forwarded-For") <mask> ipStrs := strings.SplitN(s, ", ", 2) <mask> ip = net.ParseIP(ipStrs[0]) <mask> if ip != nil { <mask> return ip,...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/home/auth.go
w.Header().Set(httphdr.RetryAfter, strconv.Itoa(int(left.Seconds())))
<mask> } <mask> <mask> if rateLimiter := Context.auth.raleLimiter; rateLimiter != nil { <mask> if left := rateLimiter.check(remoteAddr); left > 0 { <mask> w.Header().Set("Retry-After", strconv.Itoa(int(left.Seconds()))) <mask> aghhttp.Error(r, w, http.StatusTooManyRequests, "auth: blocked for %s", left...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/home/auth.go
h.Set(httphdr.CacheControl, "no-store, no-cache, must-revalidate, proxy-revalidate") h.Set(httphdr.Pragma, "no-cache") h.Set(httphdr.Expires, "0")
<mask> <mask> http.SetCookie(w, cookie) <mask> <mask> h := w.Header() <mask> h.Set("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate") <mask> h.Set("Pragma", "no-cache") <mask> h.Set("Expires", "0") <mask> <mask> aghhttp.OK(w) <mask> } <mask> <mask> func handleLogout(w http.R...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/home/auth.go
respHdr.Set(httphdr.Location, "/login.html")
<mask> c, err := r.Cookie(sessionCookieName) <mask> if err != nil { <mask> // The only error that is returned from r.Cookie is [http.ErrNoCookie]. <mask> // The user is already logged out. <mask> respHdr.Set("Location", "/login.html") <mask> w.WriteHeader(http.StatusFound) <mask> <mask> return <ma...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/home/auth.go
respHdr.Set(httphdr.Location, "/login.html") respHdr.Set(httphdr.SetCookie, c.String())
<mask> HttpOnly: true, <mask> SameSite: http.SameSiteLaxMode, <mask> } <mask> <mask> respHdr.Set("Location", "/login.html") <mask> respHdr.Set("Set-Cookie", c.String()) <mask> w.WriteHeader(http.StatusFound) <mask> } <mask> <mask> // RegisterAuthHandlers - register handlers <mask> func RegisterAuth...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/home/auth.go
w.Header().Set(httphdr.Location, "/login.html")
<mask> if glProcessRedirect(w, r) { <mask> log.Debug("auth: redirected to login page by GL-Inet submodule") <mask> } else { <mask> log.Debug("auth: redirected to login page") <mask> w.Header().Set("Location", "/login.html") <mask> w.WriteHeader(http.StatusFound) <mask> } <mask> } else { <mas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/home/auth.go
w.Header().Set(httphdr.Location, "/")
<mask> if authRequired && err == nil { <mask> // Redirect to the dashboard if already authenticated. <mask> res := Context.auth.checkSession(cookie.Value) <mask> if res == checkSessionOK { <mask> w.Header().Set("Location", "/") <mask> w.WriteHeader(http.StatusFound) <mask> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/home/auth.go
"github.com/AdguardTeam/golibs/httphdr"
<mask> "testing" <mask> "time" <mask> <mask> "github.com/AdguardTeam/golibs/testutil" <mask> "github.com/stretchr/testify/assert" <mask> "github.com/stretchr/testify/require" <mask> ) <mask> </s> Pull request 1807: upd-golibs Merge in DNS/adguard-home from upd-golibs to master Squashed commit of the f...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/home/auth_test.go
assert.NotEmpty(t, w.hdr.Get(httphdr.Location))
<mask> r.URL = &url.URL{Path: "/"} <mask> handlerCalled = false <mask> handler2(&w, &r) <mask> assert.Equal(t, http.StatusFound, w.statusCode) <mask> assert.NotEmpty(t, w.hdr.Get("Location")) <mask> assert.False(t, handlerCalled) <mask> <mask> // go to login page <mask> loginURL := w.hdr.Get("Location...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/home/auth_test.go
loginURL := w.hdr.Get(httphdr.Location)
<mask> assert.NotEmpty(t, w.hdr.Get("Location")) <mask> assert.False(t, handlerCalled) <mask> <mask> // go to login page <mask> loginURL := w.hdr.Get("Location") <mask> r.URL = &url.URL{Path: loginURL} <mask> handlerCalled = false <mask> handler2(&w, &r) <mask> assert.True(t, handlerCalled) <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/home/auth_test.go
r.Header.Set(httphdr.Cookie, cookie.String())
<mask> <mask> // get / <mask> handler2 = optionalAuth(handler) <mask> w.hdr = make(http.Header) <mask> r.Header.Set("Cookie", cookie.String()) <mask> r.URL = &url.URL{Path: "/"} <mask> handlerCalled = false <mask> handler2(&w, &r) <mask> assert.True(t, handlerCalled) <mask> </s> Pull request 1807: ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/home/auth_test.go
r.Header.Del(httphdr.Cookie)
<mask> handlerCalled = false <mask> handler2(&w, &r) <mask> assert.True(t, handlerCalled) <mask> <mask> r.Header.Del("Cookie") <mask> <mask> // get / with basic auth <mask> handler2 = optionalAuth(handler) <mask> w.hdr = make(http.Header) <mask> r.URL = &url.URL{Path: "/"} </s> Pull request 1807: u...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/home/auth_test.go
r.Header.Del(httphdr.Authorization)
<mask> r.SetBasicAuth("name", "password") <mask> handlerCalled = false <mask> handler2(&w, &r) <mask> assert.True(t, handlerCalled) <mask> r.Header.Del("Authorization") <mask> <mask> // get login page with a valid cookie - we're redirected to / <mask> handler2 = optionalAuth(handler) <mask> w.hdr = ma...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/home/auth_test.go
r.Header.Set(httphdr.Cookie, cookie.String())
<mask> <mask> // get login page with a valid cookie - we're redirected to / <mask> handler2 = optionalAuth(handler) <mask> w.hdr = make(http.Header) <mask> r.Header.Set("Cookie", cookie.String()) <mask> r.URL = &url.URL{Path: loginURL} <mask> handlerCalled = false <mask> handler2(&w, &r) <mask> assert...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/home/auth_test.go
assert.NotEmpty(t, w.hdr.Get(httphdr.Location))
<mask> r.Header.Set("Cookie", cookie.String()) <mask> r.URL = &url.URL{Path: loginURL} <mask> handlerCalled = false <mask> handler2(&w, &r) <mask> assert.NotEmpty(t, w.hdr.Get("Location")) <mask> assert.False(t, handlerCalled) <mask> r.Header.Del("Cookie") <mask> <mask> // get login page with an inval...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/home/auth_test.go
r.Header.Del(httphdr.Cookie)
<mask> handlerCalled = false <mask> handler2(&w, &r) <mask> assert.NotEmpty(t, w.hdr.Get("Location")) <mask> assert.False(t, handlerCalled) <mask> r.Header.Del("Cookie") <mask> <mask> // get login page with an invalid cookie <mask> handler2 = optionalAuth(handler) <mask> w.hdr = make(http.Header) <ma...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/home/auth_test.go
r.Header.Set(httphdr.Cookie, "bad")
<mask> <mask> // get login page with an invalid cookie <mask> handler2 = optionalAuth(handler) <mask> w.hdr = make(http.Header) <mask> r.Header.Set("Cookie", "bad") <mask> r.URL = &url.URL{Path: loginURL} <mask> handlerCalled = false <mask> handler2(&w, &r) <mask> assert.True(t, handlerCalled) <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/15bba281ee36ff9af69aced1068a9fc6925a0a6b
internal/home/auth_test.go