extern/glance
1
0
Fork 0
mirror of https://github.com/glanceapp/glance.git synced 2025-06-22 10:51:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add allow-insecure for dns-stats widget

Browse Source
This commit is contained in:
Svilen Markov 2024-11-30 14:24:56 +00:00
parent b5259d1a98
commit d876f4cb39
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/configuration.md
View File

@ -1343,6 +1343,7 @@ Preview:
| Name | Type | Required | Default | | Name | Type | Required | Default |
| ---- | ---- | -------- | ------- | | ---- | ---- | -------- | ------- |
| service | string | no | pihole | | service | string | no | pihole |
| allow-insecure | bool | no | false |
| url | string | yes | | | url | string | yes | |
| username | string | when service is `adguard` | | | username | string | when service is `adguard` | |
| password | string | when service is `adguard` | | | password | string | when service is `adguard` | |
@ -1352,6 +1353,9 @@ Preview:
##### `service` ##### `service`
Either `adguard` or `pihole`. Either `adguard` or `pihole`.
##### `allow-insecure`
Whether to allow invalid/self-signed certificates when making the request to the service.
##### `url` ##### `url`
The base URL of the service. Can be specified from an environment variable using the syntax `${VARIABLE_NAME}`. The base URL of the service. Can be specified from an environment variable using the syntax `${VARIABLE_NAME}`.

39
internal/glance/widget-dns-stats.go
View File

@ -20,12 +20,13 @@ type dnsStatsWidget struct {
TimeLabels [8]string `yaml:"-"` TimeLabels [8]string `yaml:"-"`
Stats *dnsStats `yaml:"-"` Stats *dnsStats `yaml:"-"`
HourFormat string `yaml:"hour-format"` HourFormat string `yaml:"hour-format"`
Service string `yaml:"service"` Service string `yaml:"service"`
URL optionalEnvField `yaml:"url"` AllowInsecure bool `yaml:"allow-insecure"`
Token optionalEnvField `yaml:"token"` URL optionalEnvField `yaml:"url"`
Username optionalEnvField `yaml:"username"` Token optionalEnvField `yaml:"token"`
Password optionalEnvField `yaml:"password"` Username optionalEnvField `yaml:"username"`
Password optionalEnvField `yaml:"password"`
} }
func makeDNSWidgetTimeLabels(format string) [8]string { func makeDNSWidgetTimeLabels(format string) [8]string {
@ -57,9 +58,9 @@ func (widget *dnsStatsWidget) update(ctx context.Context) {
var err error var err error
if widget.Service == "adguard" { if widget.Service == "adguard" {
stats, err = fetchAdguardStats(string(widget.URL), string(widget.Username), string(widget.Password)) stats, err = fetchAdguardStats(string(widget.URL), widget.AllowInsecure, string(widget.Username), string(widget.Password))
} else { } else {
stats, err = fetchPiholeStats(string(widget.URL), string(widget.Token)) stats, err = fetchPiholeStats(string(widget.URL), widget.AllowInsecure, string(widget.Token))
} }
if !widget.canContinueUpdateAfterHandlingErr(err) { if !widget.canContinueUpdateAfterHandlingErr(err) {
@ -110,7 +111,7 @@ type adguardStatsResponse struct {
TopBlockedDomains []map[string]int `json:"top_blocked_domains"` TopBlockedDomains []map[string]int `json:"top_blocked_domains"`
} }
func fetchAdguardStats(instanceURL, username, password string) (*dnsStats, error) { func fetchAdguardStats(instanceURL string, allowInsecure bool, username, password string) (*dnsStats, error) {
requestURL := strings.TrimRight(instanceURL, "/") + "/control/stats" requestURL := strings.TrimRight(instanceURL, "/") + "/control/stats"
request, err := http.NewRequest("GET", requestURL, nil) request, err := http.NewRequest("GET", requestURL, nil)
@ -120,7 +121,14 @@ func fetchAdguardStats(instanceURL, username, password string) (*dnsStats, error
request.SetBasicAuth(username, password) request.SetBasicAuth(username, password)
responseJson, err := decodeJsonFromRequest[adguardStatsResponse](defaultClient, request) var client requestDoer
if !allowInsecure {
client = defaultHTTPClient
} else {
client = defaultInsecureHTTPClient
}
responseJson, err := decodeJsonFromRequest[adguardStatsResponse](client, request)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -242,7 +250,7 @@ func (p *piholeTopBlockedDomains) UnmarshalJSON(data []byte) error {
return nil return nil
} }
func fetchPiholeStats(instanceURL, token string) (*dnsStats, error) { func fetchPiholeStats(instanceURL string, allowInsecure bool, token string) (*dnsStats, error) {
if token == "" { if token == "" {
return nil, errors.New("missing API token") return nil, errors.New("missing API token")
} }
@ -255,7 +263,14 @@ func fetchPiholeStats(instanceURL, token string) (*dnsStats, error) {
return nil, err return nil, err
} }
responseJson, err := decodeJsonFromRequest[piholeStatsResponse](defaultClient, request) var client requestDoer
if !allowInsecure {
client = defaultHTTPClient
} else {
client = defaultInsecureHTTPClient
}
responseJson, err := decodeJsonFromRequest[piholeStatsResponse](client, request)
if err != nil { if err != nil {
return nil, err return nil, err
} }