AdguardTeam/AdGuardHome
1
1
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2024-09-11 10:45:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Pull request: filtering: restore rewrite behavior with other question types

Browse Source 
Updates #4008.

Squashed commit of the following:

commit babbc29331cfc2603c0c3b0987f5ba926690ec3e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Dec 24 18:46:20 2021 +0300

    filtering: restore rewrite behavior with other question types
This commit is contained in:
Ainar Garipov 2021-12-24 20:14:36 +03:00
parent 46cd974e2a
commit 52f36f201e
7 changed files with 227 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
.github/workflows/build.yml vendored
View File

@ -103,32 +103,30 @@
- 'name': 'Run snapshot build' - 'name': 'Run snapshot build'
'run': 'make SIGN=0 VERBOSE=1 build-release build-docker' 'run': 'make SIGN=0 VERBOSE=1 build-release build-docker'
# TODO(a.garipov): Remove once AWS/Slack are back online. 'notify':
# 'needs':
# 'notify': - 'build-release'
# 'needs': # Secrets are not passed to workflows that are triggered by a pull request
# - 'build-release' # from a fork.
# # Secrets are not passed to workflows that are triggered by a pull request #
# # from a fork. # Use always() to signal to the runner that this job must run even if the
# # # previous ones failed.
# # Use always() to signal to the runner that this job must run even if the 'if':
# # previous ones failed. ${{ always() &&
# 'if': (
# ${{ always() && github.event_name == 'push' ||
# ( github.event.pull_request.head.repo.full_name == github.repository
# github.event_name == 'push' || )
# github.event.pull_request.head.repo.full_name == github.repository }}
# ) 'runs-on': 'ubuntu-latest'
# }} 'steps':
# 'runs-on': 'ubuntu-latest' - 'name': 'Conclusion'
# 'steps': 'uses': 'technote-space/workflow-conclusion-action@v1'
# - 'name': 'Conclusion' - 'name': 'Send Slack notif'
# 'uses': 'technote-space/workflow-conclusion-action@v1' 'uses': '8398a7/action-slack@v3'
# - 'name': 'Send Slack notif' 'with':
# 'uses': '8398a7/action-slack@v3' 'status': '${{ env.WORKFLOW_CONCLUSION }}'
# 'with': 'fields': 'repo, message, commit, author, workflow'
# 'status': '${{ env.WORKFLOW_CONCLUSION }}' 'env':
# 'fields': 'repo, message, commit, author, workflow' 'GITHUB_TOKEN': '${{ secrets.GITHUB_TOKEN }}'
# 'env': 'SLACK_WEBHOOK_URL': '${{ secrets.SLACK_WEBHOOK_URL }}'
# 'GITHUB_TOKEN': '${{ secrets.GITHUB_TOKEN }}'
# 'SLACK_WEBHOOK_URL': '${{ secrets.SLACK_WEBHOOK_URL }}'

58
.github/workflows/lint.yml vendored
View File

