Merge remote-tracking branch 'origin/main' into use-public-repo

Author: lucarin91

Taskfile.yml

@@ -167,7 +167,7 @@ tasks:
     cmds:
       - docker rm -f adbd
 
-  board:install-arduino-app-cli:
+  board:install:
     desc: Install arduino-app-cli on the board
     interactive: true
     cmds:

cmd/arduino-app-cli/app/restart.go

@@ -16,10 +16,18 @@
 package app
 
 import (
+	"context"
+	"fmt"
+
 	"github.com/spf13/cobra"
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 
 	"github.com/arduino/arduino-app-cli/cmd/arduino-app-cli/completion"
+	"github.com/arduino/arduino-app-cli/cmd/arduino-app-cli/internal/servicelocator"
 	"github.com/arduino/arduino-app-cli/cmd/feedback"
+	"github.com/arduino/arduino-app-cli/internal/orchestrator"
+	"github.com/arduino/arduino-app-cli/internal/orchestrator/app"
 	"github.com/arduino/arduino-app-cli/internal/orchestrator/config"
 )
 
@@ -32,17 +40,63 @@ func newRestartCmd(cfg config.Configuration) *cobra.Command {
 			if len(args) == 0 {
 				return cmd.Help()
 			}
-			app, err := Load(args[0])
+			appToStart, err := Load(args[0])
 			if err != nil {
 				feedback.Fatal(err.Error(), feedback.ErrBadArgument)
-				return nil
-			}
-			if err := stopHandler(cmd.Context(), app); err != nil {
-				feedback.Warnf("failed to stop app: %s", err.Error())
 			}
-			return startHandler(cmd.Context(), cfg, app)
+			return restartHandler(cmd.Context(), cfg, appToStart)
 		},
 		ValidArgsFunction: completion.ApplicationNames(cfg),
 	}
 	return cmd
 }
+
+func restartHandler(ctx context.Context, cfg config.Configuration, app app.ArduinoApp) error {
+	out, _, getResult := feedback.OutputStreams()
+
+	stream := orchestrator.RestartApp(
+		ctx,
+		servicelocator.GetDockerClient(),
+		servicelocator.GetProvisioner(),
+		servicelocator.GetModelsIndex(),
+		servicelocator.GetBricksIndex(),
+		app,
+		cfg,
+		servicelocator.GetStaticStore(),
+	)
+	for message := range stream {
+		switch message.GetType() {
+		case orchestrator.ProgressType:
+			fmt.Fprintf(out, "Progress[%s]: %.0f%%\n", message.GetProgress().Name, message.GetProgress().Progress)
+		case orchestrator.InfoType:
+			fmt.Fprintln(out, "[INFO]", message.GetData())
+		case orchestrator.ErrorType:
+			errMesg := cases.Title(language.AmericanEnglish).String(message.GetError().Error())
+			feedback.Fatal(fmt.Sprintf("[ERROR] %s", errMesg), feedback.ErrGeneric)
+			return nil
+		}
+	}
+
+	outputResult := getResult()
+	feedback.PrintResult(restartAppResult{
+		AppName: app.Name,
+		Status:  "restarted",
+		Output:  outputResult,
+	})
+
+	return nil
+}
+
+type restartAppResult struct {
+	AppName string                        `json:"app_name"`
+	Status  string                        `json:"status"`
+	Output  *feedback.OutputStreamsResult `json:"output,omitempty"`
+}
+
+func (r restartAppResult) String() string {
+	return fmt.Sprintf("✓ App %q restarted successfully", r.AppName)
+}
+
+func (r restartAppResult) Data() interface{} {
+	return r
+}

cmd/arduino-app-cli/brick/bricks.go

@@ -17,16 +17,18 @@ package brick
 
 import (
 	"github.com/spf13/cobra"
+
+	"github.com/arduino/arduino-app-cli/internal/orchestrator/config"
 )
 
