docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
"||sself.co^", | <mask> "||social.cologne^",
<mask> "||social.dev-wiki.de^",
<mask> "||social.politicaconciencia.org^",
<mask> "||social.vivaldi.net^",
<mask> "||sociale.network^",
<mask> "||sueden.social^",
<mask> "||techhub.social^",
<mask> "||theblower.au^",
<mask> "||tkz.one^",
<mask> "||toot.aquilenet.fr^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove "||snabelen.no^",
</s> add "||socel.net^", </s> remove // RootDirFS returns the fs.FS rooted at the operating system's root.
</s> add // RootDirFS returns the [fs.FS] rooted at the operating system's root. On
// Windows it returns the fs.FS rooted at the volume of the system directory
// (usually, C:). | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/filtering/servicelist.go |
"||toot.community^", | <mask> "||tkz.one^",
<mask> "||toot.aquilenet.fr^",
<mask> "||toot.funami.tech^",
<mask> "||toot.wales^",
<mask> "||troet.cafe^",
<mask> "||uiuxdev.social^",
<mask> "||union.place^",
<mask> "||universeodon.com^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove "||sociale.network^",
</s> add "||sself.co^", </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.4' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.4' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:5.4' | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/filtering/servicelist.go |
"||xarxa.cloud^", | <mask> "||universeodon.com^",
<mask> "||urbanists.social^",
<mask> "||vocalodon.net^",
<mask> "||wxw.moe^",
<mask> },
<mask> }, {
<mask> ID: "minecraft",
<mask> Name: "Minecraft",
<mask> IconSVG: []byte("<svg fill=\"currentColor\" xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\"><path d=\"M 10.5 4 C 10.066406 4 9.695313 4.273438 9.5625 4.6875 L 0.0625 34.28125 C -0.0546875 34.648438 0.0273438 35.078125 0.3125 35.34375 L 10.40625 44.71875 C 10.589844 44.890625 10.839844 45 11.09375 45 L 22 45 C 22.449219 45 22.851563 44.683594 22.96875 44.25 L 24.3125 39.34375 C 24.40625 39.371094 24.492188 39.40625 24.59375 39.40625 L 27.03125 39.40625 L 31.65625 44.65625 C 31.847656 44.875 32.117188 45 32.40625 45 L 43.6875 45 C 44.167969 45 44.597656 44.660156 44.6875 44.1875 L 49.96875 16.1875 C 50.011719 15.96875 49.976563 15.730469 49.875 15.53125 L 44.1875 4.53125 C 44.015625 4.199219 43.6875 4 43.3125 4 L 31.90625 4 C 31.449219 4 31.050781 4.308594 30.9375 4.75 L 29.8125 9.125 L 27.46875 9.1875 C 27.03125 9.203125 26.648438 9.515625 26.53125 9.9375 L 26.46875 10.125 L 22.3125 4.40625 C 22.125 4.148438 21.820313 4 21.5 4 Z M 11.21875 6 L 20.09375 6 L 18.71875 10.59375 L 9.75 10.59375 Z M 32.6875 6 L 41.96875 6 L 39.6875 15.59375 L 35 15.59375 C 35.046875 15.449219 35.074219 15.3125 35.09375 15.15625 L 35.59375 11.71875 C 35.703125 10.734375 35.359375 10.113281 35.0625 9.78125 C 34.78125 9.46875 34.277344 9.09375 33.40625 9.09375 L 31.875 9.09375 Z M 30.625 11.09375 L 33.40625 11.09375 C 33.542969 11.09375 33.589844 11.125 33.59375 11.125 C 33.609375 11.152344 33.644531 11.277344 33.625 11.46875 L 33.09375 14.875 C 33.050781 15.273438 32.679688 15.5 32.3125 15.5 C 32.15625 15.5 32.007813 15.53125 31.875 15.59375 L 27.125 15.59375 L 28.0625 12.15625 C 28.089844 12.054688 28.097656 11.945313 28.09375 11.84375 L 28.28125 11.1875 Z M 9.125 12.59375 L 20.71875 12.59375 L 19.71875 16.34375 C 19.640625 16.644531 19.714844 16.972656 19.90625 17.21875 C 20.09375 17.464844 20.378906 17.59375 20.6875 17.59375 L 39.25 17.59375 L 35.78125 33.6875 L 27 33.6875 L 29.96875 22.65625 C 30.050781 22.355469 29.96875 22.027344 29.78125 21.78125 C 29.59375 21.535156 29.3125 21.40625 29 21.40625 L 25.5 21.40625 C 25.046875 21.40625 24.648438 21.71875 24.53125 22.15625 L 23.21875 27 L 19.125 27 L 20.375 22.5625 C 20.460938 22.261719 20.375 21.9375 20.1875 21.6875 C 20 21.4375 19.71875 21.3125 19.40625 21.3125 L 15.90625 21.3125 C 15.460938 21.3125 15.0625 21.605469 14.9375 22.03125 L 13.8125 25.90625 C 13.742188 26 13.660156 26.101563 13.625 26.21875 L 13.59375 26.40625 L 10.15625 26.40625 L 10.5625 25.1875 C 10.75 24.53125 10.628906 23.84375 10.25 23.34375 C 9.890625 22.867188 9.320313 22.59375 8.6875 22.59375 L 5.90625 22.59375 Z M 5.25 24.59375 L 8.65625 24.59375 L 8.28125 25.71875 C 8.089844 26.167969 8.042969 26.613281 8.15625 27.03125 C 7.808594 27.316406 7.5625 27.6875 7.4375 28.125 L 7.0625 29.46875 C 6.773438 30.195313 6.832031 30.976563 7.21875 31.5625 C 7.53125 32.035156 8.183594 32.59375 9.59375 32.59375 L 11.8125 32.59375 L 11.53125 33.5 L 2.375 33.59375 Z M 10.09375 28.40625 L 13 28.40625 L 12.375 30.59375 L 9.59375 30.59375 C 9.015625 30.59375 8.875 30.46875 8.875 30.46875 C 8.863281 30.441406 8.851563 30.316406 8.90625 30.1875 C 8.921875 30.148438 8.957031 30.101563 8.96875 30.0625 L 9.375 28.6875 C 9.410156 28.558594 9.714844 28.40625 10.09375 28.40625 Z\"/></svg>"),
<mask> Rules: []string{
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 8fe5f029f2092ff1b23c6b734fef35937658c6d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 16:13:04 2022 +0300
aghos: fix windows root dir
commit 57237df1d95c7c72cc02103eb869590a2b8fe50c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 7 15:18:59 2022 +0300
all: upd go, i18n, svcs </s> remove "||colorid.es^",
"||dizl.de^",
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa49d74aa8f0eac826331732d4008799dc6b8f1e | internal/filtering/servicelist.go |
withinInterfaceCtx := false | <mask> return false, err
<mask> }
<mask> lines := strings.Split(string(body), "\n")
<mask> nameLine := fmt.Sprintf("interface %s", ifaceName)
<mask> state := 0
<mask>
<mask> for _, line := range lines {
<mask> line = strings.TrimSpace(line)
<mask>
<mask> if state == 1 && len(line) == 0 {
</s> * hasStaticIP: use properly named boolean variable </s> remove if state == 1 && len(line) == 0 {
</s> add if withinInterfaceCtx && len(line) == 0 { </s> remove state = 0
</s> add withinInterfaceCtx = false </s> remove state = 0
</s> add // we found another interface - reset our state
withinInterfaceCtx = false </s> remove if state == 0 {
</s> add if !withinInterfaceCtx { </s> remove state = 1
</s> add // we found our interface
withinInterfaceCtx = true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa5ff053b761a223ead943a492b1d89700317fff | dhcp.go |
if withinInterfaceCtx && len(line) == 0 { | <mask>
<mask> for _, line := range lines {
<mask> line = strings.TrimSpace(line)
<mask>
<mask> if state == 1 && len(line) == 0 {
<mask> // an empty line resets our state
<mask> state = 0
<mask> }
<mask>
<mask> if len(line) == 0 || line[0] == '#' {
</s> * hasStaticIP: use properly named boolean variable </s> remove state = 0
</s> add withinInterfaceCtx = false </s> remove state := 0
</s> add withinInterfaceCtx := false </s> remove state = 1
</s> add // we found our interface
withinInterfaceCtx = true </s> remove if state == 0 {
</s> add if !withinInterfaceCtx { </s> remove } else if state == 1 {
</s> add } else { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa5ff053b761a223ead943a492b1d89700317fff | dhcp.go |
withinInterfaceCtx = false | <mask> line = strings.TrimSpace(line)
<mask>
<mask> if state == 1 && len(line) == 0 {
<mask> // an empty line resets our state
<mask> state = 0
<mask> }
<mask>
<mask> if len(line) == 0 || line[0] == '#' {
<mask> continue
<mask> }
</s> * hasStaticIP: use properly named boolean variable </s> remove if state == 1 && len(line) == 0 {
</s> add if withinInterfaceCtx && len(line) == 0 { </s> remove state := 0
</s> add withinInterfaceCtx := false </s> remove state = 1
</s> add // we found our interface
withinInterfaceCtx = true </s> remove if state == 0 {
</s> add if !withinInterfaceCtx { </s> remove } else if state == 1 {
</s> add } else { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa5ff053b761a223ead943a492b1d89700317fff | dhcp.go |
if !withinInterfaceCtx { | <mask> continue
<mask> }
<mask> line = strings.TrimSpace(line)
<mask>
<mask> if state == 0 {
<mask> if line == nameLine {
<mask> state = 1
<mask> }
<mask>
<mask> } else if state == 1 {
</s> * hasStaticIP: use properly named boolean variable </s> remove } else if state == 1 {
</s> add } else { </s> remove state = 1
</s> add // we found our interface
withinInterfaceCtx = true </s> remove state = 0
</s> add withinInterfaceCtx = false </s> remove if state == 1 && len(line) == 0 {
</s> add if withinInterfaceCtx && len(line) == 0 { </s> remove state = 0
</s> add // we found another interface - reset our state
withinInterfaceCtx = false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa5ff053b761a223ead943a492b1d89700317fff | dhcp.go |
// we found our interface
withinInterfaceCtx = true | <mask> line = strings.TrimSpace(line)
<mask>
<mask> if state == 0 {
<mask> if line == nameLine {
<mask> state = 1
<mask> }
<mask>
<mask> } else if state == 1 {
<mask> if strings.HasPrefix(line, "interface ") {
<mask> state = 0
</s> * hasStaticIP: use properly named boolean variable </s> remove } else if state == 1 {
</s> add } else { </s> remove state = 0
</s> add // we found another interface - reset our state
withinInterfaceCtx = false </s> remove if state == 0 {
</s> add if !withinInterfaceCtx { </s> remove state = 0
</s> add withinInterfaceCtx = false </s> remove if state == 1 && len(line) == 0 {
</s> add if withinInterfaceCtx && len(line) == 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa5ff053b761a223ead943a492b1d89700317fff | dhcp.go |
} else { | <mask> if line == nameLine {
<mask> state = 1
<mask> }
<mask>
<mask> } else if state == 1 {
<mask> if strings.HasPrefix(line, "interface ") {
<mask> state = 0
<mask> continue
<mask> }
<mask> if strings.HasPrefix(line, "static ip_address=") {
</s> * hasStaticIP: use properly named boolean variable </s> remove state = 0
</s> add // we found another interface - reset our state
withinInterfaceCtx = false </s> remove state = 1
</s> add // we found our interface
withinInterfaceCtx = true </s> remove if state == 0 {
</s> add if !withinInterfaceCtx { </s> remove state = 0
</s> add withinInterfaceCtx = false </s> remove if state == 1 && len(line) == 0 {
</s> add if withinInterfaceCtx && len(line) == 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa5ff053b761a223ead943a492b1d89700317fff | dhcp.go |
// we found another interface - reset our state
withinInterfaceCtx = false | <mask> }
<mask>
<mask> } else if state == 1 {
<mask> if strings.HasPrefix(line, "interface ") {
<mask> state = 0
<mask> continue
<mask> }
<mask> if strings.HasPrefix(line, "static ip_address=") {
<mask> return true, nil
<mask> }
</s> * hasStaticIP: use properly named boolean variable </s> remove } else if state == 1 {
</s> add } else { </s> remove state = 1
</s> add // we found our interface
withinInterfaceCtx = true </s> remove state := 0
</s> add withinInterfaceCtx := false </s> remove if state == 0 {
</s> add if !withinInterfaceCtx { </s> remove state = 0
</s> add withinInterfaceCtx = false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa5ff053b761a223ead943a492b1d89700317fff | dhcp.go |
font-weight: 600; | <mask> grid-column-gap: 1.5rem;
<mask> }
<mask>
<mask> .grid--title {
<mask> font-weight: bold;
<mask> }
<mask>
<mask> .grid--title:not(:first-child) {
<mask> padding-top: 1rem;
<mask> }
</s> Fix the remaining stylint issues </s> remove font-weight: bold;
</s> add font-weight: 600; </s> remove font-weight: bold;
</s> add font-weight: 600; </s> remove font-weight: bold;
</s> add font-weight: 600; </s> remove --size: 2.5rem;
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa96d49dcb690131d4a559ab16b27453c147a4c9 | client/src/components/Logs/Cells/IconTooltip.css |
font-weight: 600; | <mask> margin: 0 !important;
<mask> }
<mask>
<mask> .grid .key-colon, .grid .title--border {
<mask> font-weight: bold;
<mask> }
<mask> }
<mask>
<mask> .grid .key-colon:nth-child(odd)::after {
<mask> content: ":";
</s> Fix the remaining stylint issues </s> remove font-weight: bold;
</s> add font-weight: 600; </s> remove font-weight: bold;
</s> add font-weight: 600; </s> remove font-weight: bold;
</s> add font-weight: 600; </s> remove --size: 2.5rem;
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa96d49dcb690131d4a559ab16b27453c147a4c9 | client/src/components/Logs/Cells/IconTooltip.css |
font-weight: 600; | <mask> line-height: 1.5rem;
<mask> }
<mask>
<mask> .logs__text--bold {
<mask> font-weight: bold;
<mask> }
<mask>
<mask> .logs__time {
<mask> font-size: 1rem;
<mask> line-height: 1.5;
</s> Fix the remaining stylint issues </s> remove font-weight: bold;
</s> add font-weight: 600; </s> remove font-weight: bold;
</s> add font-weight: 600; </s> remove font-weight: bold;
</s> add font-weight: 600; </s> remove --size: 2.5rem;
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa96d49dcb690131d4a559ab16b27453c147a4c9 | client/src/components/Logs/Logs.css |
<mask> }
<mask> }
<mask>
<mask> .logs__refresh {
<mask> --size: 2.5rem;
<mask> position: relative;
<mask> top: 3px;
<mask> display: inline-flex;
<mask> align-items: center;
<mask> justify-content: center;
</s> Fix the remaining stylint issues </s> remove font-weight: bold;
</s> add font-weight: 600; </s> remove font-weight: bold;
</s> add font-weight: 600; </s> remove font-weight: bold;
</s> add font-weight: 600; </s> remove font-weight: bold;
</s> add font-weight: 600; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa96d49dcb690131d4a559ab16b27453c147a4c9 | client/src/components/Logs/Logs.css | |
--size: 2.5rem; | <mask> top: 3px;
<mask> display: inline-flex;
<mask> align-items: center;
<mask> justify-content: center;
<mask> width: var(--size);
<mask> height: var(--size);
<mask> padding: 0;
<mask> margin-left: 0.9375rem;
</s> Fix the remaining stylint issues </s> remove --size: 2.5rem;
</s> add </s> remove font-weight: bold;
</s> add font-weight: 600; </s> remove font-weight: bold;
</s> add font-weight: 600; </s> remove font-weight: bold;
</s> add font-weight: 600; </s> remove font-weight: bold;
</s> add font-weight: 600; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa96d49dcb690131d4a559ab16b27453c147a4c9 | client/src/components/Logs/Logs.css |
font-weight: 600; | <mask> .logs__no-data {
<mask> color: var(--gray-4d);
<mask> background-color: var(--white80);
<mask> pointer-events: none;
<mask> font-weight: bold;
<mask> text-align: center;
<mask> padding-top: 21rem;
<mask> display: block;
<mask> }
<mask>
</s> Fix the remaining stylint issues </s> remove font-weight: bold;
</s> add font-weight: 600; </s> remove font-weight: bold;
</s> add font-weight: 600; </s> remove font-weight: bold;
</s> add font-weight: 600; </s> remove --size: 2.5rem;
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fa96d49dcb690131d4a559ab16b27453c147a4c9 | client/src/components/Logs/Logs.css |
"name": "AdAway Default Blocklist", | <mask> "homepage": "https://github.com/AdguardTeam/AdGuardSDNSFilter",
<mask> "source": "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt"
<mask> },
<mask> "adaway-default-blocklist": {
<mask> "name": "AdAway default blocklist",
<mask> "categoryId": "general",
<mask> "homepage": "https://github.com/AdAway/adaway.github.io/",
<mask> "source": "https://raw.githubusercontent.com/AdAway/adaway.github.io/master/hosts.txt"
<mask> },
<mask> "peter-lowe-list": {
</s> * Update URLs for default filters </s> remove "source": "https://raw.githubusercontent.com/AdAway/adaway.github.io/master/hosts.txt"
</s> add "source": "https://adaway.org/hosts.txt" </s> remove "homepage": "https://ssl.bblck.me/",
"source": "https://ssl.bblck.me/blacklists/ublock-origin.txt"
</s> add "homepage": "https://github.com/paulgb/BarbBlock/",
"source": "https://paulgb.github.io/BarbBlock/blacklists/hosts-file.txt" </s> remove {Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://github.com/AdAway/adaway.github.io/blob/master/hosts.txt", Name: "AdAway"},
</s> add {Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway Default Blocklist"}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/facf72f774b2f7cf33397951b16d1aeabfdeeedb | client/src/helpers/filters/filters.json |
"source": "https://adaway.org/hosts.txt" | <mask> "adaway-default-blocklist": {
<mask> "name": "AdAway default blocklist",
<mask> "categoryId": "general",
<mask> "homepage": "https://github.com/AdAway/adaway.github.io/",
<mask> "source": "https://raw.githubusercontent.com/AdAway/adaway.github.io/master/hosts.txt"
<mask> },
<mask> "peter-lowe-list": {
<mask> "name": "Peter Lowe's List",
<mask> "categoryId": "general",
<mask> "homepage": "https://pgl.yoyo.org/adservers/",
</s> * Update URLs for default filters </s> remove "name": "AdAway default blocklist",
</s> add "name": "AdAway Default Blocklist", </s> remove "homepage": "https://ssl.bblck.me/",
"source": "https://ssl.bblck.me/blacklists/ublock-origin.txt"
</s> add "homepage": "https://github.com/paulgb/BarbBlock/",
"source": "https://paulgb.github.io/BarbBlock/blacklists/hosts-file.txt" </s> remove {Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://github.com/AdAway/adaway.github.io/blob/master/hosts.txt", Name: "AdAway"},
</s> add {Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway Default Blocklist"}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/facf72f774b2f7cf33397951b16d1aeabfdeeedb | client/src/helpers/filters/filters.json |
"homepage": "https://github.com/paulgb/BarbBlock/",
"source": "https://paulgb.github.io/BarbBlock/blacklists/hosts-file.txt" | <mask> },
<mask> "BarbBlock": {
<mask> "name": "BarbBlock",
<mask> "categoryId": "other",
<mask> "homepage": "https://ssl.bblck.me/",
<mask> "source": "https://ssl.bblck.me/blacklists/ublock-origin.txt"
<mask> }
<mask> }
<mask> }
</s> * Update URLs for default filters </s> remove "name": "AdAway default blocklist",
</s> add "name": "AdAway Default Blocklist", </s> remove "source": "https://raw.githubusercontent.com/AdAway/adaway.github.io/master/hosts.txt"
</s> add "source": "https://adaway.org/hosts.txt" </s> remove {Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://github.com/AdAway/adaway.github.io/blob/master/hosts.txt", Name: "AdAway"},
</s> add {Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway Default Blocklist"}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/facf72f774b2f7cf33397951b16d1aeabfdeeedb | client/src/helpers/filters/filters.json |
{Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway Default Blocklist"}, | <mask>
<mask> func defaultFilters() []filter {
<mask> return []filter{
<mask> {Filter: dnsfilter.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard DNS filter"},
<mask> {Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://github.com/AdAway/adaway.github.io/blob/master/hosts.txt", Name: "AdAway"},
<mask> {Filter: dnsfilter.Filter{ID: 4}, Enabled: false, URL: "https://www.malwaredomainlist.com/hostslist/hosts.txt", Name: "MalwareDomainList.com Hosts List"},
<mask> }
<mask> }
<mask>
<mask> // field ordering is important -- yaml fields will mirror ordering from here
</s> * Update URLs for default filters </s> remove "name": "AdAway default blocklist",
</s> add "name": "AdAway Default Blocklist", </s> remove "source": "https://raw.githubusercontent.com/AdAway/adaway.github.io/master/hosts.txt"
</s> add "source": "https://adaway.org/hosts.txt" </s> remove "homepage": "https://ssl.bblck.me/",
"source": "https://ssl.bblck.me/blacklists/ublock-origin.txt"
</s> add "homepage": "https://github.com/paulgb/BarbBlock/",
"source": "https://paulgb.github.io/BarbBlock/blacklists/hosts-file.txt" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/facf72f774b2f7cf33397951b16d1aeabfdeeedb | home/filter.go |
github.com/AdguardTeam/dnsproxy v0.48.2 | <mask> go 1.19
<mask>
<mask> require (
<mask> // TODO(a.garipov): Use v0.48.0 when it's released.
<mask> github.com/AdguardTeam/dnsproxy v0.48.0
<mask> github.com/AdguardTeam/golibs v0.13.0
<mask> github.com/AdguardTeam/urlfilter v0.16.1
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.5
<mask> github.com/digineo/go-ipset/v2 v2.2.1
</s> Pull request 1784: 5631-lookup-panic
Merge in DNS/adguard-home from 5631-lookup-panic to master
Updates #5631.
Squashed commit of the following:
commit 0ec578485bd955146d9119b6b8dafda33bfcefad
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:42:26 2023 +0500
all: imp code, log changes
commit fc43c39418640af4864ec3b5bc92ec31ec9cd018
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:15:27 2023 +0500
home: handle error, upd proxy </s> remove github.com/ameshkov/dnscrypt/v2 v2.2.5
</s> add github.com/ameshkov/dnscrypt/v2 v2.2.6 </s> remove github.com/AdguardTeam/dnsproxy v0.48.0 h1:sGViYy2pV0cEp2zCsxPjFd9rlgD0+yELpIeLkBxHAoI=
github.com/AdguardTeam/dnsproxy v0.48.0/go.mod h1:9OHoeaVod+moWwrLjHF95RQnFWGi/6B1tfKsxWc/yGE=
</s> add github.com/AdguardTeam/dnsproxy v0.48.2 h1:zEWeImyJGPeQAZ7+F/sgOJ2WbCRN1zbINLsDAEnFWjI=
github.com/AdguardTeam/dnsproxy v0.48.2/go.mod h1:Y7g7jRTd/u7+KJ/QvnGI2PCE8vnisp6EsW47/Sz0DZw= </s> remove github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
</s> add </s> remove github.com/quic-go/quic-go v0.32.0
</s> add github.com/quic-go/quic-go v0.33.0 </s> remove return nil, fmt.Errorf("couldn't lookup host: %s", host)
</s> add return nil, fmt.Errorf("couldn't lookup host: %q", host) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fb7b8bba6a9a113ab7c86f6f3c638532c32d2c3d | go.mod |
github.com/ameshkov/dnscrypt/v2 v2.2.6 | <mask> github.com/AdguardTeam/dnsproxy v0.48.0
<mask> github.com/AdguardTeam/golibs v0.13.0
<mask> github.com/AdguardTeam/urlfilter v0.16.1
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.5
<mask> github.com/digineo/go-ipset/v2 v2.2.1
<mask> github.com/dimfeld/httptreemux/v5 v5.5.0
<mask> github.com/fsnotify/fsnotify v1.6.0
<mask> github.com/go-ping/ping v1.1.0
<mask> github.com/google/go-cmp v0.5.9
</s> Pull request 1784: 5631-lookup-panic
Merge in DNS/adguard-home from 5631-lookup-panic to master
Updates #5631.
Squashed commit of the following:
commit 0ec578485bd955146d9119b6b8dafda33bfcefad
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:42:26 2023 +0500
all: imp code, log changes
commit fc43c39418640af4864ec3b5bc92ec31ec9cd018
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:15:27 2023 +0500
home: handle error, upd proxy </s> remove github.com/AdguardTeam/dnsproxy v0.48.0
</s> add github.com/AdguardTeam/dnsproxy v0.48.2 </s> remove github.com/AdguardTeam/dnsproxy v0.48.0 h1:sGViYy2pV0cEp2zCsxPjFd9rlgD0+yELpIeLkBxHAoI=
github.com/AdguardTeam/dnsproxy v0.48.0/go.mod h1:9OHoeaVod+moWwrLjHF95RQnFWGi/6B1tfKsxWc/yGE=
</s> add github.com/AdguardTeam/dnsproxy v0.48.2 h1:zEWeImyJGPeQAZ7+F/sgOJ2WbCRN1zbINLsDAEnFWjI=
github.com/AdguardTeam/dnsproxy v0.48.2/go.mod h1:Y7g7jRTd/u7+KJ/QvnGI2PCE8vnisp6EsW47/Sz0DZw= </s> remove github.com/quic-go/quic-go v0.32.0
</s> add github.com/quic-go/quic-go v0.33.0 </s> remove return nil, fmt.Errorf("couldn't lookup host: %s", host)
</s> add return nil, fmt.Errorf("couldn't lookup host: %q", host) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fb7b8bba6a9a113ab7c86f6f3c638532c32d2c3d | go.mod |
github.com/quic-go/quic-go v0.33.0 | <mask> github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118
<mask> github.com/mdlayher/netlink v1.7.1
<mask> github.com/mdlayher/packet v1.1.1
<mask> github.com/miekg/dns v1.1.50
<mask> github.com/quic-go/quic-go v0.32.0
<mask> github.com/stretchr/testify v1.8.2
<mask> github.com/ti-mo/netfilter v0.5.0
<mask> go.etcd.io/bbolt v1.3.7
<mask> golang.org/x/crypto v0.6.0
<mask> golang.org/x/exp v0.0.0-20230306221820-f0f767cdffd6
</s> Pull request 1784: 5631-lookup-panic
Merge in DNS/adguard-home from 5631-lookup-panic to master
Updates #5631.
Squashed commit of the following:
commit 0ec578485bd955146d9119b6b8dafda33bfcefad
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:42:26 2023 +0500
all: imp code, log changes
commit fc43c39418640af4864ec3b5bc92ec31ec9cd018
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:15:27 2023 +0500
home: handle error, upd proxy </s> remove github.com/quic-go/quic-go v0.32.0 h1:lY02md31s1JgPiiyfqJijpu/UX/Iun304FI3yUqX7tA=
github.com/quic-go/quic-go v0.32.0/go.mod h1:/fCsKANhQIeD5l76c2JFU+07gVE3KaA0FP+0zMWwfwo=
</s> add github.com/quic-go/quic-go v0.33.0 h1:ItNoTDN/Fm/zBlq769lLJc8ECe9gYaW40veHCCco7y0=
github.com/quic-go/quic-go v0.33.0/go.mod h1:YMuhaAV9/jIu0XclDXwZPAsP/2Kgr5yMYhe9oxhhOFA= </s> remove github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U=
github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc=
</s> add </s> remove github.com/ameshkov/dnscrypt/v2 v2.2.5
</s> add github.com/ameshkov/dnscrypt/v2 v2.2.6 </s> remove github.com/AdguardTeam/dnsproxy v0.48.0
</s> add github.com/AdguardTeam/dnsproxy v0.48.2 </s> remove return nil, fmt.Errorf("couldn't lookup host: %s", host)
</s> add return nil, fmt.Errorf("couldn't lookup host: %q", host) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fb7b8bba6a9a113ab7c86f6f3c638532c32d2c3d | go.mod |
<mask> github.com/pierrec/lz4/v4 v4.1.17 // indirect
<mask> github.com/pkg/errors v0.9.1 // indirect
<mask> github.com/pmezard/go-difflib v1.0.0 // indirect
<mask> github.com/quic-go/qpack v0.4.0 // indirect
<mask> github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
<mask> github.com/quic-go/qtls-go1-19 v0.2.1 // indirect
<mask> github.com/quic-go/qtls-go1-20 v0.1.1 // indirect
<mask> github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect
<mask> golang.org/x/mod v0.8.0 // indirect
<mask> golang.org/x/sync v0.1.0 // indirect
</s> Pull request 1784: 5631-lookup-panic
Merge in DNS/adguard-home from 5631-lookup-panic to master
Updates #5631.
Squashed commit of the following:
commit 0ec578485bd955146d9119b6b8dafda33bfcefad
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:42:26 2023 +0500
all: imp code, log changes
commit fc43c39418640af4864ec3b5bc92ec31ec9cd018
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:15:27 2023 +0500
home: handle error, upd proxy </s> remove github.com/AdguardTeam/dnsproxy v0.48.0
</s> add github.com/AdguardTeam/dnsproxy v0.48.2 </s> remove github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U=
github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc=
</s> add </s> remove github.com/quic-go/quic-go v0.32.0 h1:lY02md31s1JgPiiyfqJijpu/UX/Iun304FI3yUqX7tA=
github.com/quic-go/quic-go v0.32.0/go.mod h1:/fCsKANhQIeD5l76c2JFU+07gVE3KaA0FP+0zMWwfwo=
</s> add github.com/quic-go/quic-go v0.33.0 h1:ItNoTDN/Fm/zBlq769lLJc8ECe9gYaW40veHCCco7y0=
github.com/quic-go/quic-go v0.33.0/go.mod h1:YMuhaAV9/jIu0XclDXwZPAsP/2Kgr5yMYhe9oxhhOFA= </s> remove return nil, fmt.Errorf("couldn't lookup host: %s", host)
</s> add return nil, fmt.Errorf("couldn't lookup host: %q", host) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fb7b8bba6a9a113ab7c86f6f3c638532c32d2c3d | go.mod | |
github.com/AdguardTeam/dnsproxy v0.48.2 h1:zEWeImyJGPeQAZ7+F/sgOJ2WbCRN1zbINLsDAEnFWjI=
github.com/AdguardTeam/dnsproxy v0.48.2/go.mod h1:Y7g7jRTd/u7+KJ/QvnGI2PCE8vnisp6EsW47/Sz0DZw= | <mask> github.com/AdguardTeam/dnsproxy v0.48.0 h1:sGViYy2pV0cEp2zCsxPjFd9rlgD0+yELpIeLkBxHAoI=
<mask> github.com/AdguardTeam/dnsproxy v0.48.0/go.mod h1:9OHoeaVod+moWwrLjHF95RQnFWGi/6B1tfKsxWc/yGE=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
<mask> github.com/AdguardTeam/golibs v0.13.0 h1:hVBeNQXT/BgcjKz/4FMpFGvEYqXiXDJG+b5XpGCUOLk=
<mask> github.com/AdguardTeam/golibs v0.13.0/go.mod h1:rIglKDHdLvFT1UbhumBLHO9S4cvWS9MEyT1njommI/Y=
<mask> github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
</s> Pull request 1784: 5631-lookup-panic
Merge in DNS/adguard-home from 5631-lookup-panic to master
Updates #5631.
Squashed commit of the following:
commit 0ec578485bd955146d9119b6b8dafda33bfcefad
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:42:26 2023 +0500
all: imp code, log changes
commit fc43c39418640af4864ec3b5bc92ec31ec9cd018
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:15:27 2023 +0500
home: handle error, upd proxy </s> remove github.com/AdguardTeam/dnsproxy v0.48.0
</s> add github.com/AdguardTeam/dnsproxy v0.48.2 </s> remove github.com/ameshkov/dnscrypt/v2 v2.2.5
</s> add github.com/ameshkov/dnscrypt/v2 v2.2.6 </s> remove github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U=
github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc=
</s> add </s> remove return nil, fmt.Errorf("couldn't lookup host: %s", host)
</s> add return nil, fmt.Errorf("couldn't lookup host: %q", host) | [
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fb7b8bba6a9a113ab7c86f6f3c638532c32d2c3d | go.sum |
<mask> github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
<mask> github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
<mask> github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
<mask> github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
<mask> github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U=
<mask> github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc=
<mask> github.com/quic-go/qtls-go1-19 v0.2.1 h1:aJcKNMkH5ASEJB9FXNeZCyTEIHU1J7MmHyz1Q1TSG1A=
<mask> github.com/quic-go/qtls-go1-19 v0.2.1/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
<mask> github.com/quic-go/qtls-go1-20 v0.1.1 h1:KbChDlg82d3IHqaj2bn6GfKRj84Per2VGf5XV3wSwQk=
<mask> github.com/quic-go/qtls-go1-20 v0.1.1/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
<mask> github.com/quic-go/quic-go v0.32.0 h1:lY02md31s1JgPiiyfqJijpu/UX/Iun304FI3yUqX7tA=
</s> Pull request 1784: 5631-lookup-panic
Merge in DNS/adguard-home from 5631-lookup-panic to master
Updates #5631.
Squashed commit of the following:
commit 0ec578485bd955146d9119b6b8dafda33bfcefad
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:42:26 2023 +0500
all: imp code, log changes
commit fc43c39418640af4864ec3b5bc92ec31ec9cd018
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:15:27 2023 +0500
home: handle error, upd proxy </s> remove github.com/quic-go/quic-go v0.32.0 h1:lY02md31s1JgPiiyfqJijpu/UX/Iun304FI3yUqX7tA=
github.com/quic-go/quic-go v0.32.0/go.mod h1:/fCsKANhQIeD5l76c2JFU+07gVE3KaA0FP+0zMWwfwo=
</s> add github.com/quic-go/quic-go v0.33.0 h1:ItNoTDN/Fm/zBlq769lLJc8ECe9gYaW40veHCCco7y0=
github.com/quic-go/quic-go v0.33.0/go.mod h1:YMuhaAV9/jIu0XclDXwZPAsP/2Kgr5yMYhe9oxhhOFA= </s> remove github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
</s> add </s> remove github.com/AdguardTeam/dnsproxy v0.48.0 h1:sGViYy2pV0cEp2zCsxPjFd9rlgD0+yELpIeLkBxHAoI=
github.com/AdguardTeam/dnsproxy v0.48.0/go.mod h1:9OHoeaVod+moWwrLjHF95RQnFWGi/6B1tfKsxWc/yGE=
</s> add github.com/AdguardTeam/dnsproxy v0.48.2 h1:zEWeImyJGPeQAZ7+F/sgOJ2WbCRN1zbINLsDAEnFWjI=
github.com/AdguardTeam/dnsproxy v0.48.2/go.mod h1:Y7g7jRTd/u7+KJ/QvnGI2PCE8vnisp6EsW47/Sz0DZw= </s> remove github.com/quic-go/quic-go v0.32.0
</s> add github.com/quic-go/quic-go v0.33.0 </s> remove return nil, fmt.Errorf("couldn't lookup host: %s", host)
</s> add return nil, fmt.Errorf("couldn't lookup host: %q", host) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fb7b8bba6a9a113ab7c86f6f3c638532c32d2c3d | go.sum | |
github.com/quic-go/quic-go v0.33.0 h1:ItNoTDN/Fm/zBlq769lLJc8ECe9gYaW40veHCCco7y0=
github.com/quic-go/quic-go v0.33.0/go.mod h1:YMuhaAV9/jIu0XclDXwZPAsP/2Kgr5yMYhe9oxhhOFA= | <mask> github.com/quic-go/qtls-go1-19 v0.2.1 h1:aJcKNMkH5ASEJB9FXNeZCyTEIHU1J7MmHyz1Q1TSG1A=
<mask> github.com/quic-go/qtls-go1-19 v0.2.1/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
<mask> github.com/quic-go/qtls-go1-20 v0.1.1 h1:KbChDlg82d3IHqaj2bn6GfKRj84Per2VGf5XV3wSwQk=
<mask> github.com/quic-go/qtls-go1-20 v0.1.1/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
<mask> github.com/quic-go/quic-go v0.32.0 h1:lY02md31s1JgPiiyfqJijpu/UX/Iun304FI3yUqX7tA=
<mask> github.com/quic-go/quic-go v0.32.0/go.mod h1:/fCsKANhQIeD5l76c2JFU+07gVE3KaA0FP+0zMWwfwo=
<mask> github.com/shirou/gopsutil/v3 v3.21.8 h1:nKct+uP0TV8DjjNiHanKf8SAuub+GNsbrOtM9Nl9biA=
<mask> github.com/shirou/gopsutil/v3 v3.21.8/go.mod h1:YWp/H8Qs5fVmf17v7JNZzA0mPJ+mS2e9JdiUF9LlKzQ=
<mask> github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
<mask> github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
<mask> github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
</s> Pull request 1784: 5631-lookup-panic
Merge in DNS/adguard-home from 5631-lookup-panic to master
Updates #5631.
Squashed commit of the following:
commit 0ec578485bd955146d9119b6b8dafda33bfcefad
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:42:26 2023 +0500
all: imp code, log changes
commit fc43c39418640af4864ec3b5bc92ec31ec9cd018
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:15:27 2023 +0500
home: handle error, upd proxy </s> remove github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U=
github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc=
</s> add </s> remove github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
</s> add </s> remove github.com/quic-go/quic-go v0.32.0
</s> add github.com/quic-go/quic-go v0.33.0 </s> remove return nil, fmt.Errorf("couldn't lookup host: %s", host)
</s> add return nil, fmt.Errorf("couldn't lookup host: %q", host) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fb7b8bba6a9a113ab7c86f6f3c638532c32d2c3d | go.sum |
<mask> return dialer.DialContext(ctx, network, addr)
<mask> }
<mask>
<mask> addrs, err := Context.dnsServer.Resolve(host)
<mask> log.Debug("dnsServer.Resolve: %s: %v", host, addrs)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> if len(addrs) == 0 {
</s> Pull request 1784: 5631-lookup-panic
Merge in DNS/adguard-home from 5631-lookup-panic to master
Updates #5631.
Squashed commit of the following:
commit 0ec578485bd955146d9119b6b8dafda33bfcefad
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:42:26 2023 +0500
all: imp code, log changes
commit fc43c39418640af4864ec3b5bc92ec31ec9cd018
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:15:27 2023 +0500
home: handle error, upd proxy </s> remove return nil, err
</s> add return nil, fmt.Errorf("resolving %q: %w", host, err) </s> remove return nil, fmt.Errorf("couldn't lookup host: %s", host)
</s> add return nil, fmt.Errorf("couldn't lookup host: %q", host) </s> remove github.com/quic-go/quic-go v0.32.0 h1:lY02md31s1JgPiiyfqJijpu/UX/Iun304FI3yUqX7tA=
github.com/quic-go/quic-go v0.32.0/go.mod h1:/fCsKANhQIeD5l76c2JFU+07gVE3KaA0FP+0zMWwfwo=
</s> add github.com/quic-go/quic-go v0.33.0 h1:ItNoTDN/Fm/zBlq769lLJc8ECe9gYaW40veHCCco7y0=
github.com/quic-go/quic-go v0.33.0/go.mod h1:YMuhaAV9/jIu0XclDXwZPAsP/2Kgr5yMYhe9oxhhOFA= </s> remove github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U=
github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fb7b8bba6a9a113ab7c86f6f3c638532c32d2c3d | internal/home/home.go | |
return nil, fmt.Errorf("resolving %q: %w", host, err) | <mask>
<mask> addrs, err := Context.dnsServer.Resolve(host)
<mask> log.Debug("dnsServer.Resolve: %s: %v", host, addrs)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> if len(addrs) == 0 {
<mask> return nil, fmt.Errorf("couldn't lookup host: %s", host)
<mask> }
</s> Pull request 1784: 5631-lookup-panic
Merge in DNS/adguard-home from 5631-lookup-panic to master
Updates #5631.
Squashed commit of the following:
commit 0ec578485bd955146d9119b6b8dafda33bfcefad
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:42:26 2023 +0500
all: imp code, log changes
commit fc43c39418640af4864ec3b5bc92ec31ec9cd018
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:15:27 2023 +0500
home: handle error, upd proxy </s> remove log.Debug("dnsServer.Resolve: %s: %v", host, addrs)
</s> add </s> remove return nil, fmt.Errorf("couldn't lookup host: %s", host)
</s> add return nil, fmt.Errorf("couldn't lookup host: %q", host) </s> remove github.com/quic-go/quic-go v0.32.0 h1:lY02md31s1JgPiiyfqJijpu/UX/Iun304FI3yUqX7tA=
github.com/quic-go/quic-go v0.32.0/go.mod h1:/fCsKANhQIeD5l76c2JFU+07gVE3KaA0FP+0zMWwfwo=
</s> add github.com/quic-go/quic-go v0.33.0 h1:ItNoTDN/Fm/zBlq769lLJc8ECe9gYaW40veHCCco7y0=
github.com/quic-go/quic-go v0.33.0/go.mod h1:YMuhaAV9/jIu0XclDXwZPAsP/2Kgr5yMYhe9oxhhOFA= </s> remove github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U=
github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fb7b8bba6a9a113ab7c86f6f3c638532c32d2c3d | internal/home/home.go |
log.Debug("dnsServer.Resolve: %q: %v", host, addrs)
| <mask> return nil, fmt.Errorf("resolving %q: %w", host, err)
<mask> }
<mask>
<mask> if len(addrs) == 0 {
<mask> return nil, fmt.Errorf("couldn't lookup host: %q", host)
<mask> }
<mask>
<mask> var dialErrs []error
</s> Pull request 1784: 5631-lookup-panic
Merge in DNS/adguard-home from 5631-lookup-panic to master
Updates #5631.
Squashed commit of the following:
commit 0ec578485bd955146d9119b6b8dafda33bfcefad
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:42:26 2023 +0500
all: imp code, log changes
commit fc43c39418640af4864ec3b5bc92ec31ec9cd018
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:15:27 2023 +0500
home: handle error, upd proxy </s> remove return nil, fmt.Errorf("couldn't lookup host: %s", host)
</s> add return nil, fmt.Errorf("couldn't lookup host: %q", host) </s> remove return nil, err
</s> add return nil, fmt.Errorf("resolving %q: %w", host, err) </s> remove log.Debug("dnsServer.Resolve: %s: %v", host, addrs)
</s> add </s> remove github.com/quic-go/quic-go v0.32.0 h1:lY02md31s1JgPiiyfqJijpu/UX/Iun304FI3yUqX7tA=
github.com/quic-go/quic-go v0.32.0/go.mod h1:/fCsKANhQIeD5l76c2JFU+07gVE3KaA0FP+0zMWwfwo=
</s> add github.com/quic-go/quic-go v0.33.0 h1:ItNoTDN/Fm/zBlq769lLJc8ECe9gYaW40veHCCco7y0=
github.com/quic-go/quic-go v0.33.0/go.mod h1:YMuhaAV9/jIu0XclDXwZPAsP/2Kgr5yMYhe9oxhhOFA= </s> remove github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U=
github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc=
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fb7b8bba6a9a113ab7c86f6f3c638532c32d2c3d | internal/home/home.go |
return nil, fmt.Errorf("couldn't lookup host: %q", host) | <mask> return nil, err
<mask> }
<mask>
<mask> if len(addrs) == 0 {
<mask> return nil, fmt.Errorf("couldn't lookup host: %s", host)
<mask> }
<mask>
<mask> var dialErrs []error
<mask> for _, a := range addrs {
<mask> addr = net.JoinHostPort(a.String(), port)
</s> Pull request 1784: 5631-lookup-panic
Merge in DNS/adguard-home from 5631-lookup-panic to master
Updates #5631.
Squashed commit of the following:
commit 0ec578485bd955146d9119b6b8dafda33bfcefad
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:42:26 2023 +0500
all: imp code, log changes
commit fc43c39418640af4864ec3b5bc92ec31ec9cd018
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:15:27 2023 +0500
home: handle error, upd proxy </s> remove return nil, err
</s> add return nil, fmt.Errorf("resolving %q: %w", host, err) </s> remove log.Debug("dnsServer.Resolve: %s: %v", host, addrs)
</s> add </s> remove github.com/quic-go/quic-go v0.32.0 h1:lY02md31s1JgPiiyfqJijpu/UX/Iun304FI3yUqX7tA=
github.com/quic-go/quic-go v0.32.0/go.mod h1:/fCsKANhQIeD5l76c2JFU+07gVE3KaA0FP+0zMWwfwo=
</s> add github.com/quic-go/quic-go v0.33.0 h1:ItNoTDN/Fm/zBlq769lLJc8ECe9gYaW40veHCCco7y0=
github.com/quic-go/quic-go v0.33.0/go.mod h1:YMuhaAV9/jIu0XclDXwZPAsP/2Kgr5yMYhe9oxhhOFA= </s> remove github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U=
github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fb7b8bba6a9a113ab7c86f6f3c638532c32d2c3d | internal/home/home.go |
accessor: row => this.props.normalizedTopClients.auto[row.ip] || 0, | <mask> Cell: whoisCell(this.props.t),
<mask> },
<mask> {
<mask> Header: this.props.t('requests_count'),
<mask> accessor: row => this.props.normalizedTopClients[row.ip] || 0,
<mask> sortMethod: (a, b) => b - a,
<mask> id: 'statistics',
<mask> minWidth: COLUMN_MIN_WIDTH,
<mask> Cell: (row) => {
<mask> const { value: clientStats } = row;
</s> - client: fix logic of top clients normalization </s> remove accessor: row => this.props.normalizedTopClients[row.name] || 0,
</s> add accessor: row => this.props.normalizedTopClients.configured[row.name] || 0, </s> remove export const normalizeTopClients = clients => clients.reduce((accumulator, clientObj) => {
const { name, count } = clientObj;
</s> add /**
* Normalizes the topClients array
*
* @param {Object[]} topClients
* @param {string} topClients.name
* @param {number} topClients.count
* @param {Object} topClients.info
* @param {string} topClients.info.name
* @returns {Object} normalizedTopClients
* @returns {Object.<string, number>} normalizedTopClients.auto - auto clients
* @returns {Object.<string, number>} normalizedTopClients.configured - configured clients
*/
export const normalizeTopClients = topClients => topClients.reduce((nameToCountMap, clientObj) => {
const { name, count, info: { name: infoName } } = clientObj; </s> remove accumulator[name] = count;
return accumulator;
</s> add nameToCountMap.auto = { ...nameToCountMap.auto, [name]: count };
// eslint-disable-next-line no-param-reassign
nameToCountMap.configured = { ...nameToCountMap.configured, [infoName]: count };
return nameToCountMap; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fb8d23f51baa785a1ea50b0fe67cadc0f7f140a8 | client/src/components/Settings/Clients/AutoClients.js |
this.props.getStats(); | <mask> this.handleFormAdd(config);
<mask> }
<mask> };
<mask>
<mask> getClient = (name, clients) => {
<mask> const client = clients.find(item => name === item.name);
<mask>
<mask> if (client) {
</s> - client: fix logic of top clients normalization </s> remove accumulator[name] = count;
return accumulator;
</s> add nameToCountMap.auto = { ...nameToCountMap.auto, [name]: count };
// eslint-disable-next-line no-param-reassign
nameToCountMap.configured = { ...nameToCountMap.configured, [infoName]: count };
return nameToCountMap; </s> remove export const normalizeTopClients = clients => clients.reduce((accumulator, clientObj) => {
const { name, count } = clientObj;
</s> add /**
* Normalizes the topClients array
*
* @param {Object[]} topClients
* @param {string} topClients.name
* @param {number} topClients.count
* @param {Object} topClients.info
* @param {string} topClients.info.name
* @returns {Object} normalizedTopClients
* @returns {Object.<string, number>} normalizedTopClients.auto - auto clients
* @returns {Object.<string, number>} normalizedTopClients.configured - configured clients
*/
export const normalizeTopClients = topClients => topClients.reduce((nameToCountMap, clientObj) => {
const { name, count, info: { name: infoName } } = clientObj; </s> remove accessor: row => this.props.normalizedTopClients[row.name] || 0,
</s> add accessor: row => this.props.normalizedTopClients.configured[row.name] || 0, </s> remove accessor: row => this.props.normalizedTopClients[row.ip] || 0,
</s> add accessor: row => this.props.normalizedTopClients.auto[row.ip] || 0, | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fb8d23f51baa785a1ea50b0fe67cadc0f7f140a8 | client/src/components/Settings/Clients/ClientsTable.js |
this.props.getStats(); | <mask> // eslint-disable-next-line no-alert
<mask> if (window.confirm(this.props.t('client_confirm_delete', { key: data.name }))) {
<mask> this.props.deleteClient(data);
<mask> }
<mask> };
<mask>
<mask> columns = [
<mask> {
</s> - client: fix logic of top clients normalization </s> remove accumulator[name] = count;
return accumulator;
</s> add nameToCountMap.auto = { ...nameToCountMap.auto, [name]: count };
// eslint-disable-next-line no-param-reassign
nameToCountMap.configured = { ...nameToCountMap.configured, [infoName]: count };
return nameToCountMap; </s> remove export const normalizeTopClients = clients => clients.reduce((accumulator, clientObj) => {
const { name, count } = clientObj;
</s> add /**
* Normalizes the topClients array
*
* @param {Object[]} topClients
* @param {string} topClients.name
* @param {number} topClients.count
* @param {Object} topClients.info
* @param {string} topClients.info.name
* @returns {Object} normalizedTopClients
* @returns {Object.<string, number>} normalizedTopClients.auto - auto clients
* @returns {Object.<string, number>} normalizedTopClients.configured - configured clients
*/
export const normalizeTopClients = topClients => topClients.reduce((nameToCountMap, clientObj) => {
const { name, count, info: { name: infoName } } = clientObj; </s> remove accessor: row => this.props.normalizedTopClients[row.name] || 0,
</s> add accessor: row => this.props.normalizedTopClients.configured[row.name] || 0, </s> remove accessor: row => this.props.normalizedTopClients[row.ip] || 0,
</s> add accessor: row => this.props.normalizedTopClients.auto[row.ip] || 0, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fb8d23f51baa785a1ea50b0fe67cadc0f7f140a8 | client/src/components/Settings/Clients/ClientsTable.js |
accessor: row => this.props.normalizedTopClients.configured[row.name] || 0, | <mask> },
<mask> {
<mask> Header: this.props.t('requests_count'),
<mask> id: 'statistics',
<mask> accessor: row => this.props.normalizedTopClients[row.name] || 0,
<mask> sortMethod: (a, b) => b - a,
<mask> minWidth: 120,
<mask> Cell: (row) => {
<mask> const { value: clientStats } = row;
<mask>
</s> - client: fix logic of top clients normalization </s> remove accessor: row => this.props.normalizedTopClients[row.ip] || 0,
</s> add accessor: row => this.props.normalizedTopClients.auto[row.ip] || 0, </s> remove export const normalizeTopClients = clients => clients.reduce((accumulator, clientObj) => {
const { name, count } = clientObj;
</s> add /**
* Normalizes the topClients array
*
* @param {Object[]} topClients
* @param {string} topClients.name
* @param {number} topClients.count
* @param {Object} topClients.info
* @param {string} topClients.info.name
* @returns {Object} normalizedTopClients
* @returns {Object.<string, number>} normalizedTopClients.auto - auto clients
* @returns {Object.<string, number>} normalizedTopClients.configured - configured clients
*/
export const normalizeTopClients = topClients => topClients.reduce((nameToCountMap, clientObj) => {
const { name, count, info: { name: infoName } } = clientObj; </s> remove accumulator[name] = count;
return accumulator;
</s> add nameToCountMap.auto = { ...nameToCountMap.auto, [name]: count };
// eslint-disable-next-line no-param-reassign
nameToCountMap.configured = { ...nameToCountMap.configured, [infoName]: count };
return nameToCountMap; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fb8d23f51baa785a1ea50b0fe67cadc0f7f140a8 | client/src/components/Settings/Clients/ClientsTable.js |
getStats: PropTypes.func.isRequired, | <mask> processingDeleting: PropTypes.bool.isRequired,
<mask> processingUpdating: PropTypes.bool.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(ClientsTable);
</s> - client: fix logic of top clients normalization </s> remove accumulator[name] = count;
return accumulator;
</s> add nameToCountMap.auto = { ...nameToCountMap.auto, [name]: count };
// eslint-disable-next-line no-param-reassign
nameToCountMap.configured = { ...nameToCountMap.configured, [infoName]: count };
return nameToCountMap; </s> remove export const normalizeTopClients = clients => clients.reduce((accumulator, clientObj) => {
const { name, count } = clientObj;
</s> add /**
* Normalizes the topClients array
*
* @param {Object[]} topClients
* @param {string} topClients.name
* @param {number} topClients.count
* @param {Object} topClients.info
* @param {string} topClients.info.name
* @returns {Object} normalizedTopClients
* @returns {Object.<string, number>} normalizedTopClients.auto - auto clients
* @returns {Object.<string, number>} normalizedTopClients.configured - configured clients
*/
export const normalizeTopClients = topClients => topClients.reduce((nameToCountMap, clientObj) => {
const { name, count, info: { name: infoName } } = clientObj; | [
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fb8d23f51baa785a1ea50b0fe67cadc0f7f140a8 | client/src/components/Settings/Clients/ClientsTable.js |
getStats, | <mask> addClient,
<mask> updateClient,
<mask> deleteClient,
<mask> toggleClientModal,
<mask> } = this.props;
<mask>
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title={t('client_settings')} />
</s> - client: fix logic of top clients normalization </s> remove accumulator[name] = count;
return accumulator;
</s> add nameToCountMap.auto = { ...nameToCountMap.auto, [name]: count };
// eslint-disable-next-line no-param-reassign
nameToCountMap.configured = { ...nameToCountMap.configured, [infoName]: count };
return nameToCountMap; </s> remove export const normalizeTopClients = clients => clients.reduce((accumulator, clientObj) => {
const { name, count } = clientObj;
</s> add /**
* Normalizes the topClients array
*
* @param {Object[]} topClients
* @param {string} topClients.name
* @param {number} topClients.count
* @param {Object} topClients.info
* @param {string} topClients.info.name
* @returns {Object} normalizedTopClients
* @returns {Object.<string, number>} normalizedTopClients.auto - auto clients
* @returns {Object.<string, number>} normalizedTopClients.configured - configured clients
*/
export const normalizeTopClients = topClients => topClients.reduce((nameToCountMap, clientObj) => {
const { name, count, info: { name: infoName } } = clientObj; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fb8d23f51baa785a1ea50b0fe67cadc0f7f140a8 | client/src/components/Settings/Clients/index.js |
getStats={getStats} | <mask> processingAdding={clients.processingAdding}
<mask> processingDeleting={clients.processingDeleting}
<mask> processingUpdating={clients.processingUpdating}
<mask> />
<mask> <AutoClients
<mask> autoClients={dashboard.autoClients}
<mask> normalizedTopClients={stats.normalizedTopClients}
<mask> />
</s> - client: fix logic of top clients normalization </s> remove accumulator[name] = count;
return accumulator;
</s> add nameToCountMap.auto = { ...nameToCountMap.auto, [name]: count };
// eslint-disable-next-line no-param-reassign
nameToCountMap.configured = { ...nameToCountMap.configured, [infoName]: count };
return nameToCountMap; </s> remove export const normalizeTopClients = clients => clients.reduce((accumulator, clientObj) => {
const { name, count } = clientObj;
</s> add /**
* Normalizes the topClients array
*
* @param {Object[]} topClients
* @param {string} topClients.name
* @param {number} topClients.count
* @param {Object} topClients.info
* @param {string} topClients.info.name
* @returns {Object} normalizedTopClients
* @returns {Object.<string, number>} normalizedTopClients.auto - auto clients
* @returns {Object.<string, number>} normalizedTopClients.configured - configured clients
*/
export const normalizeTopClients = topClients => topClients.reduce((nameToCountMap, clientObj) => {
const { name, count, info: { name: infoName } } = clientObj; </s> remove accessor: row => this.props.normalizedTopClients[row.name] || 0,
</s> add accessor: row => this.props.normalizedTopClients.configured[row.name] || 0, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fb8d23f51baa785a1ea50b0fe67cadc0f7f140a8 | client/src/components/Settings/Clients/index.js |
/**
* Normalizes the topClients array
*
* @param {Object[]} topClients
* @param {string} topClients.name
* @param {number} topClients.count
* @param {Object} topClients.info
* @param {string} topClients.info.name
* @returns {Object} normalizedTopClients
* @returns {Object.<string, number>} normalizedTopClients.auto - auto clients
* @returns {Object.<string, number>} normalizedTopClients.configured - configured clients
*/
export const normalizeTopClients = topClients => topClients.reduce((nameToCountMap, clientObj) => {
const { name, count, info: { name: infoName } } = clientObj; | <mask> };
<mask>
<mask> export const normalizeTextarea = text => text && text.replace(/[;, ]/g, '\n').split('\n').filter(n => n);
<mask>
<mask> export const normalizeTopClients = clients => clients.reduce((accumulator, clientObj) => {
<mask> const { name, count } = clientObj;
<mask> // eslint-disable-next-line no-param-reassign
<mask> accumulator[name] = count;
<mask> return accumulator;
<mask> }, {});
<mask>
</s> - client: fix logic of top clients normalization </s> remove accumulator[name] = count;
return accumulator;
</s> add nameToCountMap.auto = { ...nameToCountMap.auto, [name]: count };
// eslint-disable-next-line no-param-reassign
nameToCountMap.configured = { ...nameToCountMap.configured, [infoName]: count };
return nameToCountMap; </s> remove accessor: row => this.props.normalizedTopClients[row.name] || 0,
</s> add accessor: row => this.props.normalizedTopClients.configured[row.name] || 0, </s> remove accessor: row => this.props.normalizedTopClients[row.ip] || 0,
</s> add accessor: row => this.props.normalizedTopClients.auto[row.ip] || 0, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fb8d23f51baa785a1ea50b0fe67cadc0f7f140a8 | client/src/helpers/helpers.js |
nameToCountMap.auto = { ...nameToCountMap.auto, [name]: count };
// eslint-disable-next-line no-param-reassign
nameToCountMap.configured = { ...nameToCountMap.configured, [infoName]: count };
return nameToCountMap; | <mask>
<mask> export const normalizeTopClients = clients => clients.reduce((accumulator, clientObj) => {
<mask> const { name, count } = clientObj;
<mask> // eslint-disable-next-line no-param-reassign
<mask> accumulator[name] = count;
<mask> return accumulator;
<mask> }, {});
<mask>
<mask> export const getClientInfo = (clients, ip) => {
<mask> const client = clients
<mask> .find(item => item.ip_addrs && item.ip_addrs.find(clientIp => clientIp === ip));
</s> - client: fix logic of top clients normalization </s> remove export const normalizeTopClients = clients => clients.reduce((accumulator, clientObj) => {
const { name, count } = clientObj;
</s> add /**
* Normalizes the topClients array
*
* @param {Object[]} topClients
* @param {string} topClients.name
* @param {number} topClients.count
* @param {Object} topClients.info
* @param {string} topClients.info.name
* @returns {Object} normalizedTopClients
* @returns {Object.<string, number>} normalizedTopClients.auto - auto clients
* @returns {Object.<string, number>} normalizedTopClients.configured - configured clients
*/
export const normalizeTopClients = topClients => topClients.reduce((nameToCountMap, clientObj) => {
const { name, count, info: { name: infoName } } = clientObj; </s> remove accessor: row => this.props.normalizedTopClients[row.name] || 0,
</s> add accessor: row => this.props.normalizedTopClients.configured[row.name] || 0, </s> remove accessor: row => this.props.normalizedTopClients[row.ip] || 0,
</s> add accessor: row => this.props.normalizedTopClients.auto[row.ip] || 0, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fb8d23f51baa785a1ea50b0fe67cadc0f7f140a8 | client/src/helpers/helpers.js |
'dockerGo': 'adguard/golang-ubuntu:6.5' | <mask> 'name': 'AdGuard Home - Build and publish release'
<mask> # Make sure to sync any changes with the branch overrides below.
<mask> 'variables':
<mask> 'channel': 'edge'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.3'
<mask>
<mask> 'stages':
<mask> - 'Build frontend':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request 1850: upd-golang-ubuntu
Merge in DNS/adguard-home from upd-golang-ubuntu to master
Squashed commit of the following:
commit d4c79a1ddbf732f2d8500830b9f53f547ce33f23
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon May 22 16:29:48 2023 +0300
all: upd golang-ubuntu </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.5' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.5' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.5' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc64e0089e40613541f88555504f76d6936cdcad | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:6.5' | <mask> # Set the default release channel on the release branch to beta, as we may
<mask> # need to build a few of these.
<mask> 'variables':
<mask> 'channel': 'beta'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.3'
<mask> # release-vX.Y.Z branches are the branches from which the actual final release
<mask> # is built.
<mask> - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
<mask> # Disable integration branches for release branches.
<mask> 'branch-config':
</s> Pull request 1850: upd-golang-ubuntu
Merge in DNS/adguard-home from upd-golang-ubuntu to master
Squashed commit of the following:
commit d4c79a1ddbf732f2d8500830b9f53f547ce33f23
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon May 22 16:29:48 2023 +0300
all: upd golang-ubuntu </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.5' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.5' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.5' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc64e0089e40613541f88555504f76d6936cdcad | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:6.5' | <mask> # Set the default release channel on the final branch to release, as these
<mask> # are the ones that actually get released.
<mask> 'variables':
<mask> 'channel': 'release'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.3'
</s> Pull request 1850: upd-golang-ubuntu
Merge in DNS/adguard-home from upd-golang-ubuntu to master
Squashed commit of the following:
commit d4c79a1ddbf732f2d8500830b9f53f547ce33f23
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon May 22 16:29:48 2023 +0300
all: upd golang-ubuntu </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.5' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.5' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.5' | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc64e0089e40613541f88555504f76d6936cdcad | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:6.5' | <mask> 'project-key': 'AGH'
<mask> 'key': 'AHBRTSPECS'
<mask> 'name': 'AdGuard Home - Build and run tests'
<mask> 'variables':
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.3'
<mask>
<mask> 'stages':
<mask> - 'Tests':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request 1850: upd-golang-ubuntu
Merge in DNS/adguard-home from upd-golang-ubuntu to master
Squashed commit of the following:
commit d4c79a1ddbf732f2d8500830b9f53f547ce33f23
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon May 22 16:29:48 2023 +0300
all: upd golang-ubuntu </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.5' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.5' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.3'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.5' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc64e0089e40613541f88555504f76d6936cdcad | bamboo-specs/test.yaml |
github.com/AdguardTeam/urlfilter v0.14.1 | <mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.33.7
<mask> github.com/AdguardTeam/golibs v0.4.4
<mask> github.com/AdguardTeam/urlfilter v0.14.0
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.0.1
<mask> github.com/fsnotify/fsnotify v1.4.9
<mask> github.com/go-ping/ping v0.0.0-20201115131931-3300c582a663
<mask> github.com/gobuffalo/envy v1.9.0 // indirect
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove github.com/AdguardTeam/urlfilter v0.14.0 h1:+aAhOvZDVGzl5gTERB4pOJCL1zxMyw7vLecJJ6TQTCw=
github.com/AdguardTeam/urlfilter v0.14.0/go.mod h1:klx4JbOfc4EaNb5lWLqOwfg+pVcyRukmoJRvO55lL5U=
</s> add github.com/AdguardTeam/urlfilter v0.14.1 h1:imYls0fit9ojA6pP1hWFUEIjyoXbDF85ZM+G67bI48c=
github.com/AdguardTeam/urlfilter v0.14.1/go.mod h1:klx4JbOfc4EaNb5lWLqOwfg+pVcyRukmoJRvO55lL5U= </s> remove RCode rules.RCode `json:",omitempty"`
</s> add </s> remove // It returns the constructed answer resource record.
</s> add // It returns the properly constructed answer resource record. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | go.mod |
github.com/AdguardTeam/urlfilter v0.14.1 h1:imYls0fit9ojA6pP1hWFUEIjyoXbDF85ZM+G67bI48c=
github.com/AdguardTeam/urlfilter v0.14.1/go.mod h1:klx4JbOfc4EaNb5lWLqOwfg+pVcyRukmoJRvO55lL5U= | <mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.4 h1:cM9UySQiYFW79zo5XRwnaIWVzfW4eNXmZktMrWbthpw=
<mask> github.com/AdguardTeam/golibs v0.4.4/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
<mask> github.com/AdguardTeam/urlfilter v0.14.0 h1:+aAhOvZDVGzl5gTERB4pOJCL1zxMyw7vLecJJ6TQTCw=
<mask> github.com/AdguardTeam/urlfilter v0.14.0/go.mod h1:klx4JbOfc4EaNb5lWLqOwfg+pVcyRukmoJRvO55lL5U=
<mask> github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
<mask> github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
<mask> github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
<mask> github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
<mask> github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove github.com/AdguardTeam/urlfilter v0.14.0
</s> add github.com/AdguardTeam/urlfilter v0.14.1 </s> remove RCode rules.RCode `json:",omitempty"`
</s> add </s> remove answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
</s> add answer = append(answer, s.genAnswerCNAME(d.Req, res.CanonName)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | go.sum |
<mask> )
<mask>
<mask> // DNSRewriteResult is the result of application of $dnsrewrite rules.
<mask> type DNSRewriteResult struct {
<mask> RCode rules.RCode `json:",omitempty"`
<mask> Response DNSRewriteResultResponse `json:",omitempty"`
<mask> }
<mask>
<mask> // DNSRewriteResultResponse is the collection of DNS response records
<mask> // the server returns.
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove // It returns the constructed answer resource record.
</s> add // It returns the properly constructed answer resource record. </s> remove // Make a CNAME response
func (s *Server) genCNAMEAnswer(req *dns.Msg, cname string) *dns.CNAME {
answer := new(dns.CNAME)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeCNAME,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
}
answer.Target = dns.Fqdn(cname)
return answer
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsfilter/dnsrewrite.go | |
RCode rules.RCode `json:",omitempty"` | <mask>
<mask> // DNSRewriteResult is the result of application of $dnsrewrite rules.
<mask> type DNSRewriteResult struct {
<mask> Response DNSRewriteResultResponse `json:",omitempty"`
<mask> }
<mask>
<mask> // DNSRewriteResultResponse is the collection of DNS response records
<mask> // the server returns.
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove RCode rules.RCode `json:",omitempty"`
</s> add </s> remove // It returns the constructed answer resource record.
</s> add // It returns the properly constructed answer resource record. </s> remove // Make a CNAME response
func (s *Server) genCNAMEAnswer(req *dns.Msg, cname string) *dns.CNAME {
answer := new(dns.CNAME)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeCNAME,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
}
answer.Target = dns.Fqdn(cname)
return answer
}
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsfilter/dnsrewrite.go |
answer = append(answer, s.genAnswerCNAME(d.Req, res.CanonName)) | <mask> d.Res.Question[0] = ctx.origQuestion
<mask>
<mask> if len(d.Res.Answer) != 0 {
<mask> answer := []dns.RR{}
<mask> answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
<mask> answer = append(answer, d.Res.Answer...)
<mask> d.Res.Answer = answer
<mask> }
<mask>
<mask> case dnsfilter.NotFilteredAllowList:
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove resp.Answer = append(resp.Answer, s.genCNAMEAnswer(req, res.CanonName))
</s> add resp.Answer = append(resp.Answer, s.genAnswerCNAME(req, res.CanonName)) </s> remove answer.A = ip
return answer
</s> add </s> remove func (s *Server) genAAAAAnswer(req *dns.Msg, ip net.IP) *dns.AAAA {
answer := new(dns.AAAA)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeAAAA,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
</s> add func (s *Server) genAnswerA(req *dns.Msg, ip net.IP) (ans *dns.A) {
return &dns.A{
Hdr: s.hdr(req, dns.TypeA),
A: ip, </s> remove Rrtype: dns.TypeA,
</s> add Rrtype: rrType, </s> remove // Make a CNAME response
func (s *Server) genCNAMEAnswer(req *dns.Msg, cname string) *dns.CNAME {
answer := new(dns.CNAME)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeCNAME,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
}
answer.Target = dns.Fqdn(cname)
return answer
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsforward/dns.go |
// It returns the properly constructed answer resource record. | <mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> // filterDNSRewriteResponse handles a single DNS rewrite response entry.
<mask> // It returns the constructed answer resource record.
<mask> func (s *Server) filterDNSRewriteResponse(req *dns.Msg, rr rules.RRType, v rules.RRValue) (ans dns.RR, err error) {
<mask> switch rr {
<mask> case dns.TypeA, dns.TypeAAAA:
<mask> ip, ok := v.(net.IP)
<mask> if !ok {
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove return nil, fmt.Errorf("value has type %T, not net.IP", v)
</s> add return nil, fmt.Errorf("value for rr type %d has type %T, not net.IP", rr, v) </s> remove RCode rules.RCode `json:",omitempty"`
</s> add </s> remove return nil, fmt.Errorf("value has type %T, not string", v)
</s> add return nil, fmt.Errorf("value for rr type %d has type %T, not string", rr, v)
}
if rr == dns.TypeTXT {
return s.genAnswerTXT(req, []string{str}), nil
}
return s.genAnswerPTR(req, str), nil
case dns.TypeMX:
mx, ok := v.(*rules.DNSMX)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSMX", rr, v)
}
return s.genAnswerMX(req, mx), nil
case dns.TypeHTTPS,
dns.TypeSVCB:
svcb, ok := v.(*rules.DNSSVCB)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSVCB", rr, v)
}
if rr == dns.TypeHTTPS {
return s.genAnswerHTTPS(req, svcb), nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsforward/dnsrewrite.go |
// TODO(a.garipov): As more types are added, we will probably want to
// use a handler-oriented approach here. So, think of a way to decouple
// the answer generation logic from the Server.
| <mask>
<mask> // filterDNSRewriteResponse handles a single DNS rewrite response entry.
<mask> // It returns the properly constructed answer resource record.
<mask> func (s *Server) filterDNSRewriteResponse(req *dns.Msg, rr rules.RRType, v rules.RRValue) (ans dns.RR, err error) {
<mask> switch rr {
<mask> case dns.TypeA, dns.TypeAAAA:
<mask> ip, ok := v.(net.IP)
<mask> if !ok {
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove // It returns the constructed answer resource record.
</s> add // It returns the properly constructed answer resource record. </s> remove return nil, fmt.Errorf("value has type %T, not net.IP", v)
</s> add return nil, fmt.Errorf("value for rr type %d has type %T, not net.IP", rr, v) </s> remove return nil, fmt.Errorf("value has type %T, not string", v)
</s> add return nil, fmt.Errorf("value for rr type %d has type %T, not string", rr, v)
}
if rr == dns.TypeTXT {
return s.genAnswerTXT(req, []string{str}), nil
}
return s.genAnswerPTR(req, str), nil
case dns.TypeMX:
mx, ok := v.(*rules.DNSMX)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSMX", rr, v)
}
return s.genAnswerMX(req, mx), nil
case dns.TypeHTTPS,
dns.TypeSVCB:
svcb, ok := v.(*rules.DNSSVCB)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSVCB", rr, v)
}
if rr == dns.TypeHTTPS {
return s.genAnswerHTTPS(req, svcb), nil </s> remove // Make a CNAME response
func (s *Server) genCNAMEAnswer(req *dns.Msg, cname string) *dns.CNAME {
answer := new(dns.CNAME)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeCNAME,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
}
answer.Target = dns.Fqdn(cname)
return answer
}
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsforward/dnsrewrite.go |
return nil, fmt.Errorf("value for rr type %d has type %T, not net.IP", rr, v) | <mask> switch rr {
<mask> case dns.TypeA, dns.TypeAAAA:
<mask> ip, ok := v.(net.IP)
<mask> if !ok {
<mask> return nil, fmt.Errorf("value has type %T, not net.IP", v)
<mask> }
<mask>
<mask> if rr == dns.TypeA {
<mask> return s.genAAnswer(req, ip.To4()), nil
<mask> }
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove return s.genAAnswer(req, ip.To4()), nil
</s> add return s.genAnswerA(req, ip.To4()), nil </s> remove return s.genAAAAAnswer(req, ip), nil
case dns.TypeTXT:
</s> add return s.genAnswerAAAA(req, ip), nil
case dns.TypePTR,
dns.TypeTXT: </s> remove return nil, fmt.Errorf("value has type %T, not string", v)
</s> add return nil, fmt.Errorf("value for rr type %d has type %T, not string", rr, v)
}
if rr == dns.TypeTXT {
return s.genAnswerTXT(req, []string{str}), nil
}
return s.genAnswerPTR(req, str), nil
case dns.TypeMX:
mx, ok := v.(*rules.DNSMX)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSMX", rr, v)
}
return s.genAnswerMX(req, mx), nil
case dns.TypeHTTPS,
dns.TypeSVCB:
svcb, ok := v.(*rules.DNSSVCB)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSVCB", rr, v)
}
if rr == dns.TypeHTTPS {
return s.genAnswerHTTPS(req, svcb), nil </s> remove return s.genTXTAnswer(req, []string{str}), nil
</s> add return s.genAnswerSVCB(req, svcb), nil </s> remove // It returns the constructed answer resource record.
</s> add // It returns the properly constructed answer resource record. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsforward/dnsrewrite.go |
return s.genAnswerA(req, ip.To4()), nil | <mask> return nil, fmt.Errorf("value has type %T, not net.IP", v)
<mask> }
<mask>
<mask> if rr == dns.TypeA {
<mask> return s.genAAnswer(req, ip.To4()), nil
<mask> }
<mask>
<mask> return s.genAAAAAnswer(req, ip), nil
<mask> case dns.TypeTXT:
<mask> str, ok := v.(string)
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove return s.genAAAAAnswer(req, ip), nil
case dns.TypeTXT:
</s> add return s.genAnswerAAAA(req, ip), nil
case dns.TypePTR,
dns.TypeTXT: </s> remove return nil, fmt.Errorf("value has type %T, not net.IP", v)
</s> add return nil, fmt.Errorf("value for rr type %d has type %T, not net.IP", rr, v) </s> remove return nil, fmt.Errorf("value has type %T, not string", v)
</s> add return nil, fmt.Errorf("value for rr type %d has type %T, not string", rr, v)
}
if rr == dns.TypeTXT {
return s.genAnswerTXT(req, []string{str}), nil
}
return s.genAnswerPTR(req, str), nil
case dns.TypeMX:
mx, ok := v.(*rules.DNSMX)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSMX", rr, v)
}
return s.genAnswerMX(req, mx), nil
case dns.TypeHTTPS,
dns.TypeSVCB:
svcb, ok := v.(*rules.DNSSVCB)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSVCB", rr, v)
}
if rr == dns.TypeHTTPS {
return s.genAnswerHTTPS(req, svcb), nil </s> remove return s.genTXTAnswer(req, []string{str}), nil
</s> add return s.genAnswerSVCB(req, svcb), nil </s> remove a := s.genAAnswer(req, ip.To4())
</s> add a := s.genAnswerA(req, ip.To4()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsforward/dnsrewrite.go |
return s.genAnswerAAAA(req, ip), nil
case dns.TypePTR,
dns.TypeTXT: | <mask> if rr == dns.TypeA {
<mask> return s.genAAnswer(req, ip.To4()), nil
<mask> }
<mask>
<mask> return s.genAAAAAnswer(req, ip), nil
<mask> case dns.TypeTXT:
<mask> str, ok := v.(string)
<mask> if !ok {
<mask> return nil, fmt.Errorf("value has type %T, not string", v)
<mask> }
<mask>
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove return s.genAAnswer(req, ip.To4()), nil
</s> add return s.genAnswerA(req, ip.To4()), nil </s> remove return nil, fmt.Errorf("value has type %T, not string", v)
</s> add return nil, fmt.Errorf("value for rr type %d has type %T, not string", rr, v)
}
if rr == dns.TypeTXT {
return s.genAnswerTXT(req, []string{str}), nil
}
return s.genAnswerPTR(req, str), nil
case dns.TypeMX:
mx, ok := v.(*rules.DNSMX)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSMX", rr, v)
}
return s.genAnswerMX(req, mx), nil
case dns.TypeHTTPS,
dns.TypeSVCB:
svcb, ok := v.(*rules.DNSSVCB)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSVCB", rr, v)
}
if rr == dns.TypeHTTPS {
return s.genAnswerHTTPS(req, svcb), nil </s> remove return nil, fmt.Errorf("value has type %T, not net.IP", v)
</s> add return nil, fmt.Errorf("value for rr type %d has type %T, not net.IP", rr, v) </s> remove return s.genTXTAnswer(req, []string{str}), nil
</s> add return s.genAnswerSVCB(req, svcb), nil </s> remove a := s.genAAnswer(req, ip.To4())
</s> add a := s.genAnswerA(req, ip.To4()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsforward/dnsrewrite.go |
return nil, fmt.Errorf("value for rr type %d has type %T, not string", rr, v)
}
if rr == dns.TypeTXT {
return s.genAnswerTXT(req, []string{str}), nil
}
return s.genAnswerPTR(req, str), nil
case dns.TypeMX:
mx, ok := v.(*rules.DNSMX)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSMX", rr, v)
}
return s.genAnswerMX(req, mx), nil
case dns.TypeHTTPS,
dns.TypeSVCB:
svcb, ok := v.(*rules.DNSSVCB)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSVCB", rr, v)
}
if rr == dns.TypeHTTPS {
return s.genAnswerHTTPS(req, svcb), nil | <mask> return s.genAAAAAnswer(req, ip), nil
<mask> case dns.TypeTXT:
<mask> str, ok := v.(string)
<mask> if !ok {
<mask> return nil, fmt.Errorf("value has type %T, not string", v)
<mask> }
<mask>
<mask> return s.genTXTAnswer(req, []string{str}), nil
<mask> default:
<mask> log.Debug("don't know how to handle dns rr type %d, skipping", rr)
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove return s.genTXTAnswer(req, []string{str}), nil
</s> add return s.genAnswerSVCB(req, svcb), nil </s> remove return s.genAAAAAnswer(req, ip), nil
case dns.TypeTXT:
</s> add return s.genAnswerAAAA(req, ip), nil
case dns.TypePTR,
dns.TypeTXT: </s> remove return s.genAAnswer(req, ip.To4()), nil
</s> add return s.genAnswerA(req, ip.To4()), nil </s> remove return nil, fmt.Errorf("value has type %T, not net.IP", v)
</s> add return nil, fmt.Errorf("value for rr type %d has type %T, not net.IP", rr, v) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsforward/dnsrewrite.go |
return s.genAnswerSVCB(req, svcb), nil | <mask> if !ok {
<mask> return nil, fmt.Errorf("value has type %T, not string", v)
<mask> }
<mask>
<mask> return s.genTXTAnswer(req, []string{str}), nil
<mask> default:
<mask> log.Debug("don't know how to handle dns rr type %d, skipping", rr)
<mask>
<mask> return nil, nil
<mask> }
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove return nil, fmt.Errorf("value has type %T, not string", v)
</s> add return nil, fmt.Errorf("value for rr type %d has type %T, not string", rr, v)
}
if rr == dns.TypeTXT {
return s.genAnswerTXT(req, []string{str}), nil
}
return s.genAnswerPTR(req, str), nil
case dns.TypeMX:
mx, ok := v.(*rules.DNSMX)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSMX", rr, v)
}
return s.genAnswerMX(req, mx), nil
case dns.TypeHTTPS,
dns.TypeSVCB:
svcb, ok := v.(*rules.DNSSVCB)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSVCB", rr, v)
}
if rr == dns.TypeHTTPS {
return s.genAnswerHTTPS(req, svcb), nil </s> remove return nil, fmt.Errorf("value has type %T, not net.IP", v)
</s> add return nil, fmt.Errorf("value for rr type %d has type %T, not net.IP", rr, v) </s> remove return s.genAAAAAnswer(req, ip), nil
case dns.TypeTXT:
</s> add return s.genAnswerAAAA(req, ip), nil
case dns.TypePTR,
dns.TypeTXT: </s> remove return s.genAAnswer(req, ip.To4()), nil
</s> add return s.genAnswerA(req, ip.To4()), nil </s> remove func (s *Server) genTXTAnswer(req *dns.Msg, strs []string) (answer *dns.TXT) {
</s> add func (s *Server) genAnswerAAAA(req *dns.Msg, ip net.IP) (ans *dns.AAAA) {
return &dns.AAAA{
Hdr: s.hdr(req, dns.TypeAAAA),
AAAA: ip,
}
}
func (s *Server) genAnswerCNAME(req *dns.Msg, cname string) (ans *dns.CNAME) {
return &dns.CNAME{
Hdr: s.hdr(req, dns.TypeCNAME),
Target: dns.Fqdn(cname),
}
}
func (s *Server) genAnswerMX(req *dns.Msg, mx *rules.DNSMX) (ans *dns.MX) {
return &dns.MX{
Hdr: s.hdr(req, dns.TypePTR),
Preference: mx.Preference,
Mx: mx.Exchange,
}
}
func (s *Server) genAnswerPTR(req *dns.Msg, ptr string) (ans *dns.PTR) {
return &dns.PTR{
Hdr: s.hdr(req, dns.TypePTR),
Ptr: ptr,
}
}
func (s *Server) genAnswerTXT(req *dns.Msg, strs []string) (ans *dns.TXT) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsforward/dnsrewrite.go |
resp.Answer = append(resp.Answer, s.genAnswerCNAME(req, res.CanonName)) | <mask> resp := s.makeResponse(req)
<mask>
<mask> name := host
<mask> if len(res.CanonName) != 0 {
<mask> resp.Answer = append(resp.Answer, s.genCNAMEAnswer(req, res.CanonName))
<mask> name = res.CanonName
<mask> }
<mask>
<mask> for _, ip := range res.IPList {
<mask> if req.Question[0].Qtype == dns.TypeA {
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove a := s.genAAnswer(req, ip.To4())
</s> add a := s.genAnswerA(req, ip.To4()) </s> remove answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
</s> add answer = append(answer, s.genAnswerCNAME(d.Req, res.CanonName)) </s> remove a := s.genAAAAAnswer(req, ip)
</s> add a := s.genAnswerAAAA(req, ip) </s> remove resp.Answer = append(resp.Answer, s.genAAnswer(request, ip))
</s> add resp.Answer = append(resp.Answer, s.genAnswerA(request, ip)) </s> remove resp.Answer = append(resp.Answer, s.genAAAAAnswer(request, ip))
</s> add resp.Answer = append(resp.Answer, s.genAnswerAAAA(request, ip)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsforward/filter.go |
a := s.genAnswerA(req, ip.To4()) | <mask> }
<mask>
<mask> for _, ip := range res.IPList {
<mask> if req.Question[0].Qtype == dns.TypeA {
<mask> a := s.genAAnswer(req, ip.To4())
<mask> a.Hdr.Name = dns.Fqdn(name)
<mask> resp.Answer = append(resp.Answer, a)
<mask> } else if req.Question[0].Qtype == dns.TypeAAAA {
<mask> a := s.genAAAAAnswer(req, ip)
<mask> a.Hdr.Name = dns.Fqdn(name)
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove a := s.genAAAAAnswer(req, ip)
</s> add a := s.genAnswerAAAA(req, ip) </s> remove resp.Answer = append(resp.Answer, s.genCNAMEAnswer(req, res.CanonName))
</s> add resp.Answer = append(resp.Answer, s.genAnswerCNAME(req, res.CanonName)) </s> remove resp.Answer = append(resp.Answer, s.genAAnswer(request, ip))
</s> add resp.Answer = append(resp.Answer, s.genAnswerA(request, ip)) </s> remove resp.Answer = append(resp.Answer, s.genAAAAAnswer(request, ip))
</s> add resp.Answer = append(resp.Answer, s.genAnswerAAAA(request, ip)) </s> remove return s.genAAAAAnswer(req, ip), nil
case dns.TypeTXT:
</s> add return s.genAnswerAAAA(req, ip), nil
case dns.TypePTR,
dns.TypeTXT: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsforward/filter.go |
a := s.genAnswerAAAA(req, ip) | <mask> a := s.genAAnswer(req, ip.To4())
<mask> a.Hdr.Name = dns.Fqdn(name)
<mask> resp.Answer = append(resp.Answer, a)
<mask> } else if req.Question[0].Qtype == dns.TypeAAAA {
<mask> a := s.genAAAAAnswer(req, ip)
<mask> a.Hdr.Name = dns.Fqdn(name)
<mask> resp.Answer = append(resp.Answer, a)
<mask> }
<mask> }
<mask>
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove a := s.genAAnswer(req, ip.To4())
</s> add a := s.genAnswerA(req, ip.To4()) </s> remove resp.Answer = append(resp.Answer, s.genCNAMEAnswer(req, res.CanonName))
</s> add resp.Answer = append(resp.Answer, s.genAnswerCNAME(req, res.CanonName)) </s> remove resp.Answer = append(resp.Answer, s.genAAAAAnswer(request, ip))
</s> add resp.Answer = append(resp.Answer, s.genAnswerAAAA(request, ip)) </s> remove resp.Answer = append(resp.Answer, s.genAAnswer(request, ip))
</s> add resp.Answer = append(resp.Answer, s.genAnswerA(request, ip)) </s> remove func (s *Server) genAAnswer(req *dns.Msg, ip net.IP) *dns.A {
answer := new(dns.A)
answer.Hdr = dns.RR_Header{
</s> add func (s *Server) hdr(req *dns.Msg, rrType rules.RRType) (h dns.RR_Header) {
return dns.RR_Header{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsforward/filter.go |
"github.com/AdguardTeam/urlfilter/rules" | <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> // Create a DNS response by DNS request and set necessary flags
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove // It returns the constructed answer resource record.
</s> add // It returns the properly constructed answer resource record. </s> remove // Make a CNAME response
func (s *Server) genCNAMEAnswer(req *dns.Msg, cname string) *dns.CNAME {
answer := new(dns.CNAME)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeCNAME,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
}
answer.Target = dns.Fqdn(cname)
return answer
}
</s> add </s> remove RCode rules.RCode `json:",omitempty"`
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsforward/msg.go |
resp.Answer = append(resp.Answer, s.genAnswerA(request, ip)) | <mask> }
<mask>
<mask> func (s *Server) genARecord(request *dns.Msg, ip net.IP) *dns.Msg {
<mask> resp := s.makeResponse(request)
<mask> resp.Answer = append(resp.Answer, s.genAAnswer(request, ip))
<mask> return resp
<mask> }
<mask>
<mask> func (s *Server) genAAAARecord(request *dns.Msg, ip net.IP) *dns.Msg {
<mask> resp := s.makeResponse(request)
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove resp.Answer = append(resp.Answer, s.genAAAAAnswer(request, ip))
</s> add resp.Answer = append(resp.Answer, s.genAnswerAAAA(request, ip)) </s> remove func (s *Server) genAAnswer(req *dns.Msg, ip net.IP) *dns.A {
answer := new(dns.A)
answer.Hdr = dns.RR_Header{
</s> add func (s *Server) hdr(req *dns.Msg, rrType rules.RRType) (h dns.RR_Header) {
return dns.RR_Header{ </s> remove // Make a CNAME response
func (s *Server) genCNAMEAnswer(req *dns.Msg, cname string) *dns.CNAME {
answer := new(dns.CNAME)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeCNAME,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
}
answer.Target = dns.Fqdn(cname)
return answer
}
</s> add </s> remove resp.Answer = append(resp.Answer, s.genCNAMEAnswer(req, res.CanonName))
</s> add resp.Answer = append(resp.Answer, s.genAnswerCNAME(req, res.CanonName)) </s> remove func (s *Server) genAAAAAnswer(req *dns.Msg, ip net.IP) *dns.AAAA {
answer := new(dns.AAAA)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeAAAA,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
</s> add func (s *Server) genAnswerA(req *dns.Msg, ip net.IP) (ans *dns.A) {
return &dns.A{
Hdr: s.hdr(req, dns.TypeA),
A: ip, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsforward/msg.go |
resp.Answer = append(resp.Answer, s.genAnswerAAAA(request, ip)) | <mask> }
<mask>
<mask> func (s *Server) genAAAARecord(request *dns.Msg, ip net.IP) *dns.Msg {
<mask> resp := s.makeResponse(request)
<mask> resp.Answer = append(resp.Answer, s.genAAAAAnswer(request, ip))
<mask> return resp
<mask> }
<mask>
<mask> func (s *Server) genAAnswer(req *dns.Msg, ip net.IP) *dns.A {
<mask> answer := new(dns.A)
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove resp.Answer = append(resp.Answer, s.genAAnswer(request, ip))
</s> add resp.Answer = append(resp.Answer, s.genAnswerA(request, ip)) </s> remove func (s *Server) genAAnswer(req *dns.Msg, ip net.IP) *dns.A {
answer := new(dns.A)
answer.Hdr = dns.RR_Header{
</s> add func (s *Server) hdr(req *dns.Msg, rrType rules.RRType) (h dns.RR_Header) {
return dns.RR_Header{ </s> remove Rrtype: dns.TypeA,
</s> add Rrtype: rrType, </s> remove // Make a CNAME response
func (s *Server) genCNAMEAnswer(req *dns.Msg, cname string) *dns.CNAME {
answer := new(dns.CNAME)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeCNAME,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
}
answer.Target = dns.Fqdn(cname)
return answer
}
</s> add </s> remove func (s *Server) genAAAAAnswer(req *dns.Msg, ip net.IP) *dns.AAAA {
answer := new(dns.AAAA)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeAAAA,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
</s> add func (s *Server) genAnswerA(req *dns.Msg, ip net.IP) (ans *dns.A) {
return &dns.A{
Hdr: s.hdr(req, dns.TypeA),
A: ip, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsforward/msg.go |
func (s *Server) hdr(req *dns.Msg, rrType rules.RRType) (h dns.RR_Header) {
return dns.RR_Header{ | <mask> resp.Answer = append(resp.Answer, s.genAAAAAnswer(request, ip))
<mask> return resp
<mask> }
<mask>
<mask> func (s *Server) genAAnswer(req *dns.Msg, ip net.IP) *dns.A {
<mask> answer := new(dns.A)
<mask> answer.Hdr = dns.RR_Header{
<mask> Name: req.Question[0].Name,
<mask> Rrtype: dns.TypeA,
<mask> Ttl: s.conf.BlockedResponseTTL,
<mask> Class: dns.ClassINET,
<mask> }
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove Rrtype: dns.TypeA,
</s> add Rrtype: rrType, </s> remove resp.Answer = append(resp.Answer, s.genAAAAAnswer(request, ip))
</s> add resp.Answer = append(resp.Answer, s.genAnswerAAAA(request, ip)) </s> remove answer.A = ip
return answer
</s> add </s> remove func (s *Server) genAAAAAnswer(req *dns.Msg, ip net.IP) *dns.AAAA {
answer := new(dns.AAAA)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeAAAA,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
</s> add func (s *Server) genAnswerA(req *dns.Msg, ip net.IP) (ans *dns.A) {
return &dns.A{
Hdr: s.hdr(req, dns.TypeA),
A: ip, </s> remove resp.Answer = append(resp.Answer, s.genAAnswer(request, ip))
</s> add resp.Answer = append(resp.Answer, s.genAnswerA(request, ip)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsforward/msg.go |
Rrtype: rrType, | <mask> func (s *Server) genAAnswer(req *dns.Msg, ip net.IP) *dns.A {
<mask> answer := new(dns.A)
<mask> answer.Hdr = dns.RR_Header{
<mask> Name: req.Question[0].Name,
<mask> Rrtype: dns.TypeA,
<mask> Ttl: s.conf.BlockedResponseTTL,
<mask> Class: dns.ClassINET,
<mask> }
<mask> answer.A = ip
<mask> return answer
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove func (s *Server) genAAnswer(req *dns.Msg, ip net.IP) *dns.A {
answer := new(dns.A)
answer.Hdr = dns.RR_Header{
</s> add func (s *Server) hdr(req *dns.Msg, rrType rules.RRType) (h dns.RR_Header) {
return dns.RR_Header{ </s> remove answer.A = ip
return answer
</s> add </s> remove func (s *Server) genAAAAAnswer(req *dns.Msg, ip net.IP) *dns.AAAA {
answer := new(dns.AAAA)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeAAAA,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
</s> add func (s *Server) genAnswerA(req *dns.Msg, ip net.IP) (ans *dns.A) {
return &dns.A{
Hdr: s.hdr(req, dns.TypeA),
A: ip, </s> remove resp.Answer = append(resp.Answer, s.genAAAAAnswer(request, ip))
</s> add resp.Answer = append(resp.Answer, s.genAnswerAAAA(request, ip)) </s> remove // Make a CNAME response
func (s *Server) genCNAMEAnswer(req *dns.Msg, cname string) *dns.CNAME {
answer := new(dns.CNAME)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeCNAME,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
}
answer.Target = dns.Fqdn(cname)
return answer
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsforward/msg.go |
<mask> Rrtype: dns.TypeA,
<mask> Ttl: s.conf.BlockedResponseTTL,
<mask> Class: dns.ClassINET,
<mask> }
<mask> answer.A = ip
<mask> return answer
<mask> }
<mask>
<mask> func (s *Server) genAAAAAnswer(req *dns.Msg, ip net.IP) *dns.AAAA {
<mask> answer := new(dns.AAAA)
<mask> answer.Hdr = dns.RR_Header{
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove func (s *Server) genAAAAAnswer(req *dns.Msg, ip net.IP) *dns.AAAA {
answer := new(dns.AAAA)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeAAAA,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
</s> add func (s *Server) genAnswerA(req *dns.Msg, ip net.IP) (ans *dns.A) {
return &dns.A{
Hdr: s.hdr(req, dns.TypeA),
A: ip, </s> remove Rrtype: dns.TypeA,
</s> add Rrtype: rrType, </s> remove func (s *Server) genAAnswer(req *dns.Msg, ip net.IP) *dns.A {
answer := new(dns.A)
answer.Hdr = dns.RR_Header{
</s> add func (s *Server) hdr(req *dns.Msg, rrType rules.RRType) (h dns.RR_Header) {
return dns.RR_Header{ </s> remove answer.AAAA = ip
return answer
</s> add </s> remove // Make a CNAME response
func (s *Server) genCNAMEAnswer(req *dns.Msg, cname string) *dns.CNAME {
answer := new(dns.CNAME)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeCNAME,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
}
answer.Target = dns.Fqdn(cname)
return answer
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsforward/msg.go | |
func (s *Server) genAnswerA(req *dns.Msg, ip net.IP) (ans *dns.A) {
return &dns.A{
Hdr: s.hdr(req, dns.TypeA),
A: ip, | <mask> answer.A = ip
<mask> return answer
<mask> }
<mask>
<mask> func (s *Server) genAAAAAnswer(req *dns.Msg, ip net.IP) *dns.AAAA {
<mask> answer := new(dns.AAAA)
<mask> answer.Hdr = dns.RR_Header{
<mask> Name: req.Question[0].Name,
<mask> Rrtype: dns.TypeAAAA,
<mask> Ttl: s.conf.BlockedResponseTTL,
<mask> Class: dns.ClassINET,
<mask> }
<mask> answer.AAAA = ip
<mask> return answer
<mask> }
<mask>
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove answer.A = ip
return answer
</s> add </s> remove Rrtype: dns.TypeA,
</s> add Rrtype: rrType, </s> remove answer.AAAA = ip
return answer
</s> add </s> remove func (s *Server) genAAnswer(req *dns.Msg, ip net.IP) *dns.A {
answer := new(dns.A)
answer.Hdr = dns.RR_Header{
</s> add func (s *Server) hdr(req *dns.Msg, rrType rules.RRType) (h dns.RR_Header) {
return dns.RR_Header{ </s> remove // Make a CNAME response
func (s *Server) genCNAMEAnswer(req *dns.Msg, cname string) *dns.CNAME {
answer := new(dns.CNAME)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeCNAME,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
}
answer.Target = dns.Fqdn(cname)
return answer
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsforward/msg.go |
<mask> Rrtype: dns.TypeAAAA,
<mask> Ttl: s.conf.BlockedResponseTTL,
<mask> Class: dns.ClassINET,
<mask> }
<mask> answer.AAAA = ip
<mask> return answer
<mask> }
<mask>
<mask> func (s *Server) genTXTAnswer(req *dns.Msg, strs []string) (answer *dns.TXT) {
<mask> return &dns.TXT{
<mask> Hdr: dns.RR_Header{
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove Hdr: dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeTXT,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
},
</s> add Hdr: s.hdr(req, dns.TypeTXT), </s> remove func (s *Server) genTXTAnswer(req *dns.Msg, strs []string) (answer *dns.TXT) {
</s> add func (s *Server) genAnswerAAAA(req *dns.Msg, ip net.IP) (ans *dns.AAAA) {
return &dns.AAAA{
Hdr: s.hdr(req, dns.TypeAAAA),
AAAA: ip,
}
}
func (s *Server) genAnswerCNAME(req *dns.Msg, cname string) (ans *dns.CNAME) {
return &dns.CNAME{
Hdr: s.hdr(req, dns.TypeCNAME),
Target: dns.Fqdn(cname),
}
}
func (s *Server) genAnswerMX(req *dns.Msg, mx *rules.DNSMX) (ans *dns.MX) {
return &dns.MX{
Hdr: s.hdr(req, dns.TypePTR),
Preference: mx.Preference,
Mx: mx.Exchange,
}
}
func (s *Server) genAnswerPTR(req *dns.Msg, ptr string) (ans *dns.PTR) {
return &dns.PTR{
Hdr: s.hdr(req, dns.TypePTR),
Ptr: ptr,
}
}
func (s *Server) genAnswerTXT(req *dns.Msg, strs []string) (ans *dns.TXT) { </s> remove func (s *Server) genAAAAAnswer(req *dns.Msg, ip net.IP) *dns.AAAA {
answer := new(dns.AAAA)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeAAAA,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
</s> add func (s *Server) genAnswerA(req *dns.Msg, ip net.IP) (ans *dns.A) {
return &dns.A{
Hdr: s.hdr(req, dns.TypeA),
A: ip, </s> remove answer.A = ip
return answer
</s> add </s> remove Rrtype: dns.TypeA,
</s> add Rrtype: rrType, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsforward/msg.go | |
func (s *Server) genAnswerAAAA(req *dns.Msg, ip net.IP) (ans *dns.AAAA) {
return &dns.AAAA{
Hdr: s.hdr(req, dns.TypeAAAA),
AAAA: ip,
}
}
func (s *Server) genAnswerCNAME(req *dns.Msg, cname string) (ans *dns.CNAME) {
return &dns.CNAME{
Hdr: s.hdr(req, dns.TypeCNAME),
Target: dns.Fqdn(cname),
}
}
func (s *Server) genAnswerMX(req *dns.Msg, mx *rules.DNSMX) (ans *dns.MX) {
return &dns.MX{
Hdr: s.hdr(req, dns.TypePTR),
Preference: mx.Preference,
Mx: mx.Exchange,
}
}
func (s *Server) genAnswerPTR(req *dns.Msg, ptr string) (ans *dns.PTR) {
return &dns.PTR{
Hdr: s.hdr(req, dns.TypePTR),
Ptr: ptr,
}
}
func (s *Server) genAnswerTXT(req *dns.Msg, strs []string) (ans *dns.TXT) { | <mask> answer.AAAA = ip
<mask> return answer
<mask> }
<mask>
<mask> func (s *Server) genTXTAnswer(req *dns.Msg, strs []string) (answer *dns.TXT) {
<mask> return &dns.TXT{
<mask> Hdr: dns.RR_Header{
<mask> Name: req.Question[0].Name,
<mask> Rrtype: dns.TypeTXT,
<mask> Ttl: s.conf.BlockedResponseTTL,
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove answer.AAAA = ip
return answer
</s> add </s> remove Hdr: dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeTXT,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
},
</s> add Hdr: s.hdr(req, dns.TypeTXT), </s> remove func (s *Server) genAAAAAnswer(req *dns.Msg, ip net.IP) *dns.AAAA {
answer := new(dns.AAAA)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeAAAA,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
</s> add func (s *Server) genAnswerA(req *dns.Msg, ip net.IP) (ans *dns.A) {
return &dns.A{
Hdr: s.hdr(req, dns.TypeA),
A: ip, </s> remove Rrtype: dns.TypeA,
</s> add Rrtype: rrType, </s> remove func (s *Server) genAAnswer(req *dns.Msg, ip net.IP) *dns.A {
answer := new(dns.A)
answer.Hdr = dns.RR_Header{
</s> add func (s *Server) hdr(req *dns.Msg, rrType rules.RRType) (h dns.RR_Header) {
return dns.RR_Header{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsforward/msg.go |
Hdr: s.hdr(req, dns.TypeTXT), | <mask> }
<mask>
<mask> func (s *Server) genTXTAnswer(req *dns.Msg, strs []string) (answer *dns.TXT) {
<mask> return &dns.TXT{
<mask> Hdr: dns.RR_Header{
<mask> Name: req.Question[0].Name,
<mask> Rrtype: dns.TypeTXT,
<mask> Ttl: s.conf.BlockedResponseTTL,
<mask> Class: dns.ClassINET,
<mask> },
<mask> Txt: strs,
<mask> }
<mask> }
<mask>
<mask> // generate DNS response message with an IP address
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove answer.AAAA = ip
return answer
</s> add </s> remove func (s *Server) genTXTAnswer(req *dns.Msg, strs []string) (answer *dns.TXT) {
</s> add func (s *Server) genAnswerAAAA(req *dns.Msg, ip net.IP) (ans *dns.AAAA) {
return &dns.AAAA{
Hdr: s.hdr(req, dns.TypeAAAA),
AAAA: ip,
}
}
func (s *Server) genAnswerCNAME(req *dns.Msg, cname string) (ans *dns.CNAME) {
return &dns.CNAME{
Hdr: s.hdr(req, dns.TypeCNAME),
Target: dns.Fqdn(cname),
}
}
func (s *Server) genAnswerMX(req *dns.Msg, mx *rules.DNSMX) (ans *dns.MX) {
return &dns.MX{
Hdr: s.hdr(req, dns.TypePTR),
Preference: mx.Preference,
Mx: mx.Exchange,
}
}
func (s *Server) genAnswerPTR(req *dns.Msg, ptr string) (ans *dns.PTR) {
return &dns.PTR{
Hdr: s.hdr(req, dns.TypePTR),
Ptr: ptr,
}
}
func (s *Server) genAnswerTXT(req *dns.Msg, strs []string) (ans *dns.TXT) { </s> remove // Make a CNAME response
func (s *Server) genCNAMEAnswer(req *dns.Msg, cname string) *dns.CNAME {
answer := new(dns.CNAME)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeCNAME,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
}
answer.Target = dns.Fqdn(cname)
return answer
}
</s> add </s> remove func (s *Server) genAAAAAnswer(req *dns.Msg, ip net.IP) *dns.AAAA {
answer := new(dns.AAAA)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeAAAA,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
</s> add func (s *Server) genAnswerA(req *dns.Msg, ip net.IP) (ans *dns.A) {
return &dns.A{
Hdr: s.hdr(req, dns.TypeA),
A: ip, </s> remove Rrtype: dns.TypeA,
</s> add Rrtype: rrType, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsforward/msg.go |
<mask>
<mask> return resp
<mask> }
<mask>
<mask> // Make a CNAME response
<mask> func (s *Server) genCNAMEAnswer(req *dns.Msg, cname string) *dns.CNAME {
<mask> answer := new(dns.CNAME)
<mask> answer.Hdr = dns.RR_Header{
<mask> Name: req.Question[0].Name,
<mask> Rrtype: dns.TypeCNAME,
<mask> Ttl: s.conf.BlockedResponseTTL,
<mask> Class: dns.ClassINET,
<mask> }
<mask> answer.Target = dns.Fqdn(cname)
<mask> return answer
<mask> }
<mask>
<mask> // Create REFUSED DNS response
<mask> func (s *Server) makeResponseREFUSED(request *dns.Msg) *dns.Msg {
<mask> resp := dns.Msg{}
<mask> resp.SetRcode(request, dns.RcodeRefused)
<mask> resp.RecursionAvailable = true
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove func (s *Server) genAAnswer(req *dns.Msg, ip net.IP) *dns.A {
answer := new(dns.A)
answer.Hdr = dns.RR_Header{
</s> add func (s *Server) hdr(req *dns.Msg, rrType rules.RRType) (h dns.RR_Header) {
return dns.RR_Header{ </s> remove Rrtype: dns.TypeA,
</s> add Rrtype: rrType, </s> remove func (s *Server) genAAAAAnswer(req *dns.Msg, ip net.IP) *dns.AAAA {
answer := new(dns.AAAA)
answer.Hdr = dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeAAAA,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
</s> add func (s *Server) genAnswerA(req *dns.Msg, ip net.IP) (ans *dns.A) {
return &dns.A{
Hdr: s.hdr(req, dns.TypeA),
A: ip, </s> remove answer.A = ip
return answer
</s> add </s> remove Hdr: dns.RR_Header{
Name: req.Question[0].Name,
Rrtype: dns.TypeTXT,
Ttl: s.conf.BlockedResponseTTL,
Class: dns.ClassINET,
},
</s> add Hdr: s.hdr(req, dns.TypeTXT), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | internal/dnsforward/msg.go | |
, "MX"
, "PTR" | <mask> , "DOH"
<mask> , "DOQ"
<mask> , "DOT"
<mask> , "EDNS"
<mask> , "QUIC"
<mask> , "SDNS"
<mask> , "SVCB"
<mask> ]
<mask> dot_import_whitelist = []
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
</s> add answer = append(answer, s.genAnswerCNAME(d.Req, res.CanonName)) </s> remove a := s.genAAAAAnswer(req, ip)
</s> add a := s.genAnswerAAAA(req, ip) </s> remove resp.Answer = append(resp.Answer, s.genCNAMEAnswer(req, res.CanonName))
</s> add resp.Answer = append(resp.Answer, s.genAnswerCNAME(req, res.CanonName)) </s> remove a := s.genAAnswer(req, ip.To4())
</s> add a := s.genAnswerA(req, ip.To4()) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | staticcheck.conf |
, "SVCB" | <mask> , "PTR"
<mask> , "QUIC"
<mask> , "SDNS"
<mask> ]
<mask> dot_import_whitelist = []
<mask> http_status_code_whitelist = []
</s> Pull request: all: support more $dnsrewrite rr types
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102.
Updates #2452.
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types </s> remove answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
</s> add answer = append(answer, s.genAnswerCNAME(d.Req, res.CanonName)) </s> remove a := s.genAAAAAnswer(req, ip)
</s> add a := s.genAnswerAAAA(req, ip) </s> remove resp.Answer = append(resp.Answer, s.genCNAMEAnswer(req, res.CanonName))
</s> add resp.Answer = append(resp.Answer, s.genAnswerCNAME(req, res.CanonName)) </s> remove a := s.genAAnswer(req, ip.To4())
</s> add a := s.genAnswerA(req, ip.To4()) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc79e2e8f8450e8515d0a5bae03b078acee4296d | staticcheck.conf |
go-check: go-tools go-lint go-test
| <mask> go-tools: ; $(ENV) "$(SHELL)" ./scripts/make/go-tools.sh
<mask>
<mask> openapi-lint: ; cd ./openapi/ && $(YARN) test
<mask> openapi-show: ; cd ./openapi/ && $(YARN) start
<mask>
<mask> # TODO(a.garipov): Remove the legacy targets once the build
<mask> # infrastructure stops using them.
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove for i := 0; ; i++ {
ipStr := q.Get(fmt.Sprintf("ip%d", i))
ip := net.ParseIP(ipStr)
if ip == nil {
</s> add for i := 0; i < len(q); i++ {
idStr := q.Get(fmt.Sprintf("ip%d", i))
if idStr == "" { </s> remove return resultDone
</s> add return resultCodeSuccess </s> remove // getClientRequestFilteringSettings lookups client filtering settings
// using the client's IP address from the DNSContext
func (s *Server) getClientRequestFilteringSettings(d *proxy.DNSContext) *dnsfilter.RequestFilteringSettings {
</s> add // getClientRequestFilteringSettings looks up client filtering settings using
// the client's IP address and ID, if any, from ctx.
func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.RequestFilteringSettings { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | Makefile |
openapi-show: ; cd ./openapi/ && $(YARN) start | <mask> go-check: go-tools go-lint go-test
<mask>
<mask> openapi-lint: ; cd ./openapi/ && $(YARN) test
<mask>
<mask> # TODO(a.garipov): Remove the legacy targets once the build
<mask> # infrastructure stops using them.
<mask> dependencies:
<mask> @ echo "use make deps instead"
<mask> @ $(MAKE) deps
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove // getClientRequestFilteringSettings lookups client filtering settings
// using the client's IP address from the DNSContext
func (s *Server) getClientRequestFilteringSettings(d *proxy.DNSContext) *dnsfilter.RequestFilteringSettings {
</s> add // getClientRequestFilteringSettings looks up client filtering settings using
// the client's IP address and ID, if any, from ctx.
func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.RequestFilteringSettings { </s> remove return resultDone
</s> add return resultCodeSuccess </s> remove // Remove all entries that match the specified source
func (clients *clientsContainer) rmHosts(source clientSource) {
</s> add // rmHostsBySrc removes all entries that match the specified source.
func (clients *clientsContainer) rmHostsBySrc(src clientSource) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | Makefile |
<mask> "node-releases": "^1.1.53",
<mask> "pkg-up": "^2.0.0"
<mask> }
<mask> },
<mask> "caniuse-lite": {
<mask> "version": "1.0.30001062",
<mask> "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001062.tgz",
<mask> "integrity": "sha512-ei9ZqeOnN7edDrb24QfJ0OZicpEbsWxv7WusOiQGz/f2SfvBgHHbOEwBJ8HKGVSyx8Z6ndPjxzR6m0NQq+0bfw==",
<mask> "dev": true
<mask> },
<mask> "postcss": {
<mask> "version": "7.0.30",
<mask> "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.30.tgz",
<mask> "integrity": "sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==",
<mask> "dev": true,
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove "version": "1.0.30001059",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001059.tgz",
"integrity": "sha512-oOrc+jPJWooKIA0IrNZ5sYlsXc7NP7KLhNWrSGEJhnfSzDvDJ0zd3i6HXsslExY9bbu+x0FQ5C61LcqmPt7bOQ==",
</s> add "version": "1.0.30001165",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001165.tgz",
"integrity": "sha512-8cEsSMwXfx7lWSUMA2s08z9dIgsnR5NAqjXP23stdsU3AUWkCr/rr4s4OFtHXn5XXr6+7kam3QFVoYyXNPdJPA==", </s> remove }, { ips: [], cidrs: [] });
</s> add }, { ips: [], cidrs: [], clientIds: [] }); </s> remove const { ips, cidrs } = separateIpsAndCidrs(ids);
</s> add const { ips, cidrs, clientIds } = separateIpsAndCidrs(ids); </s> remove assert.Equal(t, resultDone, c.process(ctx))
</s> add assert.Equal(t, resultCodeSuccess, c.process(ctx)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/package-lock.json | |
"version": "1.0.30001165",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001165.tgz",
"integrity": "sha512-8cEsSMwXfx7lWSUMA2s08z9dIgsnR5NAqjXP23stdsU3AUWkCr/rr4s4OFtHXn5XXr6+7kam3QFVoYyXNPdJPA==", | <mask> "quick-lru": "^4.0.1"
<mask> }
<mask> },
<mask> "caniuse-lite": {
<mask> "version": "1.0.30001059",
<mask> "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001059.tgz",
<mask> "integrity": "sha512-oOrc+jPJWooKIA0IrNZ5sYlsXc7NP7KLhNWrSGEJhnfSzDvDJ0zd3i6HXsslExY9bbu+x0FQ5C61LcqmPt7bOQ==",
<mask> "dev": true
<mask> },
<mask> "capture-exit": {
<mask> "version": "2.0.0",
<mask> "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove "caniuse-lite": {
"version": "1.0.30001062",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001062.tgz",
"integrity": "sha512-ei9ZqeOnN7edDrb24QfJ0OZicpEbsWxv7WusOiQGz/f2SfvBgHHbOEwBJ8HKGVSyx8Z6ndPjxzR6m0NQq+0bfw==",
"dev": true
},
</s> add </s> remove }, { ips: [], cidrs: [] });
</s> add }, { ips: [], cidrs: [], clientIds: [] }); </s> remove const { ips, cidrs } = separateIpsAndCidrs(ids);
</s> add const { ips, cidrs, clientIds } = separateIpsAndCidrs(ids); </s> remove assert.Equal(t, resultDone, c.process(ctx))
</s> add assert.Equal(t, resultCodeSuccess, c.process(ctx)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/package-lock.json |
"form_error_server_name": "Invalid server name", | <mask> "form_error_ip_format": "Invalid IP format",
<mask> "form_error_mac_format": "Invalid MAC format",
<mask> "form_error_client_id_format": "Invalid client ID format",
<mask> "form_error_positive": "Must be greater than 0",
<mask> "form_error_negative": "Must be equal to 0 or greater",
<mask> "range_end_error": "Must be greater than range start",
<mask> "dhcp_form_gateway_input": "Gateway IP",
<mask> "dhcp_form_subnet_input": "Subnet mask",
<mask> "dhcp_form_range_title": "Range of IP addresses",
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.", </s> remove clients *clientsContainer
ipChan chan net.IP
timeoutMsec uint
</s> add clients *clientsContainer
ipChan chan net.IP </s> remove list map[string]*Client // name -> client
idIndex map[string]*Client // IP -> client
// TODO(e.burkov): Think of a way to not require string conversion for
// IP addresses.
ipHost map[string]*ClientHost // IP -> Hostname
lock sync.Mutex
</s> add // TODO(a.garipov): Perhaps use a number of separate indices for
// different types (string, net.IP, and so on).
list map[string]*Client // name -> client
idIndex map[string]*Client // ID -> client
ipHost map[string]*ClientHost // IP -> Hostname
lock sync.Mutex | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/__locales/en.json |
"client_id": "Client ID",
"client_id_placeholder": "Enter client ID",
"client_id_desc": "Different clients can be identified by a special client ID. <a>Here</a> you can learn more about how to identify clients.", | <mask> "dns_over_https": "DNS-over-HTTPS",
<mask> "dns_over_tls": "DNS-over-TLS",
<mask> "dns_over_quic": "DNS-over-QUIC",
<mask> "download_mobileconfig_doh": "Download .mobileconfig for DNS-over-HTTPS",
<mask> "download_mobileconfig_dot": "Download .mobileconfig for DNS-over-TLS",
<mask> "download_mobileconfig": "Download configuration file",
<mask> "plain_dns": "Plain DNS",
<mask> "form_enter_rate_limit": "Enter rate limit",
<mask> "rate_limit": "Rate limit",
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.", </s> remove // Filtering callback function
FilterHandler func(clientAddr net.IP, settings *dnsfilter.RequestFilteringSettings) `yaml:"-"`
</s> add // FilterHandler is an optional additional filtering callback.
FilterHandler func(clientAddr net.IP, clientID string, settings *dnsfilter.RequestFilteringSettings) `yaml:"-"` </s> remove for _, id := range old.IDs {
</s> add for _, id := range prev.IDs { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/__locales/en.json |
"download_mobileconfig": "Download configuration file", | <mask> "client_id_placeholder": "Enter client ID",
<mask> "client_id_desc": "Different clients can be identified by a special client ID. <a>Here</a> you can learn more about how to identify clients.",
<mask> "download_mobileconfig_doh": "Download .mobileconfig for DNS-over-HTTPS",
<mask> "download_mobileconfig_dot": "Download .mobileconfig for DNS-over-TLS",
<mask> "plain_dns": "Plain DNS",
<mask> "form_enter_rate_limit": "Enter rate limit",
<mask> "rate_limit": "Rate limit",
<mask> "edns_enable": "Enable EDNS Client Subnet",
<mask> "edns_cs_desc": "If enabled, AdGuard Home will be sending clients' subnets to the DNS servers.",
<mask> "rate_limit_desc": "The number of requests per second that a single client is allowed to make (setting it to 0 means unlimited)",
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.", </s> remove "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.",
</s> add "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.", </s> remove clients *clientsContainer
ipChan chan net.IP
timeoutMsec uint
</s> add clients *clientsContainer
ipChan chan net.IP | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/__locales/en.json |
"encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.", | <mask> "encryption_desc": "Encryption (HTTPS/TLS) support for both DNS and admin web interface",
<mask> "encryption_config_saved": "Encryption config saved",
<mask> "encryption_server": "Server name",
<mask> "encryption_server_enter": "Enter your domain name",
<mask> "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.",
<mask> "encryption_redirect": "Redirect to HTTPS automatically",
<mask> "encryption_redirect_desc": "If checked, AdGuard Home will automatically redirect you from HTTP to HTTPS addresses.",
<mask> "encryption_https": "HTTPS port",
<mask> "encryption_https_desc": "If HTTPS port is configured, AdGuard Home admin interface will be accessible via HTTPS, and it will also provide DNS-over-HTTPS on '/dns-query' location.",
<mask> "encryption_dot": "DNS-over-TLS port",
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.", </s> remove PayloadDisplayName: name,
</s> add PayloadDisplayName: dspName, </s> remove if (position - maxEntrySize) > 0 {
</s> add if position > maxEntrySize { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/__locales/en.json |
"client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.", | <mask> "client_new": "New Client",
<mask> "client_edit": "Edit Client",
<mask> "client_identifier": "Identifier",
<mask> "ip_address": "IP address",
<mask> "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>",
<mask> "form_enter_ip": "Enter IP",
<mask> "form_enter_mac": "Enter MAC",
<mask> "form_enter_id": "Enter identifier",
<mask> "form_add_id": "Add identifier",
<mask> "form_client_name": "Enter client name",
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.",
</s> add "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.", </s> remove c = Client{
</s> add c = &Client{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/__locales/en.json |
"setup_dns_privacy_ioc_mac": "iOS and macOS configuration", | <mask> "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> supports <1>DNS-over-HTTPS</1>.",
<mask> "setup_dns_privacy_other_5": "You will find more implementations <0>here</0> and <1>here</1>.",
<mask> "setup_dns_notice": "In order to use <1>DNS-over-HTTPS</1> or <1>DNS-over-TLS</1>, you need to <0>configure Encryption</0> in AdGuard Home settings.",
<mask> "rewrite_added": "DNS rewrite for \"{{key}}\" successfully added",
<mask> "rewrite_deleted": "DNS rewrite for \"{{key}}\" successfully deleted",
<mask> "rewrite_add": "Add DNS rewrite",
<mask> "rewrite_not_found": "No DNS rewrites found",
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.",
</s> add "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.", </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.", </s> remove PayloadDisplayName: name,
</s> add PayloadDisplayName: dspName, </s> remove ctx := &dnsContext{srv: s, proxyCtx: d}
ctx.result = &dnsfilter.Result{}
ctx.startTime = time.Now()
</s> add ctx := &dnsContext{
srv: s,
proxyCtx: d,
result: &dnsfilter.Result{},
startTime: time.Now(),
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/__locales/en.json |
const clientsParams = getParamsForClientsSearch(logs, 'client', 'client_id'); | <mask> } from '../helpers/constants';
<mask> import { addErrorToast, addSuccessToast } from './toasts';
<mask>
<mask> const enrichWithClientInfo = async (logs) => {
<mask> const clientsParams = getParamsForClientsSearch(logs, 'client');
<mask>
<mask> if (Object.keys(clientsParams).length > 0) {
<mask> const clients = await apiClient.findClients(clientsParams);
<mask> return addClientInfo(logs, clients, 'client');
<mask> }
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove import { BLOCK_ACTIONS, STATUS_COLORS } from '../../helpers/constants';
</s> add import { BLOCK_ACTIONS, R_CLIENT_ID, STATUS_COLORS } from '../../helpers/constants'; </s> remove return <Card
</s> add return (
<Card </s> remove return <>{options.map(({ name, onClick, disabled }) => <button
key={name}
className="button-action--arrow-option px-4 py-2"
onClick={onClick}
disabled={disabled}
>{t(name)}
</button>)}</>;
</s> add return (
<>
{options.map(({ name, onClick, disabled }) => (
<button
key={name}
className="button-action--arrow-option px-4 py-2"
onClick={onClick}
disabled={disabled}
>
{t(name)}
</button>
))}
</>
); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/actions/queryLogs.js |
a.btn-success.disabled {
color: #fff;
} | <mask>
<mask> .ReactModal__Body--open {
<mask> overflow: hidden;
<mask> }
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove import { BLOCK_ACTIONS, STATUS_COLORS } from '../../helpers/constants';
</s> add import { BLOCK_ACTIONS, R_CLIENT_ID, STATUS_COLORS } from '../../helpers/constants'; </s> remove return *c, true
</s> add return c, true </s> remove />
</Card>;
</s> add />
</Card>
); </s> remove return *c, true
</s> add return c, true | [
"keep",
"keep",
"keep",
"add"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/components/App/index.css |
import { BLOCK_ACTIONS, R_CLIENT_ID, STATUS_COLORS } from '../../helpers/constants'; | <mask> import Card from '../ui/Card';
<mask> import Cell from '../ui/Cell';
<mask>
<mask> import { getPercent, sortIp } from '../../helpers/helpers';
<mask> import { BLOCK_ACTIONS, STATUS_COLORS } from '../../helpers/constants';
<mask> import { toggleClientBlock } from '../../actions/access';
<mask> import { renderFormattedClientCell } from '../../helpers/renderFormattedClientCell';
<mask> import { getStats } from '../../actions/stats';
<mask>
<mask> const getClientsPercentColor = (percent) => {
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove import uniqBy from 'lodash/uniqBy';
</s> add </s> remove validateIsSafePort, validatePort, validatePortQuic, validatePortTLS,
</s> add validateServerName, validateIsSafePort, validatePort, validatePortQuic, validatePortTLS, </s> remove const clientsParams = getParamsForClientsSearch(logs, 'client');
</s> add const clientsParams = getParamsForClientsSearch(logs, 'client', 'client_id'); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/components/Dashboard/Clients.js |
if (R_CLIENT_ID.test(ip)) {
return null;
}
| <mask> };
<mask>
<mask> const renderBlockingButton = (ip, disallowed, disallowed_rule) => {
<mask> const dispatch = useDispatch();
<mask> const { t } = useTranslation();
<mask> const processingSet = useSelector((state) => state.access.processingSet);
<mask>
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove return <Card
</s> add return (
<Card </s> remove export const getParamsForClientsSearch = (data, param) => {
const uniqueClients = uniqBy(data, param);
return uniqueClients
.reduce((acc, item, idx) => {
const key = `ip${idx}`;
acc[key] = item[param];
return acc;
}, {});
</s> add export const getParamsForClientsSearch = (data, param, additionalParam) => {
const clients = new Set();
data.forEach((e) => {
clients.add(e[param]);
if (e[additionalParam]) {
clients.add(e[additionalParam]);
}
});
const params = {};
const ids = Array.from(clients.values());
ids.forEach((id, i) => {
params[`ip${i}`] = id;
});
return params; </s> remove >
<Trans>{text}</Trans>
</button>
</div>;
</s> add >
<Trans>{text}</Trans>
</button>
</div>
); </s> remove const { ips, cidrs } = separateIpsAndCidrs(ids);
</s> add const { ips, cidrs, clientIds } = separateIpsAndCidrs(ids); | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/components/Dashboard/Clients.js |
return (
<div className="table__action pl-4">
<button | <mask>
<mask> const text = disallowed ? BLOCK_ACTIONS.UNBLOCK : BLOCK_ACTIONS.BLOCK;
<mask>
<mask> const isNotInAllowedList = disallowed && disallowed_rule === '';
<mask> return <div className="table__action pl-4">
<mask> <button
<mask> type="button"
<mask> className={buttonClass}
<mask> onClick={isNotInAllowedList ? undefined : onClick}
<mask> disabled={isNotInAllowedList || processingSet}
<mask> title={t(isNotInAllowedList ? 'client_not_in_allowed_clients' : text)}
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove >
<Trans>{text}</Trans>
</button>
</div>;
</s> add >
<Trans>{text}</Trans>
</button>
</div>
); </s> remove />
</Card>;
</s> add />
</Card>
); </s> remove name: info?.name,
</s> add name: info?.name || client_id, </s> remove return <div className={containerClass}>
<button type="button"
</s> add return (
<div className={containerClass}>
<button
type="button" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/components/Dashboard/Clients.js |
>
<Trans>{text}</Trans>
</button>
</div>
); | <mask> className={buttonClass}
<mask> onClick={isNotInAllowedList ? undefined : onClick}
<mask> disabled={isNotInAllowedList || processingSet}
<mask> title={t(isNotInAllowedList ? 'client_not_in_allowed_clients' : text)}
<mask> >
<mask> <Trans>{text}</Trans>
<mask> </button>
<mask> </div>;
<mask> };
<mask>
<mask> const ClientCell = (row) => {
<mask> const { value, original: { info, info: { disallowed, disallowed_rule } } } = row;
<mask>
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove return <div className="table__action pl-4">
<button
</s> add return (
<div className="table__action pl-4">
<button </s> remove />
</Card>;
</s> add />
</Card>
); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/components/Dashboard/Clients.js |
return (
<Card | <mask> }) => {
<mask> const { t } = useTranslation();
<mask> const topClients = useSelector((state) => state.stats.topClients, shallowEqual);
<mask>
<mask> return <Card
<mask> title={t('top_clients')}
<mask> subtitle={subtitle}
<mask> bodyType="card-table"
<mask> refresh={refreshButton}
<mask> >
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove >
<ReactTable
</s> add >
<ReactTable </s> remove return <>{options.map(({ name, onClick, disabled }) => <button
key={name}
className="button-action--arrow-option px-4 py-2"
onClick={onClick}
disabled={disabled}
>{t(name)}
</button>)}</>;
</s> add return (
<>
{options.map(({ name, onClick, disabled }) => (
<button
key={name}
className="button-action--arrow-option px-4 py-2"
onClick={onClick}
disabled={disabled}
>
{t(name)}
</button>
))}
</>
); </s> remove export const getParamsForClientsSearch = (data, param) => {
const uniqueClients = uniqBy(data, param);
return uniqueClients
.reduce((acc, item, idx) => {
const key = `ip${idx}`;
acc[key] = item[param];
return acc;
}, {});
</s> add export const getParamsForClientsSearch = (data, param, additionalParam) => {
const clients = new Set();
data.forEach((e) => {
clients.add(e[param]);
if (e[additionalParam]) {
clients.add(e[additionalParam]);
}
});
const params = {};
const ids = Array.from(clients.values());
ids.forEach((id, i) => {
params[`ip${i}`] = id;
});
return params; </s> remove const { ips, cidrs } = separateIpsAndCidrs(ids);
</s> add const { ips, cidrs, clientIds } = separateIpsAndCidrs(ids); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/components/Dashboard/Clients.js |
>
<ReactTable | <mask> title={t('top_clients')}
<mask> subtitle={subtitle}
<mask> bodyType="card-table"
<mask> refresh={refreshButton}
<mask> >
<mask> <ReactTable
<mask> data={topClients.map(({
<mask> name: ip, count, info, blocked,
<mask> }) => ({
<mask> ip,
<mask> count,
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove return <Card
</s> add return (
<Card </s> remove clients.ipHost[ipStr] = ch
log.Debug("Clients: set WHOIS info for auto-client with IP %s: %v", ip, ch.WhoisInfo)
</s> add clients.ipHost[ip] = ch
log.Debug("clients: set whois info for auto-client with IP %s: %q", ip, info) </s> remove >
<Trans>{text}</Trans>
</button>
</div>;
</s> add >
<Trans>{text}</Trans>
</button>
</div>
); </s> remove return <>{options.map(({ name, onClick, disabled }) => <button
key={name}
className="button-action--arrow-option px-4 py-2"
onClick={onClick}
disabled={disabled}
>{t(name)}
</button>)}</>;
</s> add return (
<>
{options.map(({ name, onClick, disabled }) => (
<button
key={name}
className="button-action--arrow-option px-4 py-2"
onClick={onClick}
disabled={disabled}
>
{t(name)}
</button>
))}
</>
); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/components/Dashboard/Clients.js |
Header: <Trans>client_table_header</Trans>, | <mask> blocked,
<mask> }))}
<mask> columns={[
<mask> {
<mask> Header: 'IP',
<mask> accessor: 'ip',
<mask> sortMethod: sortIp,
<mask> Cell: ClientCell,
<mask> },
<mask> {
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove }, { ips: [], cidrs: [] });
</s> add }, { ips: [], cidrs: [], clientIds: [] }); </s> remove "caniuse-lite": {
"version": "1.0.30001062",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001062.tgz",
"integrity": "sha512-ei9ZqeOnN7edDrb24QfJ0OZicpEbsWxv7WusOiQGz/f2SfvBgHHbOEwBJ8HKGVSyx8Z6ndPjxzR6m0NQq+0bfw==",
"dev": true
},
</s> add </s> remove "version": "1.0.30001059",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001059.tgz",
"integrity": "sha512-oOrc+jPJWooKIA0IrNZ5sYlsXc7NP7KLhNWrSGEJhnfSzDvDJ0zd3i6HXsslExY9bbu+x0FQ5C61LcqmPt7bOQ==",
</s> add "version": "1.0.30001165",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001165.tgz",
"integrity": "sha512-8cEsSMwXfx7lWSUMA2s08z9dIgsnR5NAqjXP23stdsU3AUWkCr/rr4s4OFtHXn5XXr6+7kam3QFVoYyXNPdJPA==", </s> remove const { ips, cidrs } = separateIpsAndCidrs(ids);
</s> add const { ips, cidrs, clientIds } = separateIpsAndCidrs(ids); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/components/Dashboard/Clients.js |
/>
</Card>
); | <mask> const { info: { disallowed } } = rowInfo.original;
<mask>
<mask> return disallowed ? { className: 'logs__row--red' } : {};
<mask> }}
<mask> />
<mask> </Card>;
<mask> };
<mask>
<mask> Clients.propTypes = {
<mask> refreshButton: PropTypes.node.isRequired,
<mask> subtitle: PropTypes.string.isRequired,
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove >
<Trans>{text}</Trans>
</button>
</div>;
</s> add >
<Trans>{text}</Trans>
</button>
</div>
); </s> remove return <div className="table__action pl-4">
<button
</s> add return (
<div className="table__action pl-4">
<button </s> remove return resultDone
</s> add return resultCodeSuccess | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/components/Dashboard/Clients.js |
client_id, | <mask> import { updateLogs } from '../../../actions/queryLogs';
<mask>
<mask> const ClientCell = ({
<mask> client,
<mask> domain,
<mask> info,
<mask> info: {
<mask> name, whois_info, disallowed, disallowed_rule,
<mask> },
<mask> reason,
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove >
<Trans>{text}</Trans>
</button>
</div>;
</s> add >
<Trans>{text}</Trans>
</button>
</div>
); </s> remove import { BLOCK_ACTIONS, STATUS_COLORS } from '../../helpers/constants';
</s> add import { BLOCK_ACTIONS, R_CLIENT_ID, STATUS_COLORS } from '../../helpers/constants'; </s> remove validateIsSafePort, validatePort, validatePortQuic, validatePortTLS,
</s> add validateServerName, validateIsSafePort, validatePort, validatePortQuic, validatePortTLS, </s> remove const clientsParams = getParamsForClientsSearch(logs, 'client');
</s> add const clientsParams = getParamsForClientsSearch(logs, 'client', 'client_id'); </s> remove import uniqBy from 'lodash/uniqBy';
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/components/Logs/Cells/ClientCell.js |
const clientName = name || client_id;
const clientInfo = { ...info, name: clientName }; | <mask> const source = autoClient?.source;
<mask> const whoisAvailable = whois_info && Object.keys(whois_info).length > 0;
<mask>
<mask> const id = nanoid();
<mask>
<mask> const data = {
<mask> address: client,
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove name,
</s> add name: clientName, </s> remove const { ips, cidrs } = separateIpsAndCidrs(ids);
</s> add const { ips, cidrs, clientIds } = separateIpsAndCidrs(ids); </s> remove const clientsParams = getParamsForClientsSearch(logs, 'client');
</s> add const clientsParams = getParamsForClientsSearch(logs, 'client', 'client_id'); </s> remove return <Card
</s> add return (
<Card | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/components/Logs/Cells/ClientCell.js |
name: clientName, | <mask> const id = nanoid();
<mask>
<mask> const data = {
<mask> address: client,
<mask> name,
<mask> country: whois_info?.country,
<mask> city: whois_info?.city,
<mask> network: whois_info?.orgname,
<mask> source_label: source,
<mask> };
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove name: info?.name,
</s> add name: info?.name || client_id, </s> remove return <>{options.map(({ name, onClick, disabled }) => <button
key={name}
className="button-action--arrow-option px-4 py-2"
onClick={onClick}
disabled={disabled}
>{t(name)}
</button>)}</>;
</s> add return (
<>
{options.map(({ name, onClick, disabled }) => (
<button
key={name}
className="button-action--arrow-option px-4 py-2"
onClick={onClick}
disabled={disabled}
>
{t(name)}
</button>
))}
</>
); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/components/Logs/Cells/ClientCell.js |
return (
<>
{options.map(({ name, onClick, disabled }) => (
<button
key={name}
className="button-action--arrow-option px-4 py-2"
onClick={onClick}
disabled={disabled}
>
{t(name)}
</button>
))}
</>
); | <mask> const getOptions = (options) => {
<mask> if (options.length === 0) {
<mask> return null;
<mask> }
<mask> return <>{options.map(({ name, onClick, disabled }) => <button
<mask> key={name}
<mask> className="button-action--arrow-option px-4 py-2"
<mask> onClick={onClick}
<mask> disabled={disabled}
<mask> >{t(name)}
<mask> </button>)}</>;
<mask> };
<mask>
<mask> const content = getOptions(BUTTON_OPTIONS);
<mask>
<mask> const buttonClass = classNames('button-action button-action--main', {
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove }, { ips: [], cidrs: [] });
</s> add }, { ips: [], cidrs: [], clientIds: [] }); </s> remove export const getParamsForClientsSearch = (data, param) => {
const uniqueClients = uniqBy(data, param);
return uniqueClients
.reduce((acc, item, idx) => {
const key = `ip${idx}`;
acc[key] = item[param];
return acc;
}, {});
</s> add export const getParamsForClientsSearch = (data, param, additionalParam) => {
const clients = new Set();
data.forEach((e) => {
clients.add(e[param]);
if (e[additionalParam]) {
clients.add(e[additionalParam]);
}
});
const params = {};
const ids = Array.from(clients.values());
ids.forEach((id, i) => {
params[`ip${i}`] = id;
});
return params; </s> remove return <Card
</s> add return (
<Card </s> remove const clientsParams = getParamsForClientsSearch(logs, 'client');
</s> add const clientsParams = getParamsForClientsSearch(logs, 'client', 'client_id'); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/components/Logs/Cells/ClientCell.js |
return (
<div className={containerClass}>
<button
type="button" | <mask> const containerClass = classNames('button-action__container', {
<mask> 'button-action__container--detailed': isDetailed,
<mask> });
<mask>
<mask> return <div className={containerClass}>
<mask> <button type="button"
<mask> className={buttonClass}
<mask> onClick={onClick}
<mask> disabled={processingRules}
<mask> >
<mask> {t(buttonType)}
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove >
{t(buttonType)}
</button>
{content && <button className={buttonArrowClass} disabled={processingRules}>
<IconTooltip
className='h-100'
tooltipClass='button-action--arrow-option-container'
xlinkHref='chevron-down'
triggerClass='button-action--icon'
content={content} placement="bottom-end" trigger="click"
onVisibilityChange={setOptionsOpened}
/>
</button>}
</div>;
</s> add >
{t(buttonType)}
</button>
{content && (
<button className={buttonArrowClass} disabled={processingRules}>
<IconTooltip
className="h-100"
tooltipClass="button-action--arrow-option-container"
xlinkHref="chevron-down"
triggerClass="button-action--icon"
content={content}
placement="bottom-end"
trigger="click"
onVisibilityChange={setOptionsOpened}
/>
</button>
)}
</div>
); </s> remove return <div className="table__action pl-4">
<button
</s> add return (
<div className="table__action pl-4">
<button </s> remove return <>{options.map(({ name, onClick, disabled }) => <button
key={name}
className="button-action--arrow-option px-4 py-2"
onClick={onClick}
disabled={disabled}
>{t(name)}
</button>)}</>;
</s> add return (
<>
{options.map(({ name, onClick, disabled }) => (
<button
key={name}
className="button-action--arrow-option px-4 py-2"
onClick={onClick}
disabled={disabled}
>
{t(name)}
</button>
))}
</>
); </s> remove return <div className="o-hidden h-100 logs__cell logs__cell--client" role="gridcell">
<IconTooltip className={hintClass} columnClass='grid grid--limited' tooltipClass='px-5 pb-5 pt-4 mw-75'
xlinkHref='question' contentItemClass="contentItemClass" title="client_details"
content={processedData} placement="bottom" />
<div className={nameClass}>
<div data-tip={true} data-for={id}>
{renderFormattedClientCell(client, info, isDetailed, true)}
</s> add return (
<div
className="o-hidden h-100 logs__cell logs__cell--client"
role="gridcell"
>
<IconTooltip
className={hintClass}
columnClass="grid grid--limited"
tooltipClass="px-5 pb-5 pt-4"
xlinkHref="question"
contentItemClass="text-truncate key-colon o-hidden"
title="client_details"
content={processedData}
placement="bottom"
/>
<div className={nameClass}>
<div data-tip={true} data-for={id}>
{renderFormattedClientCell(client, clientInfo, isDetailed, true)}
</div>
{isDetailed && clientName && !whoisAvailable && (
<div
className="detailed-info d-none d-sm-block logs__text"
title={clientName}
>
{clientName}
</div>
)} </s> remove >
<Trans>{text}</Trans>
</button>
</div>;
</s> add >
<Trans>{text}</Trans>
</button>
</div>
); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/components/Logs/Cells/ClientCell.js |
>
{t(buttonType)}
</button>
{content && (
<button className={buttonArrowClass} disabled={processingRules}>
<IconTooltip
className="h-100"
tooltipClass="button-action--arrow-option-container"
xlinkHref="chevron-down"
triggerClass="button-action--icon"
content={content}
placement="bottom-end"
trigger="click"
onVisibilityChange={setOptionsOpened}
/>
</button>
)}
</div>
); | <mask> <button type="button"
<mask> className={buttonClass}
<mask> onClick={onClick}
<mask> disabled={processingRules}
<mask> >
<mask> {t(buttonType)}
<mask> </button>
<mask> {content && <button className={buttonArrowClass} disabled={processingRules}>
<mask> <IconTooltip
<mask> className='h-100'
<mask> tooltipClass='button-action--arrow-option-container'
<mask> xlinkHref='chevron-down'
<mask> triggerClass='button-action--icon'
<mask> content={content} placement="bottom-end" trigger="click"
<mask> onVisibilityChange={setOptionsOpened}
<mask> />
<mask> </button>}
<mask> </div>;
<mask> };
<mask>
<mask> return <div className="o-hidden h-100 logs__cell logs__cell--client" role="gridcell">
<mask> <IconTooltip className={hintClass} columnClass='grid grid--limited' tooltipClass='px-5 pb-5 pt-4 mw-75'
<mask> xlinkHref='question' contentItemClass="contentItemClass" title="client_details"
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove return <div className="o-hidden h-100 logs__cell logs__cell--client" role="gridcell">
<IconTooltip className={hintClass} columnClass='grid grid--limited' tooltipClass='px-5 pb-5 pt-4 mw-75'
xlinkHref='question' contentItemClass="contentItemClass" title="client_details"
content={processedData} placement="bottom" />
<div className={nameClass}>
<div data-tip={true} data-for={id}>
{renderFormattedClientCell(client, info, isDetailed, true)}
</s> add return (
<div
className="o-hidden h-100 logs__cell logs__cell--client"
role="gridcell"
>
<IconTooltip
className={hintClass}
columnClass="grid grid--limited"
tooltipClass="px-5 pb-5 pt-4"
xlinkHref="question"
contentItemClass="text-truncate key-colon o-hidden"
title="client_details"
content={processedData}
placement="bottom"
/>
<div className={nameClass}>
<div data-tip={true} data-for={id}>
{renderFormattedClientCell(client, clientInfo, isDetailed, true)}
</div>
{isDetailed && clientName && !whoisAvailable && (
<div
className="detailed-info d-none d-sm-block logs__text"
title={clientName}
>
{clientName}
</div>
)} </s> remove return <div className={containerClass}>
<button type="button"
</s> add return (
<div className={containerClass}>
<button
type="button" </s> remove return <div className="table__action pl-4">
<button
</s> add return (
<div className="table__action pl-4">
<button </s> remove return <>{options.map(({ name, onClick, disabled }) => <button
key={name}
className="button-action--arrow-option px-4 py-2"
onClick={onClick}
disabled={disabled}
>{t(name)}
</button>)}</>;
</s> add return (
<>
{options.map(({ name, onClick, disabled }) => (
<button
key={name}
className="button-action--arrow-option px-4 py-2"
onClick={onClick}
disabled={disabled}
>
{t(name)}
</button>
))}
</>
); </s> remove >
<Trans>{text}</Trans>
</button>
</div>;
</s> add >
<Trans>{text}</Trans>
</button>
</div>
); | [
"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/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/components/Logs/Cells/ClientCell.js |
return (
<div
className="o-hidden h-100 logs__cell logs__cell--client"
role="gridcell"
>
<IconTooltip
className={hintClass}
columnClass="grid grid--limited"
tooltipClass="px-5 pb-5 pt-4"
xlinkHref="question"
contentItemClass="text-truncate key-colon o-hidden"
title="client_details"
content={processedData}
placement="bottom"
/>
<div className={nameClass}>
<div data-tip={true} data-for={id}>
{renderFormattedClientCell(client, clientInfo, isDetailed, true)}
</div>
{isDetailed && clientName && !whoisAvailable && (
<div
className="detailed-info d-none d-sm-block logs__text"
title={clientName}
>
{clientName}
</div>
)} | <mask> </button>}
<mask> </div>;
<mask> };
<mask>
<mask> return <div className="o-hidden h-100 logs__cell logs__cell--client" role="gridcell">
<mask> <IconTooltip className={hintClass} columnClass='grid grid--limited' tooltipClass='px-5 pb-5 pt-4 mw-75'
<mask> xlinkHref='question' contentItemClass="contentItemClass" title="client_details"
<mask> content={processedData} placement="bottom" />
<mask> <div className={nameClass}>
<mask> <div data-tip={true} data-for={id}>
<mask> {renderFormattedClientCell(client, info, isDetailed, true)}
<mask> </div>
<mask> {isDetailed && name && !whoisAvailable
<mask> && <div className="detailed-info d-none d-sm-block logs__text"
<mask> title={name}>{name}</div>}
<mask> </div>
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove {isDetailed && name && !whoisAvailable
&& <div className="detailed-info d-none d-sm-block logs__text"
title={name}>{name}</div>}
</s> add {renderBlockingButton(isFiltered, domain)} </s> remove >
{t(buttonType)}
</button>
{content && <button className={buttonArrowClass} disabled={processingRules}>
<IconTooltip
className='h-100'
tooltipClass='button-action--arrow-option-container'
xlinkHref='chevron-down'
triggerClass='button-action--icon'
content={content} placement="bottom-end" trigger="click"
onVisibilityChange={setOptionsOpened}
/>
</button>}
</div>;
</s> add >
{t(buttonType)}
</button>
{content && (
<button className={buttonArrowClass} disabled={processingRules}>
<IconTooltip
className="h-100"
tooltipClass="button-action--arrow-option-container"
xlinkHref="chevron-down"
triggerClass="button-action--icon"
content={content}
placement="bottom-end"
trigger="click"
onVisibilityChange={setOptionsOpened}
/>
</button>
)}
</div>
); </s> remove {renderBlockingButton(isFiltered, domain)}
</div>;
</s> add ); </s> remove return <div className={containerClass}>
<button type="button"
</s> add return (
<div className={containerClass}>
<button
type="button" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/components/Logs/Cells/ClientCell.js |
{renderBlockingButton(isFiltered, domain)} | <mask> <div className={nameClass}>
<mask> <div data-tip={true} data-for={id}>
<mask> {renderFormattedClientCell(client, info, isDetailed, true)}
<mask> </div>
<mask> {isDetailed && name && !whoisAvailable
<mask> && <div className="detailed-info d-none d-sm-block logs__text"
<mask> title={name}>{name}</div>}
<mask> </div>
<mask> {renderBlockingButton(isFiltered, domain)}
<mask> </div>;
<mask> };
<mask>
</s> Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383.
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits </s> remove return <div className="o-hidden h-100 logs__cell logs__cell--client" role="gridcell">
<IconTooltip className={hintClass} columnClass='grid grid--limited' tooltipClass='px-5 pb-5 pt-4 mw-75'
xlinkHref='question' contentItemClass="contentItemClass" title="client_details"
content={processedData} placement="bottom" />
<div className={nameClass}>
<div data-tip={true} data-for={id}>
{renderFormattedClientCell(client, info, isDetailed, true)}
</s> add return (
<div
className="o-hidden h-100 logs__cell logs__cell--client"
role="gridcell"
>
<IconTooltip
className={hintClass}
columnClass="grid grid--limited"
tooltipClass="px-5 pb-5 pt-4"
xlinkHref="question"
contentItemClass="text-truncate key-colon o-hidden"
title="client_details"
content={processedData}
placement="bottom"
/>
<div className={nameClass}>
<div data-tip={true} data-for={id}>
{renderFormattedClientCell(client, clientInfo, isDetailed, true)}
</div>
{isDetailed && clientName && !whoisAvailable && (
<div
className="detailed-info d-none d-sm-block logs__text"
title={clientName}
>
{clientName}
</div>
)} </s> remove {renderBlockingButton(isFiltered, domain)}
</div>;
</s> add ); </s> remove >
{t(buttonType)}
</button>
{content && <button className={buttonArrowClass} disabled={processingRules}>
<IconTooltip
className='h-100'
tooltipClass='button-action--arrow-option-container'
xlinkHref='chevron-down'
triggerClass='button-action--icon'
content={content} placement="bottom-end" trigger="click"
onVisibilityChange={setOptionsOpened}
/>
</button>}
</div>;
</s> add >
{t(buttonType)}
</button>
{content && (
<button className={buttonArrowClass} disabled={processingRules}>
<IconTooltip
className="h-100"
tooltipClass="button-action--arrow-option-container"
xlinkHref="chevron-down"
triggerClass="button-action--icon"
content={content}
placement="bottom-end"
trigger="click"
onVisibilityChange={setOptionsOpened}
/>
</button>
)}
</div>
); </s> remove <a href="#dhcp" key="0">
</s> add <a href="https://github.com/AdguardTeam/AdGuardHome/wiki/Clients#idclient" key="0" target="_blank" rel="noopener noreferrer"> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | client/src/components/Logs/Cells/ClientCell.js |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.