WebUI, NodeInfo between peers and DevContainers

.devcontainer/devcontainer.json

@@ -0,0 +1,60 @@
+{
+    "name": "Yggdrasil Go Development",
+    "dockerFile": "../contrib/docker/devcontainer/Dockerfile",
+    "context": "..",
+    // Set up port forwarding for development
+    "forwardPorts": [
+        9000,
+        9001,
+        9002,
+        9003
+    ],
+    // Configure Docker run options for TUN device access
+    "runArgs": [
+        "--privileged",
+        "--cap-add=NET_ADMIN",
+        "--device=/dev/net/tun"
+    ],
+    // Configure VS Code settings and extensions
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "go.toolsManagement.checkForUpdates": "local",
+                "go.useLanguageServer": true,
+                "go.gopath": "/go",
+                "go.goroot": "/usr/local/go",
+                "go.lintTool": "golangci-lint",
+                "go.lintFlags": [
+                    "--fast"
+                ],
+                "terminal.integrated.defaultProfile.linux": "zsh",
+                "editor.formatOnSave": true,
+                "go.formatTool": "goimports",
+                "go.buildOnSave": "package"
+            },
+            "extensions": [
+                "golang.Go",
+                "fabiospampinato.vscode-todo-plus"
+            ]
+        }
+    },
+    // Environment variables for Go module caching
+    "containerEnv": {
+        "GOCACHE": "/home/vscode/.cache/go-build",
+        "GOMODCACHE": "/home/vscode/.cache/go-mod"
+    },
+    // Post create command to set up the environment
+    "postCreateCommand": "mkdir -p /home/vscode/.cache/go-build /home/vscode/.cache/go-mod && cd /workspaces/yggdrasil-go && go mod download && go mod tidy",
+    // Keep the container running
+    "overrideCommand": false,
+    // Use non-root user
+    "remoteUser": "vscode",
+    // Configure container user
+    "containerUser": "vscode",
+    "updateRemoteUserUID": true,
+    // Features to install
+    "features": {
+        "ghcr.io/devcontainers/features/git:1": {},
+        "ghcr.io/devcontainers/features/github-cli:1": {}
+    }
+}

.github/workflows/ci.yml

@@ -37,15 +37,15 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: go
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
 
   build-linux:
     strategy:

.gitignore

@@ -0,0 +1,6 @@
+**/TODO
+/yggdrasil
+/yggdrasilctl
+/yggdrasil.*
+/run
+/test

.vscode/launch.json

@@ -0,0 +1,38 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Debug Yggdrasil with Config (Root)",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${workspaceFolder}/cmd/yggdrasil",
+            "cwd": "${workspaceFolder}",
+            "env": {},
+            "args": [
+                "-useconffile",
+                "yggdrasil.json"
+            ],
+            "showLog": true,
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen",
+            "asRoot": true
+        },
+        {
+            "name": "Debug Yggdrasilctl",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${workspaceFolder}/cmd/yggdrasilctl",
+            "cwd": "${workspaceFolder}",
+            "env": {},
+            "args": [],
+            "showLog": true,
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen"
+        }
+    ]
+}

CHANGELOG.md

@@ -26,6 +26,22 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - in case of vulnerabilities.
 -->
 
+## [0.5.13] - ...
+
+### Added
+
+* Web UI interface for managing Yggdrasil nodes through a browser
+  * Built-in configuration editor with JSON support
+  * Peer management and monitoring
+  * Multilingual support (English and Russian)
+  * Authentication system with brute force protection
+  * Theme toggle functionality
+  * Mobile-responsive design
+* NodeInfo exchange during peer handshakes for better peer identification
+  * Peer names are now displayed in CLI and admin responses
+  * NodeInfo data is exchanged and stored during connection establishment
+  * Enhanced peer display with names alongside IP addresses
+
 ## [0.5.12] - 2024-12-18
 
 * Go 1.22 is now required to build Yggdrasil

cmd/yggdrasil/main.go