-func NewBrickCmd() *cobra.Command {
+func NewBrickCmd(cfg config.Configuration) *cobra.Command {
 	appCmd := &cobra.Command{
 		Use:   "brick",
 		Short: "Manage Arduino Bricks",
 	}
 
 	appCmd.AddCommand(newBricksListCmd())
-	appCmd.AddCommand(newBricksDetailsCmd())
+	appCmd.AddCommand(newBricksDetailsCmd(cfg))
 
 	return appCmd
 }

cmd/arduino-app-cli/brick/details.go

@@ -25,21 +25,23 @@ import (
 	"github.com/arduino/arduino-app-cli/cmd/arduino-app-cli/internal/servicelocator"
 	"github.com/arduino/arduino-app-cli/cmd/feedback"
 	"github.com/arduino/arduino-app-cli/internal/orchestrator/bricks"
+	"github.com/arduino/arduino-app-cli/internal/orchestrator/config"
 )
 
-func newBricksDetailsCmd() *cobra.Command {
+func newBricksDetailsCmd(cfg config.Configuration) *cobra.Command {
 	return &cobra.Command{
 		Use:   "details",
 		Short: "Details of a specific brick",
 		Args:  cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
-			bricksDetailsHandler(args[0])
+			bricksDetailsHandler(args[0], cfg)
 		},
 	}
 }
 
-func bricksDetailsHandler(id string) {
-	res, err := servicelocator.GetBrickService().BricksDetails(id)
+func bricksDetailsHandler(id string, cfg config.Configuration) {
+	res, err := servicelocator.GetBrickService().BricksDetails(id, servicelocator.GetAppIDProvider(),
+		cfg)
 	if err != nil {
 		if errors.Is(err, bricks.ErrBrickNotFound) {
 			feedback.Fatal(err.Error(), feedback.ErrBadArgument)

cmd/arduino-app-cli/main.go

@@ -71,7 +71,7 @@ func run(configuration cfg.Configuration) error {
 
 	rootCmd.AddCommand(
 		app.NewAppCmd(configuration),
-		brick.NewBrickCmd(),
+		brick.NewBrickCmd(configuration),
 		completion.NewCompletionCommand(),
 		daemon.NewDaemonCmd(configuration, Version),
 		properties.NewPropertiesCmd(configuration),

debian/arduino-app-cli/etc/systemd/system/arduino-app-cli.service

@@ -2,7 +2,6 @@
 Description=Arduino App CLI daemon Service
 After=network-online.target docker.service arduino-router.service
 Wants=network-online.target docker.service arduino-router.service
-Requires=docker.service arduino-router.service
 
 [Service]
 ExecStart=/usr/bin/arduino-app-cli daemon --port 8800 --log-level error

internal/api/api.go

@@ -56,7 +56,7 @@ func NewHTTPRouter(
 	mux.Handle("GET /v1/version", handlers.HandlerVersion(version))
 	mux.Handle("GET /v1/config", handlers.HandleConfig(cfg))
 	mux.Handle("GET /v1/bricks", handlers.HandleBrickList(brickService))
-	mux.Handle("GET /v1/bricks/{brickID}", handlers.HandleBrickDetails(brickService))
+	mux.Handle("GET /v1/bricks/{brickID}", handlers.HandleBrickDetails(brickService, idProvider, cfg))
 
 	mux.Handle("GET /v1/properties", handlers.HandlePropertyKeys(cfg))
 	mux.Handle("GET /v1/properties/{key}", handlers.HandlePropertyGet(cfg))

internal/api/handlers/bricks.go

@@ -26,6 +26,7 @@ import (
 	"github.com/arduino/arduino-app-cli/internal/api/models"
 	"github.com/arduino/arduino-app-cli/internal/orchestrator/app"
 	"github.com/arduino/arduino-app-cli/internal/orchestrator/bricks"
+	"github.com/arduino/arduino-app-cli/internal/orchestrator/config"
 	"github.com/arduino/arduino-app-cli/internal/render"
 )
 
@@ -153,14 +154,15 @@ func HandleBrickCreate(
 	}
 }
 
-func HandleBrickDetails(brickService *bricks.Service) http.HandlerFunc {
+func HandleBrickDetails(brickService *bricks.Service, idProvider *app.IDProvider,
+	cfg config.Configuration) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		id := r.PathValue("brickID")
 		if id == "" {
 			render.EncodeResponse(w, http.StatusBadRequest, models.ErrorResponse{Details: "id must be set"})
 			return
 		}
-		res, err := brickService.BricksDetails(id)
+		res, err := brickService.BricksDetails(id, idProvider, cfg)
 		if err != nil {
 			if errors.Is(err, bricks.ErrBrickNotFound) {
 				details := fmt.Sprintf("brick with id %q not found", id)

internal/api/handlers/monitor.go

@@ -83,24 +83,53 @@ func monitorStream(mon net.Conn, ws *websocket.Conn) {
 	}()
 }
 
+func splitOrigin(origin string) (scheme, host, port string, err error) {
+	parts := strings.SplitN(origin, "://", 2)
+	if len(parts) != 2 {
+		return "", "", "", fmt.Errorf("invalid origin format: %s", origin)
+	}
+	scheme = parts[0]
+	hostPort := parts[1]
+	hostParts := strings.SplitN(hostPort, ":", 2)
+	host = hostParts[0]
+	if len(hostParts) == 2 {
+		port = hostParts[1]
+	} else {
+		port = "*"
+	}
+	return scheme, host, port, nil
+}
+
 func checkOrigin(origin string, allowedOrigins []string) bool {
+	scheme, host, port, err := splitOrigin(origin)
+	if err != nil {
+		slog.Error("WebSocket origin check failed", slog.String("origin", origin), slog.String("error", err.Error()))
+		return false
+	}
 	for _, allowed := range allowedOrigins {
-		if strings.HasSuffix(allowed, "*") {
-			// String ends with *, match the prefix
-			if strings.HasPrefix(origin, strings.TrimSuffix(allowed, "*")) {
-				return true
-			}
-		} else {
-			// Exact match
-			if allowed == origin {
-				return true
-			}
+		allowedScheme, allowedHost, allowedPort, err := splitOrigin(allowed)
+		if err != nil {
+			panic(err)
+		}
+		if allowedScheme != scheme {
+			continue
 		}
+		if allowedHost != host && allowedHost != "*" {
+			continue
+		}
+		if allowedPort != port && allowedPort != "*" {
+			continue
+		}
+		return true
 	}
+	slog.Error("WebSocket origin check failed", slog.String("origin", origin))
 	return false
 }
 
 func HandleMonitorWS(allowedOrigins []string) http.HandlerFunc {
+	// Do a dry-run of checkorigin, so it can panic if misconfigured now, not on first request
+	_ = checkOrigin("http://localhost", allowedOrigins)
+
 	upgrader := websocket.Upgrader{
 		ReadBufferSize:  1024,
 		WriteBufferSize: 1024,

internal/api/handlers/monitor_test.go

@@ -0,0 +1,52 @@
+// This file is part of arduino-app-cli.
+//
+// Copyright 2025 ARDUINO SA (http://www.arduino.cc/)
+//
+// This software is released under the GNU General Public License version 3,
+// which covers the main part of arduino-app-cli.
+// The terms of this license can be found at:
+// https://www.gnu.org/licenses/gpl-3.0.en.html
+//
+// You can be released from the requirements of the above licenses by purchasing
+// a commercial license. Buying such a license is mandatory if you want to
+// modify or otherwise use the software for commercial activities involving the
+// Arduino software without disclosing the source code of your own applications.
+// To purchase a commercial license, send an email to license@arduino.cc.
+
+package handlers
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestCheckOrigin(t *testing.T) {
+	origins := []string{
+		"wails://wails",
+		"wails://wails.localhost:*",
+		"http://wails.localhost:*",
+		"http://localhost:*",
+		"https://localhost:*",
+		"http://example.com:7000",
+		"https://*:443",
+	}
+
+	allow := func(origin string) {
+		require.True(t, checkOrigin(origin, origins), "Expected origin %s to be allowed", origin)
+	}
+	deny := func(origin string) {
+		require.False(t, checkOrigin(origin, origins), "Expected origin %s to be denied", origin)
+	}
+	allow("wails://wails")
+	allow("wails://wails:8000")
+	allow("http://wails.localhost")
+	allow("http://localhost")
+	allow("http://example.com:7000")
+	allow("https://blah.com:443")
+	deny("wails://evil.com")
+	deny("https://wails.localhost:8000")
+	deny("http://example.com:8000")
+	deny("http://blah.com:443")
+	deny("https://blah.com:8080")
+}