Pull request 2279: AG-27492-clients-runtime-sources-dhcp

Squashed commit of the following:

commit 51fb3e3d07
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Sep 19 17:01:03 2024 +0300

    all: upd chlog

commit 3ab945bb44
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Sep 19 16:49:00 2024 +0300

    home: clients runtime sources dhcp

CHANGELOG.md

@@ -44,6 +44,8 @@ NOTE: Add new changes BELOW THIS COMMENT.
 
 ### Fixed
 
+- Property `clients.runtime_sources.dhcp` in the configuration file not taking
+  effect.
 - Update Google safe search domains list ([#7155]).
 - Enforce Bing safe search from Edge sidebar ([#7154]).
 - Text overflow on the query log page ([#7119]).

internal/home/clients.go

@@ -619,9 +619,12 @@ func (clients *clientsContainer) addHostLocked(
 ) (ok bool) {
 	rc := client.NewRuntime(ip)
 	rc.SetInfo(src, []string{host})
+
+	if config.Clients.Sources.DHCP {
 		if dhcpHost := clients.dhcp.HostByIP(ip); dhcpHost != "" {
 			rc.SetInfo(client.SourceDHCP, []string{dhcpHost})
 		}
+	}
 
 	clients.storage.UpdateRuntime(rc)
 

internal/home/clientshttp.go

@@ -117,6 +117,7 @@ func (clients *clientsContainer) handleGetClients(w http.ResponseWriter, r *http
 		return true
 	})
 
+	if config.Clients.Sources.DHCP {
 		for _, l := range clients.dhcp.Leases() {
 			cj := runtimeClientJSON{
 				Name:   l.Hostname,
@@ -127,6 +128,7 @@ func (clients *clientsContainer) handleGetClients(w http.ResponseWriter, r *http
 
 			data.RuntimeClients = append(data.RuntimeClients, cj)
 		}
+	}
 
 	data.Tags = clientTags