@@ -25,6 +25,7 @@ import (
 	"github.com/yggdrasil-network/yggdrasil-go/src/admin"
 	"github.com/yggdrasil-network/yggdrasil-go/src/config"
 	"github.com/yggdrasil-network/yggdrasil-go/src/ipv6rwc"
+	"github.com/yggdrasil-network/yggdrasil-go/src/webui"
 
 	"github.com/yggdrasil-network/yggdrasil-go/src/core"
 	"github.com/yggdrasil-network/yggdrasil-go/src/multicast"
@@ -37,6 +38,7 @@ type node struct {
 	tun       *tun.TunAdapter
 	multicast *multicast.Multicast
 	admin     *admin.AdminSocket
+	webui     *webui.WebUIServer
 }
 
 // The main function is responsible for configuring and starting Yggdrasil.
@@ -55,6 +57,7 @@ func main() {
 	getpkey := flag.Bool("publickey", false, "use in combination with either -useconf or -useconffile, outputs your public key")
 	loglevel := flag.String("loglevel", "info", "loglevel to enable")
 	chuserto := flag.String("user", "", "user (and, optionally, group) to set UID/GID to")
+
 	flag.Parse()
 
 	done := make(chan struct{})
@@ -90,6 +93,7 @@ func main() {
 	}
 
 	cfg := config.GenerateConfig()
+	var configPath string
 	var err error
 	switch {
 	case *ver:
@@ -107,6 +111,7 @@ func main() {
 		}
 
 	case *useconffile != "":
+		configPath = *useconffile
 		f, err := os.Open(*useconffile)
 		if err != nil {
 			panic(err)
@@ -189,6 +194,9 @@ func main() {
 		return
 	}
 
+	// Set current config for web UI
+	config.SetCurrentConfig(configPath, cfg)
+
 	n := &node{}
 
 	// Set up the Yggdrasil node itself.
@@ -282,6 +290,34 @@ func main() {
 		}
 	}
 
+	// Set up the web UI server if enabled in config.
+	if cfg.WebUI.Enable {
+		var listenAddr string
+		if cfg.WebUI.Host == "" {
+			listenAddr = fmt.Sprintf(":%d", cfg.WebUI.Port)
+		} else {
+			listenAddr = fmt.Sprintf("%s:%d", cfg.WebUI.Host, cfg.WebUI.Port)
+		}
+
+		n.webui = webui.Server(listenAddr, cfg.WebUI.Password, logger)
+
+		// Connect WebUI with AdminSocket for direct API access
+		if n.admin != nil {
+			n.webui.SetAdmin(n.admin)
+		}
+
+		if cfg.WebUI.Password != "" {
+			logger.Infof("WebUI password authentication enabled")
+		} else {
+			logger.Warnf("WebUI running without password protection")
+		}
+		go func() {
+			if err := n.webui.Start(); err != nil {
+				logger.Errorf("WebUI server error: %v", err)
+			}
+		}()
+	}
+
 	//Windows service shutdown
 	minwinsvc.SetOnExit(func() {
 		logger.Infof("Shutting down service ...")
@@ -320,6 +356,9 @@ func main() {
 	_ = n.admin.Stop()
 	_ = n.multicast.Stop()
 	_ = n.tun.Stop()
+	if n.webui != nil {
+		_ = n.webui.Stop()
+	}
 	n.core.Stop()
 }
 

cmd/yggdrasilctl/main.go

@@ -186,9 +186,9 @@ func run() int {
 		if err := json.Unmarshal(recv.Response, &resp); err != nil {
 			panic(err)
 		}
-		table.SetHeader([]string{"URI", "State", "Dir", "IP Address", "Uptime", "RTT", "RX", "TX", "Down", "Up", "Pr", "Cost", "Last Error"})
+		table.SetHeader([]string{"URI", "State", "Dir", "Name", "IP Address", "Uptime", "RTT", "RX", "TX", "Down", "Up", "Pr", "Cost", "Last Error"})
 		for _, peer := range resp.Peers {
-			state, lasterr, dir, rtt, rxr, txr := "Up", "-", "Out", "-", "-", "-"
+			state, lasterr, dir, rtt, rxr, txr, name := "Up", "-", "Out", "-", "-", "-", "-"
 			if !peer.Up {
 				state, lasterr = "Down", fmt.Sprintf("%s ago: %s", peer.LastErrorTime.Round(time.Second), peer.LastError)
 			} else if rttms := float64(peer.Latency.Microseconds()) / 1000; rttms > 0 {
@@ -197,6 +197,19 @@ func run() int {
 			if peer.Inbound {
 				dir = "In"
 			}
+
+			// Extract name from NodeInfo if available
+			if peer.NodeInfo != "" {
+				var nodeInfo map[string]interface{}
+				if err := json.Unmarshal([]byte(peer.NodeInfo), &nodeInfo); err == nil {
+					if nameValue, ok := nodeInfo["name"]; ok {
+						if nameStr, ok := nameValue.(string); ok && nameStr != "" {
+							name = nameStr
+						}
+					}
+				}
+			}
+
 			uristring := peer.URI
 			if uri, err := url.Parse(peer.URI); err == nil {
 				uri.RawQuery = ""
@@ -208,10 +221,12 @@ func run() int {
 			if peer.TXRate > 0 {
 				txr = peer.TXRate.String() + "/s"
 			}
+
 			table.Append([]string{
 				uristring,
 				state,
 				dir,
+				name,
 				peer.IPAddress,
 				(time.Duration(peer.Uptime) * time.Second).String(),
 				rtt,

contrib/docker/devcontainer/Dockerfile

@@ -0,0 +1,70 @@
+# Development Dockerfile for VS Code Dev Containers
+FROM golang:1.24-bullseye
+
+# Install only essential system packages
+RUN apt-get update && apt-get install -y \
+    git \
+    ca-certificates \
+    sudo \
+    zsh \
+    locales \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install essential Go development tools only
+RUN go install golang.org/x/tools/gopls@latest \
+    && go install github.com/go-delve/delve/cmd/dlv@latest \
+    && go install golang.org/x/tools/cmd/goimports@latest \
+    && go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
+
+# Create a non-root user for development
+ARG USERNAME=vscode
+ARG USER_UID=1000
+ARG USER_GID=$USER_UID
+
+# Create user and group with proper permissions
+RUN groupadd --gid $USER_GID $USERNAME \
+    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME -s /bin/zsh \
+    && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
+    && chmod 0440 /etc/sudoers.d/$USERNAME
+
+# Fix Go module cache permissions
+RUN chown -R $USERNAME:$USERNAME /go/pkg/mod || true \
+    && chmod -R 755 /go/pkg/mod || true
+
+# Create default yggdrasil conf directory
+RUN mkdir -p /etc/yggdrasil \
+    && chown -R $USERNAME:$USERNAME /etc/yggdrasil
+
+# Set up the workspace with proper ownership
+WORKDIR /workspace
+RUN chown $USERNAME:$USERNAME /workspace
+
+# Copy go module files to enable dependency caching
+COPY go.mod go.sum ./
+RUN go mod download && chown -R $USERNAME:$USERNAME /workspace
+
+# Install Oh My Zsh for better terminal experience
+RUN sh -c "ZSH=/usr/local/share/zsh/oh-my-zsh $(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" --unattended \
+    && ZSH_CUSTOM=/usr/local/share/zsh/oh-my-zsh/custom \
+    && git clone https://github.com/chrissicool/zsh-256color $ZSH_CUSTOM/plugins/zsh-256color \
+    && git clone https://github.com/zsh-users/zsh-autosuggestions $ZSH_CUSTOM/plugins/zsh-autosuggestions \
+    && git clone https://github.com/popstas/zsh-command-time.git $ZSH_CUSTOM/plugins/command-time
+
+# Setup zshrc
+COPY contrib/docker/devcontainer/zshrc /usr/local/share/zsh/.zshrc
+RUN rm -f /root/.zshrc \
+    && ln -s /usr/local/share/zsh/.zshrc /root/.zshrc \
+    && ln -s /usr/local/share/zsh/.zshrc /home/vscode/.zshrc
+
+# Set up shell environment for vscode user
+USER $USERNAME
+
+# Set up shell environment for vscode user
+ENV SHELL=/bin/zsh
+
+# Expose common ports that might be used by Yggdrasil
+EXPOSE 9001 9002 9003
+
+# Keep container running for dev containers
+CMD ["sleep", "infinity"]