@ -33,33 +33,31 @@
- 'name': 'Run ESLint' - 'name': 'Run ESLint'
'run': 'npm --prefix="./client" run lint' 'run': 'npm --prefix="./client" run lint'
# TODO(a.garipov): Remove once AWS/Slack are back online. 'notify':
# 'needs':
# 'notify': - 'go-lint'
# 'needs': - 'eslint'
# - 'go-lint' # Secrets are not passed to workflows that are triggered by a pull request
# - 'eslint' # from a fork.
# # Secrets are not passed to workflows that are triggered by a pull request #
# # from a fork. # Use always() to signal to the runner that this job must run even if the
# # # previous ones failed.
# # Use always() to signal to the runner that this job must run even if the 'if':
# # previous ones failed. ${{ always() &&
# 'if': (
# ${{ always() && github.event_name == 'push' ||
# ( github.event.pull_request.head.repo.full_name == github.repository
# github.event_name == 'push' || )
# github.event.pull_request.head.repo.full_name == github.repository }}
# ) 'runs-on': 'ubuntu-latest'
# }} 'steps':
# 'runs-on': 'ubuntu-latest' - 'name': 'Conclusion'
# 'steps': 'uses': 'technote-space/workflow-conclusion-action@v1'
# - 'name': 'Conclusion' - 'name': 'Send Slack notif'
# 'uses': 'technote-space/workflow-conclusion-action@v1' 'uses': '8398a7/action-slack@v3'
# - 'name': 'Send Slack notif' 'with':
# 'uses': '8398a7/action-slack@v3' 'status': '${{ env.WORKFLOW_CONCLUSION }}'
# 'with': 'fields': 'repo, message, commit, author, workflow'
# 'status': '${{ env.WORKFLOW_CONCLUSION }}' 'env':
# 'fields': 'repo, message, commit, author, workflow' 'GITHUB_TOKEN': '${{ secrets.GITHUB_TOKEN }}'
# 'env': 'SLACK_WEBHOOK_URL': '${{ secrets.SLACK_WEBHOOK_URL }}'
# 'GITHUB_TOKEN': '${{ secrets.GITHUB_TOKEN }}'
# 'SLACK_WEBHOOK_URL': '${{ secrets.SLACK_WEBHOOK_URL }}'

3
CHANGELOG.md
View File

