mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-15 19:31:45 +03:00
681c604c22
Merge in DNS/adguard-home from nextapi-frontend-fs to master
Squashed commit of the following:
commit 3ed959f21939cf5590c27426af46906cbffed502
Merge: e60bbdd04 9fda7bfd3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jun 13 13:37:00 2023 +0300
Merge branch 'master' into nextapi-frontend-fs
commit e60bbdd04ce841c1aaaa198cc9dc85ae14799ffa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 9 14:53:09 2023 +0300
next: support frontend fs
63 lines
1.7 KiB
Go
63 lines
1.7 KiB
Go
package websvc_test
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/netip"
|
|
"net/url"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/next/agh"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/next/websvc"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestService_HandlePatchSettingsHTTP(t *testing.T) {
|
|
wantWeb := &websvc.HTTPAPIHTTPSettings{
|
|
Addresses: []netip.AddrPort{netip.MustParseAddrPort("127.0.1.1:80")},
|
|
SecureAddresses: []netip.AddrPort{netip.MustParseAddrPort("127.0.1.1:443")},
|
|
Timeout: websvc.JSONDuration(10 * time.Second),
|
|
ForceHTTPS: false,
|
|
}
|
|
|
|
svc, err := websvc.New(&websvc.Config{
|
|
TLS: &tls.Config{
|
|
Certificates: []tls.Certificate{{}},
|
|
},
|
|
Addresses: []netip.AddrPort{netip.MustParseAddrPort("127.0.0.1:80")},
|
|
SecureAddresses: []netip.AddrPort{netip.MustParseAddrPort("127.0.0.1:443")},
|
|
Timeout: 5 * time.Second,
|
|
ForceHTTPS: true,
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
confMgr := newConfigManager()
|
|
confMgr.onWeb = func() (s agh.ServiceWithConfig[*websvc.Config]) { return svc }
|
|
confMgr.onUpdateWeb = func(ctx context.Context, c *websvc.Config) (err error) { return nil }
|
|
|
|
_, addr := newTestServer(t, confMgr)
|
|
u := &url.URL{
|
|
Scheme: "http",
|
|
Host: addr.String(),
|
|
Path: websvc.PathV1SettingsHTTP,
|
|
}
|
|
|
|
req := jobj{
|
|
"addresses": wantWeb.Addresses,
|
|
"secure_addresses": wantWeb.SecureAddresses,
|
|
"timeout": wantWeb.Timeout,
|
|
"force_https": wantWeb.ForceHTTPS,
|
|
}
|
|
|
|
respBody := httpPatch(t, u, req, http.StatusOK)
|
|
resp := &websvc.HTTPAPIHTTPSettings{}
|
|
err = json.Unmarshal(respBody, resp)
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, wantWeb, resp)
|
|
}
|