mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-26 06:55:48 +03:00
143616ca6e
Merge in DNS/adguard-home from 4299-querylog-stats-api to master Updates #1717. Updates #4299. Squashed commit of the following: commit 5b706b7997a536bc4fd2c532fb89ca5ab3536848 Merge: 48b62b0f306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 22 13:53:09 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 48b62b0f1882f1ad120c6cdd90cd7dd8cb8a7738 Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Wed Mar 22 12:25:04 2023 +0200 client: fix styles, add titles and descrs commit 97e31cff70d05b51bd0e5ea2d20e8e7a251a7e41 Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Tue Mar 21 18:38:12 2023 +0200 client: add ignored domains for querylog commit 24d75c4376382205ae6b8f731b1cd23d517772c9 Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Tue Mar 21 18:21:13 2023 +0200 client: add ignore domains for stats commit eefc3891d01f90af79fdac9ba8eea06d4d54a0bc Merge: 978675ea1daabb97
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 21 10:53:35 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 978675ea2c07bf248b4c8f26ebdf78cf59a12ef5 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 21 10:53:11 2023 +0300 openapi: fix chlog commit 2ed33007aade115d38b0ca582206cc10678b084c Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 20 17:49:07 2023 +0300 home: fix tests commit 6af11520c164553ee9fce8f214ea169672188d7e Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 20 17:40:16 2023 +0300 home: fix typo commit 56acdfde5b1ee8d16b232c1293b91affbe319ad1 Merge: 319da34d48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 20 17:32:58 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 319da34de41ec84310b23bba2ad79c8a3a4c14ff Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Mar 3 17:34:38 2023 +0300 querylog: fix docs commit d5a8f24d5b336e7bdbbca18069f6ede8c96bcc2c Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Mar 3 11:42:00 2023 +0300 stats: fix docs commit e0cbfc1c4078180a05835ce7587e9f45484adc81 Merge: 4743c810012e5beb
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 18:45:17 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 4743c81038052b9e0ca29ae5f1565021d36ca1ef Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 18:14:16 2023 +0300 all: imp code; fix time conversion commit 34310cffd7e331d098c535590245387051674fa8 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 12:34:11 2023 +0300 chlog: restore order commit cadd864a66655242948f1cb16e6d4945c0235d7e Merge: 2f3e25bebb226434
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 12:26:06 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 2f3e25bee56d2c6ddcf4aa2fc6a1dc51ed9b06e1 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 12:25:14 2023 +0300 all: fix fmt commit d54022baa6c8a3d0d3c308a9b6b1a6a9dc6ac7b6 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Feb 28 16:16:40 2023 +0300 all: imp code; fix chlog commit df22de91f59a51194c55e7bcbe5bc3fcc60cb8e3 Merge: e1ea4797a772212d
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Feb 27 17:24:09 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit e1ea4797af974c36f06683ffc6eaaae917921a43 Merge: d7db0a5abb80a7c2
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Feb 27 17:23:20 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit d7db0a5af1e1f49f6174c1c42e6d9306f2381d16 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Feb 27 17:12:20 2023 +0300 all: imp docs ... and 15 more commits
152 lines
3.5 KiB
Go
152 lines
3.5 KiB
Go
package stats
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"path/filepath"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghalg"
|
|
"github.com/AdguardTeam/golibs/testutil"
|
|
"github.com/AdguardTeam/golibs/timeutil"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestHandleStatsConfig(t *testing.T) {
|
|
const (
|
|
smallIvl = 1 * time.Minute
|
|
minIvl = 1 * time.Hour
|
|
maxIvl = 365 * timeutil.Day
|
|
)
|
|
|
|
conf := Config{
|
|
Filename: filepath.Join(t.TempDir(), "stats.db"),
|
|
Limit: time.Hour * 24,
|
|
Enabled: true,
|
|
UnitID: func() (id uint32) { return 0 },
|
|
ConfigModified: func() {},
|
|
}
|
|
|
|
testCases := []struct {
|
|
name string
|
|
body getConfigResp
|
|
wantCode int
|
|
wantErr string
|
|
}{{
|
|
name: "set_ivl_1_minIvl",
|
|
body: getConfigResp{
|
|
Enabled: aghalg.NBTrue,
|
|
Interval: float64(minIvl.Milliseconds()),
|
|
Ignored: []string{},
|
|
},
|
|
wantCode: http.StatusOK,
|
|
wantErr: "",
|
|
}, {
|
|
name: "small_interval",
|
|
body: getConfigResp{
|
|
Enabled: aghalg.NBTrue,
|
|
Interval: float64(smallIvl.Milliseconds()),
|
|
Ignored: []string{},
|
|
},
|
|
wantCode: http.StatusUnprocessableEntity,
|
|
wantErr: "unsupported interval: less than an hour\n",
|
|
}, {
|
|
name: "big_interval",
|
|
body: getConfigResp{
|
|
Enabled: aghalg.NBTrue,
|
|
Interval: float64(maxIvl.Milliseconds() + minIvl.Milliseconds()),
|
|
Ignored: []string{},
|
|
},
|
|
wantCode: http.StatusUnprocessableEntity,
|
|
wantErr: "unsupported interval: more than a year\n",
|
|
}, {
|
|
name: "set_ignored_ivl_1_maxIvl",
|
|
body: getConfigResp{
|
|
Enabled: aghalg.NBTrue,
|
|
Interval: float64(maxIvl.Milliseconds()),
|
|
Ignored: []string{
|
|
"ignor.ed",
|
|
},
|
|
},
|
|
wantCode: http.StatusOK,
|
|
wantErr: "",
|
|
}, {
|
|
name: "ignored_duplicate",
|
|
body: getConfigResp{
|
|
Enabled: aghalg.NBTrue,
|
|
Interval: float64(minIvl.Milliseconds()),
|
|
Ignored: []string{
|
|
"ignor.ed",
|
|
"ignor.ed",
|
|
},
|
|
},
|
|
wantCode: http.StatusUnprocessableEntity,
|
|
wantErr: "ignored: duplicate host name \"ignor.ed\" at index 1\n",
|
|
}, {
|
|
name: "ignored_empty",
|
|
body: getConfigResp{
|
|
Enabled: aghalg.NBTrue,
|
|
Interval: float64(minIvl.Milliseconds()),
|
|
Ignored: []string{
|
|
"",
|
|
},
|
|
},
|
|
wantCode: http.StatusUnprocessableEntity,
|
|
wantErr: "ignored: host name is empty\n",
|
|
}, {
|
|
name: "enabled_is_null",
|
|
body: getConfigResp{
|
|
Enabled: aghalg.NBNull,
|
|
Interval: float64(minIvl.Milliseconds()),
|
|
Ignored: []string{},
|
|
},
|
|
wantCode: http.StatusUnprocessableEntity,
|
|
wantErr: "enabled is null\n",
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
s, err := New(conf)
|
|
require.NoError(t, err)
|
|
|
|
s.Start()
|
|
testutil.CleanupAndRequireSuccess(t, s.Close)
|
|
|
|
buf, err := json.Marshal(tc.body)
|
|
require.NoError(t, err)
|
|
|
|
const (
|
|
configGet = "/control/stats/config"
|
|
configPut = "/control/stats/config/update"
|
|
)
|
|
|
|
req := httptest.NewRequest(http.MethodPut, configPut, bytes.NewReader(buf))
|
|
rw := httptest.NewRecorder()
|
|
|
|
s.handlePutStatsConfig(rw, req)
|
|
require.Equal(t, tc.wantCode, rw.Code)
|
|
|
|
if tc.wantCode != http.StatusOK {
|
|
assert.Equal(t, tc.wantErr, rw.Body.String())
|
|
|
|
return
|
|
}
|
|
|
|
resp := httptest.NewRequest(http.MethodGet, configGet, nil)
|
|
rw = httptest.NewRecorder()
|
|
|
|
s.handleGetStatsConfig(rw, resp)
|
|
require.Equal(t, http.StatusOK, rw.Code)
|
|
|
|
ans := getConfigResp{}
|
|
err = json.Unmarshal(rw.Body.Bytes(), &ans)
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, tc.body, ans)
|
|
})
|
|
}
|
|
}
|