docstring_tokens
stringlengths 0
76.5k
| code_tokens
stringlengths 75
1.81M
| label_window
sequencelengths 4
2.12k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|
//go:embed build | <mask> // Embed the prebuilt client here since we strive to keep .go files inside the
<mask> // internal directory and the embed package is unable to embed files located
<mask> // outside of the same or underlying directory.
<mask>
<mask> //go:embed build2
<mask> var clientBuildFS embed.FS
<mask>
<mask> func main() {
<mask> cmd.Main(clientBuildFS)
<mask> }
</s> Pull request 1717: remove-client2
Merge in DNS/adguard-home from remove-client2 to master
Squashed commit of the following:
commit 0a0923494b0d1003e4f02f3a5f93d5248f0f2ded
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 20 17:14:29 2023 +0300
all: rm old experimental beta (dir client2/)
This project was unfortunately abandoned. v0.108.0 will have a
different front-end and new APIs. </s> remove //go:embed build build2
</s> add //go:embed build </s> remove // Go to http://127.0.0.1:80
// Go to http://127.0.0.1:3000 (BETA)
func printWebAddrs(proto, addr string, port, betaPort int) {
const (
hostMsg = "Go to %s://%s"
hostBetaMsg = hostMsg + " (BETA)"
)
log.Printf(hostMsg, proto, netutil.JoinHostPort(addr, port))
if betaPort == 0 {
return
}
log.Printf(hostBetaMsg, proto, netutil.JoinHostPort(addr, config.BetaBindPort))
</s> add // go to http://127.0.0.1:80
func printWebAddrs(proto, addr string, port int) {
log.Printf("go to %s://%s", proto, netutil.JoinHostPort(addr, port)) </s> remove // port. At least one address is printed with the value of port. If the value
// of betaPort is 0, the second address is not printed. Output example:
</s> add // port. At least one address is printed with the value of port. Output
// example: </s> remove var clientFS, clientBetaFS fs.FS
</s> add var clientFS fs.FS </s> remove addPorts(tcpPorts, tcpPort(config.BetaBindPort), port)
</s> add addPorts(tcpPorts, port) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/54a141abdeca00005a75f4af141645520b3f6b52 | main_next.go |
<mask> 'content':
<mask> 'application/json':
<mask> 'schema':
<mask> '$ref': '#/components/schemas/LanguageSettings'
<mask> '/install/get_addresses_beta':
<mask> 'get':
<mask> 'tags':
<mask> - 'install'
<mask> 'operationId': 'installGetAddressesBeta'
<mask> 'summary': >
<mask> 'UNSTABLE!: Gets the network interfaces information.'
<mask> 'responses':
<mask> '200':
<mask> 'description': 'OK.'
<mask> 'content':
<mask> 'application/json':
<mask> 'schema':
<mask> '$ref': '#/components/schemas/AddressesInfoBeta'
<mask> '/install/get_addresses':
<mask> 'get':
<mask> 'tags':
<mask> - 'install'
<mask> 'operationId': 'installGetAddresses'
</s> Pull request 1717: remove-client2
Merge in DNS/adguard-home from remove-client2 to master
Squashed commit of the following:
commit 0a0923494b0d1003e4f02f3a5f93d5248f0f2ded
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 20 17:14:29 2023 +0300
all: rm old experimental beta (dir client2/)
This project was unfortunately abandoned. v0.108.0 will have a
different front-end and new APIs. </s> remove '/install/check_config_beta':
'post':
'tags':
- 'install'
'operationId': 'installCheckConfigBeta'
'summary': >
'UNSTABLE!: Checks configuration'
'requestBody':
'content':
'application/json':
'schema':
'$ref': '#/components/schemas/CheckConfigRequestBeta'
'description': 'Configuration to be checked'
'required': true
'responses':
'200':
'description': 'OK.'
'content':
'application/json':
'schema':
'$ref': '#/components/schemas/CheckConfigResponse'
'400':
'description': >
Failed to parse JSON or cannot listen on the specified address.
</s> add </s> remove '/install/configure_beta':
'post':
'tags':
- 'install'
'operationId': 'installConfigureBeta'
'summary': >
'UNSTABLE!: Applies the initial configuration.'
'requestBody':
'content':
'application/json':
'schema':
'$ref': '#/components/schemas/InitialConfigurationBeta'
'description': 'Initial configuration JSON'
'required': true
'responses':
'200':
'description': 'OK.'
'400':
'description': >
Failed to parse initial configuration or cannot listen to the
specified addresses.
'500':
'description': 'Cannot start the DNS server'
</s> add </s> remove 'InitialConfigurationBeta':
'type': 'object'
'description': >
AdGuard Home initial configuration for the first-install wizard.
'required':
- 'dns'
- 'web'
- 'username'
- 'password'
'properties':
'dns':
'$ref': '#/components/schemas/AddressInfoBeta'
'web':
'$ref': '#/components/schemas/AddressInfoBeta'
'username':
'type': 'string'
'description': 'Basic auth username'
'example': 'admin'
'password':
'type': 'string'
'description': 'Basic auth password'
'example': 'password'
</s> add </s> remove 'AddressesInfoBeta':
'type': 'object'
'description': 'AdGuard Home addresses configuration'
'required':
- 'dns_port'
- 'web_port'
- 'interfaces'
'properties':
'dns_port':
'type': 'integer'
'format': 'uint16'
'example': 53
'web_port':
'type': 'integer'
'format': 'uint16'
'example': 80
'interfaces':
'type': 'array'
'description': >
Network interfaces dictionary, keys are interface names.
'items':
'$ref': '#/components/schemas/NetInterface'
</s> add </s> remove 'CheckConfigRequestBeta':
'type': 'object'
'description': 'Configuration to be checked'
'properties':
'dns':
'$ref': '#/components/schemas/CheckConfigRequestInfoBeta'
'web':
'$ref': '#/components/schemas/CheckConfigRequestInfoBeta'
'set_static_ip':
'type': 'boolean'
'example': false
</s> add | [
"keep",
"keep",
"keep",
"keep",
"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/54a141abdeca00005a75f4af141645520b3f6b52 | openapi/openapi.yaml |
|
<mask> 'content':
<mask> 'application/json':
<mask> 'schema':
<mask> '$ref': '#/components/schemas/AddressesInfo'
<mask> '/install/check_config_beta':
<mask> 'post':
<mask> 'tags':
<mask> - 'install'
<mask> 'operationId': 'installCheckConfigBeta'
<mask> 'summary': >
<mask> 'UNSTABLE!: Checks configuration'
<mask> 'requestBody':
<mask> 'content':
<mask> 'application/json':
<mask> 'schema':
<mask> '$ref': '#/components/schemas/CheckConfigRequestBeta'
<mask> 'description': 'Configuration to be checked'
<mask> 'required': true
<mask> 'responses':
<mask> '200':
<mask> 'description': 'OK.'
<mask> 'content':
<mask> 'application/json':
<mask> 'schema':
<mask> '$ref': '#/components/schemas/CheckConfigResponse'
<mask> '400':
<mask> 'description': >
<mask> Failed to parse JSON or cannot listen on the specified address.
<mask> '/install/check_config':
<mask> 'post':
<mask> 'tags':
<mask> - 'install'
<mask> 'operationId': 'installCheckConfig'
</s> Pull request 1717: remove-client2
Merge in DNS/adguard-home from remove-client2 to master
Squashed commit of the following:
commit 0a0923494b0d1003e4f02f3a5f93d5248f0f2ded
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 20 17:14:29 2023 +0300
all: rm old experimental beta (dir client2/)
This project was unfortunately abandoned. v0.108.0 will have a
different front-end and new APIs. </s> remove '/install/configure_beta':
'post':
'tags':
- 'install'
'operationId': 'installConfigureBeta'
'summary': >
'UNSTABLE!: Applies the initial configuration.'
'requestBody':
'content':
'application/json':
'schema':
'$ref': '#/components/schemas/InitialConfigurationBeta'
'description': 'Initial configuration JSON'
'required': true
'responses':
'200':
'description': 'OK.'
'400':
'description': >
Failed to parse initial configuration or cannot listen to the
specified addresses.
'500':
'description': 'Cannot start the DNS server'
</s> add </s> remove '/install/get_addresses_beta':
'get':
'tags':
- 'install'
'operationId': 'installGetAddressesBeta'
'summary': >
'UNSTABLE!: Gets the network interfaces information.'
'responses':
'200':
'description': 'OK.'
'content':
'application/json':
'schema':
'$ref': '#/components/schemas/AddressesInfoBeta'
</s> add </s> remove 'CheckConfigRequestBeta':
'type': 'object'
'description': 'Configuration to be checked'
'properties':
'dns':
'$ref': '#/components/schemas/CheckConfigRequestInfoBeta'
'web':
'$ref': '#/components/schemas/CheckConfigRequestInfoBeta'
'set_static_ip':
'type': 'boolean'
'example': false
</s> add </s> remove 'InitialConfigurationBeta':
'type': 'object'
'description': >
AdGuard Home initial configuration for the first-install wizard.
'required':
- 'dns'
- 'web'
- 'username'
- 'password'
'properties':
'dns':
'$ref': '#/components/schemas/AddressInfoBeta'
'web':
'$ref': '#/components/schemas/AddressInfoBeta'
'username':
'type': 'string'
'description': 'Basic auth username'
'example': 'admin'
'password':
'type': 'string'
'description': 'Basic auth password'
'example': 'password'
</s> add </s> remove 'AddressesInfoBeta':
'type': 'object'
'description': 'AdGuard Home addresses configuration'
'required':
- 'dns_port'
- 'web_port'
- 'interfaces'
'properties':
'dns_port':
'type': 'integer'
'format': 'uint16'
'example': 53
'web_port':
'type': 'integer'
'format': 'uint16'
'example': 80
'interfaces':
'type': 'array'
'description': >
Network interfaces dictionary, keys are interface names.
'items':
'$ref': '#/components/schemas/NetInterface'
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"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/54a141abdeca00005a75f4af141645520b3f6b52 | openapi/openapi.yaml |
|
<mask> '$ref': '#/components/schemas/CheckConfigResponse'
<mask> '400':
<mask> 'description': >
<mask> Failed to parse JSON or cannot listen on the specified address.
<mask> '/install/configure_beta':
<mask> 'post':
<mask> 'tags':
<mask> - 'install'
<mask> 'operationId': 'installConfigureBeta'
<mask> 'summary': >
<mask> 'UNSTABLE!: Applies the initial configuration.'
<mask> 'requestBody':
<mask> 'content':
<mask> 'application/json':
<mask> 'schema':
<mask> '$ref': '#/components/schemas/InitialConfigurationBeta'
<mask> 'description': 'Initial configuration JSON'
<mask> 'required': true
<mask> 'responses':
<mask> '200':
<mask> 'description': 'OK.'
<mask> '400':
<mask> 'description': >
<mask> Failed to parse initial configuration or cannot listen to the
<mask> specified addresses.
<mask> '500':
<mask> 'description': 'Cannot start the DNS server'
<mask> '/install/configure':
<mask> 'post':
<mask> 'tags':
<mask> - 'install'
<mask> 'operationId': 'installConfigure'
</s> Pull request 1717: remove-client2
Merge in DNS/adguard-home from remove-client2 to master
Squashed commit of the following:
commit 0a0923494b0d1003e4f02f3a5f93d5248f0f2ded
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 20 17:14:29 2023 +0300
all: rm old experimental beta (dir client2/)
This project was unfortunately abandoned. v0.108.0 will have a
different front-end and new APIs. </s> remove '/install/check_config_beta':
'post':
'tags':
- 'install'
'operationId': 'installCheckConfigBeta'
'summary': >
'UNSTABLE!: Checks configuration'
'requestBody':
'content':
'application/json':
'schema':
'$ref': '#/components/schemas/CheckConfigRequestBeta'
'description': 'Configuration to be checked'
'required': true
'responses':
'200':
'description': 'OK.'
'content':
'application/json':
'schema':
'$ref': '#/components/schemas/CheckConfigResponse'
'400':
'description': >
Failed to parse JSON or cannot listen on the specified address.
</s> add </s> remove '/install/get_addresses_beta':
'get':
'tags':
- 'install'
'operationId': 'installGetAddressesBeta'
'summary': >
'UNSTABLE!: Gets the network interfaces information.'
'responses':
'200':
'description': 'OK.'
'content':
'application/json':
'schema':
'$ref': '#/components/schemas/AddressesInfoBeta'
</s> add </s> remove 'InitialConfigurationBeta':
'type': 'object'
'description': >
AdGuard Home initial configuration for the first-install wizard.
'required':
- 'dns'
- 'web'
- 'username'
- 'password'
'properties':
'dns':
'$ref': '#/components/schemas/AddressInfoBeta'
'web':
'$ref': '#/components/schemas/AddressInfoBeta'
'username':
'type': 'string'
'description': 'Basic auth username'
'example': 'admin'
'password':
'type': 'string'
'description': 'Basic auth password'
'example': 'password'
</s> add </s> remove 'AddressesInfoBeta':
'type': 'object'
'description': 'AdGuard Home addresses configuration'
'required':
- 'dns_port'
- 'web_port'
- 'interfaces'
'properties':
'dns_port':
'type': 'integer'
'format': 'uint16'
'example': 53
'web_port':
'type': 'integer'
'format': 'uint16'
'example': 80
'interfaces':
'type': 'array'
'description': >
Network interfaces dictionary, keys are interface names.
'items':
'$ref': '#/components/schemas/NetInterface'
</s> add </s> remove 'CheckConfigRequestBeta':
'type': 'object'
'description': 'Configuration to be checked'
'properties':
'dns':
'$ref': '#/components/schemas/CheckConfigRequestInfoBeta'
'web':
'$ref': '#/components/schemas/CheckConfigRequestInfoBeta'
'set_static_ip':
'type': 'boolean'
'example': false
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"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/54a141abdeca00005a75f4af141645520b3f6b52 | openapi/openapi.yaml |
|
<mask> 'items':
<mask> 'type': 'string'
<mask> 'mtu':
<mask> 'type': 'integer'
<mask> 'AddressInfoBeta':
<mask> 'type': 'object'
<mask> 'description': 'Port information'
<mask> 'required':
<mask> - 'ip'
<mask> - 'port'
<mask> 'properties':
<mask> 'ip':
<mask> 'type': 'array'
<mask> 'items':
<mask> 'type': 'string'
<mask> 'minItems': 1
<mask> 'example':
<mask> - '127.0.0.1'
<mask> 'port':
<mask> 'type': 'integer'
<mask> 'format': 'uint16'
<mask> 'example': 53
<mask> 'AddressInfo':
<mask> 'type': 'object'
<mask> 'description': 'Port information'
<mask> 'required':
<mask> - 'ip'
</s> Pull request 1717: remove-client2
Merge in DNS/adguard-home from remove-client2 to master
Squashed commit of the following:
commit 0a0923494b0d1003e4f02f3a5f93d5248f0f2ded
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 20 17:14:29 2023 +0300
all: rm old experimental beta (dir client2/)
This project was unfortunately abandoned. v0.108.0 will have a
different front-end and new APIs. </s> remove 'CheckConfigRequestInfoBeta':
'type': 'object'
'properties':
'ip':
'type': 'array'
'items':
'type': 'string'
'minItems': 1
'example':
- '127.0.0.1'
'port':
'type': 'integer'
'format': 'uint16'
'example': 53
'autofix':
'type': 'boolean'
'example': false
</s> add </s> remove 'AddressesInfoBeta':
'type': 'object'
'description': 'AdGuard Home addresses configuration'
'required':
- 'dns_port'
- 'web_port'
- 'interfaces'
'properties':
'dns_port':
'type': 'integer'
'format': 'uint16'
'example': 53
'web_port':
'type': 'integer'
'format': 'uint16'
'example': 80
'interfaces':
'type': 'array'
'description': >
Network interfaces dictionary, keys are interface names.
'items':
'$ref': '#/components/schemas/NetInterface'
</s> add </s> remove 'InitialConfigurationBeta':
'type': 'object'
'description': >
AdGuard Home initial configuration for the first-install wizard.
'required':
- 'dns'
- 'web'
- 'username'
- 'password'
'properties':
'dns':
'$ref': '#/components/schemas/AddressInfoBeta'
'web':
'$ref': '#/components/schemas/AddressInfoBeta'
'username':
'type': 'string'
'description': 'Basic auth username'
'example': 'admin'
'password':
'type': 'string'
'description': 'Basic auth password'
'example': 'password'
</s> add </s> remove 'CheckConfigRequestBeta':
'type': 'object'
'description': 'Configuration to be checked'
'properties':
'dns':
'$ref': '#/components/schemas/CheckConfigRequestInfoBeta'
'web':
'$ref': '#/components/schemas/CheckConfigRequestInfoBeta'
'set_static_ip':
'type': 'boolean'
'example': false
</s> add </s> remove '/install/check_config_beta':
'post':
'tags':
- 'install'
'operationId': 'installCheckConfigBeta'
'summary': >
'UNSTABLE!: Checks configuration'
'requestBody':
'content':
'application/json':
'schema':
'$ref': '#/components/schemas/CheckConfigRequestBeta'
'description': 'Configuration to be checked'
'required': true
'responses':
'200':
'description': 'OK.'
'content':
'application/json':
'schema':
'$ref': '#/components/schemas/CheckConfigResponse'
'400':
'description': >
Failed to parse JSON or cannot listen on the specified address.
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"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/54a141abdeca00005a75f4af141645520b3f6b52 | openapi/openapi.yaml |
|
<mask> 'web_port':
<mask> 'type': 'integer'
<mask> 'format': 'uint16'
<mask> 'example': 80
<mask> 'AddressesInfoBeta':
<mask> 'type': 'object'
<mask> 'description': 'AdGuard Home addresses configuration'
<mask> 'required':
<mask> - 'dns_port'
<mask> - 'web_port'
<mask> - 'interfaces'
<mask> 'properties':
<mask> 'dns_port':
<mask> 'type': 'integer'
<mask> 'format': 'uint16'
<mask> 'example': 53
<mask> 'web_port':
<mask> 'type': 'integer'
<mask> 'format': 'uint16'
<mask> 'example': 80
<mask> 'interfaces':
<mask> 'type': 'array'
<mask> 'description': >
<mask> Network interfaces dictionary, keys are interface names.
<mask> 'items':
<mask> '$ref': '#/components/schemas/NetInterface'
<mask> 'ProfileInfo':
<mask> 'type': 'object'
<mask> 'description': 'Information about the current user'
<mask> 'properties':
<mask> 'name':
</s> Pull request 1717: remove-client2
Merge in DNS/adguard-home from remove-client2 to master
Squashed commit of the following:
commit 0a0923494b0d1003e4f02f3a5f93d5248f0f2ded
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 20 17:14:29 2023 +0300
all: rm old experimental beta (dir client2/)
This project was unfortunately abandoned. v0.108.0 will have a
different front-end and new APIs. </s> remove 'AddressInfoBeta':
'type': 'object'
'description': 'Port information'
'required':
- 'ip'
- 'port'
'properties':
'ip':
'type': 'array'
'items':
'type': 'string'
'minItems': 1
'example':
- '127.0.0.1'
'port':
'type': 'integer'
'format': 'uint16'
'example': 53
</s> add </s> remove 'CheckConfigRequestInfoBeta':
'type': 'object'
'properties':
'ip':
'type': 'array'
'items':
'type': 'string'
'minItems': 1
'example':
- '127.0.0.1'
'port':
'type': 'integer'
'format': 'uint16'
'example': 53
'autofix':
'type': 'boolean'
'example': false
</s> add </s> remove 'InitialConfigurationBeta':
'type': 'object'
'description': >
AdGuard Home initial configuration for the first-install wizard.
'required':
- 'dns'
- 'web'
- 'username'
- 'password'
'properties':
'dns':
'$ref': '#/components/schemas/AddressInfoBeta'
'web':
'$ref': '#/components/schemas/AddressInfoBeta'
'username':
'type': 'string'
'description': 'Basic auth username'
'example': 'admin'
'password':
'type': 'string'
'description': 'Basic auth password'
'example': 'password'
</s> add </s> remove 'CheckConfigRequestBeta':
'type': 'object'
'description': 'Configuration to be checked'
'properties':
'dns':
'$ref': '#/components/schemas/CheckConfigRequestInfoBeta'
'web':
'$ref': '#/components/schemas/CheckConfigRequestInfoBeta'
'set_static_ip':
'type': 'boolean'
'example': false
</s> add </s> remove '/install/check_config_beta':
'post':
'tags':
- 'install'
'operationId': 'installCheckConfigBeta'
'summary': >
'UNSTABLE!: Checks configuration'
'requestBody':
'content':
'application/json':
'schema':
'$ref': '#/components/schemas/CheckConfigRequestBeta'
'description': 'Configuration to be checked'
'required': true
'responses':
'200':
'description': 'OK.'
'content':
'application/json':
'schema':
'$ref': '#/components/schemas/CheckConfigResponse'
'400':
'description': >
Failed to parse JSON or cannot listen on the specified address.
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"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/54a141abdeca00005a75f4af141645520b3f6b52 | openapi/openapi.yaml |
|
<mask> - 'id'
<mask> - 'name'
<mask> - 'rules'
<mask> 'type': 'object'
<mask> 'CheckConfigRequestBeta':
<mask> 'type': 'object'
<mask> 'description': 'Configuration to be checked'
<mask> 'properties':
<mask> 'dns':
<mask> '$ref': '#/components/schemas/CheckConfigRequestInfoBeta'
<mask> 'web':
<mask> '$ref': '#/components/schemas/CheckConfigRequestInfoBeta'
<mask> 'set_static_ip':
<mask> 'type': 'boolean'
<mask> 'example': false
<mask> 'CheckConfigRequest':
<mask> 'type': 'object'
<mask> 'description': 'Configuration to be checked'
<mask> 'properties':
<mask> 'dns':
</s> Pull request 1717: remove-client2
Merge in DNS/adguard-home from remove-client2 to master
Squashed commit of the following:
commit 0a0923494b0d1003e4f02f3a5f93d5248f0f2ded
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 20 17:14:29 2023 +0300
all: rm old experimental beta (dir client2/)
This project was unfortunately abandoned. v0.108.0 will have a
different front-end and new APIs. </s> remove 'CheckConfigRequestInfoBeta':
'type': 'object'
'properties':
'ip':
'type': 'array'
'items':
'type': 'string'
'minItems': 1
'example':
- '127.0.0.1'
'port':
'type': 'integer'
'format': 'uint16'
'example': 53
'autofix':
'type': 'boolean'
'example': false
</s> add </s> remove 'InitialConfigurationBeta':
'type': 'object'
'description': >
AdGuard Home initial configuration for the first-install wizard.
'required':
- 'dns'
- 'web'
- 'username'
- 'password'
'properties':
'dns':
'$ref': '#/components/schemas/AddressInfoBeta'
'web':
'$ref': '#/components/schemas/AddressInfoBeta'
'username':
'type': 'string'
'description': 'Basic auth username'
'example': 'admin'
'password':
'type': 'string'
'description': 'Basic auth password'
'example': 'password'
</s> add </s> remove 'AddressesInfoBeta':
'type': 'object'
'description': 'AdGuard Home addresses configuration'
'required':
- 'dns_port'
- 'web_port'
- 'interfaces'
'properties':
'dns_port':
'type': 'integer'
'format': 'uint16'
'example': 53
'web_port':
'type': 'integer'
'format': 'uint16'
'example': 80
'interfaces':
'type': 'array'
'description': >
Network interfaces dictionary, keys are interface names.
'items':
'$ref': '#/components/schemas/NetInterface'
</s> add </s> remove 'AddressInfoBeta':
'type': 'object'
'description': 'Port information'
'required':
- 'ip'
- 'port'
'properties':
'ip':
'type': 'array'
'items':
'type': 'string'
'minItems': 1
'example':
- '127.0.0.1'
'port':
'type': 'integer'
'format': 'uint16'
'example': 53
</s> add </s> remove '/install/check_config_beta':
'post':
'tags':
- 'install'
'operationId': 'installCheckConfigBeta'
'summary': >
'UNSTABLE!: Checks configuration'
'requestBody':
'content':
'application/json':
'schema':
'$ref': '#/components/schemas/CheckConfigRequestBeta'
'description': 'Configuration to be checked'
'required': true
'responses':
'200':
'description': 'OK.'
'content':
'application/json':
'schema':
'$ref': '#/components/schemas/CheckConfigResponse'
'400':
'description': >
Failed to parse JSON or cannot listen on the specified address.
</s> add | [
"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/54a141abdeca00005a75f4af141645520b3f6b52 | openapi/openapi.yaml |
|
<mask> '$ref': '#/components/schemas/CheckConfigRequestInfo'
<mask> 'set_static_ip':
<mask> 'type': 'boolean'
<mask> 'example': false
<mask> 'CheckConfigRequestInfoBeta':
<mask> 'type': 'object'
<mask> 'properties':
<mask> 'ip':
<mask> 'type': 'array'
<mask> 'items':
<mask> 'type': 'string'
<mask> 'minItems': 1
<mask> 'example':
<mask> - '127.0.0.1'
<mask> 'port':
<mask> 'type': 'integer'
<mask> 'format': 'uint16'
<mask> 'example': 53
<mask> 'autofix':
<mask> 'type': 'boolean'
<mask> 'example': false
<mask> 'CheckConfigRequestInfo':
<mask> 'type': 'object'
<mask> 'properties':
<mask> 'ip':
<mask> 'type': 'string'
</s> Pull request 1717: remove-client2
Merge in DNS/adguard-home from remove-client2 to master
Squashed commit of the following:
commit 0a0923494b0d1003e4f02f3a5f93d5248f0f2ded
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 20 17:14:29 2023 +0300
all: rm old experimental beta (dir client2/)
This project was unfortunately abandoned. v0.108.0 will have a
different front-end and new APIs. </s> remove 'AddressInfoBeta':
'type': 'object'
'description': 'Port information'
'required':
- 'ip'
- 'port'
'properties':
'ip':
'type': 'array'
'items':
'type': 'string'
'minItems': 1
'example':
- '127.0.0.1'
'port':
'type': 'integer'
'format': 'uint16'
'example': 53
</s> add </s> remove 'AddressesInfoBeta':
'type': 'object'
'description': 'AdGuard Home addresses configuration'
'required':
- 'dns_port'
- 'web_port'
- 'interfaces'
'properties':
'dns_port':
'type': 'integer'
'format': 'uint16'
'example': 53
'web_port':
'type': 'integer'
'format': 'uint16'
'example': 80
'interfaces':
'type': 'array'
'description': >
Network interfaces dictionary, keys are interface names.
'items':
'$ref': '#/components/schemas/NetInterface'
</s> add </s> remove 'CheckConfigRequestBeta':
'type': 'object'
'description': 'Configuration to be checked'
'properties':
'dns':
'$ref': '#/components/schemas/CheckConfigRequestInfoBeta'
'web':
'$ref': '#/components/schemas/CheckConfigRequestInfoBeta'
'set_static_ip':
'type': 'boolean'
'example': false
</s> add </s> remove 'InitialConfigurationBeta':
'type': 'object'
'description': >
AdGuard Home initial configuration for the first-install wizard.
'required':
- 'dns'
- 'web'
- 'username'
- 'password'
'properties':
'dns':
'$ref': '#/components/schemas/AddressInfoBeta'
'web':
'$ref': '#/components/schemas/AddressInfoBeta'
'username':
'type': 'string'
'description': 'Basic auth username'
'example': 'admin'
'password':
'type': 'string'
'description': 'Basic auth password'
'example': 'password'
</s> add </s> remove '/install/get_addresses_beta':
'get':
'tags':
- 'install'
'operationId': 'installGetAddressesBeta'
'summary': >
'UNSTABLE!: Gets the network interfaces information.'
'responses':
'200':
'description': 'OK.'
'content':
'application/json':
'schema':
'$ref': '#/components/schemas/AddressesInfoBeta'
</s> add | [
"keep",
"keep",
"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/54a141abdeca00005a75f4af141645520b3f6b52 | openapi/openapi.yaml |
|
<mask> 'error':
<mask> 'type': 'string'
<mask> 'default': ''
<mask> 'description': 'Error text. Set if static=error'
<mask> 'InitialConfigurationBeta':
<mask> 'type': 'object'
<mask> 'description': >
<mask> AdGuard Home initial configuration for the first-install wizard.
<mask> 'required':
<mask> - 'dns'
<mask> - 'web'
<mask> - 'username'
<mask> - 'password'
<mask> 'properties':
<mask> 'dns':
<mask> '$ref': '#/components/schemas/AddressInfoBeta'
<mask> 'web':
<mask> '$ref': '#/components/schemas/AddressInfoBeta'
<mask> 'username':
<mask> 'type': 'string'
<mask> 'description': 'Basic auth username'
<mask> 'example': 'admin'
<mask> 'password':
<mask> 'type': 'string'
<mask> 'description': 'Basic auth password'
<mask> 'example': 'password'
<mask> 'InitialConfiguration':
<mask> 'type': 'object'
<mask> 'description': >
<mask> AdGuard Home initial configuration for the first-install wizard.
<mask> 'required':
</s> Pull request 1717: remove-client2
Merge in DNS/adguard-home from remove-client2 to master
Squashed commit of the following:
commit 0a0923494b0d1003e4f02f3a5f93d5248f0f2ded
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 20 17:14:29 2023 +0300
all: rm old experimental beta (dir client2/)
This project was unfortunately abandoned. v0.108.0 will have a
different front-end and new APIs. </s> remove 'AddressInfoBeta':
'type': 'object'
'description': 'Port information'
'required':
- 'ip'
- 'port'
'properties':
'ip':
'type': 'array'
'items':
'type': 'string'
'minItems': 1
'example':
- '127.0.0.1'
'port':
'type': 'integer'
'format': 'uint16'
'example': 53
</s> add </s> remove 'AddressesInfoBeta':
'type': 'object'
'description': 'AdGuard Home addresses configuration'
'required':
- 'dns_port'
- 'web_port'
- 'interfaces'
'properties':
'dns_port':
'type': 'integer'
'format': 'uint16'
'example': 53
'web_port':
'type': 'integer'
'format': 'uint16'
'example': 80
'interfaces':
'type': 'array'
'description': >
Network interfaces dictionary, keys are interface names.
'items':
'$ref': '#/components/schemas/NetInterface'
</s> add </s> remove 'CheckConfigRequestBeta':
'type': 'object'
'description': 'Configuration to be checked'
'properties':
'dns':
'$ref': '#/components/schemas/CheckConfigRequestInfoBeta'
'web':
'$ref': '#/components/schemas/CheckConfigRequestInfoBeta'
'set_static_ip':
'type': 'boolean'
'example': false
</s> add </s> remove 'CheckConfigRequestInfoBeta':
'type': 'object'
'properties':
'ip':
'type': 'array'
'items':
'type': 'string'
'minItems': 1
'example':
- '127.0.0.1'
'port':
'type': 'integer'
'format': 'uint16'
'example': 53
'autofix':
'type': 'boolean'
'example': false
</s> add </s> remove '/install/configure_beta':
'post':
'tags':
- 'install'
'operationId': 'installConfigureBeta'
'summary': >
'UNSTABLE!: Applies the initial configuration.'
'requestBody':
'content':
'application/json':
'schema':
'$ref': '#/components/schemas/InitialConfigurationBeta'
'description': 'Initial configuration JSON'
'required': true
'responses':
'200':
'description': 'OK.'
'400':
'description': >
Failed to parse initial configuration or cannot listen to the
specified addresses.
'500':
'description': 'Cannot start the DNS server'
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"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/54a141abdeca00005a75f4af141645520b3f6b52 | openapi/openapi.yaml |
|
<mask> then
<mask> make VERBOSE="$verbose" js-lint js-test
<mask> fi
<mask>
<mask> if [ "$( git diff --cached --name-only -- 'client2/*.js' 'client2/*.ts' 'client2/*.tsx' )" ]
<mask> then
<mask> make VERBOSE="$verbose" js-beta-lint js-beta-test
<mask> fi
<mask>
<mask> if [ "$( git diff --cached --name-only -- '*.go' '*.mod' '*.sh' 'Makefile' )" ]
<mask> then
<mask> make VERBOSE="$verbose" go-os-check go-lint go-test
<mask> fi
<mask>
</s> Pull request 1717: remove-client2
Merge in DNS/adguard-home from remove-client2 to master
Squashed commit of the following:
commit 0a0923494b0d1003e4f02f3a5f93d5248f0f2ded
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 20 17:14:29 2023 +0300
all: rm old experimental beta (dir client2/)
This project was unfortunately abandoned. v0.108.0 will have a
different front-end and new APIs. </s> remove addPorts(tcpPorts, tcpPort(config.BetaBindPort), port)
</s> add addPorts(tcpPorts, port) </s> remove $(YARN) $(YARN_FLAGS) build
</s> add </s> remove CLIENT_BETA_DIR = client2
</s> add </s> remove addPorts(tcpPorts, tcpPort(opts.bindPort), tcpPort(config.BetaBindPort))
</s> add addPorts(tcpPorts, tcpPort(opts.bindPort)) </s> remove clientBetaFS = os.DirFS("build2/static")
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/54a141abdeca00005a75f4af141645520b3f6b52 | scripts/hooks/pre-commit |
|
// Set the filter ID
log.Printf("Seting ID=%d for filter %s", NextFilterId, filter.URL)
filter.ID = NextFilterId
NextFilterId++ | <mask> for i := range config.Filters {
<mask>
<mask> filter := &config.Filters[i] // otherwise we will be operating on a copy
<mask>
<mask> log.Printf("Seting ID=%d for filter %s", i, filter.URL)
<mask> filter.ID = i + 1 // start with ID=1
<mask>
<mask> // Forcibly update the filter
<mask> _, err := filter.update(true)
<mask> if err != nil {
<mask> log.Fatal(err)
</s> Fix review comments: NextFilterId collisions </s> remove coreDnsPlugin.Reload <- true
</s> add corednsplugin.Reload <- true </s> remove filterId, err := strconv.Atoi(c.Val())
</s> add filterId, err := strconv.ParseInt(c.Val(), 10, 64) </s> remove var NextFilterId int
</s> add var NextFilterId = time.Now().Unix() </s> remove func (d *Dnsfilter) AddRule(input string, filterListID uint32) error {
</s> add func (d *Dnsfilter) AddRule(input string, filterListID int64) error { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/54bdacdde282a4b9b7dde55df7ed4aeda3df375d | app.go |
<mask> package main
<mask>
<mask> import (
<mask> "bytes"
<mask> "gopkg.in/yaml.v2"
<mask> "io/ioutil"
<mask> "log"
<mask> "os"
<mask> "path/filepath"
<mask> "regexp"
</s> Fix review comments: NextFilterId collisions </s> remove func (d *Dnsfilter) parseEtcHosts(input string, filterListID uint32) bool {
</s> add func (d *Dnsfilter) parseEtcHosts(input string, filterListID int64) bool { </s> remove func (d *Dnsfilter) AddRule(input string, filterListID uint32) error {
</s> add func (d *Dnsfilter) AddRule(input string, filterListID int64) error { </s> remove var NextFilterId int
</s> add var NextFilterId = time.Now().Unix() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/54bdacdde282a4b9b7dde55df7ed4aeda3df375d | config.go |
|
"gopkg.in/yaml.v2" | <mask> "regexp"
<mask> "sync"
<mask> "text/template"
<mask> "time"
<mask> )
<mask>
<mask> // Current schema version. We compare it with the value from
<mask> // the configuration file and perform necessary upgrade operations if needed
<mask> const SchemaVersion = 1
</s> Fix review comments: NextFilterId collisions </s> remove var NextFilterId int
</s> add var NextFilterId = time.Now().Unix() </s> remove func (d *Dnsfilter) AddRule(input string, filterListID uint32) error {
</s> add func (d *Dnsfilter) AddRule(input string, filterListID int64) error { </s> remove coreDnsPlugin "github.com/AdguardTeam/AdGuardHome/coredns_plugin"
</s> add corednsplugin "github.com/AdguardTeam/AdGuardHome/coredns_plugin" </s> remove log.Printf("Seting ID=%d for filter %s", i, filter.URL)
filter.ID = i + 1 // start with ID=1
</s> add // Set the filter ID
log.Printf("Seting ID=%d for filter %s", NextFilterId, filter.URL)
filter.ID = NextFilterId
NextFilterId++ | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/54bdacdde282a4b9b7dde55df7ed4aeda3df375d | config.go |
// User filter ID is always 0
const UserFilterId = 0
| <mask> const FiltersDir = "filters"
<mask>
<mask> // Just a counter that we use for incrementing the filter ID
<mask> var NextFilterId = time.Now().Unix()
<mask>
<mask> // configuration is loaded from YAML
</s> Fix review comments: NextFilterId collisions </s> remove var NextFilterId int
</s> add var NextFilterId = time.Now().Unix() </s> remove log.Printf("Seting ID=%d for filter %s", i, filter.URL)
filter.ID = i + 1 // start with ID=1
</s> add // Set the filter ID
log.Printf("Seting ID=%d for filter %s", NextFilterId, filter.URL)
filter.ID = NextFilterId
NextFilterId++ </s> remove FilterID uint32 `json:",omitempty"` // Filter ID the rule belongs to
</s> add FilterID int64 `json:",omitempty"` // Filter ID the rule belongs to </s> remove ID int `json:"id" yaml:"id"` // auto-assigned when filter is added (see NextFilterId)
</s> add ID int64 `json:"id" yaml:"id"` // auto-assigned when filter is added (see NextFilterId) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/54bdacdde282a4b9b7dde55df7ed4aeda3df375d | config.go |
var NextFilterId = time.Now().Unix() | <mask> // Directory where we'll store all downloaded filters contents
<mask> const FiltersDir = "filters"
<mask>
<mask> // Just a counter that we use for incrementing the filter ID
<mask> var NextFilterId int
<mask>
<mask> // configuration is loaded from YAML
<mask> type configuration struct {
<mask> // Config filename (can be overriden via the command line arguments)
<mask> ourConfigFilename string
</s> Fix review comments: NextFilterId collisions </s> remove log.Printf("Seting ID=%d for filter %s", i, filter.URL)
filter.ID = i + 1 // start with ID=1
</s> add // Set the filter ID
log.Printf("Seting ID=%d for filter %s", NextFilterId, filter.URL)
filter.ID = NextFilterId
NextFilterId++ </s> remove ID int `json:"id" yaml:"id"` // auto-assigned when filter is added (see NextFilterId)
</s> add ID int64 `json:"id" yaml:"id"` // auto-assigned when filter is added (see NextFilterId) </s> remove FilterID uint32 `json:",omitempty"` // Filter ID the rule belongs to
</s> add FilterID int64 `json:",omitempty"` // Filter ID the rule belongs to | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/54bdacdde282a4b9b7dde55df7ed4aeda3df375d | config.go |
ID int64 `yaml:"-"` | <mask> sync.RWMutex `yaml:"-"`
<mask> }
<mask>
<mask> type coreDnsFilter struct {
<mask> ID int `yaml:"-"`
<mask> Path string `yaml:"-"`
<mask> }
<mask>
<mask> type coreDNSConfig struct {
<mask> binaryFile string
</s> Fix review comments: NextFilterId collisions </s> remove ID uint32
</s> add ID int64 </s> remove ID int `json:"id" yaml:"id"` // auto-assigned when filter is added (see NextFilterId)
</s> add ID int64 `json:"id" yaml:"id"` // auto-assigned when filter is added (see NextFilterId) </s> remove var NextFilterId int
</s> add var NextFilterId = time.Now().Unix() </s> remove return filepath.Join(config.ourBinaryDir, config.ourDataDir, FiltersDir, strconv.Itoa(filter.ID)+".txt")
</s> add return filepath.Join(config.ourBinaryDir, config.ourDataDir, FiltersDir, strconv.FormatInt(filter.ID, 10)+".txt") </s> remove func (d *Dnsfilter) parseEtcHosts(input string, filterListID uint32) bool {
</s> add func (d *Dnsfilter) parseEtcHosts(input string, filterListID int64) bool { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/54bdacdde282a4b9b7dde55df7ed4aeda3df375d | config.go |
ID int64 `json:"id" yaml:"id"` // auto-assigned when filter is added (see NextFilterId) | <mask> UpstreamDNS []string `yaml:"upstream_dns"`
<mask> }
<mask>
<mask> type filter struct {
<mask> ID int `json:"id" yaml:"id"` // auto-assigned when filter is added (see NextFilterId)
<mask> URL string `json:"url"`
<mask> Name string `json:"name" yaml:"name"`
<mask> Enabled bool `json:"enabled"`
<mask> RulesCount int `json:"rulesCount" yaml:"-"`
<mask> contents []byte
</s> Fix review comments: NextFilterId collisions </s> remove ID int `yaml:"-"`
</s> add ID int64 `yaml:"-"` </s> remove var NextFilterId int
</s> add var NextFilterId = time.Now().Unix() </s> remove ID uint32
</s> add ID int64 </s> remove return filepath.Join(config.ourBinaryDir, config.ourDataDir, FiltersDir, strconv.Itoa(filter.ID)+".txt")
</s> add return filepath.Join(config.ourBinaryDir, config.ourDataDir, FiltersDir, strconv.FormatInt(filter.ID, 10)+".txt") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/54bdacdde282a4b9b7dde55df7ed4aeda3df375d | config.go |
// User filter always has constant ID=0
ID: UserFilterId, | <mask> contents = append(contents, '\n')
<mask> }
<mask>
<mask> userFilter := filter{
<mask> // User filter always has ID=0
<mask> ID: 0,
<mask> contents: contents,
<mask> Enabled: true,
<mask> }
<mask>
<mask> return userFilter
</s> Fix review comments: NextFilterId collisions </s> remove ID: uint32(filterId),
</s> add ID: filterId, </s> remove return filepath.Join(config.ourBinaryDir, config.ourDataDir, FiltersDir, strconv.Itoa(filter.ID)+".txt")
</s> add return filepath.Join(config.ourBinaryDir, config.ourDataDir, FiltersDir, strconv.FormatInt(filter.ID, 10)+".txt") </s> remove ID int `json:"id" yaml:"id"` // auto-assigned when filter is added (see NextFilterId)
</s> add ID int64 `json:"id" yaml:"id"` // auto-assigned when filter is added (see NextFilterId) </s> remove log.Printf("Seting ID=%d for filter %s", i, filter.URL)
filter.ID = i + 1 // start with ID=1
</s> add // Set the filter ID
log.Printf("Seting ID=%d for filter %s", NextFilterId, filter.URL)
filter.ID = NextFilterId
NextFilterId++ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/54bdacdde282a4b9b7dde55df7ed4aeda3df375d | config.go |
corednsplugin "github.com/AdguardTeam/AdGuardHome/coredns_plugin" | <mask> "strconv"
<mask> "strings"
<mask> "time"
<mask>
<mask> coreDnsPlugin "github.com/AdguardTeam/AdGuardHome/coredns_plugin"
<mask> "github.com/miekg/dns"
<mask> "gopkg.in/asaskevich/govalidator.v4"
<mask> )
<mask>
<mask> const updatePeriod = time.Minute * 30
</s> Fix review comments: NextFilterId collisions </s> remove ID uint32
</s> add ID int64 </s> remove var NextFilterId int
</s> add var NextFilterId = time.Now().Unix() </s> remove func (d *Dnsfilter) parseEtcHosts(input string, filterListID uint32) bool {
</s> add func (d *Dnsfilter) parseEtcHosts(input string, filterListID int64) bool { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/54bdacdde282a4b9b7dde55df7ed4aeda3df375d | control.go |
corednsplugin.Reload <- true | <mask> // -------------------
<mask> // coredns run control
<mask> // -------------------
<mask> func tellCoreDNSToReload() {
<mask> coreDnsPlugin.Reload <- true
<mask> }
<mask>
<mask> func writeAllConfigsAndReloadCoreDNS() error {
<mask> err := writeAllConfigs()
<mask> if err != nil {
</s> Fix review comments: NextFilterId collisions </s> remove filterId, err := strconv.Atoi(c.Val())
</s> add filterId, err := strconv.ParseInt(c.Val(), 10, 64) </s> remove log.Printf("Seting ID=%d for filter %s", i, filter.URL)
filter.ID = i + 1 // start with ID=1
</s> add // Set the filter ID
log.Printf("Seting ID=%d for filter %s", NextFilterId, filter.URL)
filter.ID = NextFilterId
NextFilterId++ </s> remove func (d *Dnsfilter) AddRule(input string, filterListID uint32) error {
</s> add func (d *Dnsfilter) AddRule(input string, filterListID int64) error { </s> remove func (d *Dnsfilter) parseEtcHosts(input string, filterListID uint32) bool {
</s> add func (d *Dnsfilter) parseEtcHosts(input string, filterListID int64) bool { </s> remove return filepath.Join(config.ourBinaryDir, config.ourDataDir, FiltersDir, strconv.Itoa(filter.ID)+".txt")
</s> add return filepath.Join(config.ourBinaryDir, config.ourDataDir, FiltersDir, strconv.FormatInt(filter.ID, 10)+".txt") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/54bdacdde282a4b9b7dde55df7ed4aeda3df375d | control.go |
return filepath.Join(config.ourBinaryDir, config.ourDataDir, FiltersDir, strconv.FormatInt(filter.ID, 10)+".txt") | <mask> }
<mask>
<mask> // Path to the filter contents
<mask> func (filter *filter) getFilterFilePath() string {
<mask> return filepath.Join(config.ourBinaryDir, config.ourDataDir, FiltersDir, strconv.Itoa(filter.ID)+".txt")
<mask> }
<mask>
<mask> // ------------
<mask> // safebrowsing
<mask> // ------------
</s> Fix review comments: NextFilterId collisions </s> remove FilterID uint32 `json:",omitempty"` // Filter ID the rule belongs to
</s> add FilterID int64 `json:",omitempty"` // Filter ID the rule belongs to </s> remove // User filter always has ID=0
ID: 0,
</s> add // User filter always has constant ID=0
ID: UserFilterId, </s> remove var NextFilterId int
</s> add var NextFilterId = time.Now().Unix() </s> remove coreDnsPlugin.Reload <- true
</s> add corednsplugin.Reload <- true </s> remove ID int `json:"id" yaml:"id"` // auto-assigned when filter is added (see NextFilterId)
</s> add ID int64 `json:"id" yaml:"id"` // auto-assigned when filter is added (see NextFilterId) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/54bdacdde282a4b9b7dde55df7ed4aeda3df375d | control.go |
http.HandleFunc("/control/querylog", optionalAuth(ensureGET(corednsplugin.HandleQueryLog))) | <mask> func registerControlHandlers() {
<mask> http.HandleFunc("/control/status", optionalAuth(ensureGET(handleStatus)))
<mask> http.HandleFunc("/control/enable_protection", optionalAuth(ensurePOST(handleProtectionEnable)))
<mask> http.HandleFunc("/control/disable_protection", optionalAuth(ensurePOST(handleProtectionDisable)))
<mask> http.HandleFunc("/control/querylog", optionalAuth(ensureGET(coreDnsPlugin.HandleQueryLog)))
<mask> http.HandleFunc("/control/querylog_enable", optionalAuth(ensurePOST(handleQueryLogEnable)))
<mask> http.HandleFunc("/control/querylog_disable", optionalAuth(ensurePOST(handleQueryLogDisable)))
<mask> http.HandleFunc("/control/set_upstream_dns", optionalAuth(ensurePOST(handleSetUpstreamDNS)))
<mask> http.HandleFunc("/control/test_upstream_dns", optionalAuth(ensurePOST(handleTestUpstreamDNS)))
<mask> http.HandleFunc("/control/stats_top", optionalAuth(ensureGET(coreDnsPlugin.HandleStatsTop)))
</s> Fix review comments: NextFilterId collisions </s> remove http.HandleFunc("/control/stats_top", optionalAuth(ensureGET(coreDnsPlugin.HandleStatsTop)))
http.HandleFunc("/control/stats", optionalAuth(ensureGET(coreDnsPlugin.HandleStats)))
http.HandleFunc("/control/stats_history", optionalAuth(ensureGET(coreDnsPlugin.HandleStatsHistory)))
http.HandleFunc("/control/stats_reset", optionalAuth(ensurePOST(coreDnsPlugin.HandleStatsReset)))
</s> add http.HandleFunc("/control/stats_top", optionalAuth(ensureGET(corednsplugin.HandleStatsTop)))
http.HandleFunc("/control/stats", optionalAuth(ensureGET(corednsplugin.HandleStats)))
http.HandleFunc("/control/stats_history", optionalAuth(ensureGET(corednsplugin.HandleStatsHistory)))
http.HandleFunc("/control/stats_reset", optionalAuth(ensurePOST(corednsplugin.HandleStatsReset))) </s> remove coreDnsPlugin.Reload <- true
</s> add corednsplugin.Reload <- true </s> remove func (d *Dnsfilter) parseEtcHosts(input string, filterListID uint32) bool {
</s> add func (d *Dnsfilter) parseEtcHosts(input string, filterListID int64) bool { </s> remove func (d *Dnsfilter) AddRule(input string, filterListID uint32) error {
</s> add func (d *Dnsfilter) AddRule(input string, filterListID int64) error { </s> remove return filepath.Join(config.ourBinaryDir, config.ourDataDir, FiltersDir, strconv.Itoa(filter.ID)+".txt")
</s> add return filepath.Join(config.ourBinaryDir, config.ourDataDir, FiltersDir, strconv.FormatInt(filter.ID, 10)+".txt") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/54bdacdde282a4b9b7dde55df7ed4aeda3df375d | control.go |
http.HandleFunc("/control/stats_top", optionalAuth(ensureGET(corednsplugin.HandleStatsTop)))
http.HandleFunc("/control/stats", optionalAuth(ensureGET(corednsplugin.HandleStats)))
http.HandleFunc("/control/stats_history", optionalAuth(ensureGET(corednsplugin.HandleStatsHistory)))
http.HandleFunc("/control/stats_reset", optionalAuth(ensurePOST(corednsplugin.HandleStatsReset))) | <mask> http.HandleFunc("/control/querylog_enable", optionalAuth(ensurePOST(handleQueryLogEnable)))
<mask> http.HandleFunc("/control/querylog_disable", optionalAuth(ensurePOST(handleQueryLogDisable)))
<mask> http.HandleFunc("/control/set_upstream_dns", optionalAuth(ensurePOST(handleSetUpstreamDNS)))
<mask> http.HandleFunc("/control/test_upstream_dns", optionalAuth(ensurePOST(handleTestUpstreamDNS)))
<mask> http.HandleFunc("/control/stats_top", optionalAuth(ensureGET(coreDnsPlugin.HandleStatsTop)))
<mask> http.HandleFunc("/control/stats", optionalAuth(ensureGET(coreDnsPlugin.HandleStats)))
<mask> http.HandleFunc("/control/stats_history", optionalAuth(ensureGET(coreDnsPlugin.HandleStatsHistory)))
<mask> http.HandleFunc("/control/stats_reset", optionalAuth(ensurePOST(coreDnsPlugin.HandleStatsReset)))
<mask> http.HandleFunc("/control/version.json", optionalAuth(handleGetVersionJSON))
<mask> http.HandleFunc("/control/filtering/enable", optionalAuth(ensurePOST(handleFilteringEnable)))
<mask> http.HandleFunc("/control/filtering/disable", optionalAuth(ensurePOST(handleFilteringDisable)))
<mask> http.HandleFunc("/control/filtering/add_url", optionalAuth(ensurePUT(handleFilteringAddURL)))
<mask> http.HandleFunc("/control/filtering/remove_url", optionalAuth(ensureDELETE(handleFilteringRemoveURL)))
</s> Fix review comments: NextFilterId collisions </s> remove http.HandleFunc("/control/querylog", optionalAuth(ensureGET(coreDnsPlugin.HandleQueryLog)))
</s> add http.HandleFunc("/control/querylog", optionalAuth(ensureGET(corednsplugin.HandleQueryLog))) </s> remove func (d *Dnsfilter) parseEtcHosts(input string, filterListID uint32) bool {
</s> add func (d *Dnsfilter) parseEtcHosts(input string, filterListID int64) bool { </s> remove coreDnsPlugin "github.com/AdguardTeam/AdGuardHome/coredns_plugin"
</s> add corednsplugin "github.com/AdguardTeam/AdGuardHome/coredns_plugin" </s> remove "gopkg.in/yaml.v2"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/54bdacdde282a4b9b7dde55df7ed4aeda3df375d | control.go |
ID int64 | <mask> lookupCache = map[string]cacheEntry{}
<mask> )
<mask>
<mask> type plugFilter struct {
<mask> ID uint32
<mask> Path string
<mask> }
<mask>
<mask> type plugSettings struct {
<mask> SafeBrowsingBlockHost string
</s> Fix review comments: NextFilterId collisions </s> remove ID int `yaml:"-"`
</s> add ID int64 `yaml:"-"` </s> remove ID int `json:"id" yaml:"id"` // auto-assigned when filter is added (see NextFilterId)
</s> add ID int64 `json:"id" yaml:"id"` // auto-assigned when filter is added (see NextFilterId) </s> remove var NextFilterId int
</s> add var NextFilterId = time.Now().Unix() </s> remove return filepath.Join(config.ourBinaryDir, config.ourDataDir, FiltersDir, strconv.Itoa(filter.ID)+".txt")
</s> add return filepath.Join(config.ourBinaryDir, config.ourDataDir, FiltersDir, strconv.FormatInt(filter.ID, 10)+".txt") </s> remove listID uint32
</s> add listID int64 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/54bdacdde282a4b9b7dde55df7ed4aeda3df375d | coredns_plugin/coredns_plugin.go |
filterId, err := strconv.ParseInt(c.Val(), 10, 64) | <mask> if !c.NextArg() {
<mask> return nil, c.ArgErr()
<mask> }
<mask>
<mask> filterId, err := strconv.Atoi(c.Val())
<mask> if err != nil {
<mask> return nil, c.ArgErr()
<mask> }
<mask> if !c.NextArg() {
<mask> return nil, c.ArgErr()
</s> Fix review comments: NextFilterId collisions </s> remove coreDnsPlugin.Reload <- true
</s> add corednsplugin.Reload <- true </s> remove func (d *Dnsfilter) parseEtcHosts(input string, filterListID uint32) bool {
</s> add func (d *Dnsfilter) parseEtcHosts(input string, filterListID int64) bool { </s> remove log.Printf("Seting ID=%d for filter %s", i, filter.URL)
filter.ID = i + 1 // start with ID=1
</s> add // Set the filter ID
log.Printf("Seting ID=%d for filter %s", NextFilterId, filter.URL)
filter.ID = NextFilterId
NextFilterId++ </s> remove return filepath.Join(config.ourBinaryDir, config.ourDataDir, FiltersDir, strconv.Itoa(filter.ID)+".txt")
</s> add return filepath.Join(config.ourBinaryDir, config.ourDataDir, FiltersDir, strconv.FormatInt(filter.ID, 10)+".txt") </s> remove FilterID uint32 `json:",omitempty"` // Filter ID the rule belongs to
</s> add FilterID int64 `json:",omitempty"` // Filter ID the rule belongs to | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/54bdacdde282a4b9b7dde55df7ed4aeda3df375d | coredns_plugin/coredns_plugin.go |
ID: filterId, | <mask> filterPath := c.Val()
<mask>
<mask> // Initialize filter and add it to the list
<mask> p.settings.Filters = append(p.settings.Filters, plugFilter{
<mask> ID: uint32(filterId),
<mask> Path: filterPath,
<mask> })
<mask> }
<mask> }
<mask> }
</s> Fix review comments: NextFilterId collisions </s> remove // User filter always has ID=0
ID: 0,
</s> add // User filter always has constant ID=0
ID: UserFilterId, </s> remove func (d *Dnsfilter) AddRule(input string, filterListID uint32) error {
</s> add func (d *Dnsfilter) AddRule(input string, filterListID int64) error { </s> remove return filepath.Join(config.ourBinaryDir, config.ourDataDir, FiltersDir, strconv.Itoa(filter.ID)+".txt")
</s> add return filepath.Join(config.ourBinaryDir, config.ourDataDir, FiltersDir, strconv.FormatInt(filter.ID, 10)+".txt") </s> remove FilterID uint32 `json:",omitempty"` // Filter ID the rule belongs to
</s> add FilterID int64 `json:",omitempty"` // Filter ID the rule belongs to | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/54bdacdde282a4b9b7dde55df7ed4aeda3df375d | coredns_plugin/coredns_plugin.go |
listID int64 | <mask> isWhitelist bool
<mask> isImportant bool
<mask>
<mask> // user-supplied data
<mask> listID uint32
<mask>
<mask> // suffix matching
<mask> isSuffix bool
<mask> suffix string
<mask>
</s> Fix review comments: NextFilterId collisions </s> remove FilterID uint32 `json:",omitempty"` // Filter ID the rule belongs to
</s> add FilterID int64 `json:",omitempty"` // Filter ID the rule belongs to </s> remove func (d *Dnsfilter) parseEtcHosts(input string, filterListID uint32) bool {
</s> add func (d *Dnsfilter) parseEtcHosts(input string, filterListID int64) bool { </s> remove ID int `json:"id" yaml:"id"` // auto-assigned when filter is added (see NextFilterId)
</s> add ID int64 `json:"id" yaml:"id"` // auto-assigned when filter is added (see NextFilterId) </s> remove func (d *Dnsfilter) AddRule(input string, filterListID uint32) error {
</s> add func (d *Dnsfilter) AddRule(input string, filterListID int64) error { </s> remove ID uint32
</s> add ID int64 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/54bdacdde282a4b9b7dde55df7ed4aeda3df375d | dnsfilter/dnsfilter.go |
FilterID int64 `json:",omitempty"` // Filter ID the rule belongs to | <mask> IsFiltered bool `json:",omitempty"` // True if the host name is filtered
<mask> Reason Reason `json:",omitempty"` // Reason for blocking / unblocking
<mask> Rule string `json:",omitempty"` // Original rule text
<mask> Ip net.IP `json:",omitempty"` // Not nil only in the case of a hosts file syntax
<mask> FilterID uint32 `json:",omitempty"` // Filter ID the rule belongs to
<mask> }
<mask>
<mask> // Matched can be used to see if any match at all was found, no matter filtered or not
<mask> func (r Reason) Matched() bool {
<mask> return r != NotFilteredNotFound
</s> Fix review comments: NextFilterId collisions </s> remove func (d *Dnsfilter) parseEtcHosts(input string, filterListID uint32) bool {
</s> add func (d *Dnsfilter) parseEtcHosts(input string, filterListID int64) bool { </s> remove func (d *Dnsfilter) AddRule(input string, filterListID uint32) error {
</s> add func (d *Dnsfilter) AddRule(input string, filterListID int64) error { </s> remove return filepath.Join(config.ourBinaryDir, config.ourDataDir, FiltersDir, strconv.Itoa(filter.ID)+".txt")
</s> add return filepath.Join(config.ourBinaryDir, config.ourDataDir, FiltersDir, strconv.FormatInt(filter.ID, 10)+".txt") </s> remove listID uint32
</s> add listID int64 </s> remove log.Printf("Seting ID=%d for filter %s", i, filter.URL)
filter.ID = i + 1 // start with ID=1
</s> add // Set the filter ID
log.Printf("Seting ID=%d for filter %s", NextFilterId, filter.URL)
filter.ID = NextFilterId
NextFilterId++ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/54bdacdde282a4b9b7dde55df7ed4aeda3df375d | dnsfilter/dnsfilter.go |
func (d *Dnsfilter) AddRule(input string, filterListID int64) error { | <mask> // Adding rule and matching against the rules
<mask> //
<mask>
<mask> // AddRule adds a rule, checking if it is a valid rule first and if it wasn't added already
<mask> func (d *Dnsfilter) AddRule(input string, filterListID uint32) error {
<mask> input = strings.TrimSpace(input)
<mask> d.storageMutex.RLock()
<mask> _, exists := d.storage[input]
<mask> d.storageMutex.RUnlock()
<mask> if exists {
</s> Fix review comments: NextFilterId collisions </s> remove func (d *Dnsfilter) parseEtcHosts(input string, filterListID uint32) bool {
</s> add func (d *Dnsfilter) parseEtcHosts(input string, filterListID int64) bool { </s> remove FilterID uint32 `json:",omitempty"` // Filter ID the rule belongs to
</s> add FilterID int64 `json:",omitempty"` // Filter ID the rule belongs to </s> remove coreDnsPlugin.Reload <- true
</s> add corednsplugin.Reload <- true </s> remove ID: uint32(filterId),
</s> add ID: filterId, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/54bdacdde282a4b9b7dde55df7ed4aeda3df375d | dnsfilter/dnsfilter.go |
func (d *Dnsfilter) parseEtcHosts(input string, filterListID int64) bool { | <mask> return nil
<mask> }
<mask>
<mask> // Parses the hosts-syntax rules. Returns false if the input string is not of hosts-syntax.
<mask> func (d *Dnsfilter) parseEtcHosts(input string, filterListID uint32) bool {
<mask> // Strip the trailing comment
<mask> ruleText := input
<mask> if pos := strings.IndexByte(ruleText, '#'); pos != -1 {
<mask> ruleText = ruleText[0:pos]
<mask> }
</s> Fix review comments: NextFilterId collisions </s> remove func (d *Dnsfilter) AddRule(input string, filterListID uint32) error {
</s> add func (d *Dnsfilter) AddRule(input string, filterListID int64) error { </s> remove FilterID uint32 `json:",omitempty"` // Filter ID the rule belongs to
</s> add FilterID int64 `json:",omitempty"` // Filter ID the rule belongs to </s> remove coreDnsPlugin.Reload <- true
</s> add corednsplugin.Reload <- true </s> remove filterId, err := strconv.Atoi(c.Val())
</s> add filterId, err := strconv.ParseInt(c.Val(), 10, 64) </s> remove log.Printf("Seting ID=%d for filter %s", i, filter.URL)
filter.ID = i + 1 // start with ID=1
</s> add // Set the filter ID
log.Printf("Seting ID=%d for filter %s", NextFilterId, filter.URL)
filter.ID = NextFilterId
NextFilterId++ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/54bdacdde282a4b9b7dde55df7ed4aeda3df375d | dnsfilter/dnsfilter.go |
<mask> "strings"
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghio"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghos"
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> // systemResolvers implementation differs for Windows since Go's resolver
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove "syscall"
</s> add "strconv"
"strings"
"github.com/AdguardTeam/golibs/log" </s> remove "syscall"
</s> add </s> remove log.Debug("Sent signal to PID %d", pid)
</s> add log.Debug("sent signal to PID %d", pid) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f | internal/aghnet/systemresolvers_windows.go |
|
<mask> if err != nil {
<mask> return nil, fmt.Errorf("getting the command's stdout pipe: %w", err)
<mask> }
<mask>
<mask> var stdoutLimited io.Reader
<mask> stdoutLimited, err = aghio.LimitReader(stdout, aghos.MaxCmdOutputSize)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("limiting stdout reader: %w", err)
<mask> }
<mask>
<mask> go writeExit(stdin)
<mask>
<mask> err = cmd.Start()
<mask> if err != nil {
<mask> return nil, fmt.Errorf("start command executing: %w", err)
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove s := bufio.NewScanner(stdoutLimited)
</s> add s := bufio.NewScanner(stdout) </s> remove err = aghos.SendProcessSignal(pid, syscall.SIGHUP)
if err != nil {
log.Error("Can't send signal to PID %d: %s", pid, err)
</s> add if err = proc.Signal(syscall.SIGHUP); err != nil {
log.Error("Can't send signal to pid %d: %s", pid, err)
</s> remove pid, err := strconv.Atoi(strings.TrimSpace(parts[0]))
if err != nil {
log.Error("Can't read PID file %s: %s", pidfile, err)
</s> add var proc *os.Process
if proc, err = os.FindProcess(pid); err != nil {
log.Error("can't send signal to pid %d: %s", pid, err)
</s> remove parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("Can't read PID file %s: bad value", pidfile)
return
</s> add } else {
parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("can't read pid file %s: bad value", pidfile)
return
}
if pid, err = strconv.Atoi(strings.TrimSpace(parts[0])); err != nil {
log.Error("can't read pid file %s: %s", pidfile, err)
return
} </s> remove
data = []byte(psdata)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f | internal/aghnet/systemresolvers_windows.go |
|
s := bufio.NewScanner(stdout) | <mask> if err != nil {
<mask> return nil, fmt.Errorf("start command executing: %w", err)
<mask> }
<mask>
<mask> s := bufio.NewScanner(stdoutLimited)
<mask> addrs = scanAddrs(s)
<mask>
<mask> err = cmd.Wait()
<mask> if err != nil {
<mask> return nil, fmt.Errorf("executing the command: %w", err)
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove var stdoutLimited io.Reader
stdoutLimited, err = aghio.LimitReader(stdout, aghos.MaxCmdOutputSize)
if err != nil {
return nil, fmt.Errorf("limiting stdout reader: %w", err)
}
</s> add </s> remove parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("Can't read PID file %s: bad value", pidfile)
return
</s> add } else {
parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("can't read pid file %s: bad value", pidfile)
return
}
if pid, err = strconv.Atoi(strings.TrimSpace(parts[0])); err != nil {
log.Error("can't read pid file %s: %s", pidfile, err)
return
} </s> remove pid, err := strconv.Atoi(strings.TrimSpace(parts[0]))
if err != nil {
log.Error("Can't read PID file %s: %s", pidfile, err)
</s> add var proc *os.Process
if proc, err = os.FindProcess(pid); err != nil {
log.Error("can't send signal to pid %d: %s", pid, err)
</s> remove }
</s> add </s> remove err = aghos.SendProcessSignal(pid, syscall.SIGHUP)
if err != nil {
log.Error("Can't send signal to PID %d: %s", pid, err)
</s> add if err = proc.Signal(syscall.SIGHUP); err != nil {
log.Error("Can't send signal to pid %d: %s", pid, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f | internal/aghnet/systemresolvers_windows.go |
"bufio" | <mask>
<mask> import (
<mask> "fmt"
<mask> "io"
<mask> "os/exec"
<mask> "path"
<mask> "runtime"
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove "syscall"
</s> add "strconv"
"strings"
"github.com/AdguardTeam/golibs/log" </s> remove "syscall"
</s> add </s> remove command_args="-P ${pidfile} -f -r {{.WorkingDirectory}}/{{.Name}}"
</s> add command_args="-p ${pidfile} -f -r {{.WorkingDirectory}}/{{.Name}}" | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f | internal/aghos/os.go |
"io" | <mask> "bufio"
<mask> "fmt"
<mask> "os/exec"
<mask> "path"
<mask> "runtime"
<mask> "strconv"
<mask> "strings"
<mask>
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove "syscall"
</s> add "strconv"
"strings"
"github.com/AdguardTeam/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghio"
"github.com/AdguardTeam/AdGuardHome/internal/aghos"
</s> add </s> remove log.Debug("Sent signal to PID %d", pid)
</s> add log.Debug("sent signal to PID %d", pid) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f | internal/aghos/os.go |
"path" | <mask> "bufio"
<mask> "fmt"
<mask> "io"
<mask> "os/exec"
<mask> "runtime"
<mask> "strconv"
<mask> "strings"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove "syscall"
</s> add "strconv"
"strings"
"github.com/AdguardTeam/golibs/log" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghio"
"github.com/AdguardTeam/AdGuardHome/internal/aghos"
</s> add </s> remove log.Debug("Sent signal to PID %d", pid)
</s> add log.Debug("sent signal to PID %d", pid) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f | internal/aghos/os.go |
"strconv"
"strings"
"github.com/AdguardTeam/golibs/log" | <mask> import (
<mask> "fmt"
<mask> "os/exec"
<mask> "runtime"
<mask> "syscall"
<mask> )
<mask>
<mask> // UnsupportedError is returned by functions and methods when a particular
<mask> // operation Op cannot be performed on the current OS.
<mask> type UnsupportedError struct {
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove "syscall"
</s> add </s> remove // SendProcessSignal sends signal to a process.
func SendProcessSignal(pid int, sig syscall.Signal) error {
return sendProcessSignal(pid, sig)
}
</s> add </s> remove log.Debug("Sent signal to PID %d", pid)
</s> add log.Debug("sent signal to PID %d", pid) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f | internal/aghos/os.go |
<mask> func HaveAdminRights() (bool, error) {
<mask> return haveAdminRights()
<mask> }
<mask>
<mask> // SendProcessSignal sends signal to a process.
<mask> func SendProcessSignal(pid int, sig syscall.Signal) error {
<mask> return sendProcessSignal(pid, sig)
<mask> }
<mask>
<mask> // MaxCmdOutputSize is the maximum length of performed shell command output.
<mask> const MaxCmdOutputSize = 2 * 1024
<mask>
<mask> // RunCommand runs shell command.
<mask> func RunCommand(command string, arguments ...string) (int, string, error) {
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return syscall.Kill(pid, sig)
}
</s> add </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return syscall.Kill(pid, sig)
}
</s> add </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return syscall.Kill(pid, sig)
}
</s> add </s> remove log.Debug("Sent signal to PID %d", pid)
</s> add log.Debug("sent signal to PID %d", pid) </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return Unsupported("kill")
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f | internal/aghos/os.go |
|
<mask> func haveAdminRights() (bool, error) {
<mask> return os.Getuid() == 0, nil
<mask> }
<mask>
<mask> func sendProcessSignal(pid int, sig syscall.Signal) error {
<mask> return syscall.Kill(pid, sig)
<mask> }
<mask>
<mask> func isOpenWrt() (ok bool) {
<mask> return false
<mask> }
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return syscall.Kill(pid, sig)
}
</s> add </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return syscall.Kill(pid, sig)
}
</s> add </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return Unsupported("kill")
}
</s> add </s> remove // SendProcessSignal sends signal to a process.
func SendProcessSignal(pid int, sig syscall.Signal) error {
return sendProcessSignal(pid, sig)
}
</s> add </s> remove "syscall"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f | internal/aghos/os_bsd.go |
|
<mask> func haveAdminRights() (bool, error) {
<mask> return os.Getuid() == 0, nil
<mask> }
<mask>
<mask> func sendProcessSignal(pid int, sig syscall.Signal) error {
<mask> return syscall.Kill(pid, sig)
<mask> }
<mask>
<mask> func isOpenWrt() (ok bool) {
<mask> return false
<mask> }
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f | internal/aghos/os_freebsd.go |
|
<mask> // requires returning an error.
<mask> return os.Getuid() == 0, nil
<mask> }
<mask>
<mask> func sendProcessSignal(pid int, sig syscall.Signal) error {
<mask> return syscall.Kill(pid, sig)
<mask> }
<mask>
<mask> func isOpenWrt() (ok bool) {
<mask> var err error
<mask> ok, err = FileWalker(func(r io.Reader) (_ []string, cont bool, err error) {
<mask> const osNameData = "openwrt"
<mask>
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return syscall.Kill(pid, sig)
}
</s> add </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return syscall.Kill(pid, sig)
}
</s> add </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return Unsupported("kill")
}
</s> add </s> remove // SendProcessSignal sends signal to a process.
func SendProcessSignal(pid int, sig syscall.Signal) error {
return sendProcessSignal(pid, sig)
}
</s> add </s> remove parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("Can't read PID file %s: bad value", pidfile)
return
</s> add } else {
parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("can't read pid file %s: bad value", pidfile)
return
}
if pid, err = strconv.Atoi(strings.TrimSpace(parts[0])); err != nil {
log.Error("can't read pid file %s: %s", pidfile, err)
return
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f | internal/aghos/os_linux.go |
|
<mask>
<mask> package aghos
<mask>
<mask> import (
<mask> "syscall"
<mask>
<mask> "golang.org/x/sys/windows"
<mask> )
<mask>
<mask> func setRlimit(val uint64) (err error) {
<mask> return Unsupported("setrlimit")
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove "syscall"
</s> add "strconv"
"strings"
"github.com/AdguardTeam/golibs/log" </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return syscall.Kill(pid, sig)
}
</s> add </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return syscall.Kill(pid, sig)
}
</s> add </s> remove // SendProcessSignal sends signal to a process.
func SendProcessSignal(pid int, sig syscall.Signal) error {
return sendProcessSignal(pid, sig)
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f | internal/aghos/os_windows.go |
|
<mask> }
<mask> return true, nil
<mask> }
<mask>
<mask> func sendProcessSignal(pid int, sig syscall.Signal) error {
<mask> return Unsupported("kill")
<mask> }
<mask>
<mask> func isOpenWrt() (ok bool) {
<mask> return false
<mask> }
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return syscall.Kill(pid, sig)
}
</s> add </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return syscall.Kill(pid, sig)
}
</s> add </s> remove func sendProcessSignal(pid int, sig syscall.Signal) error {
return syscall.Kill(pid, sig)
}
</s> add </s> remove // SendProcessSignal sends signal to a process.
func SendProcessSignal(pid int, sig syscall.Signal) error {
return sendProcessSignal(pid, sig)
}
</s> add </s> remove parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("Can't read PID file %s: bad value", pidfile)
return
</s> add } else {
parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("can't read pid file %s: bad value", pidfile)
return
}
if pid, err = strconv.Atoi(strings.TrimSpace(parts[0])); err != nil {
log.Error("can't read pid file %s: %s", pidfile, err)
return
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f | internal/aghos/os_windows.go |
|
var pid int | <mask> }
<mask>
<mask> pidfile := fmt.Sprintf("/var/run/%s.pid", serviceName)
<mask> data, err := os.ReadFile(pidfile)
<mask> if errors.Is(err, os.ErrNotExist) {
<mask> if pid, err = aghos.PIDByCommand(serviceName, os.Getpid()); err != nil {
<mask> log.Error("finding AdGuardHome process: %s", err)
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove var code int
var psdata string
code, psdata, err = aghos.RunCommand("ps", "-C", serviceName, "-o", "pid=")
if err != nil || code != 0 {
log.Error("finding AdGuardHome process: code: %d, error: %s", code, err)
</s> add if pid, err = aghos.PIDByCommand(serviceName, os.Getpid()); err != nil {
log.Error("finding AdGuardHome process: %s", err) </s> remove
data = []byte(psdata)
</s> add </s> remove parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("Can't read PID file %s: bad value", pidfile)
return
</s> add } else {
parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("can't read pid file %s: bad value", pidfile)
return
}
if pid, err = strconv.Atoi(strings.TrimSpace(parts[0])); err != nil {
log.Error("can't read pid file %s: %s", pidfile, err)
return
} </s> remove pid, err := strconv.Atoi(strings.TrimSpace(parts[0]))
if err != nil {
log.Error("Can't read PID file %s: %s", pidfile, err)
</s> add var proc *os.Process
if proc, err = os.FindProcess(pid); err != nil {
log.Error("can't send signal to pid %d: %s", pid, err)
</s> remove s := bufio.NewScanner(stdoutLimited)
</s> add s := bufio.NewScanner(stdout) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f | internal/home/service.go |
if pid, err = aghos.PIDByCommand(serviceName, os.Getpid()); err != nil {
log.Error("finding AdGuardHome process: %s", err) | <mask>
<mask> pidfile := fmt.Sprintf("/var/run/%s.pid", serviceName)
<mask> data, err := os.ReadFile(pidfile)
<mask> if errors.Is(err, os.ErrNotExist) {
<mask> var code int
<mask> var psdata string
<mask> code, psdata, err = aghos.RunCommand("ps", "-C", serviceName, "-o", "pid=")
<mask> if err != nil || code != 0 {
<mask> log.Error("finding AdGuardHome process: code: %d, error: %s", code, err)
<mask>
<mask> return
<mask> }
<mask>
<mask> data = []byte(psdata)
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove
data = []byte(psdata)
</s> add </s> remove parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("Can't read PID file %s: bad value", pidfile)
return
</s> add } else {
parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("can't read pid file %s: bad value", pidfile)
return
}
if pid, err = strconv.Atoi(strings.TrimSpace(parts[0])); err != nil {
log.Error("can't read pid file %s: %s", pidfile, err)
return
} </s> remove }
</s> add </s> remove pid, err := strconv.Atoi(strings.TrimSpace(parts[0]))
if err != nil {
log.Error("Can't read PID file %s: %s", pidfile, err)
</s> add var proc *os.Process
if proc, err = os.FindProcess(pid); err != nil {
log.Error("can't send signal to pid %d: %s", pid, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f | internal/home/service.go |
<mask> log.Error("finding AdGuardHome process: code: %d, error: %s", code, err)
<mask>
<mask> return
<mask> }
<mask>
<mask> data = []byte(psdata)
<mask> } else if err != nil {
<mask> log.Error("reading pid file %s: %s", pidfile, err)
<mask>
<mask> return
<mask> }
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove var code int
var psdata string
code, psdata, err = aghos.RunCommand("ps", "-C", serviceName, "-o", "pid=")
if err != nil || code != 0 {
log.Error("finding AdGuardHome process: code: %d, error: %s", code, err)
</s> add if pid, err = aghos.PIDByCommand(serviceName, os.Getpid()); err != nil {
log.Error("finding AdGuardHome process: %s", err) </s> remove }
</s> add </s> remove parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("Can't read PID file %s: bad value", pidfile)
return
</s> add } else {
parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("can't read pid file %s: bad value", pidfile)
return
}
if pid, err = strconv.Atoi(strings.TrimSpace(parts[0])); err != nil {
log.Error("can't read pid file %s: %s", pidfile, err)
return
} </s> remove err = aghos.SendProcessSignal(pid, syscall.SIGHUP)
if err != nil {
log.Error("Can't send signal to PID %d: %s", pid, err)
</s> add if err = proc.Signal(syscall.SIGHUP); err != nil {
log.Error("Can't send signal to pid %d: %s", pid, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f | internal/home/service.go |
|
<mask> } else if err != nil {
<mask> log.Error("reading pid file %s: %s", pidfile, err)
<mask>
<mask> return
<mask> }
<mask>
<mask> parts := strings.SplitN(string(data), "\n", 2)
<mask> if len(parts) == 0 {
<mask> log.Error("Can't read PID file %s: bad value", pidfile)
<mask> return
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("Can't read PID file %s: bad value", pidfile)
return
</s> add } else {
parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("can't read pid file %s: bad value", pidfile)
return
}
if pid, err = strconv.Atoi(strings.TrimSpace(parts[0])); err != nil {
log.Error("can't read pid file %s: %s", pidfile, err)
return
} </s> remove pid, err := strconv.Atoi(strings.TrimSpace(parts[0]))
if err != nil {
log.Error("Can't read PID file %s: %s", pidfile, err)
</s> add var proc *os.Process
if proc, err = os.FindProcess(pid); err != nil {
log.Error("can't send signal to pid %d: %s", pid, err)
</s> remove
data = []byte(psdata)
</s> add </s> remove err = aghos.SendProcessSignal(pid, syscall.SIGHUP)
if err != nil {
log.Error("Can't send signal to PID %d: %s", pid, err)
</s> add if err = proc.Signal(syscall.SIGHUP); err != nil {
log.Error("Can't send signal to pid %d: %s", pid, err)
</s> remove log.Debug("Sent signal to PID %d", pid)
</s> add log.Debug("sent signal to PID %d", pid) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f | internal/home/service.go |
|
} else {
parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("can't read pid file %s: bad value", pidfile)
return
}
if pid, err = strconv.Atoi(strings.TrimSpace(parts[0])); err != nil {
log.Error("can't read pid file %s: %s", pidfile, err)
return
} | <mask>
<mask> return
<mask> }
<mask>
<mask> parts := strings.SplitN(string(data), "\n", 2)
<mask> if len(parts) == 0 {
<mask> log.Error("Can't read PID file %s: bad value", pidfile)
<mask> return
<mask> }
<mask>
<mask> pid, err := strconv.Atoi(strings.TrimSpace(parts[0]))
<mask> if err != nil {
<mask> log.Error("Can't read PID file %s: %s", pidfile, err)
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove }
</s> add </s> remove pid, err := strconv.Atoi(strings.TrimSpace(parts[0]))
if err != nil {
log.Error("Can't read PID file %s: %s", pidfile, err)
</s> add var proc *os.Process
if proc, err = os.FindProcess(pid); err != nil {
log.Error("can't send signal to pid %d: %s", pid, err)
</s> remove err = aghos.SendProcessSignal(pid, syscall.SIGHUP)
if err != nil {
log.Error("Can't send signal to PID %d: %s", pid, err)
</s> add if err = proc.Signal(syscall.SIGHUP); err != nil {
log.Error("Can't send signal to pid %d: %s", pid, err)
</s> remove
data = []byte(psdata)
</s> add </s> remove log.Debug("Sent signal to PID %d", pid)
</s> add log.Debug("sent signal to PID %d", pid) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f | internal/home/service.go |
var proc *os.Process
if proc, err = os.FindProcess(pid); err != nil {
log.Error("can't send signal to pid %d: %s", pid, err)
| <mask> log.Error("Can't read PID file %s: bad value", pidfile)
<mask> return
<mask> }
<mask>
<mask> pid, err := strconv.Atoi(strings.TrimSpace(parts[0]))
<mask> if err != nil {
<mask> log.Error("Can't read PID file %s: %s", pidfile, err)
<mask> return
<mask> }
<mask> err = aghos.SendProcessSignal(pid, syscall.SIGHUP)
<mask> if err != nil {
<mask> log.Error("Can't send signal to PID %d: %s", pid, err)
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove err = aghos.SendProcessSignal(pid, syscall.SIGHUP)
if err != nil {
log.Error("Can't send signal to PID %d: %s", pid, err)
</s> add if err = proc.Signal(syscall.SIGHUP); err != nil {
log.Error("Can't send signal to pid %d: %s", pid, err)
</s> remove parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("Can't read PID file %s: bad value", pidfile)
return
</s> add } else {
parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("can't read pid file %s: bad value", pidfile)
return
}
if pid, err = strconv.Atoi(strings.TrimSpace(parts[0])); err != nil {
log.Error("can't read pid file %s: %s", pidfile, err)
return
} </s> remove }
</s> add </s> remove log.Debug("Sent signal to PID %d", pid)
</s> add log.Debug("sent signal to PID %d", pid) </s> remove
data = []byte(psdata)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f | internal/home/service.go |
if err = proc.Signal(syscall.SIGHUP); err != nil {
log.Error("Can't send signal to pid %d: %s", pid, err)
| <mask> if err != nil {
<mask> log.Error("Can't read PID file %s: %s", pidfile, err)
<mask> return
<mask> }
<mask> err = aghos.SendProcessSignal(pid, syscall.SIGHUP)
<mask> if err != nil {
<mask> log.Error("Can't send signal to PID %d: %s", pid, err)
<mask> return
<mask> }
<mask> log.Debug("Sent signal to PID %d", pid)
<mask> }
<mask>
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove pid, err := strconv.Atoi(strings.TrimSpace(parts[0]))
if err != nil {
log.Error("Can't read PID file %s: %s", pidfile, err)
</s> add var proc *os.Process
if proc, err = os.FindProcess(pid); err != nil {
log.Error("can't send signal to pid %d: %s", pid, err)
</s> remove log.Debug("Sent signal to PID %d", pid)
</s> add log.Debug("sent signal to PID %d", pid) </s> remove parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("Can't read PID file %s: bad value", pidfile)
return
</s> add } else {
parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("can't read pid file %s: bad value", pidfile)
return
}
if pid, err = strconv.Atoi(strings.TrimSpace(parts[0])); err != nil {
log.Error("can't read pid file %s: %s", pidfile, err)
return
} </s> remove }
</s> add </s> remove
data = []byte(psdata)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f | internal/home/service.go |
log.Debug("sent signal to PID %d", pid) | <mask> if err != nil {
<mask> log.Error("Can't send signal to PID %d: %s", pid, err)
<mask> return
<mask> }
<mask> log.Debug("Sent signal to PID %d", pid)
<mask> }
<mask>
<mask> // handleServiceControlAction one of the possible control actions:
<mask> // install -- installs a service/daemon
<mask> // uninstall -- uninstalls it
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove err = aghos.SendProcessSignal(pid, syscall.SIGHUP)
if err != nil {
log.Error("Can't send signal to PID %d: %s", pid, err)
</s> add if err = proc.Signal(syscall.SIGHUP); err != nil {
log.Error("Can't send signal to pid %d: %s", pid, err)
</s> remove pid, err := strconv.Atoi(strings.TrimSpace(parts[0]))
if err != nil {
log.Error("Can't read PID file %s: %s", pidfile, err)
</s> add var proc *os.Process
if proc, err = os.FindProcess(pid); err != nil {
log.Error("can't send signal to pid %d: %s", pid, err)
</s> remove // SendProcessSignal sends signal to a process.
func SendProcessSignal(pid int, sig syscall.Signal) error {
return sendProcessSignal(pid, sig)
}
</s> add </s> remove parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("Can't read PID file %s: bad value", pidfile)
return
</s> add } else {
parts := strings.SplitN(string(data), "\n", 2)
if len(parts) == 0 {
log.Error("can't read pid file %s: bad value", pidfile)
return
}
if pid, err = strconv.Atoi(strings.TrimSpace(parts[0])); err != nil {
log.Error("can't read pid file %s: %s", pidfile, err)
return
} </s> remove "syscall"
</s> add "strconv"
"strings"
"github.com/AdguardTeam/golibs/log" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f | internal/home/service.go |
command_args="-p ${pidfile} -f -r {{.WorkingDirectory}}/{{.Name}}" | <mask> {{.Name}}_env="IS_DAEMON=1"
<mask> {{.Name}}_user="root"
<mask> pidfile="/var/run/${name}.pid"
<mask> command="/usr/sbin/daemon"
<mask> command_args="-P ${pidfile} -f -r {{.WorkingDirectory}}/{{.Name}}"
<mask> run_rc_command "$1"
<mask> `
</s> Pull request: 3457 fix service reload
Merge in DNS/adguard-home from 3457-darwin-svc-reload to master
Closes #3457.
Squashed commit of the following:
commit e3d6fbccf8373194360b6480e2d702ccd0ec7107
Author: Eugene Burkov <[email protected]>
Date: Wed Aug 18 00:52:39 2021 +0300
aghos: imp docs
commit 220d37ebc1e0c2e9ba37a34650bff1480bd2fcf6
Author: Eugene Burkov <[email protected]>
Date: Tue Aug 17 15:45:52 2021 +0300
all: fix ps </s> remove log.Debug("Sent signal to PID %d", pid)
</s> add log.Debug("sent signal to PID %d", pid) </s> remove var stdoutLimited io.Reader
stdoutLimited, err = aghio.LimitReader(stdout, aghos.MaxCmdOutputSize)
if err != nil {
return nil, fmt.Errorf("limiting stdout reader: %w", err)
}
</s> add </s> remove s := bufio.NewScanner(stdoutLimited)
</s> add s := bufio.NewScanner(stdout) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/550b1798a169d07139f8f079bc5c83271a181f7f | internal/home/service.go |
github.com/AdguardTeam/dnsproxy v0.23.5 | <mask>
<mask> go 1.13
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.23.4
<mask> github.com/AdguardTeam/golibs v0.3.0
<mask> github.com/AdguardTeam/urlfilter v0.7.0
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/etcd-io/bbolt v1.3.3
<mask> github.com/go-test/deep v1.0.4 // indirect
</s> -(dnsforward): use dnsproxy v0.23.5 - fix DO caching </s> remove github.com/AdguardTeam/dnsproxy v0.23.4 h1:23o1mOdORJrkuMgRHXVa1oO0zRf+lZ1K6l9HxdLr+Ig=
github.com/AdguardTeam/dnsproxy v0.23.4/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
</s> add github.com/AdguardTeam/dnsproxy v0.23.5 h1:allfgFioe0e6QvSqKVeS0ZQAo9jHR+2XdNuT1isK7og=
github.com/AdguardTeam/dnsproxy v0.23.5/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0= </s> remove github.com/miekg/dns v1.1.19
</s> add github.com/miekg/dns v1.1.26 </s> remove golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc
golang.org/x/net v0.0.0-20191002035440-2ec189313ef0
golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed
</s> add golang.org/x/crypto v0.0.0-20191219195013-becbf705a915
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5556e34e7e82a9f15d3bb67c6a01e6ac220c0a7d | go.mod |
github.com/miekg/dns v1.1.26 | <mask> github.com/joomcode/errorx v1.0.0
<mask> github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 // indirect
<mask> github.com/kardianos/service v0.0.0-20181115005516-4c239ee84e7b
<mask> github.com/krolaw/dhcp4 v0.0.0-20180925202202-7cead472c414
<mask> github.com/miekg/dns v1.1.19
<mask> github.com/sparrc/go-ping v0.0.0-20181106165434-ef3ab45e41b0
<mask> github.com/stretchr/testify v1.4.0
<mask> go.etcd.io/bbolt v1.3.3 // indirect
<mask> golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc
<mask> golang.org/x/net v0.0.0-20191002035440-2ec189313ef0
</s> -(dnsforward): use dnsproxy v0.23.5 - fix DO caching </s> remove golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc
golang.org/x/net v0.0.0-20191002035440-2ec189313ef0
golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed
</s> add golang.org/x/crypto v0.0.0-20191219195013-becbf705a915
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 </s> remove github.com/AdguardTeam/dnsproxy v0.23.4
</s> add github.com/AdguardTeam/dnsproxy v0.23.5 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5556e34e7e82a9f15d3bb67c6a01e6ac220c0a7d | go.mod |
golang.org/x/crypto v0.0.0-20191219195013-becbf705a915
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 | <mask> github.com/miekg/dns v1.1.19
<mask> github.com/sparrc/go-ping v0.0.0-20181106165434-ef3ab45e41b0
<mask> github.com/stretchr/testify v1.4.0
<mask> go.etcd.io/bbolt v1.3.3 // indirect
<mask> golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc
<mask> golang.org/x/net v0.0.0-20191002035440-2ec189313ef0
<mask> golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed
<mask> gopkg.in/yaml.v2 v2.2.3
<mask> )
</s> -(dnsforward): use dnsproxy v0.23.5 - fix DO caching </s> remove github.com/miekg/dns v1.1.19
</s> add github.com/miekg/dns v1.1.26 </s> remove github.com/AdguardTeam/dnsproxy v0.23.4
</s> add github.com/AdguardTeam/dnsproxy v0.23.5 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5556e34e7e82a9f15d3bb67c6a01e6ac220c0a7d | go.mod |
github.com/AdguardTeam/dnsproxy v0.23.5 h1:allfgFioe0e6QvSqKVeS0ZQAo9jHR+2XdNuT1isK7og=
github.com/AdguardTeam/dnsproxy v0.23.5/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0= | <mask> github.com/AdguardTeam/dnsproxy v0.23.4 h1:23o1mOdORJrkuMgRHXVa1oO0zRf+lZ1K6l9HxdLr+Ig=
<mask> github.com/AdguardTeam/dnsproxy v0.23.4/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
<mask> github.com/AdguardTeam/golibs v0.2.4 h1:GUssokegKxKF13K67Pgl0ZGwqHjNN6X7sep5ik6ORdY=
<mask> github.com/AdguardTeam/golibs v0.2.4/go.mod h1:R3M+mAg3nWG4X4Hsag5eef/TckHFH12ZYhK7AzJc8+U=
<mask> github.com/AdguardTeam/golibs v0.3.0 h1:1zO8ulGEOdXDDM++Ap4sYfTsT/Z4tZBZtiWSA4ykcOU=
<mask> github.com/AdguardTeam/golibs v0.3.0/go.mod h1:R3M+mAg3nWG4X4Hsag5eef/TckHFH12ZYhK7AzJc8+U=
<mask> github.com/AdguardTeam/gomitmproxy v0.1.2/go.mod h1:Mrt/3EfiXIYY2aZ7KsLuCUJzUARD/fWJ119IfzOB13M=
</s> -(dnsforward): use dnsproxy v0.23.5 - fix DO caching </s> remove github.com/AdguardTeam/dnsproxy v0.23.4
</s> add github.com/AdguardTeam/dnsproxy v0.23.5 | [
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5556e34e7e82a9f15d3bb67c6a01e6ac220c0a7d | go.sum |
github.com/miekg/dns v1.1.26 h1:gPxPSwALAeHJSjarOs00QjVdV9QoBvc1D2ujQUr5BzU=
github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= | <mask> github.com/miekg/dns v1.1.19 h1:0ymbfaLG1/utH2+BydNiF+dx1jSEmdr/nylOtkGHZZg=
<mask> github.com/miekg/dns v1.1.19/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
<mask> github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
<mask> github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
<mask> github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
<mask> github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
<mask> github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
<mask> github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
</s> -(dnsforward): use dnsproxy v0.23.5 - fix DO caching </s> remove github.com/miekg/dns v1.1.19
</s> add github.com/miekg/dns v1.1.26 </s> remove golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc
golang.org/x/net v0.0.0-20191002035440-2ec189313ef0
golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed
</s> add golang.org/x/crypto v0.0.0-20191219195013-becbf705a915
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5556e34e7e82a9f15d3bb67c6a01e6ac220c0a7d | go.sum |
golang.org/x/crypto v0.0.0-20191219195013-becbf705a915 h1:aJ0ex187qoXrJHPo8ZasVTASQB7llQP6YeNzgDALPRk=
golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | <mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
<mask> golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
<mask> golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc h1:KyTYo8xkh/2WdbFLUyQwBS0Jfn3qfZ9QmuPbok2oENE=
<mask> golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
<mask> golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20190119204137-ed066c81e75e h1:MDa3fSUp6MdYHouVmCCNz/zaH2a6CRcxY3VhT/K3C5Q=
<mask> golang.org/x/net v0.0.0-20190119204137-ed066c81e75e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
</s> -(dnsforward): use dnsproxy v0.23.5 - fix DO caching </s> remove golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc
golang.org/x/net v0.0.0-20191002035440-2ec189313ef0
golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed
</s> add golang.org/x/crypto v0.0.0-20191219195013-becbf705a915
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 </s> remove github.com/miekg/dns v1.1.19
</s> add github.com/miekg/dns v1.1.26 | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5556e34e7e82a9f15d3bb67c6a01e6ac220c0a7d | go.sum |
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8=
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | <mask> golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20191002035440-2ec189313ef0 h1:2mqDk8w/o6UmeUCu5Qiq2y7iMf6anbx+YA8d1JFoFrs=
<mask> golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
<mask> golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
<mask> golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
</s> -(dnsforward): use dnsproxy v0.23.5 - fix DO caching </s> remove golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc
golang.org/x/net v0.0.0-20191002035440-2ec189313ef0
golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed
</s> add golang.org/x/crypto v0.0.0-20191219195013-becbf705a915
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 </s> remove github.com/miekg/dns v1.1.19
</s> add github.com/miekg/dns v1.1.26 | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5556e34e7e82a9f15d3bb67c6a01e6ac220c0a7d | go.sum |
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 h1:Dho5nD6R3PcW2SH1or8vS0dszDaXRxIw55lBX7XiE5g=
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | <mask> golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed h1:5TJcLJn2a55mJjzYk0yOoqN8X1OdvBDUnaZaKKyQtkY=
<mask> golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
<mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
</s> -(dnsforward): use dnsproxy v0.23.5 - fix DO caching </s> remove golang.org/x/crypto v0.0.0-20191001170739-f9e2070545dc
golang.org/x/net v0.0.0-20191002035440-2ec189313ef0
golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed
</s> add golang.org/x/crypto v0.0.0-20191219195013-becbf705a915
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 </s> remove github.com/AdguardTeam/dnsproxy v0.23.4 h1:23o1mOdORJrkuMgRHXVa1oO0zRf+lZ1K6l9HxdLr+Ig=
github.com/AdguardTeam/dnsproxy v0.23.4/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
</s> add github.com/AdguardTeam/dnsproxy v0.23.5 h1:allfgFioe0e6QvSqKVeS0ZQAo9jHR+2XdNuT1isK7og=
github.com/AdguardTeam/dnsproxy v0.23.5/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0= </s> remove github.com/AdguardTeam/dnsproxy v0.23.4
</s> add github.com/AdguardTeam/dnsproxy v0.23.5 | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5556e34e7e82a9f15d3bb67c6a01e6ac220c0a7d | go.sum |
"local_ptr_title": "Private reverse DNS servers", | <mask> "load_balancing": "Load-balancing",
<mask> "load_balancing_desc": "Query one upstream server at a time. AdGuard Home will use the weighted random algorithm to pick the server so that the fastest server is used more often.",
<mask> "bootstrap_dns": "Bootstrap DNS servers",
<mask> "bootstrap_dns_desc": "Bootstrap DNS servers are used to resolve IP addresses of the DoH/DoT resolvers you specify as upstreams.",
<mask> "local_ptr_title": "Private DNS servers",
<mask> "local_ptr_desc": "The DNS servers that AdGuard Home uses for local PTR queries. These servers are used to resolve the hostnames of clients with private IP addresses, for example \"192.168.12.34\", using rDNS. If not set, AdGuard Home uses the default DNS resolvers of your OS.",
<mask> "local_ptr_placeholder": "Enter one server address per line",
<mask> "resolve_clients_title": "Enable reverse resolving of clients' IP addresses",
<mask> "resolve_clients_desc": "If enabled, AdGuard Home will attempt to reversely resolve clients' IP addresses into their hostnames by sending PTR queries to corresponding resolvers (private DNS servers for local clients, upstream server for clients with public IP addresses).",
<mask> "check_dhcp_servers": "Check for DHCP servers",
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | client/src/__locales/en.json |
"use_private_ptr_resolvers_title": "Use private rDNS resolvers",
"use_private_ptr_resolvers_desc": "Perform reverse DNS lookups for locally-served addresses using these upstream servers. If disabled, AdGuard Home responds with NXDOMAIN to all such PTR requests except for clients known from DHCP, /etc/hosts, and so on.", | <mask> "local_ptr_desc": "The DNS servers that AdGuard Home uses for local PTR queries. These servers are used to resolve the hostnames of clients with private IP addresses, for example \"192.168.12.34\", using rDNS. If not set, AdGuard Home uses the default DNS resolvers of your OS.",
<mask> "local_ptr_placeholder": "Enter one server address per line",
<mask> "resolve_clients_title": "Enable reverse resolving of clients' IP addresses",
<mask> "resolve_clients_desc": "If enabled, AdGuard Home will attempt to reversely resolve clients' IP addresses into their hostnames by sending PTR queries to corresponding resolvers (private DNS servers for local clients, upstream server for clients with public IP addresses).",
<mask> "check_dhcp_servers": "Check for DHCP servers",
<mask> "save_config": "Save configuration",
<mask> "enabled_dhcp": "DHCP server enabled",
<mask> "disabled_dhcp": "DHCP server disabled",
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove "local_ptr_title": "Private DNS servers",
</s> add "local_ptr_title": "Private reverse DNS servers", | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | client/src/__locales/en.json |
<div className="col-12 mb-2"> | <mask> <div className="col-12">
<mask> <Examples />
<mask> <hr />
<mask> </div>
<mask> <div className="col-12 mb-4">
<mask> <label
<mask> className="form__label form__label--with-desc"
<mask> htmlFor="bootstrap_dns"
<mask> >
<mask> <Trans>bootstrap_dns</Trans>
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove <div className="col-12 mb-4">
</s> add <div className="col-12"> </s> remove return
</s> add return true </s> remove // Begin adds the ip to the resolving queue if it is not cached or already
// resolved.
func (r *RDNS) Begin(ip net.IP) {
</s> add // ensurePrivateCache ensures that the state of the RDNS cache is consistent
// with the current private client RDNS resolving settings.
//
// TODO(e.burkov): Clearing cache each time this value changed is not a perfect
// approach since only unresolved locally-served addresses should be removed.
// Implement when improving the cache.
func (r *RDNS) ensurePrivateCache() {
var usePrivate uint32
if r.exchanger.ResolvesPrivatePTR() {
usePrivate = 1
}
if atomic.CompareAndSwapUint32(&r.usePrivate, 1-usePrivate, usePrivate) {
r.ipCache.Clear()
}
}
// isCached returns true if ip is already cached and not expired yet. It also
// caches it otherwise.
func (r *RDNS) isCached(ip net.IP) (ok bool) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | client/src/components/Settings/Dns/Upstream/Form.js |
<div className="col-12"> | <mask> </div>
<mask> <div className="col-12">
<mask> <hr />
<mask> </div>
<mask> <div className="col-12 mb-4">
<mask> <label
<mask> className="form__label form__label--with-desc"
<mask> htmlFor="local_ptr"
<mask> >
<mask> <Trans>local_ptr_title</Trans>
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove <div className="col-12 mb-4">
</s> add <div className="col-12 mb-2"> </s> remove return
</s> add return true </s> remove // Begin adds the ip to the resolving queue if it is not cached or already
// resolved.
func (r *RDNS) Begin(ip net.IP) {
</s> add // ensurePrivateCache ensures that the state of the RDNS cache is consistent
// with the current private client RDNS resolving settings.
//
// TODO(e.burkov): Clearing cache each time this value changed is not a perfect
// approach since only unresolved locally-served addresses should be removed.
// Implement when improving the cache.
func (r *RDNS) ensurePrivateCache() {
var usePrivate uint32
if r.exchanger.ResolvesPrivatePTR() {
usePrivate = 1
}
if atomic.CompareAndSwapUint32(&r.usePrivate, 1-usePrivate, usePrivate) {
r.ipCache.Clear()
}
}
// isCached returns true if ip is already cached and not expired yet. It also
// caches it otherwise.
func (r *RDNS) isCached(ip net.IP) (ok bool) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | client/src/components/Settings/Dns/Upstream/Form.js |
<div className="mt-4">
<Field
name="use_private_ptr_resolvers"
type="checkbox"
component={CheckboxField}
placeholder={t('use_private_ptr_resolvers_title')}
subtitle={t('use_private_ptr_resolvers_desc')}
disabled={processingSetConfig}
/>
</div>
</div>
<div className="col-12">
<hr /> | <mask> placeholder={t('local_ptr_placeholder')}
<mask> disabled={processingSetConfig}
<mask> normalizeOnBlur={removeEmptyLines}
<mask> />
<mask> </div>
<mask> <div className="col-12 mb-4">
<mask> <Field
<mask> name="resolve_clients"
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove <div className="col-12 mb-4">
</s> add <div className="col-12 mb-2"> </s> remove <div className="col-12 mb-4">
</s> add <div className="col-12"> </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock()
| [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | client/src/components/Settings/Dns/Upstream/Form.js |
use_private_ptr_resolvers, | <mask> resolve_clients,
<mask> local_ptr_upstreams,
<mask> } = useSelector((state) => state.dnsConfig, shallowEqual);
<mask>
<mask> const upstream_dns_file = useSelector((state) => state.dnsConfig.upstream_dns_file);
<mask>
<mask> const handleSubmit = (values) => {
<mask> const {
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | client/src/components/Settings/Dns/Upstream/index.js |
use_private_ptr_resolvers, | <mask> upstream_dns,
<mask> upstream_mode,
<mask> resolve_clients,
<mask> local_ptr_upstreams,
<mask> } = values;
<mask>
<mask> const dnsConfig = {
<mask> bootstrap_dns,
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock() | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | client/src/components/Settings/Dns/Upstream/index.js |
use_private_ptr_resolvers, | <mask> resolve_clients,
<mask> local_ptr_upstreams,
<mask> ...(upstream_dns_file ? null : { upstream_dns }),
<mask> };
<mask>
<mask> dispatch(setDnsConfig(dnsConfig));
<mask> };
<mask>
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | client/src/components/Settings/Dns/Upstream/index.js |
use_private_ptr_resolvers, | <mask> resolve_clients,
<mask> local_ptr_upstreams,
<mask> }}
<mask> onSubmit={handleSubmit}
<mask> />
<mask> </div>
<mask> </div>
<mask> </Card>;
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove <div className="col-12 mb-4">
</s> add <div className="col-12"> </s> remove <div className="col-12 mb-4">
</s> add <div className="col-12 mb-2"> | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | client/src/components/Settings/Dns/Upstream/index.js |
func (s *Server) accessListJSON() (j accessListJSON) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
return accessListJSON{
AllowedClients: aghstrings.CloneSlice(s.conf.AllowedClients),
DisallowedClients: aghstrings.CloneSlice(s.conf.DisallowedClients),
BlockedHosts: aghstrings.CloneSlice(s.conf.BlockedHosts), | <mask> DisallowedClients []string `json:"disallowed_clients"`
<mask> BlockedHosts []string `json:"blocked_hosts"`
<mask> }
<mask>
<mask> func (s *Server) handleAccessList(w http.ResponseWriter, r *http.Request) {
<mask> s.RLock()
<mask> j := accessListJSON{
<mask> AllowedClients: s.conf.AllowedClients,
<mask> DisallowedClients: s.conf.DisallowedClients,
<mask> BlockedHosts: s.conf.BlockedHosts,
<mask> }
<mask> s.RUnlock()
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
<mask> err := json.NewEncoder(w).Encode(j)
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove s.RUnlock()
</s> add }
func (s *Server) handleAccessList(w http.ResponseWriter, r *http.Request) {
j := s.accessListJSON() </s> remove // ServeHTTP is a HTTP handler method we use to provide DNS-over-HTTPS
</s> add // ServeHTTP is a HTTP handler method we use to provide DNS-over-HTTPS. </s> remove s.RLock()
p := s.dnsProxy
s.RUnlock()
if p != nil { // an attempt to protect against race in case we're here after Close() was called
</s> add var p *proxy.Proxy
func() {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
p = s.dnsProxy
}()
if p != nil { </s> remove
s.Unlock()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/access.go |
}
func (s *Server) handleAccessList(w http.ResponseWriter, r *http.Request) {
j := s.accessListJSON() | <mask> AllowedClients: s.conf.AllowedClients,
<mask> DisallowedClients: s.conf.DisallowedClients,
<mask> BlockedHosts: s.conf.BlockedHosts,
<mask> }
<mask> s.RUnlock()
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
<mask> err := json.NewEncoder(w).Encode(j)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusInternalServerError, "json.Encode: %s", err)
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove func (s *Server) handleAccessList(w http.ResponseWriter, r *http.Request) {
s.RLock()
j := accessListJSON{
AllowedClients: s.conf.AllowedClients,
DisallowedClients: s.conf.DisallowedClients,
BlockedHosts: s.conf.BlockedHosts,
</s> add func (s *Server) accessListJSON() (j accessListJSON) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
return accessListJSON{
AllowedClients: aghstrings.CloneSlice(s.conf.AllowedClients),
DisallowedClients: aghstrings.CloneSlice(s.conf.DisallowedClients),
BlockedHosts: aghstrings.CloneSlice(s.conf.BlockedHosts), </s> remove err := s.ipset.Close()
if err != nil {
</s> add if err := s.ipset.Close(); err != nil { </s> remove
s.Unlock()
</s> add </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/access.go |
defer log.Debug("Access: updated lists: %d, %d, %d",
len(j.AllowedClients), len(j.DisallowedClients), len(j.BlockedHosts))
defer s.conf.ConfigModified()
s.serverLock.Lock()
defer s.serverLock.Unlock()
| <mask>
<mask> return
<mask> }
<mask>
<mask> s.Lock()
<mask> s.conf.AllowedClients = j.AllowedClients
<mask> s.conf.DisallowedClients = j.DisallowedClients
<mask> s.conf.BlockedHosts = j.BlockedHosts
<mask> s.access = a
<mask> s.Unlock()
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove s.Unlock()
s.conf.ConfigModified()
log.Debug("Access: updated lists: %d, %d, %d",
len(j.AllowedClients), len(j.DisallowedClients), len(j.BlockedHosts))
</s> add </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> remove s.Lock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/access.go |
<mask> s.conf.AllowedClients = j.AllowedClients
<mask> s.conf.DisallowedClients = j.DisallowedClients
<mask> s.conf.BlockedHosts = j.BlockedHosts
<mask> s.access = a
<mask> s.Unlock()
<mask> s.conf.ConfigModified()
<mask>
<mask> log.Debug("Access: updated lists: %d, %d, %d",
<mask> len(j.AllowedClients), len(j.DisallowedClients), len(j.BlockedHosts))
<mask> }
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove s.Lock()
</s> add defer log.Debug("Access: updated lists: %d, %d, %d",
len(j.AllowedClients), len(j.DisallowedClients), len(j.BlockedHosts))
defer s.conf.ConfigModified()
s.serverLock.Lock()
defer s.serverLock.Unlock()
</s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> remove err := s.ipset.Close()
if err != nil {
</s> add if err := s.ipset.Close(); err != nil { </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/access.go |
|
// UsePrivateRDNS defines if the PTR requests for unknown addresses from
// locally-served networks should be resolved via private PTR resolvers.
UsePrivateRDNS bool
| <mask>
<mask> // ResolveClients signals if the RDNS should resolve clients' addresses.
<mask> ResolveClients bool
<mask>
<mask> // LocalPTRResolvers is a slice of addresses to be used as upstreams for
<mask> // resolving PTR queries for local addresses.
<mask> LocalPTRResolvers []string
<mask> }
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove "local_ptr_title": "Private DNS servers",
</s> add "local_ptr_title": "Private reverse DNS servers", | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/config.go |
s.serverLock.RLock()
defer s.serverLock.RUnlock()
| <mask> }
<mask>
<mask> if !s.subnetDetector.IsLocallyServedNetwork(ip) {
<mask> return resultCodeSuccess
<mask> }
<mask>
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err </s> remove s.RUnlock()
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dns.go |
if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err | <mask> if !s.subnetDetector.IsLocallyServedNetwork(ip) {
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> err := s.localResolvers.Resolve(d)
<mask> if err != nil {
<mask> ctx.err = err
<mask>
<mask> return resultCodeError
<mask> }
<mask>
<mask> if d.Res == nil {
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove return resultCodeError
</s> add return resultCodeError
} </s> remove s.RUnlock()
</s> add </s> remove if ctx.protectionEnabled {
if ctx.setts == nil {
ctx.setts = s.getClientRequestFilteringSettings(ctx)
}
ctx.result, err = s.filterDNSRequest(ctx)
</s> add if !ctx.protectionEnabled {
return resultCodeSuccess | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dns.go |
return resultCodeError
} | <mask> err := s.localResolvers.Resolve(d)
<mask> if err != nil {
<mask> ctx.err = err
<mask>
<mask> return resultCodeError
<mask> }
<mask>
<mask> if d.Res == nil {
<mask> d.Res = s.genNXDomain(d.Req)
<mask>
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err </s> remove s.RUnlock()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dns.go |
// Do not even put into query log. | <mask> if d.Res == nil {
<mask> d.Res = s.genNXDomain(d.Req)
<mask>
<mask> return resultCodeFinish
<mask> }
<mask>
<mask> return resultCodeSuccess
<mask> }
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove return resultCodeError
</s> add return resultCodeError
} </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err </s> remove d.Res = s.genDNSFilterMessage(d, &res)
</s> add d.Res = s.genDNSFilterMessage(d, res) </s> remove return &res, nil
</s> add return res, nil | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dns.go |
s.serverLock.RLock()
defer s.serverLock.RUnlock() | <mask> if d.Res != nil {
<mask> return resultCodeSuccess // response is already set - nothing to do
<mask> }
<mask>
<mask> s.RLock()
<mask> // Synchronize access to s.dnsFilter so it won't be suddenly uninitialized while in use.
<mask> // This could happen after proxy server has been stopped, but its workers are not yet exited.
<mask> //
<mask> // A better approach is for proxy.Stop() to wait until all its workers exit,
<mask> // but this would require the Upstream interface to have Close() function
<mask> // (to prevent from hanging while waiting for unresponsive DNS server to respond).
<mask>
<mask> var err error
<mask> ctx.protectionEnabled = s.conf.ProtectionEnabled && s.dnsFilter != nil
<mask> if ctx.protectionEnabled {
<mask> if ctx.setts == nil {
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove var err error
</s> add </s> remove s.RLock()
// Synchronize access to s.dnsFilter so it won't be suddenly uninitialized while in use.
// This could happen after proxy server has been stopped, but its workers are not yet exited.
if !s.conf.ProtectionEnabled || s.dnsFilter == nil {
s.RUnlock()
continue
}
res, err := s.dnsFilter.CheckHostRules(host, d.Req.Question[0].Qtype, ctx.setts)
s.RUnlock()
</s> add res, err := s.checkHostRules(host, d.Req.Question[0].Qtype, ctx.setts) </s> remove s.RLock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove if ctx.protectionEnabled {
if ctx.setts == nil {
ctx.setts = s.getClientRequestFilteringSettings(ctx)
}
ctx.result, err = s.filterDNSRequest(ctx)
</s> add if !ctx.protectionEnabled {
return resultCodeSuccess </s> remove // Close - close object
</s> add // Close gracefully closes the server. It is safe for concurrent use.
//
// TODO(e.burkov): A better approach would be making Stop method waiting for all
// its workers finished. But it would require the upstream.Upstream to have the
// Close method to prevent from hanging while waiting for unresponsive server to
// respond. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dns.go |
<mask> // A better approach is for proxy.Stop() to wait until all its workers exit,
<mask> // but this would require the Upstream interface to have Close() function
<mask> // (to prevent from hanging while waiting for unresponsive DNS server to respond).
<mask>
<mask> var err error
<mask> ctx.protectionEnabled = s.conf.ProtectionEnabled && s.dnsFilter != nil
<mask> if ctx.protectionEnabled {
<mask> if ctx.setts == nil {
<mask> ctx.setts = s.getClientRequestFilteringSettings(ctx)
<mask> }
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove s.RLock()
// Synchronize access to s.dnsFilter so it won't be suddenly uninitialized while in use.
// This could happen after proxy server has been stopped, but its workers are not yet exited.
//
// A better approach is for proxy.Stop() to wait until all its workers exit,
// but this would require the Upstream interface to have Close() function
// (to prevent from hanging while waiting for unresponsive DNS server to respond).
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> remove if ctx.protectionEnabled {
if ctx.setts == nil {
ctx.setts = s.getClientRequestFilteringSettings(ctx)
}
ctx.result, err = s.filterDNSRequest(ctx)
</s> add if !ctx.protectionEnabled {
return resultCodeSuccess </s> remove // Close - close object
</s> add // Close gracefully closes the server. It is safe for concurrent use.
//
// TODO(e.burkov): A better approach would be making Stop method waiting for all
// its workers finished. But it would require the upstream.Upstream to have the
// Close method to prevent from hanging while waiting for unresponsive server to
// respond. </s> remove s.RLock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dns.go |
|
if !ctx.protectionEnabled {
return resultCodeSuccess | <mask> // (to prevent from hanging while waiting for unresponsive DNS server to respond).
<mask>
<mask> var err error
<mask> ctx.protectionEnabled = s.conf.ProtectionEnabled && s.dnsFilter != nil
<mask> if ctx.protectionEnabled {
<mask> if ctx.setts == nil {
<mask> ctx.setts = s.getClientRequestFilteringSettings(ctx)
<mask> }
<mask> ctx.result, err = s.filterDNSRequest(ctx)
<mask> }
<mask> s.RUnlock()
<mask>
<mask> if err != nil {
<mask> ctx.err = err
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove var err error
</s> add </s> remove s.RUnlock()
</s> add </s> remove s.RLock()
// Synchronize access to s.dnsFilter so it won't be suddenly uninitialized while in use.
// This could happen after proxy server has been stopped, but its workers are not yet exited.
//
// A better approach is for proxy.Stop() to wait until all its workers exit,
// but this would require the Upstream interface to have Close() function
// (to prevent from hanging while waiting for unresponsive DNS server to respond).
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dns.go |
<mask> ctx.setts = s.getClientRequestFilteringSettings(ctx)
<mask> }
<mask> ctx.result, err = s.filterDNSRequest(ctx)
<mask> }
<mask> s.RUnlock()
<mask>
<mask> if err != nil {
<mask> ctx.err = err
<mask>
<mask> return resultCodeError
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove if ctx.protectionEnabled {
if ctx.setts == nil {
ctx.setts = s.getClientRequestFilteringSettings(ctx)
}
ctx.result, err = s.filterDNSRequest(ctx)
</s> add if !ctx.protectionEnabled {
return resultCodeSuccess </s> remove return resultCodeError
</s> add return resultCodeError
} </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err </s> remove if s.subnetDetector.IsLocallyServedNetwork(ip) {
err = s.localResolvers.Resolve(ctx)
} else {
err = s.internalProxy.Resolve(ctx)
}
</s> add err = resolver.Resolve(ctx) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dns.go |
|
if ctx.setts == nil {
ctx.setts = s.getClientRequestFilteringSettings(ctx)
}
var err error
ctx.result, err = s.filterDNSRequest(ctx) | <mask> if !ctx.protectionEnabled {
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> if err != nil {
<mask> ctx.err = err
<mask>
<mask> return resultCodeError
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err </s> remove return resultCodeError
</s> add return resultCodeError
} </s> remove s.RUnlock()
</s> add </s> remove if ctx.protectionEnabled {
if ctx.setts == nil {
ctx.setts = s.getClientRequestFilteringSettings(ctx)
}
ctx.result, err = s.filterDNSRequest(ctx)
</s> add if !ctx.protectionEnabled {
return resultCodeSuccess </s> remove if s.subnetDetector.IsLocallyServedNetwork(ip) {
err = s.localResolvers.Resolve(ctx)
} else {
err = s.internalProxy.Resolve(ctx)
}
</s> add err = resolver.Resolve(ctx) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dns.go |
func TestServer_ProcessRestrictLocal(t *testing.T) { | <mask> })
<mask> }
<mask> }
<mask>
<mask> func TestLocalRestriction(t *testing.T) {
<mask> ups := &aghtest.TestUpstream{
<mask> Reverse: map[string][]string{
<mask> "251.252.253.254.in-addr.arpa.": {"host1.example.net."},
<mask> "1.1.168.192.in-addr.arpa.": {"some.local-client."},
<mask> },
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove dns.conf.ResolveClients = false
for _, tc := range testCases {
host, eerr := dns.Exchange(tc.req)
</s> add srv.conf.UsePrivateRDNS = false </s> remove host, eerr := dns.Exchange(tc.req)
</s> add host, eerr := srv.Exchange(tc.req) </s> remove dns.localResolvers = &proxy.Proxy{
</s> add srv.localResolvers = &proxy.Proxy{ </s> remove require.NoError(t, eerr)
assert.Empty(t, host)
}
</s> add host, eerr := srv.Exchange(localIP)
require.NoError(t, eerr)
assert.Empty(t, host) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dns_test.go |
<mask> internalProxy *proxy.Proxy
<mask>
<mask> isRunning bool
<mask>
<mask> sync.RWMutex
<mask> conf ServerConfig
<mask> }
<mask>
<mask> // defaultLocalDomainSuffix is the default suffix used to detect internal hosts
<mask> // when no suffix is provided.
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dnsforward.go |
|
// serverLock protects Server.
serverLock sync.RWMutex | <mask> isRunning bool
<mask>
<mask> conf ServerConfig
<mask> }
<mask>
<mask> // defaultLocalDomainSuffix is the default suffix used to detect internal hosts
<mask> // when no suffix is provided.
<mask> //
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove sync.RWMutex
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dnsforward.go |
// Close gracefully closes the server. It is safe for concurrent use.
//
// TODO(e.burkov): A better approach would be making Stop method waiting for all
// its workers finished. But it would require the upstream.Upstream to have the
// Close method to prevent from hanging while waiting for unresponsive server to
// respond. | <mask>
<mask> return s
<mask> }
<mask>
<mask> // Close - close object
<mask> func (s *Server) Close() {
<mask> s.Lock()
<mask> s.dnsFilter = nil
<mask> s.stats = nil
<mask> s.queryLog = nil
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove s.Lock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock()
</s> remove err := s.ipset.Close()
if err != nil {
</s> add if err := s.ipset.Close(); err != nil { </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> remove
s.Unlock()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dnsforward.go |
s.serverLock.Lock()
defer s.serverLock.Unlock()
| <mask> }
<mask>
<mask> // Close - close object
<mask> func (s *Server) Close() {
<mask> s.Lock()
<mask> s.dnsFilter = nil
<mask> s.stats = nil
<mask> s.queryLog = nil
<mask> s.dnsProxy = nil
<mask>
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove // Close - close object
</s> add // Close gracefully closes the server. It is safe for concurrent use.
//
// TODO(e.burkov): A better approach would be making Stop method waiting for all
// its workers finished. But it would require the upstream.Upstream to have the
// Close method to prevent from hanging while waiting for unresponsive server to
// respond. </s> remove err := s.ipset.Close()
if err != nil {
</s> add if err := s.ipset.Close(); err != nil { </s> remove s.RLock()
p := s.dnsProxy
s.RUnlock()
if p != nil { // an attempt to protect against race in case we're here after Close() was called
</s> add var p *proxy.Proxy
func() {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
p = s.dnsProxy
}()
if p != nil { </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> remove
s.Unlock()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dnsforward.go |
if err := s.ipset.Close(); err != nil { | <mask> s.stats = nil
<mask> s.queryLog = nil
<mask> s.dnsProxy = nil
<mask>
<mask> err := s.ipset.Close()
<mask> if err != nil {
<mask> log.Error("closing ipset: %s", err)
<mask> }
<mask>
<mask> s.Unlock()
<mask> }
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove
s.Unlock()
</s> add </s> remove s.Lock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock()
</s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err </s> remove d.Res = s.genDNSFilterMessage(d, &res)
</s> add d.Res = s.genDNSFilterMessage(d, res) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dnsforward.go |
<mask> err := s.ipset.Close()
<mask> if err != nil {
<mask> log.Error("closing ipset: %s", err)
<mask> }
<mask>
<mask> s.Unlock()
<mask> }
<mask>
<mask> // WriteDiskConfig - write configuration
<mask> func (s *Server) WriteDiskConfig(c *FilteringConfig) {
<mask> s.RLock()
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove err := s.ipset.Close()
if err != nil {
</s> add if err := s.ipset.Close(); err != nil { </s> remove s.RLock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> remove s.RUnlock()
</s> add }
func (s *Server) handleAccessList(w http.ResponseWriter, r *http.Request) {
j := s.accessListJSON() </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dnsforward.go |
|
s.serverLock.RLock()
defer s.serverLock.RUnlock()
| <mask> }
<mask>
<mask> // WriteDiskConfig - write configuration
<mask> func (s *Server) WriteDiskConfig(c *FilteringConfig) {
<mask> s.RLock()
<mask> sc := s.conf.FilteringConfig
<mask> *c = sc
<mask> c.RatelimitWhitelist = aghstrings.CloneSlice(sc.RatelimitWhitelist)
<mask> c.BootstrapDNS = aghstrings.CloneSlice(sc.BootstrapDNS)
<mask> c.AllowedClients = aghstrings.CloneSlice(sc.AllowedClients)
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove
s.Unlock()
</s> add </s> remove s.RUnlock()
</s> add </s> remove s.Lock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock()
</s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients bool) {
s.RLock()
defer s.RUnlock()
</s> add func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients, resolvePTR bool) {
s.serverLock.RLock()
defer s.serverLock.RUnlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dnsforward.go |
<mask> c.AllowedClients = aghstrings.CloneSlice(sc.AllowedClients)
<mask> c.DisallowedClients = aghstrings.CloneSlice(sc.DisallowedClients)
<mask> c.BlockedHosts = aghstrings.CloneSlice(sc.BlockedHosts)
<mask> c.UpstreamDNS = aghstrings.CloneSlice(sc.UpstreamDNS)
<mask> s.RUnlock()
<mask> }
<mask>
<mask> // RDNSSettings returns the copy of actual RDNS configuration.
<mask> func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients bool) {
<mask> s.RLock()
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients bool) {
s.RLock()
defer s.RUnlock()
</s> add func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients, resolvePTR bool) {
s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> remove return aghstrings.CloneSlice(s.conf.LocalPTRResolvers), s.conf.ResolveClients
</s> add return aghstrings.CloneSlice(s.conf.LocalPTRResolvers),
s.conf.ResolveClients,
s.conf.UsePrivateRDNS </s> remove s.RLock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove // IsRunning returns true if the DNS server is running
</s> add // IsRunning returns true if the DNS server is running. </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dnsforward.go |
|
func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients, resolvePTR bool) {
s.serverLock.RLock()
defer s.serverLock.RUnlock() | <mask> s.RUnlock()
<mask> }
<mask>
<mask> // RDNSSettings returns the copy of actual RDNS configuration.
<mask> func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients bool) {
<mask> s.RLock()
<mask> defer s.RUnlock()
<mask>
<mask> return aghstrings.CloneSlice(s.conf.LocalPTRResolvers), s.conf.ResolveClients
<mask> }
<mask>
<mask> // Resolve - get IP addresses by host name from an upstream server.
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove return aghstrings.CloneSlice(s.conf.LocalPTRResolvers), s.conf.ResolveClients
</s> add return aghstrings.CloneSlice(s.conf.LocalPTRResolvers),
s.conf.ResolveClients,
s.conf.UsePrivateRDNS </s> remove s.RUnlock()
</s> add </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove // IsRunning returns true if the DNS server is running
</s> add // IsRunning returns true if the DNS server is running. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dnsforward.go |
return aghstrings.CloneSlice(s.conf.LocalPTRResolvers),
s.conf.ResolveClients,
s.conf.UsePrivateRDNS | <mask> func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients bool) {
<mask> s.RLock()
<mask> defer s.RUnlock()
<mask>
<mask> return aghstrings.CloneSlice(s.conf.LocalPTRResolvers), s.conf.ResolveClients
<mask> }
<mask>
<mask> // Resolve - get IP addresses by host name from an upstream server.
<mask> // No request/response filtering is performed.
<mask> // Query log and Stats are not updated.
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients bool) {
s.RLock()
defer s.RUnlock()
</s> add func (s *Server) RDNSSettings() (localPTRResolvers []string, resolveClients, resolvePTR bool) {
s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove s.RUnlock()
</s> add </s> remove // If response contains CNAME, A or AAAA records, we apply filtering to each canonical host name or IP address.
// If this is a match, we set a new response in d.Res and return.
</s> add // checkHostRules checks the host against filters. It is safe for concurrent
// use.
func (s *Server) checkHostRules(host string, qtype uint16, setts *filtering.Settings) (
r *filtering.Result,
err error,
) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
if s.dnsFilter == nil {
return nil, nil
}
var res filtering.Result
res, err = s.dnsFilter.CheckHostRules(host, qtype, setts)
if err != nil {
return nil, err
}
return &res, err
}
// If response contains CNAME, A or AAAA records, we apply filtering to each
// canonical host name or IP address. If this is a match, we set a new response
// in d.Res and return. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dnsforward.go |
s.serverLock.RLock()
defer s.serverLock.RUnlock()
| <mask> // No request/response filtering is performed.
<mask> // Query log and Stats are not updated.
<mask> // This method may be called before Start().
<mask> func (s *Server) Resolve(host string) ([]net.IPAddr, error) {
<mask> s.RLock()
<mask> defer s.RUnlock()
<mask> return s.internalProxy.LookupIPAddr(host)
<mask> }
<mask>
<mask> // RDNSExchanger is a resolver for clients' addresses.
<mask> type RDNSExchanger interface {
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove return aghstrings.CloneSlice(s.conf.LocalPTRResolvers), s.conf.ResolveClients
</s> add return aghstrings.CloneSlice(s.conf.LocalPTRResolvers),
s.conf.ResolveClients,
s.conf.UsePrivateRDNS </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> remove // ServeHTTP is a HTTP handler method we use to provide DNS-over-HTTPS
</s> add // ServeHTTP is a HTTP handler method we use to provide DNS-over-HTTPS. </s> remove aghtest.Exchanger
</s> add ex aghtest.Exchanger
usePrivate bool | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dnsforward.go |
// ResolvesPrivatePTR returns true if the RDNSExchanger is able to
// resolve PTR requests for locally-served addresses.
ResolvesPrivatePTR() (ok bool) | <mask> // Exchange tries to resolve the ip in a suitable way, e.g. either as
<mask> // local or as external.
<mask> Exchange(ip net.IP) (host string, err error)
<mask> }
<mask>
<mask> const (
<mask> // rDNSEmptyAnswerErr is returned by Exchange method when the answer
<mask> // section of respond is empty.
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove aghtest.Exchanger
</s> add ex aghtest.Exchanger
usePrivate bool </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> remove // If response contains CNAME, A or AAAA records, we apply filtering to each canonical host name or IP address.
// If this is a match, we set a new response in d.Res and return.
</s> add // checkHostRules checks the host against filters. It is safe for concurrent
// use.
func (s *Server) checkHostRules(host string, qtype uint16, setts *filtering.Settings) (
r *filtering.Result,
err error,
) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
if s.dnsFilter == nil {
return nil, nil
}
var res filtering.Result
res, err = s.dnsFilter.CheckHostRules(host, qtype, setts)
if err != nil {
return nil, err
}
return &res, err
}
// If response contains CNAME, A or AAAA records, we apply filtering to each
// canonical host name or IP address. If this is a match, we set a new response
// in d.Res and return. </s> remove // Begin adds the ip to the resolving queue if it is not cached or already
// resolved.
func (r *RDNS) Begin(ip net.IP) {
</s> add // ensurePrivateCache ensures that the state of the RDNS cache is consistent
// with the current private client RDNS resolving settings.
//
// TODO(e.burkov): Clearing cache each time this value changed is not a perfect
// approach since only unresolved locally-served addresses should be removed.
// Implement when improving the cache.
func (r *RDNS) ensurePrivateCache() {
var usePrivate uint32
if r.exchanger.ResolvesPrivatePTR() {
usePrivate = 1
}
if atomic.CompareAndSwapUint32(&r.usePrivate, 1-usePrivate, usePrivate) {
r.ipCache.Clear()
}
}
// isCached returns true if ip is already cached and not expired yet. It also
// caches it otherwise.
func (r *RDNS) isCached(ip net.IP) (ok bool) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dnsforward.go |
s.serverLock.RLock()
defer s.serverLock.RUnlock() | <mask> )
<mask>
<mask> // Exchange implements the RDNSExchanger interface for *Server.
<mask> func (s *Server) Exchange(ip net.IP) (host string, err error) {
<mask> s.RLock()
<mask> defer s.RUnlock()
<mask>
<mask> if !s.conf.ResolveClients {
<mask> return "", nil
<mask> }
<mask>
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove aghtest.Exchanger
</s> add ex aghtest.Exchanger
usePrivate bool </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
</s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dnsforward.go |
var resolver *proxy.Proxy = s.localResolvers
if !s.subnetDetector.IsLocallyServedNetwork(ip) {
resolver = s.internalProxy
} else if !s.conf.UsePrivateRDNS {
return "", nil
}
| <mask> return "", nil
<mask> }
<mask>
<mask> arpa := dns.Fqdn(aghnet.ReverseAddr(ip))
<mask> req := &dns.Msg{
<mask> MsgHdr: dns.MsgHdr{
<mask> Id: dns.Id(),
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove aghtest.Exchanger
</s> add ex aghtest.Exchanger
usePrivate bool </s> remove resp, err := e.Exchanger.Exchange(req)
</s> add resp, err := e.ex.Exchange(req) </s> remove if s.subnetDetector.IsLocallyServedNetwork(ip) {
err = s.localResolvers.Resolve(ctx)
} else {
err = s.internalProxy.Resolve(ctx)
}
</s> add err = resolver.Resolve(ctx) </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock() </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dnsforward.go |
err = resolver.Resolve(ctx) | <mask> StartTime: time.Now(),
<mask> }
<mask>
<mask> var resp *dns.Msg
<mask> if s.subnetDetector.IsLocallyServedNetwork(ip) {
<mask> err = s.localResolvers.Resolve(ctx)
<mask> } else {
<mask> err = s.internalProxy.Resolve(ctx)
<mask> }
<mask> if err != nil {
<mask> return "", err
<mask> }
<mask>
<mask> resp = ctx.Res
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove resp, err := e.Exchanger.Exchange(req)
</s> add resp, err := e.ex.Exchange(req) </s> remove err := s.localResolvers.Resolve(d)
if err != nil {
ctx.err = err
</s> add if s.conf.UsePrivateRDNS {
if err := s.localResolvers.Resolve(d); err != nil {
ctx.err = err </s> remove d.Res = s.genDNSFilterMessage(d, &res)
</s> add d.Res = s.genDNSFilterMessage(d, res) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dnsforward.go |
// ResolvesPrivatePTR implements the RDNSExchanger interface for *Server.
func (s *Server) ResolvesPrivatePTR() (ok bool) {
s.serverLock.RLock()
defer s.serverLock.RUnlock()
return s.conf.UsePrivateRDNS
}
| <mask> return strings.TrimSuffix(ptr.Ptr, "."), nil
<mask> }
<mask>
<mask> // Start starts the DNS server.
<mask> func (s *Server) Start() error {
<mask> s.serverLock.Lock()
<mask> defer s.serverLock.Unlock()
</s> Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184.
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <[email protected]>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <[email protected]>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <[email protected]>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code </s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock()
</s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock()
</s> remove s.Lock()
defer s.Unlock()
</s> add s.serverLock.Lock()
defer s.serverLock.Unlock() </s> remove // Reconfigure applies the new configuration to the DNS server
</s> add // Reconfigure applies the new configuration to the DNS server. </s> remove s.RLock()
defer s.RUnlock()
</s> add s.serverLock.RLock()
defer s.serverLock.RUnlock()
| [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/557bbcbf37a8f1d6092a51064e329ecc50bebb9d | internal/dnsforward/dnsforward.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.