bootserver/bootoption/bootoption.go

@@ -3,8 +3,9 @@ package bootoption
 import "github.com/google/uuid"
 
 type EFIApp struct {
-	Name       string `json:"name"`
+	Name   string `json:"name"`
-	DevicePath string `json:"device_path"`
+	Path   string `json:"path"`
+	DiskID string `json:"disk_id"`
 }
 
 type Client struct {

bootserver/bootprotocol/bootprotocol.go

@@ -6,7 +6,6 @@ import (
 	"encoding"
 	"errors"
 	"fmt"
-	"strings"
 
 	"github.com/google/uuid"
 )
@@ -21,7 +20,7 @@ const (
 )
 
 var spaceByte = []byte(" ")
-var commaByte = []byte(";")
+var commaByte = []byte(",")
 
 const (
 	keyID     = "id"
@@ -141,13 +140,9 @@ func (am *acceptMessage) UnmarshalBinary(data []byte) error {
 
 func (am *acceptMessage) MarshalBinary() (data []byte, err error) {
 	action := []byte(am.Action().String())
-	// efiApp := strings.ReplaceAll(am.efiApp, `\`, `\\`)
-	// efiApp = strings.ReplaceAll(efiApp, "File(", "")
-	efiApp := strings.ReplaceAll(am.efiApp, "File(", "")
-	efiApp, _ = strings.CutSuffix(efiApp, ")")
 	params := [][]byte{
 		[]byte(fmt.Sprintf("%s=%s", keyID, am.id.String())),
-		[]byte(fmt.Sprintf("%s=%s", keyEfiApp, efiApp)),
+		[]byte(fmt.Sprintf("%s=%s", keyEfiApp, am.efiApp)),
 	}
 	param_bytes := bytes.Join(params, commaByte)
 	return bytes.Join([][]byte{action, param_bytes}, spaceByte), nil

bootserver/config/config.go

@@ -55,7 +55,6 @@ type jsonConf struct {
 		Iface      string `json:"interface"`
 		Port       int    `json:"port"`
 		McastGroup string `json:"multicast_group"`
-		SrcAddr    string `json:"src_addr"`
 	} `json:"boot_provider"`
 }
 
@@ -69,7 +68,6 @@ type AppConfig struct {
 	UPDMcastGroup string
 	UDPPort       int
 	UDPIface      string
-	UDPSrcAddr    string
 }
 
 func parseLevel(lvlStr string) logrus.Level {
@@ -99,7 +97,6 @@ func (ac *AppConfig) UnmarshalJSON(data []byte) error {
 	ac.UPDMcastGroup = jsonConf.BootProvider.McastGroup
 	ac.UDPIface = jsonConf.BootProvider.Iface
 	ac.UDPPort = jsonConf.BootProvider.Port
-	ac.UDPSrcAddr = jsonConf.BootProvider.SrcAddr
 	ac.DataFilepath = jsonConf.Storage.Path
 	return nil
 }

bootserver/controllers/client/client.go

@@ -1,110 +1,85 @@
 package client
 
-import (
+// import (
-	"encoding/json"
+// 	"encoding/json"
-	"errors"
+// 	"fmt"
-	"fmt"
+// 	"io"
-	"io"
+// 	"net"
-	"net/http"
+// 	"net/http"
 
-	"git.faercol.me/faercol/http-boot-server/bootserver/helpers"
+// 	"git.faercol.me/faercol/http-boot-server/bootserver/helpers"
-	"git.faercol.me/faercol/http-boot-server/bootserver/services"
+// 	"git.faercol.me/faercol/http-boot-server/bootserver/services"
-	"github.com/google/uuid"
+// 	"github.com/sirupsen/logrus"
-	"github.com/sirupsen/logrus"
+// )
-)
 
-const SetBootRoute = "/config/boot"
+// const BootRoute = "/boot"
 
-type setBootOptionPayload struct {
+// type BootController struct {
-	ClientID string `json:"client_id"`
+// 	clientService *services.ClientHandlerService
-	OptionID string `json:"option_id"`
+// 	l             *logrus.Logger
-}
+// }
 
-type BootController struct {
+// func NewBootController(logger *logrus.Logger, service *services.ClientHandlerService) *BootController {
-	clientService *services.ClientHandlerService
+// 	return &BootController{
-	l             *logrus.Logger
+// 		clientService: service,
-}
+// 		l:             logger,
+// 	}
+// }
 
-func NewBootController(logger *logrus.Logger, service *services.ClientHandlerService) *BootController {
+// func (bc *BootController) getBootOption(clientIP string, w http.ResponseWriter, r *http.Request) (int, []byte, error) {
-	return &BootController{
+// 	bootOption, err := bc.clientService.GetClientSelectedBootOption(clientIP)
-		clientService: service,
+// 	if err != nil {
-		l:             logger,
+// 		return http.StatusInternalServerError, nil, fmt.Errorf("failed to get boot option: %w", err)
-	}
+// 	}
-}
 
-func (bc *BootController) setBootOption(w http.ResponseWriter, r *http.Request) (int, []byte, error) {
+// 	dat, err := json.Marshal(bootOption)
-	dat, err := io.ReadAll(r.Body)
+// 	if err != nil {
-	if err != nil {
+// 		return http.StatusInternalServerError, nil, fmt.Errorf("failed to serialize body")
-		return http.StatusInternalServerError, nil, fmt.Errorf("failed to read body: %w", err)
+// 	}
-	}
-	var payload setBootOptionPayload
-	if err := json.Unmarshal(dat, &payload); err != nil {
-		return http.StatusBadRequest, nil, fmt.Errorf("failed to parse body: %w", err)
-	}
 
-	clientID, err := uuid.Parse(payload.ClientID)
+// 	w.Header().Add("Content-Type", "application/json")
-	if err != nil {
+// 	return http.StatusOK, dat, nil
-		return http.StatusBadRequest, []byte("bad client ID"), fmt.Errorf("invalid format for client ID: %w", err)
+// }
-	}
-	optionID, err := uuid.Parse(payload.OptionID)
-	if err != nil {
-		return http.StatusBadRequest, []byte("bad option ID"), fmt.Errorf("invalid format for option ID: %w", err)
-	}
 
-	if err := bc.clientService.SetClientBootOption(clientID, optionID.String()); err != nil {
+// func (bc *BootController) setBootOption(clientIP string, w http.ResponseWriter, r *http.Request) (int, error) {
-		if errors.Is(err, services.ErrUnknownClient) {
+// 	dat, err := io.ReadAll(r.Body)
-			return http.StatusNotFound, []byte("unknown client"), err
+// 	if err != nil {
-		}
+// 		return http.StatusInternalServerError, fmt.Errorf("failed to read body: %w", err)
-		if errors.Is(err, services.ErrUnknownBootOption) {
+// 	}
-			return http.StatusNotFound, []byte("unknown boot option"), err
+// 	var option string
-		}
+// 	if err := json.Unmarshal(dat, &option); err != nil {
-		return http.StatusInternalServerError, nil, fmt.Errorf("failed to set boot option for client: %w", err)
+// 		return http.StatusInternalServerError, fmt.Errorf("failed to parse body: %w", err)
-	}
+// 	}
 
-	return http.StatusAccepted, nil, nil
+// 	if err := bc.clientService.SetClientBootOption(clientIP, option); err != nil {
-}
+// 		return http.StatusInternalServerError, fmt.Errorf("failed to set boot option for client: %w", err)
+// 	}
 
-func (bc *BootController) deleteClient(w http.ResponseWriter, r *http.Request) (int, []byte, error) {
+// 	return http.StatusAccepted, nil
-	dat, err := io.ReadAll(r.Body)
+// }
-	if err != nil {
-		return http.StatusInternalServerError, nil, fmt.Errorf("failed to read body: %w", err)
-	}
-	var payload setBootOptionPayload
-	if err := json.Unmarshal(dat, &payload); err != nil {
-		return http.StatusBadRequest, nil, fmt.Errorf("failed to parse body: %w", err)
-	}
 
-	clientID, err := uuid.Parse(payload.ClientID)
+// func (bc *BootController) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	if err != nil {
+// 	clientIP, _, err := net.SplitHostPort(r.RemoteAddr)
-		return http.StatusBadRequest, []byte("bad client ID"), fmt.Errorf("invalid format for client ID: %w", err)
+// 	if err != nil {
-	}
+// 		bc.l.Errorf("Failed to read remote IP: %s", err.Error())
-	if err := bc.clientService.DeleteClient(clientID); err != nil {
+// 		helpers.HandleResponse(w, r, http.StatusInternalServerError, nil, bc.l)
-		return http.StatusInternalServerError, []byte("failed to delete client"), fmt.Errorf("failed to delete client: %w", err)
+// 		return
-	}
+// 	}
 
-	return http.StatusOK, nil, nil
+// 	var returncode int
-}
+// 	var content []byte
 
-func (bc *BootController) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+// 	switch r.Method {
-	var returncode int
+// 	case http.MethodGet:
-	var content []byte
+// 		returncode, content, err = bc.getBootOption(clientIP, w, r)
-	var err error
+// 	case http.MethodPut:
+// 		returncode, err = bc.setBootOption(clientIP, w, r)
+// 	default:
+// 		returncode = http.StatusMethodNotAllowed
+// 	}
 
-	switch r.Method {
+// 	if err != nil {
-	case http.MethodPut:
+// 		bc.l.Errorf("An error occured while handling boot request: %q", err.Error())
-		returncode, content, err = bc.setBootOption(w, r)
+// 	}
-		if err != nil {
+// 	helpers.HandleResponse(w, r, returncode, content, bc.l)
-			bc.l.Errorf("Error setting boot option for client: %s", err.Error())
+// }
-		}
-	case http.MethodDelete:
-		returncode, content, err = bc.deleteClient(w, r)
-		if err != nil {
-			bc.l.Errorf("Error setting boot option for client: %s", err.Error())
-		}
-	default:
-		helpers.HandleResponse(w, r, http.StatusMethodNotAllowed, nil, bc.l)
-		return
-	}
-
-	helpers.HandleResponse(w, r, returncode, content, bc.l)
-}

bootserver/controllers/client/enroll.go

@@ -15,25 +15,18 @@ import (
 const EnrollRoute = "/enroll"
 
 type newClientPayload struct {
-	ID             string `json:"ID"`
+	ID string `json:"ID"`
-	MulticastGroup string `json:"multicast_group"`
-	MulticastPort  int    `json:"multicast_port"`
 }
 
 type EnrollController struct {
-	clientService  *services.ClientHandlerService
+	clientService *services.ClientHandlerService
-	l              *logrus.Logger
+	l             *logrus.Logger
-	multicastPort  int
-	multicastGroup string
 }
 
-func NewEnrollController(l *logrus.Logger, service *services.ClientHandlerService, mcastPort int, mcastGroup string) *EnrollController {
+func NewEnrollController(l *logrus.Logger, service *services.ClientHandlerService) *EnrollController {
 	return &EnrollController{
-
+		clientService: service,
-		clientService:  service,
+		l:             l,
-		l:              l,
-		multicastPort:  mcastPort,
-		multicastGroup: mcastGroup,
 	}
 }
 
@@ -57,13 +50,12 @@ func (ec *EnrollController) enrollMachine(w http.ResponseWriter, r *http.Request
 		return http.StatusInternalServerError, nil, fmt.Errorf("failed to create client %w", err)
 	}
 
-	payload, err := json.Marshal(newClientPayload{ID: cltID.String(), MulticastGroup: ec.multicastGroup, MulticastPort: ec.multicastPort})
+	payload, err := json.Marshal(newClientPayload{ID: cltID.String()})
 	if err != nil {
 		return http.StatusInternalServerError, nil, fmt.Errorf("failed to serialize payload: %w", err)
 	}
 
 	ec.l.Infof("Added client")
-	w.Header().Add("Content-Type", "application/json")
 	return http.StatusOK, payload, nil
 }
 

bootserver/controllers/ui/ui.go

@@ -7,7 +7,6 @@ import (
 	"io"
 	"net/http"
 	"path/filepath"
-	"sort"
 
 	"git.faercol.me/faercol/http-boot-server/bootserver/helpers"
 	"git.faercol.me/faercol/http-boot-server/bootserver/services"
@@ -64,13 +63,10 @@ func (uc *UIController) serveUI(w http.ResponseWriter, r *http.Request) (int, in
 		for id, bo := range clt.Options {
 			tplBO = append(tplBO, templateBootOption{
 				Name:     bo.Name,
-				Path:     bo.DevicePath,
+				Path:     bo.Path,
 				ID:       id,
 				Selected: id == clt.SelectedOption,
 			})
-			sort.Slice(tplBO, func(i, j int) bool {
-				return tplBO[i].ID < tplBO[j].ID
-			})
 		}
 		dat.Clients = append(dat.Clients, templateClient{
 			ID:          clt.ID.String(),
@@ -91,16 +87,10 @@ func (uc *UIController) serveUI(w http.ResponseWriter, r *http.Request) (int, in
 }
 
 func (uc *UIController) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	if r.RequestURI != "/" {
-		uc.l.Errorf("Unhandled route %q", r.RequestURI)
-		helpers.HandleResponse(w, r, http.StatusNotFound, nil, uc.l)
-		return
-	}
 	returncode, contentLength, err := uc.serveUI(w, r)
 	if err != nil {
 		uc.l.Errorf("Error serving UI: %s", err.Error())
 		helpers.HandleResponse(w, r, returncode, nil, uc.l)
-	} else {
-		helpers.AddToContext(r, returncode, contentLength)
 	}
+	helpers.AddToContext(r, returncode, contentLength)
 }

bootserver/server/server.go

@@ -67,11 +67,10 @@ func New(appConf *config.AppConfig, logger *logrus.Logger) (*Server, error) {
 	}
 	service := services.NewClientHandlerService(appConf.DataFilepath, logger)
 	controllers := map[string]http.Handler{
-		client.EnrollRoute:  middlewares.WithLogger(client.NewEnrollController(logger, service, appConf.UDPPort, appConf.UPDMcastGroup), logger),
+		client.EnrollRoute: middlewares.WithLogger(client.NewEnrollController(logger, service), logger),
-		client.ConfigRoute:  middlewares.WithLogger(client.NewGetConfigController(logger, service, appConf), logger),
+		client.ConfigRoute: middlewares.WithLogger(client.NewGetConfigController(logger, service, appConf), logger),
-		client.SetBootRoute: middlewares.WithLogger(client.NewBootController(logger, service), logger),
+		ui.StaticRoute:     &ui.StaticController{},
-		ui.StaticRoute:      &ui.StaticController{},
+		ui.UIRoute:         middlewares.WithLogger(ui.NewUIController(logger, service), logger),
-		ui.UIRoute:          middlewares.WithLogger(ui.NewUIController(logger, service), logger),
 	}
 
 	m := http.NewServeMux()

bootserver/services/services.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"sort"
 	"time"
 
 	"git.faercol.me/faercol/http-boot-server/bootserver/bootoption"
@@ -112,9 +111,6 @@ func (chs *ClientHandlerService) GetAllClientConfig() ([]*bootoption.Client, err
 		clt.ID = id
 		clientList = append(clientList, clt)
 	}
-	sort.Slice(clientList, func(i, j int) bool {
-		return clientList[i].ID.String() < clientList[j].ID.String()
-	})
 	return clientList, nil
 }
 
@@ -156,20 +152,6 @@ func (chs *ClientHandlerService) GetClientSelectedBootOption(client uuid.UUID) (
 	}
 }
 
-func (chs *ClientHandlerService) DeleteClient(client uuid.UUID) error {
-	var err error
-
-	clients, err := chs.load()
-	if err != nil {
-		return fmt.Errorf("failed to load current config: %w", err)
-	}
-	delete(clients, client)
-	if err := chs.unload(clients); err != nil {
-		return fmt.Errorf("failed to save current config: %w", err)
-	}
-	return nil
-}
-
 func (chs *ClientHandlerService) SetClientBootOption(client uuid.UUID, option string) error {
 	var err error
 

bootserver/static/scripts/index.js

@@ -1,20 +0,0 @@
-function selectBootOption(clientID, bootID) {
-  const Http = new XMLHttpRequest;
-  var host = window.location.protocol + "//" + window.location.host;
-  const url = host + "/config/boot"
-  console.debug(`Sending request to ${url}`);
-  Http.open("PUT", url);
-  Http.setRequestHeader("Content-Type", "application/json");
-  const body = JSON.stringify({
-    client_id: clientID,
-    option_id: bootID,
-  });
-  Http.onload = () => {
-    if (Http.readyState === 4 && Http.status === 202) {
-      location.reload();
-    } else {
-      console.error(`Unexpected returncode ${Http.status}`)
-    }
-  };
-  Http.send(body);
-}

bootserver/static/stylesheets/main.css

@@ -1,45 +1,24 @@
-:root {
-    --base: #1e1e2e;
-    --text: #cdd6f4;
-    --subtext1: #bac2de;
-    --surface0: #313244;
-    --surface1: #45475a;
-    --red: #f38ba8;
-    --blue: #89b4fa;
-}
-
-
 body {
-    background-color: var(--base);
+    background-color: black;
-    color: var(--text);
+    color: white;
-}
-
-.page-content {
-    width: 90%;
-    max-width: 1200px;
-    margin: auto;
-}
-
-.container {
-    border-radius: 5px;
-    background-color: var(--surface0);
-    padding: 5px;
-    border-radius: 5px 5px;
-    margin: 5px auto;
 }
 
 .main-container {
+    border-radius: 5px;
+    background-color: #121212;
     padding: 20px;
 }
 
 .title-container {
-    background-color: var(--surface0);
+    border-radius: 5px 5px 0px 0px;
+    padding: 5px;
+    background-color: #1A3A5D;
 }
 
 .client-list-container {
     border-radius: 0px 0px 5px 5px;
     padding: 10px;
-    background-color: var(--surface0);
+    background-color: #232323;
 }
 
 .client-container {
@@ -57,7 +36,7 @@ body {
 
     .client-uuid {
         font-size: smaller;
-        color: var(--subtext1);
+        color: #9B9B9B;
     }
 }
 
@@ -69,16 +48,9 @@ body {
 .client-boot-option {
     margin: 3px auto;
     padding: 8px 8px;
-    cursor: pointer;
 
     &.selected {
-        background-color: var(--surface-active);
+        background-color: #3E4042;
-        cursor: default;
-    }
-
-    &:hover {
-        background-color: var(--surface-hover);
-        --text-variant: #000000;
     }
 }
 
@@ -89,7 +61,7 @@ body {
 
 .boot-option-uuid {
     font-size: smaller;
-    color: var(--text-variant);
+    color: #9B9B9B;
 }
 
 .boot-option-path {

bootserver/templates/index.html

@@ -5,47 +5,43 @@
     <meta charset="utf-8">
     <title>HTTP boot server</title>
     <link rel="stylesheet" href="/static/stylesheets/main.css">
-    <script src="/static/scripts/index.js"></script>
 </head>
 
 <body>
-    <div class="page-content">
+    <div class="main-container">
 
-        <div class="title-container container">
+        <div class="title-container">
             <h1>HTTP boot server admin page</h1>
         </div>
 
-        <div class="main-container container">
+        <div class="client-list-container">
-            <div class="client-list">
+            <h2>Currently enrolled clients</h2>
-                <h2>{{len .Clients}} enrolled clients</h2>
 
-                {{range .Clients}}
+            {{range .Clients}}
-                <div class="client-container">
+            <div class="client-container">
-                    <div class="client-header">
+                <div class="client-header">
-                        <span class="client-name">{{.Name}}</span>
+                    <span class="client-name">{{.Name}}</span>
-                        <span class="client-uuid">{{.ID}}</span>
+                    <span class="client-uuid">{{.ID}}</span>
-                    </div>
+                </div>
-                    <div class="client-content">
+                <div class="client-content">
-                        <div class="client-boot-options">
+                    <div class="client-boot-options">
-                            {{$cid := .ID}}{{range .BootOptions}}
+                        {{range .BootOptions}}
-                            <div class="client-boot-option{{if .Selected}} selected{{end}}"
+                        <div class="client-boot-option{{if .Selected}} selected{{end}}">
-                                onclick="selectBootOption('{{$cid}}', '{{.ID}}')">
+                            <div>
-                                <div>
+                                <span class="boot-option-name">{{.Name}}</span>
-                                    <span class="boot-option-name">{{.Name}}</span>
+                                <span class="boot-option-uuid">{{.ID}}</span>
-                                    <span class="boot-option-uuid">{{.ID}}</span>
+                            </div>
-                                </div>
+                            <div>
-                                <div>
+                                <span class="boot-option-path">{{.Path}}</span>
-                                    <span class="boot-option-path">{{.Path}}</span>
-                                </div>
                             </div>
-                            {{end}}
                         </div>
+                        {{end}}
                     </div>
                 </div>
-                {{end}}
             </div>
-
+            {{end}}
         </div>
+
     </div>
 </body>
 

bootserver/udplistener/udplistener.go

@@ -22,7 +22,6 @@ type udpMessage struct {
 
 type UDPListener struct {
 	addr    *net.UDPAddr
-	laddr   *net.UDPAddr
 	iface   *net.Interface
 	l       *net.UDPConn
 	log     *logrus.Logger
@@ -42,15 +41,9 @@ func New(conf *config.AppConfig, log *logrus.Logger) (*UDPListener, error) {
 		return nil, fmt.Errorf("failed to resolve interface name %s: %w", conf.UDPIface, err)
 	}
 
-	laddr, err := net.ResolveUDPAddr("udp", fmt.Sprintf("[%s%%%s]:0", conf.UDPSrcAddr, conf.UDPIface))
-	if err != nil {
-		return nil, fmt.Errorf("failed to resolve UDP source address: %w", err)
-	}
-
 	return &UDPListener{
 		addr:    addr,
 		iface:   iface,
-		laddr:   laddr,
 		ctx:     context.TODO(),
 		service: services.NewClientHandlerService(conf.DataFilepath, log),
 		log:     log,
@@ -85,7 +78,7 @@ func (l *UDPListener) handleBootRequest(msg bootprotocol.Message, subLogger logr
 		requestLogger.Errorf("Failed to get config for client: %s", err.Error())
 		return bootprotocol.Deny(msg.ID(), "unknown server error")
 	}
-	return bootprotocol.Accept(msg.ID(), bootOption.DevicePath)
+	return bootprotocol.Accept(msg.ID(), bootOption.Path)
 }
 
 func (l *UDPListener) handleClient(msg *udpMessage) error {
@@ -95,7 +88,7 @@ func (l *UDPListener) handleClient(msg *udpMessage) error {
 	response := l.handleBootRequest(msg.message, clientLogger)
 
 	clientLogger.Debug("Dialing client for answer")
-	con, err := net.DialUDP("udp", l.laddr, msg.sourceAddr)
+	con, err := net.DialUDP("udp", nil, msg.sourceAddr)
 	if err != nil {
 		return fmt.Errorf("failed to dialed client: %w", err)
 	}