home: accept ids in clients find

heyxkhoa · Jan 26, 2021 · f79876e · f79876e
1 parent 5b72595
commit f79876e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 22 deletions.
diff --git a/internal/home/clients.go b/internal/home/clients.go
@@ -305,25 +305,25 @@ func (clients *clientsContainer) FindUpstreams(ip string) *proxy.UpstreamConfig
 }
 
 // findLocked searches for a client by its ID.  For internal use only.
-func (clients *clientsContainer) findLocked(ip string) (c *Client, ok bool) {
-	ipAddr := net.ParseIP(ip)
-	if ipAddr == nil {
-		return nil, false
-	}
-
-	c, ok = clients.idIndex[ip]
+func (clients *clientsContainer) findLocked(id string) (c *Client, ok bool) {
+	c, ok = clients.idIndex[id]
 	if ok {
 		return c, true
 	}
 
+	ip := net.ParseIP(id)
+	if ip == nil {
+		return nil, false
+	}
+
 	for _, c = range clients.list {
 		for _, id := range c.IDs {
 			_, ipnet, err := net.ParseCIDR(id)
 			if err != nil {
 				continue
 			}
 
-			if ipnet.Contains(ipAddr) {
+			if ipnet.Contains(ip) {
 				return c, true
 			}
 		}
@@ -333,7 +333,7 @@ func (clients *clientsContainer) findLocked(ip string) (c *Client, ok bool) {
 		return nil, false
 	}
 
-	macFound := clients.dhcpServer.FindMACbyIP(ipAddr)
+	macFound := clients.dhcpServer.FindMACbyIP(ip)
 	if macFound == nil {
 		return nil, false
 	}

diff --git a/internal/home/clientshttp.go b/internal/home/clientshttp.go
@@ -229,18 +229,18 @@ func (clients *clientsContainer) handleUpdateClient(w http.ResponseWriter, r *ht
 func (clients *clientsContainer) handleFindClient(w http.ResponseWriter, r *http.Request) {
 	q := r.URL.Query()
 	data := []map[string]clientJSON{}
-	for i := 0; ; i++ {
-		ipStr := q.Get(fmt.Sprintf("ip%d", i))
-		ip := net.ParseIP(ipStr)
-		if ip == nil {
+	for i := 0; i < len(q); i++ {
+		idStr := q.Get(fmt.Sprintf("ip%d", i))
+		if idStr == "" {
 			break
 		}
 
-		c, ok := clients.Find(ipStr)
+		ip := net.ParseIP(idStr)
+		c, ok := clients.Find(idStr)
 		var cj clientJSON
 		if !ok {
 			var found bool
-			cj, found = clients.findTemporary(ip, ipStr)
+			cj, found = clients.findTemporary(ip, idStr)
 			if !found {
 				continue
 			}
@@ -250,7 +250,7 @@ func (clients *clientsContainer) handleFindClient(w http.ResponseWriter, r *http
 		}
 
 		data = append(data, map[string]clientJSON{
-			ipStr: cj,
+			idStr: cj,
 		})
 	}
 
@@ -263,9 +263,9 @@ func (clients *clientsContainer) handleFindClient(w http.ResponseWriter, r *http
 
 // findTemporary looks up the IP in temporary storages, like autohosts or
 // blocklists.
-func (clients *clientsContainer) findTemporary(ip net.IP, ipStr string) (cj clientJSON, found bool) {
-	ch, ok := clients.FindAutoClient(ipStr)
-	if !ok {
+func (clients *clientsContainer) findTemporary(ip net.IP, idStr string) (cj clientJSON, found bool) {
+	ch, ok := clients.FindAutoClient(idStr)
+	if !ok && ip != nil {
 		// It is still possible that the IP used to be in the runtime
 		// clients list, but then the server was reloaded.  So, check
 		// the DNS server's blocked IP list.
@@ -277,16 +277,18 @@ func (clients *clientsContainer) findTemporary(ip net.IP, ipStr string) (cj clie
 		}
 
 		cj = clientJSON{
-			IDs:            []string{ipStr},
+			IDs:            []string{idStr},
 			Disallowed:     disallowed,
 			DisallowedRule: rule,
 		}
 
 		return cj, true
 	}
 
-	cj = clientHostToJSON(ipStr, ch)
-	cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
+	cj = clientHostToJSON(idStr, ch)
+	if ip != nil {
+		cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
+	}
 
 	return cj, true
 }