Function to get server from IP or ID parameter

server/functions.go

@@ -0,0 +1,46 @@
+package server
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+	"net/netip"
+	"strconv"
+	"time"
+
+	"go.ntppool.org/common/logger"
+	"go.ntppool.org/common/tracing"
+	"go.ntppool.org/data-api/ntpdb"
+)
+
+func (srv *Server) FindServer(ctx context.Context, serverID string) (ntpdb.Server, error) {
+	log := logger.Setup()
+	ctx, span := tracing.Tracer().Start(ctx, "FindServer")
+	defer span.End()
+	q := ntpdb.NewWrappedQuerier(ntpdb.New(srv.db))
+
+	var serverData ntpdb.Server
+	var dberr error
+	if id, err := strconv.Atoi(serverID); id > 0 && err == nil {
+		serverData, dberr = q.GetServerByID(ctx, uint32(id))
+	} else {
+		ip, err := netip.ParseAddr(serverID)
+		if err != nil || !ip.IsValid() {
+			return ntpdb.Server{}, nil // 404 error
+		}
+		serverData, dberr = q.GetServerByIP(ctx, ip.String())
+	}
+	if dberr != nil {
+		if !errors.Is(dberr, sql.ErrNoRows) {
+			log.Error("could not query server id", "err", dberr)
+			return serverData, dberr
+		}
+	}
+
+	if serverData.ID == 0 || (serverData.DeletionOn.Valid && serverData.DeletionOn.Time.Before(time.Now().Add(-1*time.Hour*24*30*24))) {
+		// no data and no error to produce 404 errors
+		return ntpdb.Server{}, nil
+	}
+
+	return serverData, nil
+}

server/graph_image.go

@@ -2,16 +2,12 @@ package server
 
 import (
 	"context"
-	"database/sql"
-	"errors"
 	"fmt"
 	"io"
 	"net/http"
 	"net/http/httptrace"
 	"net/url"
 	"os"
-	"strconv"
-	"time"
 
 	"github.com/hashicorp/go-retryablehttp"
 	"github.com/labstack/echo/v4"
@@ -22,8 +18,6 @@ import (
 
 	"go.ntppool.org/common/logger"
 	"go.ntppool.org/common/tracing"
-
-	"go.ntppool.org/data-api/ntpdb"
 )
 
 func (srv *Server) graphImage(c echo.Context) error {
@@ -51,24 +45,8 @@ func (srv *Server) graphImage(c echo.Context) error {
 		return c.Redirect(308, redirectURL.String())
 	}
 
-	q := ntpdb.NewWrappedQuerier(ntpdb.New(srv.db))
+	serverData, err := srv.FindServer(ctx, serverID)
-
+	if serverData.ID == 0 {
-	var serverData ntpdb.Server
-	var dberr error
-	if id, err := strconv.Atoi(serverID); id > 0 && err == nil {
-		serverData, dberr = q.GetServerByID(ctx, uint32(id))
-	} else {
-		serverData, dberr = q.GetServerByIP(ctx, serverID)
-	}
-	if dberr != nil {
-		if !errors.Is(dberr, sql.ErrNoRows) {
-			log.Error("could not query server id", "err", dberr)
-			return c.String(http.StatusInternalServerError, "server error")
-		}
-		return c.String(http.StatusNotFound, "not found")
-	}
-
-	if serverData.ID == 0 || (serverData.DeletionOn.Valid && serverData.DeletionOn.Time.Before(time.Now())) {
 		return c.String(http.StatusNotFound, "not found")
 	}