@ -29,6 +29,8 @@ and this project adheres to
### Fixed ### Fixed
- Legacy DNS rewrites responding from upstream when a request other than `A` or
`AAAA` is received ([#4008]).
- Panic on port availability check during installation ([#3987]). - Panic on port availability check during installation ([#3987]).
### Removed ### Removed
@ -37,6 +39,7 @@ and this project adheres to
[#3057]: https://github.com/AdguardTeam/AdGuardHome/issues/3057 [#3057]: https://github.com/AdguardTeam/AdGuardHome/issues/3057
[#3987]: https://github.com/AdguardTeam/AdGuardHome/issues/3987 [#3987]: https://github.com/AdguardTeam/AdGuardHome/issues/3987
[#4008]: https://github.com/AdguardTeam/AdGuardHome/issues/4008

73
internal/filtering/filtering.go
View File

@ -507,61 +507,76 @@ func (d *DNSFilter) matchSysHostsIntl(
return res, nil return res, nil
} }
// Process rewrites table // processRewrites performs filtering based on the legacy rewrite records.
// . Find CNAME for a domain name (exact match or by wildcard) //
// . if found and CNAME equals to domain name - this is an exception; exit // Firstly, it finds CNAME rewrites for host. If the CNAME is the same as host,
// . if found, set domain name to canonical name // this query isn't filtered. If it's different, repeat the process for the new
// . repeat for the new domain name (Note: we return only the last CNAME) // CNAME, breaking loops in the process.
// . Find A or AAAA record for a domain name (exact match or by wildcard) //
// . if found, set IP addresses (IPv4 or IPv6 depending on qtype) in Result.IPList array // Secondly, it finds A or AAAA rewrites for host and, if found, sets res.IPList
// accordingly. If the found rewrite has a special value of "A" or "AAAA", the
// result is an exception.
func (d *DNSFilter) processRewrites(host string, qtype uint16) (res Result) { func (d *DNSFilter) processRewrites(host string, qtype uint16) (res Result) {
d.confLock.RLock() d.confLock.RLock()
defer d.confLock.RUnlock() defer d.confLock.RUnlock()
rr := findRewrites(d.Rewrites, host, qtype) rewrites, matched := findRewrites(d.Rewrites, host, qtype)
if len(rr) != 0 { if !matched {
res.Reason = Rewritten return Result{}
} }
res.Reason = Rewritten
cnames := stringutil.NewSet() cnames := stringutil.NewSet()
origHost := host origHost := host
for len(rr) != 0 && rr[0].Type == dns.TypeCNAME { for matched && len(rewrites) > 0 && rewrites[0].Type == dns.TypeCNAME {
log.Debug("rewrite: CNAME for %s is %s", host, rr[0].Answer) rwAns := rewrites[0].Answer
if host == rr[0].Answer { // "host == CNAME" is an exception log.Debug("rewrite: cname for %s is %s", host, rwAns)
if host == rwAns {
// Rewrite of a domain onto itself is an exception rule.
res.Reason = NotFilteredNotFound res.Reason = NotFilteredNotFound
return res return res
} }
host = rr[0].Answer host = rwAns
if cnames.Has(host) { if cnames.Has(host) {
log.Info("rewrite: breaking CNAME redirection loop: %s. Question: %s", host, origHost) log.Info("rewrite: cname loop for %q on %q", origHost, host)
return res return res
} }
cnames.Add(host) cnames.Add(host)
res.CanonName = rr[0].Answer res.CanonName = host
rr = findRewrites(d.Rewrites, host, qtype) rewrites, matched = findRewrites(d.Rewrites, host, qtype)
} }
for _, r := range rr { setRewriteResult(&res, host, rewrites, qtype)
if r.Type == qtype && (qtype == dns.TypeA || qtype == dns.TypeAAAA) {
if r.IP == nil { // IP exception
res.Reason = NotFilteredNotFound
return res
}
res.IPList = append(res.IPList, r.IP)
log.Debug("rewrite: A/AAAA for %s is %s", host, r.IP)
}
}
return res return res
} }
// setRewriteResult sets the Reason or IPList of res if necessary. res must not
// be nil.
func setRewriteResult(res *Result, host string, rewrites []RewriteEntry, qtype uint16) {
for _, rw := range rewrites {
if rw.Type == qtype && (qtype == dns.TypeA || qtype == dns.TypeAAAA) {
if rw.IP == nil {
// "A"/"AAAA" exception: allow getting from upstream.
res.Reason = NotFilteredNotFound
return
}
res.IPList = append(res.IPList, rw.IP)
log.Debug("rewrite: a/aaaa for %s is %s", host, rw.IP)
}
}
}
// matchBlockedServicesRules checks the host against the blocked services rules // matchBlockedServicesRules checks the host against the blocked services rules
// in settings, if any. The err is always nil, it is only there to make this // in settings, if any. The err is always nil, it is only there to make this
// a valid hostChecker function. // a valid hostChecker function.

47
internal/filtering/rewrites.go
View File

@ -18,12 +18,15 @@ import (
type RewriteEntry struct { type RewriteEntry struct {
// Domain is the domain for which this rewrite should work. // Domain is the domain for which this rewrite should work.
Domain string `yaml:"domain"` Domain string `yaml:"domain"`
// Answer is the IP address, canonical name, or one of the special // Answer is the IP address, canonical name, or one of the special
// values: "A" or "AAAA". // values: "A" or "AAAA".
Answer string `yaml:"answer"` Answer string `yaml:"answer"`
// IP is the IP address that should be used in the response if Type is // IP is the IP address that should be used in the response if Type is
// A or AAAA. // A or AAAA.
IP net.IP `yaml:"-"` IP net.IP `yaml:"-"`
// Type is the DNS record type: A, AAAA, or CNAME. // Type is the DNS record type: A, AAAA, or CNAME.
Type uint16 `yaml:"-"` Type uint16 `yaml:"-"`
} }
@ -143,39 +146,46 @@ func (d *DNSFilter) prepareRewrites() {
} }
} }
// findRewrites returns the list of matched rewrite entries. The priority is: // findRewrites returns the list of matched rewrite entries. If rewrites are
// CNAME, then A and AAAA; exact, then wildcard. If the host is matched // empty, but matched is true, the domain is found among the rewrite rules but
// exactly, wildcard entries aren't returned. If the host matched by wildcards, // not for this question type.
// return the most specific for the question type. //
func findRewrites(entries []RewriteEntry, host string, qtype uint16) (matched []RewriteEntry) { // The result priority is: CNAME, then A and AAAA; exact, then wildcard. If the
rr := rewritesSorted{} // host is matched exactly, wildcard entries aren't returned. If the host
// matched by wildcards, return the most specific for the question type.
func findRewrites(
entries []RewriteEntry,
host string,
qtype uint16,
) (rewrites []RewriteEntry, matched bool) {
for _, e := range entries { for _, e := range entries {
if e.Domain != host && !matchDomainWildcard(host, e.Domain) { if e.Domain != host && !matchDomainWildcard(host, e.Domain) {
continue continue
} }
matched = true
if e.matchesQType(qtype) { if e.matchesQType(qtype) {
rr = append(rr, e) rewrites = append(rewrites, e)
} }
} }
if len(rr) == 0 { if len(rewrites) == 0 {
return nil return nil, matched
} }
sort.Sort(rr) sort.Sort(rewritesSorted(rewrites))
for i, r := range rr { for i, r := range rewrites {
if isWildcard(r.Domain) { if isWildcard(r.Domain) {
// Don't use rr[:0], because we need to return at least // Don't use rewrites[:0], because we need to return at least one
// one item here. // item here.
rr = rr[:max(1, i)] rewrites = rewrites[:max(1, i)]
break break
} }
} }
return rr return rewrites, matched
} }
func max(a, b int) int { func max(a, b int) int {
@ -230,8 +240,7 @@ func (d *DNSFilter) handleRewriteAdd(w http.ResponseWriter, r *http.Request) {
d.confLock.Lock() d.confLock.Lock()
d.Config.Rewrites = append(d.Config.Rewrites, ent) d.Config.Rewrites = append(d.Config.Rewrites, ent)
d.confLock.Unlock() d.confLock.Unlock()
log.Debug("Rewrites: added element: %s -> %s [%d]", log.Debug("rewrite: added element: %s -> %s [%d]", ent.Domain, ent.Answer, len(d.Config.Rewrites))
ent.Domain, ent.Answer, len(d.Config.Rewrites))
d.Config.ConfigModified() d.Config.ConfigModified()
} }
@ -253,9 +262,11 @@ func (d *DNSFilter) handleRewriteDelete(w http.ResponseWriter, r *http.Request)
d.confLock.Lock() d.confLock.Lock()
for _, ent := range d.Config.Rewrites { for _, ent := range d.Config.Rewrites {
if ent.equal(entDel) { if ent.equal(entDel) {
log.Debug("Rewrites: removed element: %s -> %s", ent.Domain, ent.Answer) log.Debug("rewrite: removed element: %s -> %s", ent.Domain, ent.Answer)
continue continue
} }
arr = append(arr, ent) arr = append(arr, ent)
} }
d.Config.Rewrites = arr d.Config.Rewrites = arr

147
internal/filtering/rewrites_test.go
View File

@ -70,94 +70,101 @@ func TestRewrites(t *testing.T) {
d.prepareRewrites() d.prepareRewrites()
testCases := []struct { testCases := []struct {
name string name string
host string host string
wantCName string wantCName string
wantVals []net.IP wantIPs []net.IP
dtyp uint16 wantReason Reason
dtyp uint16
}{{ }{{
name: "not_filtered_not_found", name: "not_filtered_not_found",
host: "hoost.com", host: "hoost.com",
wantCName: "", wantCName: "",
wantVals: nil, wantIPs: nil,
dtyp: dns.TypeA, wantReason: NotFilteredNotFound,
dtyp: dns.TypeA,
}, { }, {
name: "rewritten_a", name: "rewritten_a",
host: "www.host.com", host: "www.host.com",
wantCName: "host.com", wantCName: "host.com",
wantVals: []net.IP{{1, 2, 3, 4}, {1, 2, 3, 5}}, wantIPs: []net.IP{{1, 2, 3, 4}, {1, 2, 3, 5}},
dtyp: dns.TypeA, wantReason: Rewritten,
dtyp: dns.TypeA,
}, { }, {
name: "rewritten_aaaa", name: "rewritten_aaaa",
host: "www.host.com", host: "www.host.com",
wantCName: "host.com", wantCName: "host.com",
wantVals: []net.IP{net.ParseIP("1:2:3::4")}, wantIPs: []net.IP{net.ParseIP("1:2:3::4")},
dtyp: dns.TypeAAAA, wantReason: Rewritten,
dtyp: dns.TypeAAAA,
}, { }, {
name: "wildcard_match", name: "wildcard_match",
host: "abc.host.com", host: "abc.host.com",
wantCName: "", wantCName: "",
wantVals: []net.IP{{1, 2, 3, 5}}, wantIPs: []net.IP{{1, 2, 3, 5}},
dtyp: dns.TypeA, wantReason: Rewritten,
dtyp: dns.TypeA,
}, { }, {
name: "wildcard_override", name: "wildcard_override",
host: "a.host.com", host: "a.host.com",
wantCName: "", wantCName: "",
wantVals: []net.IP{{1, 2, 3, 4}}, wantIPs: []net.IP{{1, 2, 3, 4}},
dtyp: dns.TypeA, wantReason: Rewritten,
dtyp: dns.TypeA,
}, { }, {
name: "wildcard_cname_interaction", name: "wildcard_cname_interaction",
host: "www.host2.com", host: "www.host2.com",
wantCName: "host.com", wantCName: "host.com",
wantVals: []net.IP{{1, 2, 3, 4}, {1, 2, 3, 5}}, wantIPs: []net.IP{{1, 2, 3, 4}, {1, 2, 3, 5}},
dtyp: dns.TypeA, wantReason: Rewritten,
dtyp: dns.TypeA,
}, { }, {
name: "two_cnames", name: "two_cnames",
host: "b.host.com", host: "b.host.com",
wantCName: "somehost.com", wantCName: "somehost.com",
wantVals: []net.IP{{0, 0, 0, 0}}, wantIPs: []net.IP{{0, 0, 0, 0}},
dtyp: dns.TypeA, wantReason: Rewritten,
dtyp: dns.TypeA,
}, { }, {
name: "two_cnames_and_wildcard", name: "two_cnames_and_wildcard",
host: "b.host3.com", host: "b.host3.com",
wantCName: "x.host.com", wantCName: "x.host.com",
wantVals: []net.IP{{1, 2, 3, 5}}, wantIPs: []net.IP{{1, 2, 3, 5}},
dtyp: dns.TypeA, wantReason: Rewritten,
dtyp: dns.TypeA,
}, { }, {
name: "issue3343", name: "issue3343",
host: "www.hostboth.com", host: "www.hostboth.com",
wantCName: "", wantCName: "",
wantVals: []net.IP{net.ParseIP("1234::5678")}, wantIPs: []net.IP{net.ParseIP("1234::5678")},
dtyp: dns.TypeAAAA, wantReason: Rewritten,
dtyp: dns.TypeAAAA,
}, { }, {
name: "issue3351", name: "issue3351",
host: "bighost.com", host: "bighost.com",
wantCName: "", wantCName: "",
wantVals: []net.IP{{1, 2, 3, 7}}, wantIPs: []net.IP{{1, 2, 3, 7}},
dtyp: dns.TypeA, wantReason: Rewritten,
dtyp: dns.TypeA,
}, {
name: "issue4008",
host: "somehost.com",
wantCName: "",
wantIPs: nil,
wantReason: Rewritten,
dtyp: dns.TypeHTTPS,
}} }}
for _, tc := range testCases { for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
valsNum := len(tc.wantVals)
r := d.processRewrites(tc.host, tc.dtyp) r := d.processRewrites(tc.host, tc.dtyp)
if valsNum == 0 { require.Equalf(t, tc.wantReason, r.Reason, "got %s", r.Reason)
assert.Equal(t, NotFilteredNotFound, r.Reason)
return
}
require.Equalf(t, Rewritten, r.Reason, "got %s", r.Reason)
if tc.wantCName != "" { if tc.wantCName != "" {
assert.Equal(t, tc.wantCName, r.CanonName) assert.Equal(t, tc.wantCName, r.CanonName)
} }
require.Len(t, r.IPList, valsNum) assert.Equal(t, tc.wantIPs, r.IPList)
for i, ip := range tc.wantVals {
assert.Equal(t, ip, r.IPList[i])
}
}) })
} }
} }
@ -229,15 +236,17 @@ func TestRewritesExceptionCNAME(t *testing.T) {
host string host string
want net.IP want net.IP
}{{ }{{
name: "match_sub-domain", name: "match_subdomain",
host: "my.host.com", host: "my.host.com",
want: net.IP{2, 2, 2, 2}, want: net.IP{2, 2, 2, 2},
}, { }, {
name: "exception_cname", name: "exception_cname",
host: "sub.host.com", host: "sub.host.com",
want: nil,
}, { }, {
name: "exception_wildcard", name: "exception_wildcard",
host: "my.sub.host.com", host: "my.sub.host.com",
want: nil,
}} }}
for _, tc := range testCases { for _, tc := range testCases {

33
internal/home/controlinstall.go
View File

@ -22,16 +22,17 @@ import (
// getAddrsResponse is the response for /install/get_addresses endpoint. // getAddrsResponse is the response for /install/get_addresses endpoint.
type getAddrsResponse struct { type getAddrsResponse struct {
Interfaces map[string]*aghnet.NetInterface `json:"interfaces"`
WebPort int `json:"web_port"` WebPort int `json:"web_port"`
DNSPort int `json:"dns_port"` DNSPort int `json:"dns_port"`
Interfaces map[string]*aghnet.NetInterface `json:"interfaces"`
} }
// handleInstallGetAddresses is the handler for /install/get_addresses endpoint. // handleInstallGetAddresses is the handler for /install/get_addresses endpoint.
func (web *Web) handleInstallGetAddresses(w http.ResponseWriter, r *http.Request) { func (web *Web) handleInstallGetAddresses(w http.ResponseWriter, r *http.Request) {
data := getAddrsResponse{} data := getAddrsResponse{
data.WebPort = defaultPortHTTP WebPort: defaultPortHTTP,
data.DNSPort = defaultPortDNS DNSPort: defaultPortDNS,
}
ifaces, err := aghnet.GetValidNetInterfacesForWeb() ifaces, err := aghnet.GetValidNetInterfacesForWeb()
if err != nil { if err != nil {
@ -61,8 +62,8 @@ func (web *Web) handleInstallGetAddresses(w http.ResponseWriter, r *http.Request
} }
type checkConfigReqEnt struct { type checkConfigReqEnt struct {
Port int `json:"port"`
IP net.IP `json:"ip"` IP net.IP `json:"ip"`
Port int `json:"port"`
Autofix bool `json:"autofix"` Autofix bool `json:"autofix"`
} }
@ -84,9 +85,9 @@ type staticIPJSON struct {
} }
type checkConfigResp struct { type checkConfigResp struct {
StaticIP staticIPJSON `json:"static_ip"`
Web checkConfigRespEnt `json:"web"` Web checkConfigRespEnt `json:"web"`
DNS checkConfigRespEnt `json:"dns"` DNS checkConfigRespEnt `json:"dns"`
StaticIP staticIPJSON `json:"static_ip"`
} }
// Check if ports are available, respond with results // Check if ports are available, respond with results
@ -298,10 +299,11 @@ func shutdownSrv(ctx context.Context, srv *http.Server) {
err := srv.Shutdown(ctx) err := srv.Shutdown(ctx)
if err != nil { if err != nil {
const msgFmt = "shutting down http server %q: %s"
if errors.Is(err, context.Canceled) { if errors.Is(err, context.Canceled) {
log.Debug("shutting down http server %q: %s", srv.Addr, err) log.Debug(msgFmt, srv.Addr, err)
} else { } else {
log.Error("shutting down http server %q: %s", srv.Addr, err) log.Error(msgFmt, srv.Addr, err)
} }
} }
} }
@ -436,8 +438,8 @@ func (web *Web) registerInstallHandlers() {
// TODO(e.burkov): This should removed with the API v1 when the appropriate // TODO(e.burkov): This should removed with the API v1 when the appropriate
// functionality will appear in default checkConfigReqEnt. // functionality will appear in default checkConfigReqEnt.
type checkConfigReqEntBeta struct { type checkConfigReqEntBeta struct {
Port int `json:"port"`
IP []net.IP `json:"ip"` IP []net.IP `json:"ip"`
Port int `json:"port"`
Autofix bool `json:"autofix"` Autofix bool `json:"autofix"`
} }
@ -474,13 +476,13 @@ func (web *Web) handleInstallCheckConfigBeta(w http.ResponseWriter, r *http.Requ
nonBetaReqData := checkConfigReq{ nonBetaReqData := checkConfigReq{
Web: checkConfigReqEnt{ Web: checkConfigReqEnt{
Port: reqData.Web.Port,
IP: reqData.Web.IP[0], IP: reqData.Web.IP[0],
Port: reqData.Web.Port,
Autofix: reqData.Web.Autofix, Autofix: reqData.Web.Autofix,
}, },
DNS: checkConfigReqEnt{ DNS: checkConfigReqEnt{
Port: reqData.DNS.Port,
IP: reqData.DNS.IP[0], IP: reqData.DNS.IP[0],
Port: reqData.DNS.Port,
Autofix: reqData.DNS.Autofix, Autofix: reqData.DNS.Autofix,
}, },
SetStaticIP: reqData.SetStaticIP, SetStaticIP: reqData.SetStaticIP,
@ -589,9 +591,9 @@ func (web *Web) handleInstallConfigureBeta(w http.ResponseWriter, r *http.Reques
// TODO(e.burkov): This should removed with the API v1 when the appropriate // TODO(e.burkov): This should removed with the API v1 when the appropriate
// functionality will appear in default firstRunData. // functionality will appear in default firstRunData.
type getAddrsResponseBeta struct { type getAddrsResponseBeta struct {
Interfaces []*aghnet.NetInterface `json:"interfaces"`
WebPort int `json:"web_port"` WebPort int `json:"web_port"`
DNSPort int `json:"dns_port"` DNSPort int `json:"dns_port"`
Interfaces []*aghnet.NetInterface `json:"interfaces"`
} }
// handleInstallConfigureBeta is a substitution of /install/get_addresses // handleInstallConfigureBeta is a substitution of /install/get_addresses
@ -600,9 +602,10 @@ type getAddrsResponseBeta struct {
// TODO(e.burkov): This should removed with the API v1 when the appropriate // TODO(e.burkov): This should removed with the API v1 when the appropriate
// functionality will appear in default handleInstallGetAddresses. // functionality will appear in default handleInstallGetAddresses.
func (web *Web) handleInstallGetAddressesBeta(w http.ResponseWriter, r *http.Request) { func (web *Web) handleInstallGetAddressesBeta(w http.ResponseWriter, r *http.Request) {
data := getAddrsResponseBeta{} data := getAddrsResponseBeta{
data.WebPort = defaultPortHTTP WebPort: defaultPortHTTP,
data.DNSPort = defaultPortDNS DNSPort: defaultPortDNS,
}
ifaces, err := aghnet.GetValidNetInterfacesForWeb() ifaces, err := aghnet.GetValidNetInterfacesForWeb()
if err != nil { if err != nil {