From 133f87d3c7664cdc5ecc51a7b63466a0da6f25fa Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Tue, 29 Jul 2025 15:16:36 +0000 Subject: [PATCH 01/46] Add .gitignore file to exclude yggdrasil related files --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..e4eddffe --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +yggdrasil +yggdrasilctl +yggdrasil.conf + From de40a2c1adaa4ffebb84fdc52b92793a4454f00b Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Tue, 29 Jul 2025 15:16:45 +0000 Subject: [PATCH 02/46] Add development environment setup with Docker and VS Code Dev Containers --- .devcontainer/devcontainer.json | 59 +++++++++++++ contrib/docker/devcontainer/Dockerfile | 60 +++++++++++++ contrib/docker/devcontainer/Makefile | 36 ++++++++ contrib/docker/devcontainer/README.md | 112 +++++++++++++++++++++++++ 4 files changed, 267 insertions(+) create mode 100644 .devcontainer/devcontainer.json create mode 100644 contrib/docker/devcontainer/Dockerfile create mode 100644 contrib/docker/devcontainer/Makefile create mode 100644 contrib/docker/devcontainer/README.md diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..c1123b2d --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,59 @@ +{ + "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" + ] + } + }, + // 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 /workspace && 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": {} + } +} \ No newline at end of file diff --git a/contrib/docker/devcontainer/Dockerfile b/contrib/docker/devcontainer/Dockerfile new file mode 100644 index 00000000..0380a261 --- /dev/null +++ b/contrib/docker/devcontainer/Dockerfile @@ -0,0 +1,60 @@ +# 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 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +# Install Oh My Zsh for better terminal experience +RUN sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" --unattended + +# 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 + +# Set up shell environment for vscode user +USER $USERNAME +ENV SHELL=/bin/zsh +RUN echo 'export PATH=$PATH:$(go env GOPATH)/bin' >> ~/.zshrc \ + && echo 'export GO111MODULE=on' >> ~/.zshrc \ + && mkdir -p ~/.cache + +# Expose common ports that might be used by Yggdrasil +EXPOSE 9001 9002 9003 + +# Keep container running for dev containers +CMD ["sleep", "infinity"] \ No newline at end of file diff --git a/contrib/docker/devcontainer/Makefile b/contrib/docker/devcontainer/Makefile new file mode 100644 index 00000000..c2019a2b --- /dev/null +++ b/contrib/docker/devcontainer/Makefile @@ -0,0 +1,36 @@ +# Development container management + +.PHONY: dev-build dev-run dev-shell dev-stop dev-clean + +# Build development container +dev-build: + docker build -f Dockerfile -t yggdrasil-dev . + +# Run development container with volume mounts +dev-run: + docker run -it --rm \ + --name yggdrasil-dev \ + -v $(PWD):/workspace \ + -v ~/.gitconfig:/home/vscode/.gitconfig:ro \ + -p 9001:9001 \ + -p 9002:9002 \ + -p 9003:9003 \ + --privileged \ + --cap-add=NET_ADMIN \ + yggdrasil-dev + +# Get shell access to running container +dev-shell: + docker exec -it yggdrasil-dev /bin/zsh + +# Stop development container +dev-stop: + docker stop yggdrasil-dev || true + +# Clean development artifacts +dev-clean: + docker rmi yggdrasil-dev || true + docker system prune -f + +# Build and run in one command +dev: dev-build dev-run \ No newline at end of file diff --git a/contrib/docker/devcontainer/README.md b/contrib/docker/devcontainer/README.md new file mode 100644 index 00000000..840c5286 --- /dev/null +++ b/contrib/docker/devcontainer/README.md @@ -0,0 +1,112 @@ +# Development Environment Setup + +This document describes how to set up a development environment for Yggdrasil using Docker and VS Code Dev Containers. + +## Prerequisites + +- Docker installed and running +- VS Code with the "Dev Containers" extension installed +- Git configured with your user information + +## Option 1: VS Code Dev Containers (Recommended) + +1. Open this project in VS Code +2. When prompted, click "Reopen in Container" or: + - Press `Ctrl+Shift+P` (or `Cmd+Shift+P` on macOS) + - Type "Dev Containers: Reopen in Container" + - Select the option + +VS Code will automatically build the development container and set up the environment with: +- Go 1.23 with all necessary tools +- Language server (gopls) +- Linting (golangci-lint) +- Debugging support (delve) +- Git integration +- Zsh shell with Oh My Zsh + +## Option 2: Manual Docker Container + +If you prefer to use Docker directly: + +### Using Makefile commands: + +```bash +# Build and run the development container +make -f Makefile dev + +# Or build and run separately +make -f Makefile dev-build +make -f Makefile dev-run + +# Get shell access to running container +make -f Makefile dev-shell + +# Stop the container +make -f Makefile dev-stop + +# Clean up +make -f Makefile dev-clean +``` + +### Using Docker directly: + +```bash +# Build the development image +docker build -f Dockerfile -t yggdrasil-dev . + +# Run the container +docker run -it --rm \ + --name yggdrasil-dev \ + -v $(pwd):/workspace \ + -v ~/.gitconfig:/home/vscode/.gitconfig:ro \ + -p 9000:9000 \ + -p 9001:9001 \ + -p 9002:9002 \ + -p 9003:9003 \ + --privileged \ + --cap-add=NET_ADMIN \ + --device=/dev/net/tun \ + yggdrasil-dev +``` + +## Development Features + +The development environment includes: + +- **Go Tools**: gopls, delve debugger, goimports, golangci-lint, staticcheck +- **Editor Support**: Syntax highlighting, auto-completion, debugging +- **Testing**: Go test runner and coverage tools +- **Networking**: Privileged access for network interface testing +- **Port Forwarding**: Ports 9000-9003 exposed for Yggdrasil services + +## Building and Testing + +Inside the container: + +```bash +# Build the project +./build + +# Run tests +go test ./... + +# Generate configuration +./yggdrasil -genconf > yggdrasil.conf + +# Run with configuration +./yggdrasil -useconf yggdrasil.conf +``` + +## Tips + +1. Your local Git configuration is mounted into the container +2. The workspace directory (`/workspace`) is mapped to your local project directory +3. All changes made to source files are persistent on your host machine +4. The container runs as a non-root user (`vscode`) for security +5. Network capabilities are enabled for testing network-related features + +## Troubleshooting + +- If the container fails to start, ensure Docker has enough resources allocated +- For network-related issues, verify that the container has the necessary privileges +- If Go tools are missing, rebuild the container: `make -f Makefile dev-clean dev-build` \ No newline at end of file From d741657948fadd2f9cf076e1281da68faba387e5 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Tue, 29 Jul 2025 18:50:47 +0000 Subject: [PATCH 03/46] Refactor configuration struct comments and update default multicast interface settings --- .gitignore | 2 +- src/config/config.go | 23 +++++++++++++---------- src/config/defaults_darwin.go | 6 +++--- src/config/defaults_freebsd.go | 9 ++++++++- src/config/defaults_linux.go | 9 ++++++++- src/config/defaults_openbsd.go | 9 ++++++++- src/config/defaults_other.go | 9 ++++++++- src/config/defaults_windows.go | 9 ++++++++- 8 files changed, 57 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index e4eddffe..95c0e2e2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ yggdrasil yggdrasilctl yggdrasil.conf - +**/TODO \ No newline at end of file diff --git a/src/config/config.go b/src/config/config.go index 5dd7b3d4..1b82e69c 100644 --- a/src/config/config.go +++ b/src/config/config.go @@ -40,29 +40,29 @@ import ( // options that are necessary for an Yggdrasil node to run. You will need to // supply one of these structs to the Yggdrasil core when starting a node. type NodeConfig struct { - PrivateKey KeyBytes `json:",omitempty" comment:"Your private key. DO NOT share this with anyone!"` - PrivateKeyPath string `json:",omitempty" comment:"The path to your private key file in PEM format."` + PrivateKey KeyBytes `comment:"Your private key. DO NOT share this with anyone!"` + PrivateKeyPath string `comment:"The path to your private key file in PEM format."` Certificate *tls.Certificate `json:"-"` Peers []string `comment:"List of outbound peer connection strings (e.g. tls://a.b.c.d:e or\nsocks://a.b.c.d:e/f.g.h.i:j). Connection strings can contain options,\nsee https://yggdrasil-network.github.io/configurationref.html#peers.\nYggdrasil has no concept of bootstrap nodes - all network traffic\nwill transit peer connections. Therefore make sure to only peer with\nnearby nodes that have good connectivity and low latency. Avoid adding\npeers to this list from distant countries as this will worsen your\nnode's connectivity and performance considerably."` InterfacePeers map[string][]string `comment:"List of connection strings for outbound peer connections in URI format,\narranged by source interface, e.g. { \"eth0\": [ \"tls://a.b.c.d:e\" ] }.\nYou should only use this option if your machine is multi-homed and you\nwant to establish outbound peer connections on different interfaces.\nOtherwise you should use \"Peers\"."` Listen []string `comment:"Listen addresses for incoming connections. You will need to add\nlisteners in order to accept incoming peerings from non-local nodes.\nThis is not required if you wish to establish outbound peerings only.\nMulticast peer discovery will work regardless of any listeners set\nhere. Each listener should be specified in URI format as above, e.g.\ntls://0.0.0.0:0 or tls://[::]:0 to listen on all interfaces."` - AdminListen string `json:",omitempty" comment:"Listen address for admin connections. Default is to listen for local\nconnections either on TCP/9001 or a UNIX socket depending on your\nplatform. Use this value for yggdrasilctl -endpoint=X. To disable\nthe admin socket, use the value \"none\" instead."` + AdminListen string `comment:"Listen address for admin connections. Default is to listen for local\nconnections either on TCP/9001 or a UNIX socket depending on your\nplatform. Use this value for yggdrasilctl -endpoint=X. To disable\nthe admin socket, use the value \"none\" instead."` MulticastInterfaces []MulticastInterfaceConfig `comment:"Configuration for which interfaces multicast peer discovery should be\nenabled on. Regex is a regular expression which is matched against an\ninterface name, and interfaces use the first configuration that they\nmatch against. Beacon controls whether or not your node advertises its\npresence to others, whereas Listen controls whether or not your node\nlistens out for and tries to connect to other advertising nodes. See\nhttps://yggdrasil-network.github.io/configurationref.html#multicastinterfaces\nfor more supported options."` AllowedPublicKeys []string `comment:"List of peer public keys to allow incoming peering connections\nfrom. If left empty/undefined then all connections will be allowed\nby default. This does not affect outgoing peerings, nor does it\naffect link-local peers discovered via multicast.\nWARNING: THIS IS NOT A FIREWALL and DOES NOT limit who can reach\nopen ports or services running on your machine!"` IfName string `comment:"Local network interface name for TUN adapter, or \"auto\" to select\nan interface automatically, or \"none\" to run without TUN."` IfMTU uint64 `comment:"Maximum Transmission Unit (MTU) size for your local TUN interface.\nDefault is the largest supported size for your platform. The lowest\npossible value is 1280."` - LogLookups bool `json:",omitempty"` + LogLookups bool `comment:"Log lookups for peers and nodes. This is useful for debugging and\nmonitoring the network. It is disabled by default."` NodeInfoPrivacy bool `comment:"By default, nodeinfo contains some defaults including the platform,\narchitecture and Yggdrasil version. These can help when surveying\nthe network and diagnosing network routing problems. Enabling\nnodeinfo privacy prevents this, so that only items specified in\n\"NodeInfo\" are sent back if specified."` NodeInfo map[string]interface{} `comment:"Optional nodeinfo. This must be a { \"key\": \"value\", ... } map\nor set as null. This is entirely optional but, if set, is visible\nto the whole network on request."` } type MulticastInterfaceConfig struct { - Regex string - Beacon bool - Listen bool - Port uint16 `json:",omitempty"` - Priority uint64 `json:",omitempty"` // really uint8, but gobind won't export it - Password string + Regex string `comment:"Regular expression to match interface names. If an interface name matches this\nregular expression, the interface will be used for multicast peer discovery."` + Beacon bool `comment:"Whether to advertise this interface's presence to other nodes. If true, the\ninterface will be used for multicast peer discovery."` + Listen bool `comment:"Whether to listen for incoming peerings on this interface. If true, the\ninterface will be used for multicast peer discovery."` + Port uint16 `comment:"Port to use for multicast peer discovery. If 0, a random port will be used."` + Priority uint64 `comment:"Priority for multicast peer discovery. The higher the priority, the more likely\nthis interface will be used for peer discovery. The default priority is 0."` + Password string `comment:"Password to use for multicast peer discovery. If empty, no password will be used."` } // Generates default configuration and returns a pointer to the resulting @@ -74,6 +74,7 @@ func GenerateConfig() *NodeConfig { // Create a node configuration and populate it. cfg := new(NodeConfig) cfg.NewPrivateKey() + cfg.PrivateKeyPath = "" cfg.Listen = []string{} cfg.AdminListen = defaults.DefaultAdminListen cfg.Peers = []string{} @@ -82,7 +83,9 @@ func GenerateConfig() *NodeConfig { cfg.MulticastInterfaces = defaults.DefaultMulticastInterfaces cfg.IfName = defaults.DefaultIfName cfg.IfMTU = defaults.DefaultIfMTU + cfg.LogLookups = false cfg.NodeInfoPrivacy = false + cfg.NodeInfo = map[string]interface{}{} if err := cfg.postprocessConfig(); err != nil { panic(err) } diff --git a/src/config/defaults_darwin.go b/src/config/defaults_darwin.go index 5f44ef59..7d8a92f1 100644 --- a/src/config/defaults_darwin.go +++ b/src/config/defaults_darwin.go @@ -15,9 +15,9 @@ func getDefaults() platformDefaultParameters { // Multicast interfaces DefaultMulticastInterfaces: []MulticastInterfaceConfig{ - {Regex: "en.*", Beacon: true, Listen: true}, - {Regex: "bridge.*", Beacon: true, Listen: true}, - {Regex: "awdl0", Beacon: false, Listen: false}, + {Regex: "en.*", Beacon: true, Listen: true, Port: 0, Priority: 0, Password: ""}, + {Regex: "bridge.*", Beacon: true, Listen: true, Port: 0, Priority: 0, Password: ""}, + {Regex: "awdl0", Beacon: false, Listen: false, Port: 0, Priority: 0, Password: ""}, }, // TUN diff --git a/src/config/defaults_freebsd.go b/src/config/defaults_freebsd.go index 97f7b4c3..df60c98c 100644 --- a/src/config/defaults_freebsd.go +++ b/src/config/defaults_freebsd.go @@ -15,7 +15,14 @@ func getDefaults() platformDefaultParameters { // Multicast interfaces DefaultMulticastInterfaces: []MulticastInterfaceConfig{ - {Regex: ".*", Beacon: true, Listen: true}, + { + Regex: ".*", + Beacon: true, + Listen: true, + Port: 0, // 0 means random port + Priority: 0, // 0 is highest priority + Password: "", // empty means no password required + }, }, // TUN diff --git a/src/config/defaults_linux.go b/src/config/defaults_linux.go index 6f7cbfc3..c9456b98 100644 --- a/src/config/defaults_linux.go +++ b/src/config/defaults_linux.go @@ -15,7 +15,14 @@ func getDefaults() platformDefaultParameters { // Multicast interfaces DefaultMulticastInterfaces: []MulticastInterfaceConfig{ - {Regex: ".*", Beacon: true, Listen: true}, + { + Regex: ".*", + Beacon: true, + Listen: true, + Port: 0, // 0 means random port + Priority: 0, // 0 is highest priority + Password: "", // empty means no password required + }, }, // TUN diff --git a/src/config/defaults_openbsd.go b/src/config/defaults_openbsd.go index 81ddf7e8..d8c64ae0 100644 --- a/src/config/defaults_openbsd.go +++ b/src/config/defaults_openbsd.go @@ -15,7 +15,14 @@ func getDefaults() platformDefaultParameters { // Multicast interfaces DefaultMulticastInterfaces: []MulticastInterfaceConfig{ - {Regex: ".*", Beacon: true, Listen: true}, + { + Regex: ".*", + Beacon: true, + Listen: true, + Port: 0, // 0 means random port + Priority: 0, // 0 is highest priority + Password: "", // empty means no password required + }, }, // TUN diff --git a/src/config/defaults_other.go b/src/config/defaults_other.go index 8299364c..e2322232 100644 --- a/src/config/defaults_other.go +++ b/src/config/defaults_other.go @@ -15,7 +15,14 @@ func getDefaults() platformDefaultParameters { // Multicast interfaces DefaultMulticastInterfaces: []MulticastInterfaceConfig{ - {Regex: ".*", Beacon: true, Listen: true}, + { + Regex: ".*", + Beacon: true, + Listen: true, + Port: 0, // 0 means random port + Priority: 0, // 0 is highest priority + Password: "", // empty means no password required + }, }, // TUN diff --git a/src/config/defaults_windows.go b/src/config/defaults_windows.go index 5b30b4fd..ed7b7af6 100644 --- a/src/config/defaults_windows.go +++ b/src/config/defaults_windows.go @@ -15,7 +15,14 @@ func getDefaults() platformDefaultParameters { // Multicast interfaces DefaultMulticastInterfaces: []MulticastInterfaceConfig{ - {Regex: ".*", Beacon: true, Listen: true}, + { + Regex: ".*", + Beacon: true, + Listen: true, + Port: 0, // 0 means random port + Priority: 0, // 0 is highest priority + Password: "", // empty means no password required + }, }, // TUN From 707e90b1b355e6ed8027c18da26d8a5c79545f62 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Tue, 29 Jul 2025 20:02:21 +0000 Subject: [PATCH 04/46] Add VS Code extension for managing TODOs in development container --- .devcontainer/devcontainer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index c1123b2d..fb1eb82b 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -33,7 +33,8 @@ "go.buildOnSave": "package" }, "extensions": [ - "golang.Go" + "golang.Go", + "fabiospampinato.vscode-todo-plus" ] } }, From 345d5b9cbdeec8893d23c826d6bff3b46e4fed6a Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Tue, 29 Jul 2025 20:14:41 +0000 Subject: [PATCH 05/46] Add minimal Web UI server --- cmd/yggdrasil/main.go | 23 ++ src/config/config.go | 12 + src/webui/config_test.go | 335 ++++++++++++++++++++++++++ src/webui/endpoints_test.go | 282 ++++++++++++++++++++++ src/webui/error_handling_test.go | 360 ++++++++++++++++++++++++++++ src/webui/server.go | 63 +++++ src/webui/server_dev.go | 51 ++++ src/webui/server_prod.go | 64 +++++ src/webui/server_test.go | 219 +++++++++++++++++ src/webui/static/index.html | 55 +++++ src/webui/static/style.css | 136 +++++++++++ src/webui/static_files_prod_test.go | 186 ++++++++++++++ src/webui/static_files_test.go | 272 +++++++++++++++++++++ 13 files changed, 2058 insertions(+) create mode 100644 src/webui/config_test.go create mode 100644 src/webui/endpoints_test.go create mode 100644 src/webui/error_handling_test.go create mode 100644 src/webui/server.go create mode 100644 src/webui/server_dev.go create mode 100644 src/webui/server_prod.go create mode 100644 src/webui/server_test.go create mode 100644 src/webui/static/index.html create mode 100644 src/webui/static/style.css create mode 100644 src/webui/static_files_prod_test.go create mode 100644 src/webui/static_files_test.go diff --git a/cmd/yggdrasil/main.go b/cmd/yggdrasil/main.go index b3c9151d..4ad0753e 100644 --- a/cmd/yggdrasil/main.go +++ b/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. @@ -69,6 +71,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{}) @@ -261,6 +264,23 @@ 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, logger) + go func() { + if err := n.webui.Start(); err != nil { + logger.Errorf("WebUI server error: %v", err) + } + }() + } + // Set up the multicast module. { options := []multicast.SetupOption{} @@ -334,6 +354,9 @@ func main() { _ = n.admin.Stop() _ = n.multicast.Stop() _ = n.tun.Stop() + if n.webui != nil { + _ = n.webui.Stop() + } n.core.Stop() } diff --git a/src/config/config.go b/src/config/config.go index 1b82e69c..ad6e9adf 100644 --- a/src/config/config.go +++ b/src/config/config.go @@ -54,6 +54,7 @@ type NodeConfig struct { LogLookups bool `comment:"Log lookups for peers and nodes. This is useful for debugging and\nmonitoring the network. It is disabled by default."` NodeInfoPrivacy bool `comment:"By default, nodeinfo contains some defaults including the platform,\narchitecture and Yggdrasil version. These can help when surveying\nthe network and diagnosing network routing problems. Enabling\nnodeinfo privacy prevents this, so that only items specified in\n\"NodeInfo\" are sent back if specified."` NodeInfo map[string]interface{} `comment:"Optional nodeinfo. This must be a { \"key\": \"value\", ... } map\nor set as null. This is entirely optional but, if set, is visible\nto the whole network on request."` + WebUI WebUIConfig `comment:"Web interface configuration for managing the node through a browser."` } type MulticastInterfaceConfig struct { @@ -65,6 +66,12 @@ type MulticastInterfaceConfig struct { Password string `comment:"Password to use for multicast peer discovery. If empty, no password will be used."` } +type WebUIConfig struct { + Enable bool `comment:"Enable the web interface for managing the node through a browser."` + Port uint16 `comment:"Port for the web interface. Default is 9000."` + Host string `comment:"Host/IP address to bind the web interface to. Empty means all interfaces."` +} + // Generates default configuration and returns a pointer to the resulting // NodeConfig. This is used when outputting the -genconf parameter and also when // using -autoconf. @@ -86,6 +93,11 @@ func GenerateConfig() *NodeConfig { cfg.LogLookups = false cfg.NodeInfoPrivacy = false cfg.NodeInfo = map[string]interface{}{} + cfg.WebUI = WebUIConfig{ + Enable: false, + Port: 9000, + Host: "", + } if err := cfg.postprocessConfig(); err != nil { panic(err) } diff --git a/src/webui/config_test.go b/src/webui/config_test.go new file mode 100644 index 00000000..7a4aa36a --- /dev/null +++ b/src/webui/config_test.go @@ -0,0 +1,335 @@ +package webui + +import ( + "fmt" + "testing" + + "github.com/yggdrasil-network/yggdrasil-go/src/config" +) + +func TestWebUIConfig_DefaultValues(t *testing.T) { + cfg := config.GenerateConfig() + + // Check that WebUI config has reasonable defaults + if cfg.WebUI.Port == 0 { + t.Log("Note: WebUI Port is 0 (might be default unset value)") + } + + // Host can be empty (meaning all interfaces) + if cfg.WebUI.Host == "" { + t.Log("Note: WebUI Host is empty (binds to all interfaces)") + } + + // Enable should have a default value + if !cfg.WebUI.Enable && cfg.WebUI.Enable { + t.Log("WebUI Enable flag has a boolean value") + } +} + +func TestWebUIConfig_Validation(t *testing.T) { + testCases := []struct { + name string + config config.WebUIConfig + valid bool + expected string + }{ + { + name: "Valid config with default port", + config: config.WebUIConfig{ + Enable: true, + Port: 9000, + Host: "", + }, + valid: true, + expected: ":9000", + }, + { + name: "Valid config with localhost", + config: config.WebUIConfig{ + Enable: true, + Port: 8080, + Host: "localhost", + }, + valid: true, + expected: "localhost:8080", + }, + { + name: "Valid config with specific IP", + config: config.WebUIConfig{ + Enable: true, + Port: 3000, + Host: "127.0.0.1", + }, + valid: true, + expected: "127.0.0.1:3000", + }, + { + name: "Valid config with IPv6", + config: config.WebUIConfig{ + Enable: true, + Port: 9000, + Host: "::1", + }, + valid: true, + expected: "[::1]:9000", + }, + { + name: "Disabled config", + config: config.WebUIConfig{ + Enable: false, + Port: 9000, + Host: "localhost", + }, + valid: false, + expected: "", + }, + { + name: "Zero port", + config: config.WebUIConfig{ + Enable: true, + Port: 0, + Host: "localhost", + }, + valid: true, + expected: "localhost:0", + }, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + // Test building listen address from config + var listenAddr string + + if tc.config.Enable { + if tc.config.Host == "" { + listenAddr = fmt.Sprintf(":%d", tc.config.Port) + } else if tc.config.Host == "::1" || (len(tc.config.Host) > 0 && tc.config.Host[0] == ':') { + // IPv6 needs brackets + listenAddr = fmt.Sprintf("[%s]:%d", tc.config.Host, tc.config.Port) + } else { + listenAddr = fmt.Sprintf("%s:%d", tc.config.Host, tc.config.Port) + } + } + + if tc.valid { + if listenAddr != tc.expected { + t.Errorf("Expected listen address %s, got %s", tc.expected, listenAddr) + } + + // Try to create server with this config + logger := createTestLogger() + server := Server(listenAddr, logger) + if server == nil { + t.Error("Failed to create server with valid config") + } + } else { + if tc.config.Enable { + t.Error("Config should be considered invalid when WebUI is disabled") + } + } + }) + } +} + +func TestWebUIConfig_PortRanges(t *testing.T) { + logger := createTestLogger() + + // Test various port ranges + portTests := []struct { + port uint16 + shouldWork bool + description string + }{ + {1, true, "Port 1 (lowest valid port)"}, + {80, true, "Port 80 (HTTP)"}, + {443, true, "Port 443 (HTTPS)"}, + {8080, true, "Port 8080 (common alternative)"}, + {9000, true, "Port 9000 (default WebUI)"}, + {65535, true, "Port 65535 (highest valid port)"}, + {0, true, "Port 0 (OS assigns port)"}, + } + + for _, test := range portTests { + t.Run(test.description, func(t *testing.T) { + listenAddr := fmt.Sprintf("127.0.0.1:%d", test.port) + server := Server(listenAddr, logger) + + if server == nil { + t.Errorf("Failed to create server for %s", test.description) + return + } + + // For port 0, the OS will assign an available port + // For other ports, we just check if server creation succeeds + if test.shouldWork { + // Try to start briefly to see if port is valid + go func() { + server.Start() + }() + + // Quick cleanup + server.Stop() + } + }) + } +} + +func TestWebUIConfig_HostFormats(t *testing.T) { + logger := createTestLogger() + + hostTests := []struct { + host string + port uint16 + expected string + description string + }{ + {"", 9000, ":9000", "Empty host (all interfaces)"}, + {"localhost", 9000, "localhost:9000", "Localhost"}, + {"127.0.0.1", 9000, "127.0.0.1:9000", "IPv4 loopback"}, + {"0.0.0.0", 9000, "0.0.0.0:9000", "IPv4 all interfaces"}, + {"::1", 9000, "[::1]:9000", "IPv6 loopback"}, + {"::", 9000, "[::]:9000", "IPv6 all interfaces"}, + } + + for _, test := range hostTests { + t.Run(test.description, func(t *testing.T) { + var listenAddr string + + if test.host == "" { + listenAddr = fmt.Sprintf(":%d", test.port) + } else if test.host == "::1" || test.host == "::" { + listenAddr = fmt.Sprintf("[%s]:%d", test.host, test.port) + } else { + listenAddr = fmt.Sprintf("%s:%d", test.host, test.port) + } + + if listenAddr != test.expected { + t.Errorf("Expected %s, got %s", test.expected, listenAddr) + } + + server := Server(listenAddr, logger) + if server == nil { + t.Errorf("Failed to create server with %s", test.description) + } + }) + } +} + +func TestWebUIConfig_Integration(t *testing.T) { + // Test integration with actual config generation + cfg := config.GenerateConfig() + + // Modify WebUI config + cfg.WebUI.Enable = true + cfg.WebUI.Port = 9001 + cfg.WebUI.Host = "127.0.0.1" + + // Build listen address from config + listenAddr := fmt.Sprintf("%s:%d", cfg.WebUI.Host, cfg.WebUI.Port) + + logger := createTestLogger() + server := Server(listenAddr, logger) + + if server == nil { + t.Fatal("Failed to create server from generated config") + } + + // Test that server can start with this config + go func() { + server.Start() + }() + defer server.Stop() + + // Verify server properties match config + if server.listen != listenAddr { + t.Errorf("Server listen address %s doesn't match config %s", server.listen, listenAddr) + } +} + +func TestWebUIConfig_JSONSerialization(t *testing.T) { + // Test that WebUIConfig can be serialized/deserialized + // This is important for config file handling + + originalConfig := config.WebUIConfig{ + Enable: true, + Port: 8080, + Host: "localhost", + } + + // In a real scenario, this would go through JSON marshaling/unmarshaling + // For this test, we'll just verify the struct is properly defined + + if originalConfig.Enable != true { + t.Error("Enable field not properly set") + } + + if originalConfig.Port != 8080 { + t.Error("Port field not properly set") + } + + if originalConfig.Host != "localhost" { + t.Error("Host field not properly set") + } +} + +func TestWebUIConfig_EdgeCases(t *testing.T) { + logger := createTestLogger() + + // Test edge cases for configuration + edgeCases := []struct { + name string + config config.WebUIConfig + test func(t *testing.T, cfg config.WebUIConfig) + }{ + { + name: "All zeros", + config: config.WebUIConfig{ + Enable: false, + Port: 0, + Host: "", + }, + test: func(t *testing.T, cfg config.WebUIConfig) { + if cfg.Enable { + t.Error("Enable should be false") + } + }, + }, + { + name: "Maximum port", + config: config.WebUIConfig{ + Enable: true, + Port: 65535, + Host: "127.0.0.1", + }, + test: func(t *testing.T, cfg config.WebUIConfig) { + listenAddr := fmt.Sprintf("%s:%d", cfg.Host, cfg.Port) + server := Server(listenAddr, logger) + if server == nil { + t.Error("Should be able to create server with max port") + } + }, + }, + { + name: "Unicode host (should be handled gracefully)", + config: config.WebUIConfig{ + Enable: true, + Port: 9000, + Host: "тест", + }, + test: func(t *testing.T, cfg config.WebUIConfig) { + listenAddr := fmt.Sprintf("%s:%d", cfg.Host, cfg.Port) + server := Server(listenAddr, logger) + // Server creation should not panic, even with invalid host + if server == nil { + t.Error("Server creation should not fail due to host format") + } + }, + }, + } + + for _, tc := range edgeCases { + t.Run(tc.name, func(t *testing.T) { + tc.test(t, tc.config) + }) + } +} diff --git a/src/webui/endpoints_test.go b/src/webui/endpoints_test.go new file mode 100644 index 00000000..652e4e14 --- /dev/null +++ b/src/webui/endpoints_test.go @@ -0,0 +1,282 @@ +package webui + +import ( + "fmt" + "io" + "net/http" + "net/http/httptest" + "strings" + "testing" + "time" +) + +func TestWebUIServer_RootEndpoint(t *testing.T) { + logger := createTestLogger() + + // Use httptest.Server for more reliable testing + mux := http.NewServeMux() + setupStaticHandler(mux) + mux.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { + serveFile(rw, r, logger) + }) + + server := httptest.NewServer(mux) + defer server.Close() + + // Test root endpoint + resp, err := http.Get(server.URL + "/") + if err != nil { + t.Fatalf("Error requesting root endpoint: %v", err) + } + defer resp.Body.Close() + + // Should return some content (index.html or 404, depending on build mode) + if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusNotFound { + t.Errorf("Expected status 200 or 404, got %d", resp.StatusCode) + } +} + +func TestWebUIServer_HealthEndpointDetails(t *testing.T) { + logger := createTestLogger() + + // Use httptest.Server for more reliable testing + mux := http.NewServeMux() + setupStaticHandler(mux) + mux.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { + serveFile(rw, r, logger) + }) + mux.HandleFunc("/health", func(rw http.ResponseWriter, r *http.Request) { + rw.WriteHeader(http.StatusOK) + rw.Write([]byte("OK")) + }) + + server := httptest.NewServer(mux) + defer server.Close() + + // Test health endpoint with different HTTP methods + testCases := []struct { + method string + expectedStatus int + }{ + {"GET", http.StatusOK}, + {"POST", http.StatusOK}, + {"PUT", http.StatusOK}, + {"DELETE", http.StatusOK}, + {"HEAD", http.StatusOK}, + } + + client := &http.Client{Timeout: 5 * time.Second} + + for _, tc := range testCases { + t.Run(fmt.Sprintf("Method_%s", tc.method), func(t *testing.T) { + req, err := http.NewRequest(tc.method, server.URL+"/health", nil) + if err != nil { + t.Fatalf("Error creating request: %v", err) + } + + resp, err := client.Do(req) + if err != nil { + t.Fatalf("Error making request: %v", err) + } + defer resp.Body.Close() + + if resp.StatusCode != tc.expectedStatus { + t.Errorf("Expected status %d for %s, got %d", tc.expectedStatus, tc.method, resp.StatusCode) + } + + if tc.method != "HEAD" { + body, err := io.ReadAll(resp.Body) + if err != nil { + t.Fatalf("Error reading response body: %v", err) + } + + if string(body) != "OK" { + t.Errorf("Expected body 'OK', got '%s'", string(body)) + } + } + }) + } +} + +func TestWebUIServer_NonExistentEndpoint(t *testing.T) { + logger := createTestLogger() + + // Use httptest.Server for more reliable testing + mux := http.NewServeMux() + setupStaticHandler(mux) + mux.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { + serveFile(rw, r, logger) + }) + mux.HandleFunc("/health", func(rw http.ResponseWriter, r *http.Request) { + rw.WriteHeader(http.StatusOK) + rw.Write([]byte("OK")) + }) + + server := httptest.NewServer(mux) + defer server.Close() + + // Test non-existent endpoints + testPaths := []string{ + "/nonexistent", + "/api/v1/test", + "/static/nonexistent.css", + "/admin", + "/config", + } + + client := &http.Client{Timeout: 5 * time.Second} + + for _, path := range testPaths { + t.Run(fmt.Sprintf("Path_%s", strings.ReplaceAll(path, "/", "_")), func(t *testing.T) { + resp, err := client.Get(server.URL + path) + if err != nil { + t.Fatalf("Error requesting %s: %v", path, err) + } + defer resp.Body.Close() + + // Should return 404 for non-existent paths + if resp.StatusCode != http.StatusNotFound { + t.Errorf("Expected status 404 for %s, got %d", path, resp.StatusCode) + } + }) + } +} + +func TestWebUIServer_ContentTypes(t *testing.T) { + // This test checks if proper content types are set + // We'll use httptest.Server for more controlled testing + + logger := createTestLogger() + + // Create a test handler similar to what the webui server creates + mux := http.NewServeMux() + + // Setup handlers like in the actual server + setupStaticHandler(mux) + mux.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { + serveFile(rw, r, logger) + }) + mux.HandleFunc("/health", func(rw http.ResponseWriter, r *http.Request) { + rw.WriteHeader(http.StatusOK) + rw.Write([]byte("OK")) + }) + + server := httptest.NewServer(mux) + defer server.Close() + + // Test health endpoint content type + resp, err := http.Get(server.URL + "/health") + if err != nil { + t.Fatalf("Error requesting health endpoint: %v", err) + } + defer resp.Body.Close() + + // Health endpoint might not set explicit content type, which is fine + if resp.StatusCode != http.StatusOK { + t.Errorf("Expected status 200 for health endpoint, got %d", resp.StatusCode) + } +} + +func TestWebUIServer_HeaderSecurity(t *testing.T) { + logger := createTestLogger() + + // Use httptest.Server for more reliable testing + mux := http.NewServeMux() + setupStaticHandler(mux) + mux.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { + serveFile(rw, r, logger) + }) + mux.HandleFunc("/health", func(rw http.ResponseWriter, r *http.Request) { + rw.WriteHeader(http.StatusOK) + rw.Write([]byte("OK")) + }) + + server := httptest.NewServer(mux) + defer server.Close() + + // Test that server handles large headers properly + client := &http.Client{Timeout: 5 * time.Second} + + req, err := http.NewRequest("GET", server.URL+"/health", nil) + if err != nil { + t.Fatalf("Error creating request: %v", err) + } + + // Add a reasonably sized header + req.Header.Set("X-Test-Header", strings.Repeat("a", 1000)) + + resp, err := client.Do(req) + if err != nil { + t.Fatalf("Error making request with large header: %v", err) + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + t.Errorf("Expected status 200 with normal header, got %d", resp.StatusCode) + } +} + +func TestWebUIServer_ConcurrentRequests(t *testing.T) { + logger := createTestLogger() + + // Use httptest.Server for more reliable testing + mux := http.NewServeMux() + setupStaticHandler(mux) + mux.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { + serveFile(rw, r, logger) + }) + mux.HandleFunc("/health", func(rw http.ResponseWriter, r *http.Request) { + rw.WriteHeader(http.StatusOK) + rw.Write([]byte("OK")) + }) + + server := httptest.NewServer(mux) + defer server.Close() + + // Test concurrent requests to health endpoint + const numRequests = 20 + errChan := make(chan error, numRequests) + + client := &http.Client{Timeout: 5 * time.Second} + + for i := 0; i < numRequests; i++ { + go func() { + resp, err := client.Get(server.URL + "/health") + if err != nil { + errChan <- err + return + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + errChan <- fmt.Errorf("unexpected status code: %d", resp.StatusCode) + return + } + + body, err := io.ReadAll(resp.Body) + if err != nil { + errChan <- err + return + } + + if string(body) != "OK" { + errChan <- fmt.Errorf("unexpected body: %s", string(body)) + return + } + + errChan <- nil + }() + } + + // Wait for all requests to complete + for i := 0; i < numRequests; i++ { + select { + case err := <-errChan: + if err != nil { + t.Errorf("Concurrent request %d failed: %v", i+1, err) + } + case <-time.After(10 * time.Second): + t.Fatalf("Request %d timed out", i+1) + } + } +} diff --git a/src/webui/error_handling_test.go b/src/webui/error_handling_test.go new file mode 100644 index 00000000..bc57eed0 --- /dev/null +++ b/src/webui/error_handling_test.go @@ -0,0 +1,360 @@ +package webui + +import ( + "context" + "fmt" + "net" + "net/http" + "net/http/httptest" + "testing" + "time" +) + +func TestWebUIServer_InvalidListenAddress(t *testing.T) { + logger := createTestLogger() + + // Test various invalid listen addresses + invalidAddresses := []string{ + "invalid:address", + "256.256.256.256:8080", + "localhost:-1", + "localhost:99999", + "not-a-valid-address", + "", + } + + for _, addr := range invalidAddresses { + t.Run(fmt.Sprintf("Address_%s", addr), func(t *testing.T) { + server := Server(addr, logger) + + // Start should fail for invalid addresses + err := server.Start() + if err == nil { + server.Stop() // Clean up if it somehow started + t.Errorf("Expected Start() to fail for invalid address %s", addr) + } + }) + } +} + +func TestWebUIServer_PortAlreadyInUse(t *testing.T) { + logger := createTestLogger() + + // Start a server on a specific port + listener, err := net.Listen("tcp", "127.0.0.1:0") + if err != nil { + t.Fatalf("Failed to create listener: %v", err) + } + defer listener.Close() + + // Get the port that's now in use + usedPort := listener.Addr().(*net.TCPAddr).Port + conflictAddress := fmt.Sprintf("127.0.0.1:%d", usedPort) + + server := Server(conflictAddress, logger) + + // This should fail because port is already in use + err = server.Start() + if err == nil { + server.Stop() + t.Error("Expected Start() to fail when port is already in use") + } +} + +func TestWebUIServer_DoubleStart(t *testing.T) { + logger := createTestLogger() + + // Create two separate servers to test behavior + server1 := Server("127.0.0.1:0", logger) + server2 := Server("127.0.0.1:0", logger) + + // Start first server + startDone1 := make(chan error, 1) + go func() { + startDone1 <- server1.Start() + }() + + // Wait for first server to start + time.Sleep(100 * time.Millisecond) + + if server1.server == nil { + t.Fatal("First server should have started") + } + + // Start second server (should work since different instance) + startDone2 := make(chan error, 1) + go func() { + startDone2 <- server2.Start() + }() + + // Wait a bit then stop both servers + time.Sleep(100 * time.Millisecond) + + err1 := server1.Stop() + if err1 != nil { + t.Errorf("Stop() failed for server1: %v", err1) + } + + err2 := server2.Stop() + if err2 != nil { + t.Errorf("Stop() failed for server2: %v", err2) + } + + // Wait for both Start() calls to complete + select { + case err := <-startDone1: + if err != nil { + t.Logf("First Start() returned error: %v", err) + } + case <-time.After(2 * time.Second): + t.Error("First Start() did not return after Stop()") + } + + select { + case err := <-startDone2: + if err != nil { + t.Logf("Second Start() returned error: %v", err) + } + case <-time.After(2 * time.Second): + t.Error("Second Start() did not return after Stop()") + } +} + +func TestWebUIServer_StopTwice(t *testing.T) { + logger := createTestLogger() + server := Server("127.0.0.1:0", logger) + + // Start server + go func() { + server.Start() + }() + + time.Sleep(100 * time.Millisecond) + + // Stop server first time + err := server.Stop() + if err != nil { + t.Errorf("First Stop() failed: %v", err) + } + + // Stop server second time - should not error + err = server.Stop() + if err != nil { + t.Errorf("Second Stop() failed: %v", err) + } +} + +func TestWebUIServer_GracefulShutdown(t *testing.T) { + logger := createTestLogger() + + // Create a listener to get a real address + listener, err := net.Listen("tcp", "127.0.0.1:0") + if err != nil { + t.Fatalf("Failed to create listener: %v", err) + } + + addr := listener.Addr().String() + listener.Close() // Close so our server can use it + + server := Server(addr, logger) + + // Channel to track when Start() returns + startDone := make(chan error, 1) + + // Start server + go func() { + startDone <- server.Start() + }() + + time.Sleep(100 * time.Millisecond) + + // Verify server is running + if server.server == nil { + t.Fatal("Server should be running") + } + + // Make a request while server is running + client := &http.Client{Timeout: 1 * time.Second} + resp, err := client.Get(fmt.Sprintf("http://%s/health", addr)) + if err != nil { + t.Fatalf("Request failed while server running: %v", err) + } + resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + t.Errorf("Expected status 200, got %d", resp.StatusCode) + } + + // Stop server + err = server.Stop() + if err != nil { + t.Errorf("Stop() failed: %v", err) + } + + // Verify Start() returns + select { + case err := <-startDone: + if err != nil { + t.Errorf("Start() returned error after Stop(): %v", err) + } + case <-time.After(2 * time.Second): + t.Error("Start() did not return within timeout after Stop()") + } + + // Verify server is no longer accessible + _, err = client.Get(fmt.Sprintf("http://%s/health", addr)) + if err == nil { + t.Error("Expected request to fail after server stopped") + } +} + +func TestWebUIServer_ContextCancellation(t *testing.T) { + logger := createTestLogger() + server := Server("127.0.0.1:0", logger) + + // Create context with timeout + ctx, cancel := context.WithTimeout(context.Background(), 200*time.Millisecond) + defer cancel() + + // Start server + go func() { + server.Start() + }() + + time.Sleep(100 * time.Millisecond) + + // Wait for context to be cancelled + <-ctx.Done() + + // Stop server after context cancellation + err := server.Stop() + if err != nil { + t.Errorf("Stop() failed after context cancellation: %v", err) + } +} + +func TestWebUIServer_LoggerNil(t *testing.T) { + // Test server creation with nil logger + server := Server("127.0.0.1:0", nil) + + if server == nil { + t.Fatal("Server should be created even with nil logger") + } + + if server.log != nil { + t.Error("Server logger should be nil if nil was passed") + } +} + +func TestWebUIServer_EmptyListenAddress(t *testing.T) { + logger := createTestLogger() + + // Test with empty listen address + server := Server("", logger) + + // This might fail when trying to start + err := server.Start() + if err == nil { + server.Stop() + t.Log("Note: Server started with empty listen address") + } else { + t.Logf("Expected behavior: Start() failed with empty address: %v", err) + } +} + +func TestWebUIServer_RapidStartStop(t *testing.T) { + logger := createTestLogger() + + // Test rapid start/stop cycles with fewer iterations + for i := 0; i < 5; i++ { + server := Server("127.0.0.1:0", logger) + + // Start server + startDone := make(chan error, 1) + go func() { + startDone <- server.Start() + }() + + // Wait a bit for server to start + time.Sleep(50 * time.Millisecond) + + // Stop server + err := server.Stop() + if err != nil { + t.Errorf("Iteration %d: Stop() failed: %v", i, err) + } + + // Wait for Start() to return + select { + case <-startDone: + // Start() returned, good + case <-time.After(1 * time.Second): + t.Errorf("Iteration %d: Start() did not return after Stop()", i) + } + + // Pause between iterations to avoid port conflicts + time.Sleep(50 * time.Millisecond) + } +} + +func TestWebUIServer_LargeNumberOfRequests(t *testing.T) { + logger := createTestLogger() + + // Use httptest.Server for more reliable testing + mux := http.NewServeMux() + setupStaticHandler(mux) + mux.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { + serveFile(rw, r, logger) + }) + mux.HandleFunc("/health", func(rw http.ResponseWriter, r *http.Request) { + rw.WriteHeader(http.StatusOK) + rw.Write([]byte("OK")) + }) + + server := httptest.NewServer(mux) + defer server.Close() + + // Send many requests quickly + const numRequests = 50 // Reduced number for more reliable testing + errorChan := make(chan error, numRequests) + + client := &http.Client{Timeout: 2 * time.Second} + + for i := 0; i < numRequests; i++ { + go func(requestID int) { + resp, err := client.Get(server.URL + "/health") + if err != nil { + errorChan <- fmt.Errorf("request %d failed: %v", requestID, err) + return + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + errorChan <- fmt.Errorf("request %d: expected status 200, got %d", requestID, resp.StatusCode) + return + } + + errorChan <- nil + }(i) + } + + // Check results + errorCount := 0 + for i := 0; i < numRequests; i++ { + select { + case err := <-errorChan: + if err != nil { + errorCount++ + if errorCount <= 5 { // Only log first few errors + t.Errorf("Request error: %v", err) + } + } + case <-time.After(10 * time.Second): + t.Fatalf("Request %d timed out", i) + } + } + + if errorCount > 0 { + t.Errorf("Total failed requests: %d/%d", errorCount, numRequests) + } +} diff --git a/src/webui/server.go b/src/webui/server.go new file mode 100644 index 00000000..ae82fd50 --- /dev/null +++ b/src/webui/server.go @@ -0,0 +1,63 @@ +package webui + +import ( + "fmt" + "net/http" + "time" + + "github.com/yggdrasil-network/yggdrasil-go/src/core" +) + +type WebUIServer struct { + server *http.Server + log core.Logger + listen string +} + +func Server(listen string, log core.Logger) *WebUIServer { + return &WebUIServer{ + listen: listen, + log: log, + } +} + +func (w *WebUIServer) Start() error { + mux := http.NewServeMux() + + // Setup static files handler (implementation varies by build) + setupStaticHandler(mux) + + // Serve any file by path (implementation varies by build) + mux.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { + serveFile(rw, r, w.log) + }) + + // Health check endpoint + mux.HandleFunc("/health", func(rw http.ResponseWriter, r *http.Request) { + rw.WriteHeader(http.StatusOK) + rw.Write([]byte("OK")) + }) + + w.server = &http.Server{ + Addr: w.listen, + Handler: mux, + ReadTimeout: 10 * time.Second, + WriteTimeout: 10 * time.Second, + MaxHeaderBytes: 1 << 20, + } + + w.log.Infof("WebUI server starting on %s", w.listen) + + if err := w.server.ListenAndServe(); err != nil && err != http.ErrServerClosed { + return fmt.Errorf("WebUI server failed: %v", err) + } + + return nil +} + +func (w *WebUIServer) Stop() error { + if w.server != nil { + return w.server.Close() + } + return nil +} diff --git a/src/webui/server_dev.go b/src/webui/server_dev.go new file mode 100644 index 00000000..5ea9196b --- /dev/null +++ b/src/webui/server_dev.go @@ -0,0 +1,51 @@ +//go:build debug +// +build debug + +package webui + +import ( + "mime" + "net/http" + "os" + "path/filepath" + "strings" + + "github.com/yggdrasil-network/yggdrasil-go/src/core" +) + +// setupStaticHandler configures static file serving for development (files from disk) +func setupStaticHandler(mux *http.ServeMux) { + // Serve static files from disk for development + mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("src/webui/static/")))) +} + +// serveFile serves any file from disk or returns 404 if not found +func serveFile(rw http.ResponseWriter, r *http.Request, log core.Logger) { + // Clean the path and remove leading slash + requestPath := strings.TrimPrefix(r.URL.Path, "/") + + // If path is empty, serve index.html + if requestPath == "" { + requestPath = "index.html" + } + + // Construct the full path on disk + filePath := filepath.Join("src/webui/static", requestPath) + + // Check if file exists + if _, err := os.Stat(filePath); os.IsNotExist(err) { + log.Debugf("File not found: %s", filePath) + http.NotFound(rw, r) + return + } + + // Determine content type based on file extension + contentType := mime.TypeByExtension(filepath.Ext(requestPath)) + if contentType != "" { + rw.Header().Set("Content-Type", contentType) + } + + // Serve the file + log.Debugf("Serving file from disk: %s", filePath) + http.ServeFile(rw, r, filePath) +} diff --git a/src/webui/server_prod.go b/src/webui/server_prod.go new file mode 100644 index 00000000..f87dc153 --- /dev/null +++ b/src/webui/server_prod.go @@ -0,0 +1,64 @@ +//go:build !debug +// +build !debug + +package webui + +import ( + "embed" + "io/fs" + "mime" + "net/http" + "path/filepath" + "strings" + + "github.com/yggdrasil-network/yggdrasil-go/src/core" +) + +//go:embed static/* +var staticFiles embed.FS + +// setupStaticHandler configures static file serving for production (embedded files) +func setupStaticHandler(mux *http.ServeMux) { + // Get the embedded file system for static files + staticFS, err := fs.Sub(staticFiles, "static") + if err != nil { + panic("failed to get embedded static files: " + err.Error()) + } + + // Serve static files from embedded FS + mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.FS(staticFS)))) +} + +// serveFile serves any file from embedded files or returns 404 if not found +func serveFile(rw http.ResponseWriter, r *http.Request, log core.Logger) { + // Clean the path and remove leading slash + requestPath := strings.TrimPrefix(r.URL.Path, "/") + + // If path is empty, serve index.html + if requestPath == "" { + requestPath = "index.html" + } + + // Construct the full path within static directory + filePath := "static/" + requestPath + + // Try to read the file from embedded FS + data, err := staticFiles.ReadFile(filePath) + if err != nil { + log.Debugf("File not found: %s", filePath) + http.NotFound(rw, r) + return + } + + // Determine content type based on file extension + contentType := mime.TypeByExtension(filepath.Ext(requestPath)) + if contentType == "" { + contentType = "application/octet-stream" + } + + // Set headers and serve the file + rw.Header().Set("Content-Type", contentType) + rw.Write(data) + + log.Debugf("Served file: %s (type: %s)", filePath, contentType) +} diff --git a/src/webui/server_test.go b/src/webui/server_test.go new file mode 100644 index 00000000..14c85613 --- /dev/null +++ b/src/webui/server_test.go @@ -0,0 +1,219 @@ +package webui + +import ( + "fmt" + "io" + "net/http" + "net/http/httptest" + "os" + "testing" + "time" + + "github.com/gologme/log" + "github.com/yggdrasil-network/yggdrasil-go/src/core" +) + +// Helper function to create a test logger +func createTestLogger() core.Logger { + return log.New(os.Stderr, "webui_test: ", log.Flags()) +} + +// Helper function to get available port for testing +func getTestAddress() string { + return "127.0.0.1:0" // Let OS assign available port +} + +// Helper function to wait for server to be ready +func waitForServer(url string, timeout time.Duration) error { + client := &http.Client{Timeout: 1 * time.Second} + deadline := time.Now().Add(timeout) + + for time.Now().Before(deadline) { + resp, err := client.Get(url) + if err == nil { + resp.Body.Close() + return nil + } + time.Sleep(50 * time.Millisecond) + } + return fmt.Errorf("server not ready within timeout") +} + +func TestWebUIServer_Creation(t *testing.T) { + logger := createTestLogger() + listen := getTestAddress() + + server := Server(listen, logger) + + if server == nil { + t.Fatal("Server function returned nil") + } + + if server.listen != listen { + t.Errorf("Expected listen address %s, got %s", listen, server.listen) + } + + if server.log != logger { + t.Error("Logger not properly set") + } + + if server.server != nil { + t.Error("HTTP server should be nil before Start()") + } +} + +func TestWebUIServer_StartStop(t *testing.T) { + logger := createTestLogger() + listen := getTestAddress() + + server := Server(listen, logger) + + // Start server in goroutine + errChan := make(chan error, 1) + go func() { + errChan <- server.Start() + }() + + // Give server time to start + time.Sleep(100 * time.Millisecond) + + // Verify server is running + if server.server == nil { + t.Fatal("HTTP server not initialized after Start()") + } + + // Stop server + err := server.Stop() + if err != nil { + t.Errorf("Error stopping server: %v", err) + } + + // Check that Start() returns without error after Stop() + select { + case err := <-errChan: + if err != nil { + t.Errorf("Start() returned error: %v", err) + } + case <-time.After(2 * time.Second): + t.Error("Start() did not return after Stop()") + } +} + +func TestWebUIServer_StopWithoutStart(t *testing.T) { + logger := createTestLogger() + listen := getTestAddress() + + server := Server(listen, logger) + + // Stop server that was never started should not error + err := server.Stop() + if err != nil { + t.Errorf("Stop() on unstarted server returned error: %v", err) + } +} + +func TestWebUIServer_HealthEndpoint(t *testing.T) { + logger := createTestLogger() + + // Create a test server using net/http/httptest for reliable testing + mux := http.NewServeMux() + setupStaticHandler(mux) + mux.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { + serveFile(rw, r, logger) + }) + mux.HandleFunc("/health", func(rw http.ResponseWriter, r *http.Request) { + rw.WriteHeader(http.StatusOK) + rw.Write([]byte("OK")) + }) + + server := httptest.NewServer(mux) + defer server.Close() + + // Test health endpoint + resp, err := http.Get(server.URL + "/health") + if err != nil { + t.Fatalf("Error requesting health endpoint: %v", err) + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + t.Errorf("Expected status 200, got %d", resp.StatusCode) + } + + body, err := io.ReadAll(resp.Body) + if err != nil { + t.Fatalf("Error reading response body: %v", err) + } + + if string(body) != "OK" { + t.Errorf("Expected body 'OK', got '%s'", string(body)) + } +} + +func TestWebUIServer_Timeouts(t *testing.T) { + logger := createTestLogger() + server := Server("127.0.0.1:0", logger) + + // Start server + go func() { + server.Start() + }() + defer server.Stop() + + // Wait for server to start + time.Sleep(200 * time.Millisecond) + + if server.server == nil { + t.Fatal("Server not started") + } + + // Check that timeouts are properly configured + expectedReadTimeout := 10 * time.Second + expectedWriteTimeout := 10 * time.Second + expectedMaxHeaderBytes := 1 << 20 + + if server.server.ReadTimeout != expectedReadTimeout { + t.Errorf("Expected ReadTimeout %v, got %v", expectedReadTimeout, server.server.ReadTimeout) + } + + if server.server.WriteTimeout != expectedWriteTimeout { + t.Errorf("Expected WriteTimeout %v, got %v", expectedWriteTimeout, server.server.WriteTimeout) + } + + if server.server.MaxHeaderBytes != expectedMaxHeaderBytes { + t.Errorf("Expected MaxHeaderBytes %d, got %d", expectedMaxHeaderBytes, server.server.MaxHeaderBytes) + } +} + +func TestWebUIServer_ConcurrentStartStop(t *testing.T) { + logger := createTestLogger() + + // Test concurrent start/stop operations with separate servers + for i := 0; i < 3; i++ { + server := Server("127.0.0.1:0", logger) + + // Start server + startDone := make(chan error, 1) + go func() { + startDone <- server.Start() + }() + + time.Sleep(100 * time.Millisecond) + + // Stop server + err := server.Stop() + if err != nil { + t.Errorf("Iteration %d: Error stopping server: %v", i, err) + } + + // Wait for Start() to return + select { + case <-startDone: + // Good, Start() returned + case <-time.After(2 * time.Second): + t.Errorf("Iteration %d: Start() did not return after Stop()", i) + } + + time.Sleep(50 * time.Millisecond) + } +} diff --git a/src/webui/static/index.html b/src/webui/static/index.html new file mode 100644 index 00000000..c68ce3bc --- /dev/null +++ b/src/webui/static/index.html @@ -0,0 +1,55 @@ + + + + + + + Yggdrasil Web Interface + + + + +
+
+

🌳 Yggdrasil Web Interface

+

Network mesh management dashboard

+
+ +
+
+

Node Status

+
+ + Active +
+

WebUI is running and accessible

+
+ +
+
+

Configuration

+

Manage node settings and peers

+ Coming soon... +
+ +
+

Peers

+

View and manage peer connections

+ Coming soon... +
+ +
+

Network

+

Network topology and routing

+ Coming soon... +
+
+
+ +
+

Yggdrasil Network • Minimal WebUI v1.0

+
+
+ + + \ No newline at end of file diff --git a/src/webui/static/style.css b/src/webui/static/style.css new file mode 100644 index 00000000..86b056af --- /dev/null +++ b/src/webui/static/style.css @@ -0,0 +1,136 @@ +* { + margin: 0; + padding: 0; + box-sizing: border-box; +} + +body { + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; + background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); + min-height: 100vh; + color: #333; +} + +.container { + max-width: 1200px; + margin: 0 auto; + padding: 20px; +} + +header { + text-align: center; + margin-bottom: 40px; + color: white; +} + +header h1 { + font-size: 2.5rem; + margin-bottom: 10px; + text-shadow: 2px 2px 4px rgba(0,0,0,0.3); +} + +header p { + font-size: 1.2rem; + opacity: 0.9; +} + +main { + background: white; + border-radius: 12px; + padding: 30px; + box-shadow: 0 8px 32px rgba(0,0,0,0.1); + margin-bottom: 20px; +} + +.status-card { + background: #f8f9fa; + border-radius: 8px; + padding: 20px; + margin-bottom: 30px; + text-align: center; +} + +.status-indicator { + display: flex; + align-items: center; + justify-content: center; + gap: 8px; + margin: 15px 0; +} + +.status-dot { + width: 12px; + height: 12px; + border-radius: 50%; + background: #6c757d; +} + +.status-dot.active { + background: #28a745; + animation: pulse 2s infinite; +} + +@keyframes pulse { + 0% { opacity: 1; } + 50% { opacity: 0.5; } + 100% { opacity: 1; } +} + +.info-grid { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); + gap: 20px; +} + +.info-card { + background: #ffffff; + border: 1px solid #e9ecef; + border-radius: 8px; + padding: 20px; + text-align: center; + transition: transform 0.2s ease, box-shadow 0.2s ease; +} + +.info-card:hover { + transform: translateY(-2px); + box-shadow: 0 4px 12px rgba(0,0,0,0.1); +} + +.info-card h3 { + color: #495057; + margin-bottom: 10px; +} + +.info-card p { + color: #6c757d; + margin-bottom: 10px; +} + +.info-card small { + color: #adb5bd; + font-style: italic; +} + +footer { + text-align: center; + color: white; + opacity: 0.8; +} + +@media (max-width: 768px) { + .container { + padding: 10px; + } + + header h1 { + font-size: 2rem; + } + + main { + padding: 20px; + } + + .info-grid { + grid-template-columns: 1fr; + } +} \ No newline at end of file diff --git a/src/webui/static_files_prod_test.go b/src/webui/static_files_prod_test.go new file mode 100644 index 00000000..60d33c9d --- /dev/null +++ b/src/webui/static_files_prod_test.go @@ -0,0 +1,186 @@ +//go:build !debug +// +build !debug + +package webui + +import ( + "net/http" + "net/http/httptest" + "strings" + "testing" +) + +func TestStaticFiles_ProdMode_EmbeddedFiles(t *testing.T) { + logger := createTestLogger() + + // Test that the embedded files system is working + // Note: In production mode, we can't easily create test files + // so we test the behavior with what's available + + // Test serveFile function with various paths + testCases := []struct { + path string + expectedStatus int + description string + }{ + {"/", http.StatusOK, "root path should serve index.html if available"}, + {"/index.html", http.StatusOK, "index.html should be available if embedded"}, + {"/style.css", http.StatusOK, "style.css should be available if embedded"}, + {"/nonexistent.txt", http.StatusNotFound, "non-existent files should return 404"}, + {"/subdir/nonexistent.html", http.StatusNotFound, "non-existent nested files should return 404"}, + } + + for _, tc := range testCases { + t.Run(strings.ReplaceAll(tc.path, "/", "_"), func(t *testing.T) { + req := httptest.NewRequest("GET", tc.path, nil) + rec := httptest.NewRecorder() + + serveFile(rec, req, logger) + + // For embedded files, we expect either 200 (if file exists) or 404 (if not) + if rec.Code != http.StatusOK && rec.Code != http.StatusNotFound { + t.Errorf("Expected status 200 or 404 for %s, got %d", tc.path, rec.Code) + } + + // Check that known files return expected status if they exist + if (tc.path == "/" || tc.path == "/index.html") && rec.Code == http.StatusOK { + // Should have HTML content type + contentType := rec.Header().Get("Content-Type") + if !strings.Contains(contentType, "text/html") { + t.Logf("Note: Content-Type for %s is %s (might not contain text/html)", tc.path, contentType) + } + } + }) + } +} + +func TestStaticFiles_ProdMode_SetupStaticHandler(t *testing.T) { + // Test that setupStaticHandler works in production mode + mux := http.NewServeMux() + + // This should not panic + setupStaticHandler(mux) + + server := httptest.NewServer(mux) + defer server.Close() + + // Test static handler route + resp, err := http.Get(server.URL + "/static/style.css") + if err != nil { + t.Fatalf("Error requesting static file: %v", err) + } + defer resp.Body.Close() + + // Should return either 200 (if file exists) or 404 (if not embedded) + if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusNotFound { + t.Errorf("Expected status 200 or 404 for static file, got %d", resp.StatusCode) + } +} + +func TestStaticFiles_ProdMode_PathTraversal(t *testing.T) { + logger := createTestLogger() + + // Test path traversal attempts in production mode + pathTraversalTests := []string{ + "/../sensitive.txt", + "/../../etc/passwd", + "/..\\sensitive.txt", + "/static/../../../etc/passwd", + "/static/../../config.json", + } + + for _, path := range pathTraversalTests { + t.Run(strings.ReplaceAll(path, "/", "_"), func(t *testing.T) { + req := httptest.NewRequest("GET", path, nil) + rec := httptest.NewRecorder() + + serveFile(rec, req, logger) + + // Should return 404 for path traversal attempts + if rec.Code != http.StatusNotFound { + t.Errorf("Expected status 404 for path traversal attempt %s, got %d", path, rec.Code) + } + + // Should not contain any system file content + body := rec.Body.String() + if strings.Contains(body, "root:") || strings.Contains(body, "/bin/") { + t.Errorf("Path traversal might be successful for %s - system content detected", path) + } + }) + } +} + +func TestStaticFiles_ProdMode_ContentTypes(t *testing.T) { + logger := createTestLogger() + + // Test that proper content types are set for different file types + testCases := []struct { + path string + expectedContentType string + }{ + {"/index.html", "text/html"}, + {"/style.css", "text/css"}, + {"/script.js", "text/javascript"}, + {"/data.json", "application/json"}, + {"/image.png", "image/png"}, + {"/favicon.ico", "image/x-icon"}, + } + + for _, tc := range testCases { + t.Run(strings.ReplaceAll(tc.path, "/", "_"), func(t *testing.T) { + req := httptest.NewRequest("GET", tc.path, nil) + rec := httptest.NewRecorder() + + serveFile(rec, req, logger) + + // Only check content type if file exists (status 200) + if rec.Code == http.StatusOK { + contentType := rec.Header().Get("Content-Type") + if !strings.Contains(contentType, tc.expectedContentType) { + t.Logf("Note: Expected content type %s for %s, got %s", tc.expectedContentType, tc.path, contentType) + } + } + }) + } +} + +func TestStaticFiles_ProdMode_EmptyPath(t *testing.T) { + logger := createTestLogger() + + // Test that empty path serves index.html + req := httptest.NewRequest("GET", "/", nil) + rec := httptest.NewRecorder() + + serveFile(rec, req, logger) + + // Should return either 200 (if index.html exists) or 404 (if not embedded) + if rec.Code != http.StatusOK && rec.Code != http.StatusNotFound { + t.Errorf("Expected status 200 or 404 for root path, got %d", rec.Code) + } + + // If successful, should have appropriate content type + if rec.Code == http.StatusOK { + contentType := rec.Header().Get("Content-Type") + if contentType == "" { + t.Logf("Note: No Content-Type header set for root path") + } + } +} + +func TestStaticFiles_ProdMode_EmbeddedFileSystem(t *testing.T) { + // Test that the embedded file system can be accessed + // This is a basic test to ensure the embed directive works + + // Try to read from embedded FS directly + _, err := staticFiles.ReadFile("static/index.html") + if err != nil { + // This is expected if the file doesn't exist in embedded FS + t.Logf("Note: index.html not found in embedded FS: %v", err) + } + + // Test that we can at least access the embedded FS without panic + _, err = staticFiles.ReadFile("static/nonexistent.txt") + if err == nil { + t.Error("Expected error when reading non-existent file from embedded FS") + } +} diff --git a/src/webui/static_files_test.go b/src/webui/static_files_test.go new file mode 100644 index 00000000..8bb6a87f --- /dev/null +++ b/src/webui/static_files_test.go @@ -0,0 +1,272 @@ +//go:build debug +// +build debug + +package webui + +import ( + "fmt" + "io" + "net/http" + "net/http/httptest" + "os" + "path/filepath" + "strings" + "testing" +) + +func TestStaticFiles_DevMode_ServeFile(t *testing.T) { + logger := createTestLogger() + + // Create temporary test files + tempDir := t.TempDir() + staticDir := filepath.Join(tempDir, "src", "webui", "static") + err := os.MkdirAll(staticDir, 0755) + if err != nil { + t.Fatalf("Failed to create temp static dir: %v", err) + } + + // Create test files + testFiles := map[string]string{ + "index.html": "Test Index", + "style.css": "body { background: white; }", + "script.js": "console.log('test');", + "image.png": "fake png data", + "data.json": `{"test": "data"}`, + "favicon.ico": "fake ico data", + } + + for filename, content := range testFiles { + filePath := filepath.Join(staticDir, filename) + err := os.WriteFile(filePath, []byte(content), 0644) + if err != nil { + t.Fatalf("Failed to create test file %s: %v", filename, err) + } + } + + // Change working directory temporarily + originalWd, err := os.Getwd() + if err != nil { + t.Fatalf("Failed to get working directory: %v", err) + } + defer os.Chdir(originalWd) + + err = os.Chdir(tempDir) + if err != nil { + t.Fatalf("Failed to change working directory: %v", err) + } + + // Test serveFile function + testCases := []struct { + path string + expectedStatus int + expectedContentType string + expectedContent string + }{ + {"/", http.StatusOK, "text/html", testFiles["index.html"]}, + {"/index.html", http.StatusOK, "text/html", testFiles["index.html"]}, + {"/style.css", http.StatusOK, "text/css", testFiles["style.css"]}, + {"/script.js", http.StatusOK, "text/javascript", testFiles["script.js"]}, + {"/data.json", http.StatusOK, "application/json", testFiles["data.json"]}, + {"/nonexistent.txt", http.StatusNotFound, "", ""}, + {"/subdir/nonexistent.html", http.StatusNotFound, "", ""}, + } + + for _, tc := range testCases { + t.Run(fmt.Sprintf("Path_%s", strings.ReplaceAll(tc.path, "/", "_")), func(t *testing.T) { + req := httptest.NewRequest("GET", tc.path, nil) + rec := httptest.NewRecorder() + + serveFile(rec, req, logger) + + if rec.Code != tc.expectedStatus { + t.Errorf("Expected status %d, got %d", tc.expectedStatus, rec.Code) + } + + if tc.expectedStatus == http.StatusOK { + contentType := rec.Header().Get("Content-Type") + if tc.expectedContentType != "" && !strings.Contains(contentType, tc.expectedContentType) { + t.Errorf("Expected content type to contain %s, got %s", tc.expectedContentType, contentType) + } + + body := rec.Body.String() + if body != tc.expectedContent { + t.Errorf("Expected body %q, got %q", tc.expectedContent, body) + } + } + }) + } +} + +func TestStaticFiles_DevMode_SetupStaticHandler(t *testing.T) { + // Create temporary test files for static handler testing + tempDir := t.TempDir() + staticDir := filepath.Join(tempDir, "src", "webui", "static") + err := os.MkdirAll(staticDir, 0755) + if err != nil { + t.Fatalf("Failed to create temp static dir: %v", err) + } + + // Create test CSS file + cssContent := "body { color: blue; }" + cssPath := filepath.Join(staticDir, "test.css") + err = os.WriteFile(cssPath, []byte(cssContent), 0644) + if err != nil { + t.Fatalf("Failed to create test CSS file: %v", err) + } + + // Change working directory temporarily + originalWd, err := os.Getwd() + if err != nil { + t.Fatalf("Failed to get working directory: %v", err) + } + defer os.Chdir(originalWd) + + err = os.Chdir(tempDir) + if err != nil { + t.Fatalf("Failed to change working directory: %v", err) + } + + // Create HTTP server with static handler + mux := http.NewServeMux() + setupStaticHandler(mux) + + server := httptest.NewServer(mux) + defer server.Close() + + // Test static file serving + resp, err := http.Get(server.URL + "/static/test.css") + if err != nil { + t.Fatalf("Error requesting static file: %v", err) + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + t.Errorf("Expected status 200, got %d", resp.StatusCode) + } + + body, err := io.ReadAll(resp.Body) + if err != nil { + t.Fatalf("Error reading response body: %v", err) + } + + if string(body) != cssContent { + t.Errorf("Expected CSS content %q, got %q", cssContent, string(body)) + } + + // Test Content-Type header + contentType := resp.Header.Get("Content-Type") + if !strings.Contains(contentType, "text/css") { + t.Errorf("Expected Content-Type to contain text/css, got %s", contentType) + } +} + +func TestStaticFiles_DevMode_PathTraversal(t *testing.T) { + logger := createTestLogger() + + // Create temporary test setup + tempDir := t.TempDir() + staticDir := filepath.Join(tempDir, "src", "webui", "static") + err := os.MkdirAll(staticDir, 0755) + if err != nil { + t.Fatalf("Failed to create temp static dir: %v", err) + } + + // Create a sensitive file outside static directory + sensitiveFile := filepath.Join(tempDir, "sensitive.txt") + err = os.WriteFile(sensitiveFile, []byte("sensitive data"), 0644) + if err != nil { + t.Fatalf("Failed to create sensitive file: %v", err) + } + + // Change working directory temporarily + originalWd, err := os.Getwd() + if err != nil { + t.Fatalf("Failed to get working directory: %v", err) + } + defer os.Chdir(originalWd) + + err = os.Chdir(tempDir) + if err != nil { + t.Fatalf("Failed to change working directory: %v", err) + } + + // Test path traversal attempts + pathTraversalTests := []string{ + "/../sensitive.txt", + "/../../sensitive.txt", + "/../../../etc/passwd", + "/..\\sensitive.txt", + "/static/../../../sensitive.txt", + } + + for _, path := range pathTraversalTests { + t.Run(fmt.Sprintf("PathTraversal_%s", strings.ReplaceAll(path, "/", "_")), func(t *testing.T) { + req := httptest.NewRequest("GET", path, nil) + rec := httptest.NewRecorder() + + serveFile(rec, req, logger) + + // Should return 404 for path traversal attempts + if rec.Code != http.StatusNotFound { + t.Errorf("Expected status 404 for path traversal attempt %s, got %d", path, rec.Code) + } + + // Should not contain sensitive data + body := rec.Body.String() + if strings.Contains(body, "sensitive data") { + t.Errorf("Path traversal successful for %s - sensitive data leaked", path) + } + }) + } +} + +func TestStaticFiles_DevMode_EmptyPath(t *testing.T) { + logger := createTestLogger() + + // Create temporary test setup with index.html + tempDir := t.TempDir() + staticDir := filepath.Join(tempDir, "src", "webui", "static") + err := os.MkdirAll(staticDir, 0755) + if err != nil { + t.Fatalf("Failed to create temp static dir: %v", err) + } + + indexContent := "Index Page" + indexPath := filepath.Join(staticDir, "index.html") + err = os.WriteFile(indexPath, []byte(indexContent), 0644) + if err != nil { + t.Fatalf("Failed to create index.html: %v", err) + } + + // Change working directory temporarily + originalWd, err := os.Getwd() + if err != nil { + t.Fatalf("Failed to get working directory: %v", err) + } + defer os.Chdir(originalWd) + + err = os.Chdir(tempDir) + if err != nil { + t.Fatalf("Failed to change working directory: %v", err) + } + + // Test that empty path serves index.html + req := httptest.NewRequest("GET", "/", nil) + rec := httptest.NewRecorder() + + serveFile(rec, req, logger) + + if rec.Code != http.StatusOK { + t.Errorf("Expected status 200 for root path, got %d", rec.Code) + } + + body := rec.Body.String() + if body != indexContent { + t.Errorf("Expected index content %q, got %q", indexContent, body) + } + + contentType := rec.Header().Get("Content-Type") + if !strings.Contains(contentType, "text/html") { + t.Errorf("Expected Content-Type to contain text/html, got %s", contentType) + } +} From 51a1a0a3d71428369ec139e77d819e36d548768d Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Tue, 29 Jul 2025 21:03:03 +0000 Subject: [PATCH 06/46] Refactor web UI server setup in main.go and update default host in config --- cmd/yggdrasil/main.go | 34 +++++----- src/config/config.go | 2 +- src/webui/README.md | 108 +++++++++++++++++++++++++++++++ src/webui/config_test.go | 8 +-- src/webui/endpoints_test.go | 10 +-- src/webui/error_handling_test.go | 12 ++-- src/webui/server.go | 2 +- src/webui/server_prod.go | 2 +- src/webui/server_test.go | 23 +------ 9 files changed, 146 insertions(+), 55 deletions(-) create mode 100644 src/webui/README.md diff --git a/cmd/yggdrasil/main.go b/cmd/yggdrasil/main.go index 4ad0753e..5f183ca3 100644 --- a/cmd/yggdrasil/main.go +++ b/cmd/yggdrasil/main.go @@ -264,23 +264,6 @@ 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, logger) - go func() { - if err := n.webui.Start(); err != nil { - logger.Errorf("WebUI server error: %v", err) - } - }() - } - // Set up the multicast module. { options := []multicast.SetupOption{} @@ -316,6 +299,23 @@ 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, logger) + 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 ...") diff --git a/src/config/config.go b/src/config/config.go index ad6e9adf..ac2b3ec3 100644 --- a/src/config/config.go +++ b/src/config/config.go @@ -96,7 +96,7 @@ func GenerateConfig() *NodeConfig { cfg.WebUI = WebUIConfig{ Enable: false, Port: 9000, - Host: "", + Host: "127.0.0.1", } if err := cfg.postprocessConfig(); err != nil { panic(err) diff --git a/src/webui/README.md b/src/webui/README.md new file mode 100644 index 00000000..e430837e --- /dev/null +++ b/src/webui/README.md @@ -0,0 +1,108 @@ +# WebUI Module + +This module provides a web interface for managing Yggdrasil node through a browser. + +## Features + +- ✅ HTTP web server with static files +- ✅ Health check endpoint (`/health`) +- ✅ Development and production build modes +- ✅ Automatic binding to Yggdrasil IPv6 address +- ✅ IPv4 and IPv6 support +- ✅ Path traversal attack protection + +## Configuration + +In the Yggdrasil configuration file: + +```json +{ + "WebUI": { + "Enable": true, + "Port": 9000, + "Host": "", + "BindYgg": false + } +} +``` + +### Configuration parameters: + +- **`Enable`** - enable/disable WebUI +- **`Port`** - port for web interface (default 9000) +- **`Host`** - IP address to bind to (empty means all interfaces) +- **`BindYgg`** - automatically bind to Yggdrasil IPv6 address + +## Usage + +### Standard mode + +```go +server := webui.Server("127.0.0.1:9000", logger) +``` + +### With core access + +```go +server := webui.ServerWithCore("127.0.0.1:9000", logger, coreInstance) +``` + +### Automatic Yggdrasil address binding + +```go +server := webui.ServerForYggdrasil(9000, logger, coreInstance) +// Automatically binds to [yggdrasil_ipv6]:9000 +``` + +### Starting the server + +```go +go func() { + if err := server.Start(); err != nil { + logger.Errorf("WebUI server error: %v", err) + } +}() + +// To stop +server.Stop() +``` + +## Endpoints + +- **`/`** - main page (index.html) +- **`/health`** - health check (returns "OK") +- **`/static/*`** - static files (CSS, JS, images) + +## Build modes + +### Development mode (`-tags debug`) +- Files loaded from disk from `src/webui/static/` +- File changes available without rebuild + +### Production mode (default) +- Files embedded in binary +- Faster loading, smaller deployment size + +## Security + +- Path traversal attack protection +- Configured HTTP timeouts +- Header size limits +- File MIME type validation + +## Testing + +The module includes a comprehensive test suite: + +```bash +cd src/webui +go test -v +``` + +Tests cover: +- Server creation and management +- HTTP endpoints +- Static files (dev and prod modes) +- Error handling +- Configuration +- Yggdrasil IPv6 binding \ No newline at end of file diff --git a/src/webui/config_test.go b/src/webui/config_test.go index 7a4aa36a..647b5d9c 100644 --- a/src/webui/config_test.go +++ b/src/webui/config_test.go @@ -164,11 +164,11 @@ func TestWebUIConfig_PortRanges(t *testing.T) { if test.shouldWork { // Try to start briefly to see if port is valid go func() { - server.Start() + _ = server.Start() }() // Quick cleanup - server.Stop() + _ = server.Stop() } }) } @@ -236,9 +236,9 @@ func TestWebUIConfig_Integration(t *testing.T) { // Test that server can start with this config go func() { - server.Start() + _ = server.Start() }() - defer server.Stop() + defer func() { _ = server.Stop() }() // Verify server properties match config if server.listen != listenAddr { diff --git a/src/webui/endpoints_test.go b/src/webui/endpoints_test.go index 652e4e14..6916ee2d 100644 --- a/src/webui/endpoints_test.go +++ b/src/webui/endpoints_test.go @@ -47,7 +47,7 @@ func TestWebUIServer_HealthEndpointDetails(t *testing.T) { }) mux.HandleFunc("/health", func(rw http.ResponseWriter, r *http.Request) { rw.WriteHeader(http.StatusOK) - rw.Write([]byte("OK")) + _, _ = rw.Write([]byte("OK")) }) server := httptest.NewServer(mux) @@ -109,7 +109,7 @@ func TestWebUIServer_NonExistentEndpoint(t *testing.T) { }) mux.HandleFunc("/health", func(rw http.ResponseWriter, r *http.Request) { rw.WriteHeader(http.StatusOK) - rw.Write([]byte("OK")) + _, _ = rw.Write([]byte("OK")) }) server := httptest.NewServer(mux) @@ -158,7 +158,7 @@ func TestWebUIServer_ContentTypes(t *testing.T) { }) mux.HandleFunc("/health", func(rw http.ResponseWriter, r *http.Request) { rw.WriteHeader(http.StatusOK) - rw.Write([]byte("OK")) + _, _ = rw.Write([]byte("OK")) }) server := httptest.NewServer(mux) @@ -188,7 +188,7 @@ func TestWebUIServer_HeaderSecurity(t *testing.T) { }) mux.HandleFunc("/health", func(rw http.ResponseWriter, r *http.Request) { rw.WriteHeader(http.StatusOK) - rw.Write([]byte("OK")) + _, _ = rw.Write([]byte("OK")) }) server := httptest.NewServer(mux) @@ -227,7 +227,7 @@ func TestWebUIServer_ConcurrentRequests(t *testing.T) { }) mux.HandleFunc("/health", func(rw http.ResponseWriter, r *http.Request) { rw.WriteHeader(http.StatusOK) - rw.Write([]byte("OK")) + _, _ = rw.Write([]byte("OK")) }) server := httptest.NewServer(mux) diff --git a/src/webui/error_handling_test.go b/src/webui/error_handling_test.go index bc57eed0..cb0adff2 100644 --- a/src/webui/error_handling_test.go +++ b/src/webui/error_handling_test.go @@ -30,7 +30,7 @@ func TestWebUIServer_InvalidListenAddress(t *testing.T) { // Start should fail for invalid addresses err := server.Start() if err == nil { - server.Stop() // Clean up if it somehow started + _ = server.Stop() // Clean up if it somehow started t.Errorf("Expected Start() to fail for invalid address %s", addr) } }) @@ -56,7 +56,7 @@ func TestWebUIServer_PortAlreadyInUse(t *testing.T) { // This should fail because port is already in use err = server.Start() if err == nil { - server.Stop() + _ = server.Stop() t.Error("Expected Start() to fail when port is already in use") } } @@ -126,7 +126,7 @@ func TestWebUIServer_StopTwice(t *testing.T) { // Start server go func() { - server.Start() + _ = server.Start() }() time.Sleep(100 * time.Millisecond) @@ -218,7 +218,7 @@ func TestWebUIServer_ContextCancellation(t *testing.T) { // Start server go func() { - server.Start() + _ = server.Start() }() time.Sleep(100 * time.Millisecond) @@ -255,7 +255,7 @@ func TestWebUIServer_EmptyListenAddress(t *testing.T) { // This might fail when trying to start err := server.Start() if err == nil { - server.Stop() + _ = server.Stop() t.Log("Note: Server started with empty listen address") } else { t.Logf("Expected behavior: Start() failed with empty address: %v", err) @@ -308,7 +308,7 @@ func TestWebUIServer_LargeNumberOfRequests(t *testing.T) { }) mux.HandleFunc("/health", func(rw http.ResponseWriter, r *http.Request) { rw.WriteHeader(http.StatusOK) - rw.Write([]byte("OK")) + _, _ = rw.Write([]byte("OK")) }) server := httptest.NewServer(mux) diff --git a/src/webui/server.go b/src/webui/server.go index ae82fd50..130b8102 100644 --- a/src/webui/server.go +++ b/src/webui/server.go @@ -35,7 +35,7 @@ func (w *WebUIServer) Start() error { // Health check endpoint mux.HandleFunc("/health", func(rw http.ResponseWriter, r *http.Request) { rw.WriteHeader(http.StatusOK) - rw.Write([]byte("OK")) + _, _ = rw.Write([]byte("OK")) }) w.server = &http.Server{ diff --git a/src/webui/server_prod.go b/src/webui/server_prod.go index f87dc153..116805dc 100644 --- a/src/webui/server_prod.go +++ b/src/webui/server_prod.go @@ -58,7 +58,7 @@ func serveFile(rw http.ResponseWriter, r *http.Request, log core.Logger) { // Set headers and serve the file rw.Header().Set("Content-Type", contentType) - rw.Write(data) + _, _ = rw.Write(data) log.Debugf("Served file: %s (type: %s)", filePath, contentType) } diff --git a/src/webui/server_test.go b/src/webui/server_test.go index 14c85613..42cb9835 100644 --- a/src/webui/server_test.go +++ b/src/webui/server_test.go @@ -1,7 +1,6 @@ package webui import ( - "fmt" "io" "net/http" "net/http/httptest" @@ -23,22 +22,6 @@ func getTestAddress() string { return "127.0.0.1:0" // Let OS assign available port } -// Helper function to wait for server to be ready -func waitForServer(url string, timeout time.Duration) error { - client := &http.Client{Timeout: 1 * time.Second} - deadline := time.Now().Add(timeout) - - for time.Now().Before(deadline) { - resp, err := client.Get(url) - if err == nil { - resp.Body.Close() - return nil - } - time.Sleep(50 * time.Millisecond) - } - return fmt.Errorf("server not ready within timeout") -} - func TestWebUIServer_Creation(t *testing.T) { logger := createTestLogger() listen := getTestAddress() @@ -123,7 +106,7 @@ func TestWebUIServer_HealthEndpoint(t *testing.T) { }) mux.HandleFunc("/health", func(rw http.ResponseWriter, r *http.Request) { rw.WriteHeader(http.StatusOK) - rw.Write([]byte("OK")) + _, _ = rw.Write([]byte("OK")) }) server := httptest.NewServer(mux) @@ -156,9 +139,9 @@ func TestWebUIServer_Timeouts(t *testing.T) { // Start server go func() { - server.Start() + _ = server.Start() }() - defer server.Stop() + defer func() { _ = server.Stop() }() // Wait for server to start time.Sleep(200 * time.Millisecond) From 13a6398001dd99fa4b9f1f2e04d755516780b31d Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Tue, 29 Jul 2025 21:05:44 +0000 Subject: [PATCH 07/46] Update CodeQL actions to version 3 in CI workflow --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d4ad1c6c..03be0c20 100644 --- a/.github/workflows/ci.yml +++ b/.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: From a7185743ccc23dee3c3fd55b2d2da6d48d5b153e Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Tue, 29 Jul 2025 21:09:09 +0000 Subject: [PATCH 08/46] Update .gitignore to include additional yggdrasil related files and runtime directories --- .gitignore | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 95c0e2e2..ff064bd6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ -yggdrasil -yggdrasilctl -yggdrasil.conf -**/TODO \ No newline at end of file +**/TODO +/yggdrasil +/yggdrasilctl +/yggdrasil.conf +/run +/test \ No newline at end of file From 4acc41cc03e98378dd724ff3481066f27781a50e Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Tue, 29 Jul 2025 21:21:47 +0000 Subject: [PATCH 09/46] Update devcontainer configuration and Dockerfile to improve environment setup --- .devcontainer/devcontainer.json | 2 +- .gitignore | 1 + contrib/docker/devcontainer/Dockerfile | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index fb1eb82b..ed89e925 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -44,7 +44,7 @@ "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 /workspace && go mod download && go mod tidy", + "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 diff --git a/.gitignore b/.gitignore index ff064bd6..78a92910 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ /yggdrasil /yggdrasilctl /yggdrasil.conf +/yggdrasil.json /run /test \ No newline at end of file diff --git a/contrib/docker/devcontainer/Dockerfile b/contrib/docker/devcontainer/Dockerfile index 0380a261..02d74057 100644 --- a/contrib/docker/devcontainer/Dockerfile +++ b/contrib/docker/devcontainer/Dockerfile @@ -7,6 +7,7 @@ RUN apt-get update && apt-get install -y \ ca-certificates \ sudo \ zsh \ + locales \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -51,6 +52,9 @@ USER $USERNAME ENV SHELL=/bin/zsh RUN echo 'export PATH=$PATH:$(go env GOPATH)/bin' >> ~/.zshrc \ && echo 'export GO111MODULE=on' >> ~/.zshrc \ + && echo 'export LANG=C.UTF-8' >> ~/.zshrc \ + && echo 'export LC_ALL=C.UTF-8' >> ~/.zshrc \ + && echo 'export LC_CTYPE=C.UTF-8' >> ~/.zshrc \ && mkdir -p ~/.cache # Expose common ports that might be used by Yggdrasil From 170e369a5333f2256ea713f3590540ff44413d47 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Wed, 30 Jul 2025 07:40:05 +0000 Subject: [PATCH 10/46] Refactor Dockerfile to enhance Oh My Zsh installation and configuration for improved terminal experience --- contrib/docker/devcontainer/Dockerfile | 24 ++++++++++------- contrib/docker/devcontainer/zshrc | 37 ++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 9 deletions(-) create mode 100644 contrib/docker/devcontainer/zshrc diff --git a/contrib/docker/devcontainer/Dockerfile b/contrib/docker/devcontainer/Dockerfile index 02d74057..d643dcee 100644 --- a/contrib/docker/devcontainer/Dockerfile +++ b/contrib/docker/devcontainer/Dockerfile @@ -11,9 +11,6 @@ RUN apt-get update && apt-get install -y \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -# Install Oh My Zsh for better terminal experience -RUN sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" --unattended - # 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 \ @@ -47,15 +44,24 @@ RUN chown $USERNAME:$USERNAME /workspace 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 -RUN echo 'export PATH=$PATH:$(go env GOPATH)/bin' >> ~/.zshrc \ - && echo 'export GO111MODULE=on' >> ~/.zshrc \ - && echo 'export LANG=C.UTF-8' >> ~/.zshrc \ - && echo 'export LC_ALL=C.UTF-8' >> ~/.zshrc \ - && echo 'export LC_CTYPE=C.UTF-8' >> ~/.zshrc \ - && mkdir -p ~/.cache # Expose common ports that might be used by Yggdrasil EXPOSE 9001 9002 9003 diff --git a/contrib/docker/devcontainer/zshrc b/contrib/docker/devcontainer/zshrc new file mode 100644 index 00000000..a340ee1b --- /dev/null +++ b/contrib/docker/devcontainer/zshrc @@ -0,0 +1,37 @@ +export ZSH="/usr/local/share/zsh/oh-my-zsh" + +ZSH_THEME="agnoster" +CASE_SENSITIVE="true" +zstyle ':omz:update' mode disabled # disable automatic updates +DISABLE_UNTRACKED_FILES_DIRTY="true" +HIST_STAMPS="mm/dd/yyyy" +plugins=(git zsh-256color zsh-autosuggestions command-time sudo) + +ZSH_DISABLE_COMPFIX=true +ZSH_CACHE_DIR="$HOME/.cache/ohmyzsh" +ZSH_COMPDUMP="${ZSH_CACHE_DIR}/.zcompdump-${HOST/.*/}-${ZSH_VERSION}" +mkdir -p "$ZSH_CACHE_DIR" + +source $ZSH/oh-my-zsh.sh + +alias zshconfig="mate ~/.zshrc" +alias ohmyzsh="mate ~/.oh-my-zsh" + +prompt_context() { + _bg=043 + [[ $UID -eq 0 ]] && _bg=202 + prompt_segment $_bg $CURRENT_FG "%m" +} + +prompt_status() { + local -a symbols + [[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%}✘" + [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}⚙" + [[ -n "$symbols" ]] && prompt_segment black default "$symbols" +} + +export PATH=$PATH:$(go env GOPATH 2>/dev/null)/bin +export GO111MODULE=on +export LANG=C.UTF-8 +export LC_ALL=C.UTF-8 +export LC_CTYPE=C.UTF-8 From 51e1ef3ed05f6a4444da3c8c428df92712c3a4a8 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Wed, 30 Jul 2025 07:44:44 +0000 Subject: [PATCH 11/46] Refactor error handling tests to use structured test cases and add address validation in server start method --- src/webui/error_handling_test.go | 66 +++++++++++++++++--------------- src/webui/server.go | 8 ++++ 2 files changed, 43 insertions(+), 31 deletions(-) diff --git a/src/webui/error_handling_test.go b/src/webui/error_handling_test.go index cb0adff2..c8dfd6f0 100644 --- a/src/webui/error_handling_test.go +++ b/src/webui/error_handling_test.go @@ -14,24 +14,44 @@ func TestWebUIServer_InvalidListenAddress(t *testing.T) { logger := createTestLogger() // Test various invalid listen addresses - invalidAddresses := []string{ - "invalid:address", - "256.256.256.256:8080", - "localhost:-1", - "localhost:99999", - "not-a-valid-address", - "", + testCases := []struct { + addr string + shouldFail bool + description string + }{ + {"invalid:address", true, "Invalid address format"}, + {"256.256.256.256:8080", true, "Invalid IP address"}, + {"localhost:-1", true, "Negative port"}, + {"localhost:99999", true, "Port out of range"}, + {"not-a-valid-address", true, "Completely invalid address"}, } - for _, addr := range invalidAddresses { - t.Run(fmt.Sprintf("Address_%s", addr), func(t *testing.T) { - server := Server(addr, logger) + for _, tc := range testCases { + t.Run(fmt.Sprintf("Address_%s_%s", tc.addr, tc.description), func(t *testing.T) { + server := Server(tc.addr, logger) - // Start should fail for invalid addresses - err := server.Start() - if err == nil { - _ = server.Stop() // Clean up if it somehow started - t.Errorf("Expected Start() to fail for invalid address %s", addr) + // Use a timeout to prevent hanging on addresses that might partially work + done := make(chan error, 1) + go func() { + done <- server.Start() + }() + + select { + case err := <-done: + if tc.shouldFail && err == nil { + _ = server.Stop() // Clean up if it somehow started + t.Errorf("Expected Start() to fail for invalid address %s", tc.addr) + } else if !tc.shouldFail && err != nil { + t.Errorf("Expected Start() to succeed for address %s, got error: %v", tc.addr, err) + } + case <-time.After(2 * time.Second): + // If it times out, the server might be listening, stop it + _ = server.Stop() + if tc.shouldFail { + t.Errorf("Start() did not fail quickly enough for invalid address %s", tc.addr) + } else { + t.Logf("Start() timed out for address %s, assuming it started successfully", tc.addr) + } } }) } @@ -246,22 +266,6 @@ func TestWebUIServer_LoggerNil(t *testing.T) { } } -func TestWebUIServer_EmptyListenAddress(t *testing.T) { - logger := createTestLogger() - - // Test with empty listen address - server := Server("", logger) - - // This might fail when trying to start - err := server.Start() - if err == nil { - _ = server.Stop() - t.Log("Note: Server started with empty listen address") - } else { - t.Logf("Expected behavior: Start() failed with empty address: %v", err) - } -} - func TestWebUIServer_RapidStartStop(t *testing.T) { logger := createTestLogger() diff --git a/src/webui/server.go b/src/webui/server.go index 130b8102..8ffb44bc 100644 --- a/src/webui/server.go +++ b/src/webui/server.go @@ -2,6 +2,7 @@ package webui import ( "fmt" + "net" "net/http" "time" @@ -22,6 +23,13 @@ func Server(listen string, log core.Logger) *WebUIServer { } func (w *WebUIServer) Start() error { + // Validate listen address before starting + if w.listen != "" { + if _, _, err := net.SplitHostPort(w.listen); err != nil { + return fmt.Errorf("invalid listen address: %v", err) + } + } + mux := http.NewServeMux() // Setup static files handler (implementation varies by build) From 113dcbb72a441788c4a12dd8d725b3b4447b860e Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Wed, 30 Jul 2025 08:34:29 +0000 Subject: [PATCH 12/46] Add password authentication to WebUI and implement session management - Updated WebUI configuration to include a password field for authentication. - Enhanced the WebUI server to handle login and logout functionality with session management. - Added tests for authentication and session handling. - Updated README and example configuration to reflect new authentication features. --- cmd/yggdrasil/main.go | 7 +- src/config/config.go | 14 +- src/webui/README.md | 36 ++--- src/webui/auth_test.go | 147 ++++++++++++++++++++ src/webui/config_test.go | 12 +- src/webui/endpoints_test.go | 12 +- src/webui/error_handling_test.go | 20 +-- src/webui/example_config.hjson | 41 ++++++ src/webui/server.go | 201 ++++++++++++++++++++++++++-- src/webui/server_dev.go | 9 +- src/webui/server_prod.go | 10 +- src/webui/server_test.go | 13 +- src/webui/static/index.html | 19 ++- src/webui/static/login.html | 168 +++++++++++++++++++++++ src/webui/static/style.css | 37 ++++- src/webui/static_files_prod_test.go | 2 +- src/webui/static_files_test.go | 2 +- 17 files changed, 676 insertions(+), 74 deletions(-) create mode 100644 src/webui/auth_test.go create mode 100644 src/webui/example_config.hjson create mode 100644 src/webui/static/login.html diff --git a/cmd/yggdrasil/main.go b/cmd/yggdrasil/main.go index 5f183ca3..d66ef779 100644 --- a/cmd/yggdrasil/main.go +++ b/cmd/yggdrasil/main.go @@ -308,7 +308,12 @@ func main() { listenAddr = fmt.Sprintf("%s:%d", cfg.WebUI.Host, cfg.WebUI.Port) } - n.webui = webui.Server(listenAddr, logger) + n.webui = webui.Server(listenAddr, cfg.WebUI.Password, logger) + 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) diff --git a/src/config/config.go b/src/config/config.go index ac2b3ec3..5f4d965b 100644 --- a/src/config/config.go +++ b/src/config/config.go @@ -67,9 +67,10 @@ type MulticastInterfaceConfig struct { } type WebUIConfig struct { - Enable bool `comment:"Enable the web interface for managing the node through a browser."` - Port uint16 `comment:"Port for the web interface. Default is 9000."` - Host string `comment:"Host/IP address to bind the web interface to. Empty means all interfaces."` + Enable bool `comment:"Enable the web interface for managing the node through a browser."` + Port uint16 `comment:"Port for the web interface. Default is 9000."` + Host string `comment:"Host/IP address to bind the web interface to. Empty means all interfaces."` + Password string `comment:"Password for accessing the web interface. If empty, no authentication is required."` } // Generates default configuration and returns a pointer to the resulting @@ -94,9 +95,10 @@ func GenerateConfig() *NodeConfig { cfg.NodeInfoPrivacy = false cfg.NodeInfo = map[string]interface{}{} cfg.WebUI = WebUIConfig{ - Enable: false, - Port: 9000, - Host: "127.0.0.1", + Enable: false, + Port: 9000, + Host: "127.0.0.1", + Password: "", } if err := cfg.postprocessConfig(); err != nil { panic(err) diff --git a/src/webui/README.md b/src/webui/README.md index e430837e..b5f122c8 100644 --- a/src/webui/README.md +++ b/src/webui/README.md @@ -7,7 +7,9 @@ This module provides a web interface for managing Yggdrasil node through a brows - ✅ HTTP web server with static files - ✅ Health check endpoint (`/health`) - ✅ Development and production build modes -- ✅ Automatic binding to Yggdrasil IPv6 address +- ✅ Custom session-based authentication +- ✅ Beautiful login page (password-only) +- ✅ Session management with automatic cleanup - ✅ IPv4 and IPv6 support - ✅ Path traversal attack protection @@ -21,7 +23,7 @@ In the Yggdrasil configuration file: "Enable": true, "Port": 9000, "Host": "", - "BindYgg": false + "Password": "your_secure_password" } } ``` @@ -31,27 +33,20 @@ In the Yggdrasil configuration file: - **`Enable`** - enable/disable WebUI - **`Port`** - port for web interface (default 9000) - **`Host`** - IP address to bind to (empty means all interfaces) -- **`BindYgg`** - automatically bind to Yggdrasil IPv6 address +- **`Password`** - password for accessing the web interface (optional, if empty no authentication required) ## Usage -### Standard mode +### Without password authentication ```go -server := webui.Server("127.0.0.1:9000", logger) +server := webui.Server("127.0.0.1:9000", "", logger) ``` -### With core access +### With password authentication ```go -server := webui.ServerWithCore("127.0.0.1:9000", logger, coreInstance) -``` - -### Automatic Yggdrasil address binding - -```go -server := webui.ServerForYggdrasil(9000, logger, coreInstance) -// Automatically binds to [yggdrasil_ipv6]:9000 +server := webui.Server("127.0.0.1:9000", "your_password", logger) ``` ### Starting the server @@ -69,9 +64,12 @@ server.Stop() ## Endpoints -- **`/`** - main page (index.html) -- **`/health`** - health check (returns "OK") -- **`/static/*`** - static files (CSS, JS, images) +- **`/`** - main page (index.html) - requires authentication if password is set +- **`/login.html`** - custom login page (only password required) +- **`/auth/login`** - POST endpoint for authentication +- **`/auth/logout`** - logout endpoint (clears session) +- **`/health`** - health check (returns "OK") - no authentication required +- **`/static/*`** - static files (CSS, JS, images) - requires authentication if password is set ## Build modes @@ -89,6 +87,10 @@ server.Stop() - Configured HTTP timeouts - Header size limits - File MIME type validation +- Custom session-based authentication (password protection) +- HttpOnly and Secure cookies +- Session expiration (24 hours) +- Health check endpoint always accessible without authentication ## Testing diff --git a/src/webui/auth_test.go b/src/webui/auth_test.go new file mode 100644 index 00000000..f32cb5be --- /dev/null +++ b/src/webui/auth_test.go @@ -0,0 +1,147 @@ +package webui + +import ( + "fmt" + "net/http" + "net/http/httptest" + "strings" + "testing" + + "github.com/gologme/log" +) + +func TestSessionAuthentication(t *testing.T) { + logger := log.New(nil, "test: ", log.Flags()) + + // Test server with password + server := Server("127.0.0.1:0", "testpassword", logger) + + // Test cases for login endpoint + loginTests := []struct { + name string + password string + expectCode int + }{ + {"Wrong password", "wrongpass", http.StatusUnauthorized}, + {"Correct password", "testpassword", http.StatusOK}, + } + + for _, tt := range loginTests { + t.Run("Login_"+tt.name, func(t *testing.T) { + loginData := fmt.Sprintf(`{"password":"%s"}`, tt.password) + req := httptest.NewRequest("POST", "/auth/login", strings.NewReader(loginData)) + req.Header.Set("Content-Type", "application/json") + + rr := httptest.NewRecorder() + server.loginHandler(rr, req) + + if rr.Code != tt.expectCode { + t.Errorf("Expected status code %d, got %d", tt.expectCode, rr.Code) + } + }) + } + + // Test protected resource access + t.Run("Protected_resource_without_session", func(t *testing.T) { + req := httptest.NewRequest("GET", "/", nil) + rr := httptest.NewRecorder() + + handler := server.authMiddleware(func(rw http.ResponseWriter, r *http.Request) { + rw.WriteHeader(http.StatusOK) + }) + + handler(rr, req) + + // Should redirect to login + if rr.Code != http.StatusSeeOther { + t.Errorf("Expected redirect (303), got %d", rr.Code) + } + }) +} + +func TestNoPasswordAuthentication(t *testing.T) { + logger := log.New(nil, "test: ", log.Flags()) + + // Test server without password + server := Server("127.0.0.1:0", "", logger) + + req := httptest.NewRequest("GET", "/", nil) + rr := httptest.NewRecorder() + + // Create handler function for testing + handler := server.authMiddleware(func(rw http.ResponseWriter, r *http.Request) { + rw.WriteHeader(http.StatusOK) + }) + + handler(rr, req) + + // Should allow access without auth when no password is set + if rr.Code != http.StatusOK { + t.Errorf("Expected access without auth when no password is set, got %d", rr.Code) + } +} + +func TestSessionWorkflow(t *testing.T) { + logger := log.New(nil, "test: ", log.Flags()) + server := Server("127.0.0.1:0", "testpassword", logger) + + // 1. Login to get session + loginData := `{"password":"testpassword"}` + loginReq := httptest.NewRequest("POST", "/auth/login", strings.NewReader(loginData)) + loginReq.Header.Set("Content-Type", "application/json") + loginRR := httptest.NewRecorder() + + server.loginHandler(loginRR, loginReq) + + if loginRR.Code != http.StatusOK { + t.Fatalf("Login failed, expected 200, got %d", loginRR.Code) + } + + // Extract session cookie + cookies := loginRR.Result().Cookies() + var sessionCookie *http.Cookie + for _, cookie := range cookies { + if cookie.Name == "ygg_session" { + sessionCookie = cookie + break + } + } + + if sessionCookie == nil { + t.Fatal("No session cookie found after login") + } + + // 2. Access protected resource with session + protectedReq := httptest.NewRequest("GET", "/", nil) + protectedReq.AddCookie(sessionCookie) + protectedRR := httptest.NewRecorder() + + handler := server.authMiddleware(func(rw http.ResponseWriter, r *http.Request) { + rw.WriteHeader(http.StatusOK) + }) + + handler(protectedRR, protectedReq) + + if protectedRR.Code != http.StatusOK { + t.Errorf("Expected access with valid session, got %d", protectedRR.Code) + } +} + +func TestHealthEndpointNoAuth(t *testing.T) { + req := httptest.NewRequest("GET", "/health", nil) + rr := httptest.NewRecorder() + + // Health endpoint should not require auth + http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) { + rw.WriteHeader(http.StatusOK) + _, _ = rw.Write([]byte("OK")) + }).ServeHTTP(rr, req) + + if rr.Code != http.StatusOK { + t.Errorf("Health endpoint should be accessible without auth, got status %d", rr.Code) + } + + if rr.Body.String() != "OK" { + t.Errorf("Expected 'OK', got '%s'", rr.Body.String()) + } +} diff --git a/src/webui/config_test.go b/src/webui/config_test.go index 647b5d9c..eceb6f39 100644 --- a/src/webui/config_test.go +++ b/src/webui/config_test.go @@ -118,7 +118,7 @@ func TestWebUIConfig_Validation(t *testing.T) { // Try to create server with this config logger := createTestLogger() - server := Server(listenAddr, logger) + server := Server(listenAddr, "", logger) if server == nil { t.Error("Failed to create server with valid config") } @@ -152,7 +152,7 @@ func TestWebUIConfig_PortRanges(t *testing.T) { for _, test := range portTests { t.Run(test.description, func(t *testing.T) { listenAddr := fmt.Sprintf("127.0.0.1:%d", test.port) - server := Server(listenAddr, logger) + server := Server(listenAddr, "", logger) if server == nil { t.Errorf("Failed to create server for %s", test.description) @@ -207,7 +207,7 @@ func TestWebUIConfig_HostFormats(t *testing.T) { t.Errorf("Expected %s, got %s", test.expected, listenAddr) } - server := Server(listenAddr, logger) + server := Server(listenAddr, "", logger) if server == nil { t.Errorf("Failed to create server with %s", test.description) } @@ -228,7 +228,7 @@ func TestWebUIConfig_Integration(t *testing.T) { listenAddr := fmt.Sprintf("%s:%d", cfg.WebUI.Host, cfg.WebUI.Port) logger := createTestLogger() - server := Server(listenAddr, logger) + server := Server(listenAddr, "", logger) if server == nil { t.Fatal("Failed to create server from generated config") @@ -303,7 +303,7 @@ func TestWebUIConfig_EdgeCases(t *testing.T) { }, test: func(t *testing.T, cfg config.WebUIConfig) { listenAddr := fmt.Sprintf("%s:%d", cfg.Host, cfg.Port) - server := Server(listenAddr, logger) + server := Server(listenAddr, "", logger) if server == nil { t.Error("Should be able to create server with max port") } @@ -318,7 +318,7 @@ func TestWebUIConfig_EdgeCases(t *testing.T) { }, test: func(t *testing.T, cfg config.WebUIConfig) { listenAddr := fmt.Sprintf("%s:%d", cfg.Host, cfg.Port) - server := Server(listenAddr, logger) + server := Server(listenAddr, "", logger) // Server creation should not panic, even with invalid host if server == nil { t.Error("Server creation should not fail due to host format") diff --git a/src/webui/endpoints_test.go b/src/webui/endpoints_test.go index 6916ee2d..33545ff7 100644 --- a/src/webui/endpoints_test.go +++ b/src/webui/endpoints_test.go @@ -15,7 +15,7 @@ func TestWebUIServer_RootEndpoint(t *testing.T) { // Use httptest.Server for more reliable testing mux := http.NewServeMux() - setupStaticHandler(mux) + testServer := Server("127.0.0.1:0", "", createTestLogger()); setupStaticHandler(mux, testServer) mux.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { serveFile(rw, r, logger) }) @@ -41,7 +41,7 @@ func TestWebUIServer_HealthEndpointDetails(t *testing.T) { // Use httptest.Server for more reliable testing mux := http.NewServeMux() - setupStaticHandler(mux) + testServer := Server("127.0.0.1:0", "", createTestLogger()); setupStaticHandler(mux, testServer) mux.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { serveFile(rw, r, logger) }) @@ -103,7 +103,7 @@ func TestWebUIServer_NonExistentEndpoint(t *testing.T) { // Use httptest.Server for more reliable testing mux := http.NewServeMux() - setupStaticHandler(mux) + testServer := Server("127.0.0.1:0", "", createTestLogger()); setupStaticHandler(mux, testServer) mux.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { serveFile(rw, r, logger) }) @@ -152,7 +152,7 @@ func TestWebUIServer_ContentTypes(t *testing.T) { mux := http.NewServeMux() // Setup handlers like in the actual server - setupStaticHandler(mux) + testServer := Server("127.0.0.1:0", "", createTestLogger()); setupStaticHandler(mux, testServer) mux.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { serveFile(rw, r, logger) }) @@ -182,7 +182,7 @@ func TestWebUIServer_HeaderSecurity(t *testing.T) { // Use httptest.Server for more reliable testing mux := http.NewServeMux() - setupStaticHandler(mux) + testServer := Server("127.0.0.1:0", "", createTestLogger()); setupStaticHandler(mux, testServer) mux.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { serveFile(rw, r, logger) }) @@ -221,7 +221,7 @@ func TestWebUIServer_ConcurrentRequests(t *testing.T) { // Use httptest.Server for more reliable testing mux := http.NewServeMux() - setupStaticHandler(mux) + testServer := Server("127.0.0.1:0", "", createTestLogger()); setupStaticHandler(mux, testServer) mux.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { serveFile(rw, r, logger) }) diff --git a/src/webui/error_handling_test.go b/src/webui/error_handling_test.go index c8dfd6f0..9663ad4a 100644 --- a/src/webui/error_handling_test.go +++ b/src/webui/error_handling_test.go @@ -28,7 +28,7 @@ func TestWebUIServer_InvalidListenAddress(t *testing.T) { for _, tc := range testCases { t.Run(fmt.Sprintf("Address_%s_%s", tc.addr, tc.description), func(t *testing.T) { - server := Server(tc.addr, logger) + server := Server(tc.addr, "", logger) // Use a timeout to prevent hanging on addresses that might partially work done := make(chan error, 1) @@ -71,7 +71,7 @@ func TestWebUIServer_PortAlreadyInUse(t *testing.T) { usedPort := listener.Addr().(*net.TCPAddr).Port conflictAddress := fmt.Sprintf("127.0.0.1:%d", usedPort) - server := Server(conflictAddress, logger) + server := Server(conflictAddress, "", logger) // This should fail because port is already in use err = server.Start() @@ -85,8 +85,8 @@ func TestWebUIServer_DoubleStart(t *testing.T) { logger := createTestLogger() // Create two separate servers to test behavior - server1 := Server("127.0.0.1:0", logger) - server2 := Server("127.0.0.1:0", logger) + server1 := Server("127.0.0.1:0", "", logger) + server2 := Server("127.0.0.1:0", "", logger) // Start first server startDone1 := make(chan error, 1) @@ -142,7 +142,7 @@ func TestWebUIServer_DoubleStart(t *testing.T) { func TestWebUIServer_StopTwice(t *testing.T) { logger := createTestLogger() - server := Server("127.0.0.1:0", logger) + server := Server("127.0.0.1:0", "", logger) // Start server go func() { @@ -176,7 +176,7 @@ func TestWebUIServer_GracefulShutdown(t *testing.T) { addr := listener.Addr().String() listener.Close() // Close so our server can use it - server := Server(addr, logger) + server := Server(addr, "", logger) // Channel to track when Start() returns startDone := make(chan error, 1) @@ -230,7 +230,7 @@ func TestWebUIServer_GracefulShutdown(t *testing.T) { func TestWebUIServer_ContextCancellation(t *testing.T) { logger := createTestLogger() - server := Server("127.0.0.1:0", logger) + server := Server("127.0.0.1:0", "", logger) // Create context with timeout ctx, cancel := context.WithTimeout(context.Background(), 200*time.Millisecond) @@ -255,7 +255,7 @@ func TestWebUIServer_ContextCancellation(t *testing.T) { func TestWebUIServer_LoggerNil(t *testing.T) { // Test server creation with nil logger - server := Server("127.0.0.1:0", nil) + server := Server("127.0.0.1:0", "", nil) if server == nil { t.Fatal("Server should be created even with nil logger") @@ -271,7 +271,7 @@ func TestWebUIServer_RapidStartStop(t *testing.T) { // Test rapid start/stop cycles with fewer iterations for i := 0; i < 5; i++ { - server := Server("127.0.0.1:0", logger) + server := Server("127.0.0.1:0", "", logger) // Start server startDone := make(chan error, 1) @@ -306,7 +306,7 @@ func TestWebUIServer_LargeNumberOfRequests(t *testing.T) { // Use httptest.Server for more reliable testing mux := http.NewServeMux() - setupStaticHandler(mux) + testServer := Server("127.0.0.1:0", "", createTestLogger()); setupStaticHandler(mux, testServer) mux.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { serveFile(rw, r, logger) }) diff --git a/src/webui/example_config.hjson b/src/webui/example_config.hjson new file mode 100644 index 00000000..b96a858f --- /dev/null +++ b/src/webui/example_config.hjson @@ -0,0 +1,41 @@ +{ + // Example Yggdrasil configuration with WebUI password authentication + + "PrivateKey": "your_private_key_here", + "PublicKey": "your_public_key_here", + + // ... other Yggdrasil configuration options ... + + // Web interface configuration + "WebUI": { + "Enable": true, + "Port": 9000, + "Host": "127.0.0.1", // Bind only to localhost for security + "Password": "your_secure_password_here" // Set a strong password + } +} + +// Usage examples: +// +// 1. Enable WebUI with password protection: +// Set "Password" to a strong password +// Users will see a custom login page asking only for password +// +// 2. Disable password protection: +// Set "Password" to "" (empty string) +// WebUI will be accessible without authentication +// +// 3. Disable WebUI entirely: +// Set "Enable" to false +// +// Authentication features: +// - Custom login page (no username required, only password) +// - Session-based authentication with secure cookies +// - 24-hour session expiration +// - Automatic session cleanup +// +// Security recommendations: +// - Use a strong, unique password (12+ characters) +// - Bind to localhost (127.0.0.1) unless you need remote access +// - Consider using HTTPS reverse proxy for production deployments +// - Sessions are stored in memory and lost on server restart \ No newline at end of file diff --git a/src/webui/server.go b/src/webui/server.go index 8ffb44bc..c0a5f3c6 100644 --- a/src/webui/server.go +++ b/src/webui/server.go @@ -1,27 +1,193 @@ package webui import ( + "crypto/rand" + "crypto/subtle" + "encoding/hex" + "encoding/json" "fmt" "net" "net/http" + "strings" + "sync" "time" "github.com/yggdrasil-network/yggdrasil-go/src/core" ) type WebUIServer struct { - server *http.Server - log core.Logger - listen string + server *http.Server + log core.Logger + listen string + password string + sessions map[string]time.Time // sessionID -> expiry time + sessionsMux sync.RWMutex } -func Server(listen string, log core.Logger) *WebUIServer { +type LoginRequest struct { + Password string `json:"password"` +} + +func Server(listen string, password string, log core.Logger) *WebUIServer { return &WebUIServer{ - listen: listen, - log: log, + listen: listen, + password: password, + log: log, + sessions: make(map[string]time.Time), } } +// generateSessionID creates a random session ID +func (w *WebUIServer) generateSessionID() string { + bytes := make([]byte, 32) + rand.Read(bytes) + return hex.EncodeToString(bytes) +} + +// isValidSession checks if a session is valid and not expired +func (w *WebUIServer) isValidSession(sessionID string) bool { + w.sessionsMux.RLock() + defer w.sessionsMux.RUnlock() + + expiry, exists := w.sessions[sessionID] + if !exists { + return false + } + + if time.Now().After(expiry) { + // Session expired, clean it up + go func() { + w.sessionsMux.Lock() + delete(w.sessions, sessionID) + w.sessionsMux.Unlock() + }() + return false + } + + return true +} + +// createSession creates a new session for the user +func (w *WebUIServer) createSession() string { + sessionID := w.generateSessionID() + expiry := time.Now().Add(24 * time.Hour) // Session valid for 24 hours + + w.sessionsMux.Lock() + w.sessions[sessionID] = expiry + w.sessionsMux.Unlock() + + return sessionID +} + +// cleanupExpiredSessions removes expired sessions +func (w *WebUIServer) cleanupExpiredSessions() { + w.sessionsMux.Lock() + defer w.sessionsMux.Unlock() + + now := time.Now() + for sessionID, expiry := range w.sessions { + if now.After(expiry) { + delete(w.sessions, sessionID) + } + } +} + +// authMiddleware checks for valid session or redirects to login +func (w *WebUIServer) authMiddleware(next http.HandlerFunc) http.HandlerFunc { + return func(rw http.ResponseWriter, r *http.Request) { + // Skip authentication if no password is set + if w.password == "" { + next(rw, r) + return + } + + // Check for session cookie + cookie, err := r.Cookie("ygg_session") + if err != nil || !w.isValidSession(cookie.Value) { + // No valid session - redirect to login page + if r.URL.Path == "/login.html" || strings.HasPrefix(r.URL.Path, "/auth/") { + // Allow access to login page and auth endpoints + next(rw, r) + return + } + + // For API calls, return 401 + if strings.HasPrefix(r.URL.Path, "/api/") { + rw.WriteHeader(http.StatusUnauthorized) + return + } + + // For regular pages, redirect to login + http.Redirect(rw, r, "/login.html", http.StatusSeeOther) + return + } + + next(rw, r) + } +} + +// loginHandler handles password authentication +func (w *WebUIServer) loginHandler(rw http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodPost { + http.Error(rw, "Method not allowed", http.StatusMethodNotAllowed) + return + } + + var loginReq LoginRequest + if err := json.NewDecoder(r.Body).Decode(&loginReq); err != nil { + http.Error(rw, "Invalid request", http.StatusBadRequest) + return + } + + // Check password + if subtle.ConstantTimeCompare([]byte(loginReq.Password), []byte(w.password)) != 1 { + w.log.Debugf("Authentication failed for request from %s", r.RemoteAddr) + http.Error(rw, "Invalid password", http.StatusUnauthorized) + return + } + + // Create session + sessionID := w.createSession() + + // Set session cookie + http.SetCookie(rw, &http.Cookie{ + Name: "ygg_session", + Value: sessionID, + Path: "/", + HttpOnly: true, + Secure: r.TLS != nil, // Only set Secure flag if using HTTPS + SameSite: http.SameSiteStrictMode, + MaxAge: 24 * 60 * 60, // 24 hours + }) + + w.log.Debugf("Successful authentication for request from %s", r.RemoteAddr) + rw.WriteHeader(http.StatusOK) +} + +// logoutHandler handles logout +func (w *WebUIServer) logoutHandler(rw http.ResponseWriter, r *http.Request) { + // Get session cookie + cookie, err := r.Cookie("ygg_session") + if err == nil { + // Remove session from server + w.sessionsMux.Lock() + delete(w.sessions, cookie.Value) + w.sessionsMux.Unlock() + } + + // Clear session cookie + http.SetCookie(rw, &http.Cookie{ + Name: "ygg_session", + Value: "", + Path: "/", + HttpOnly: true, + MaxAge: -1, // Delete cookie + }) + + // Redirect to login page + http.Redirect(rw, r, "/login.html", http.StatusSeeOther) +} + func (w *WebUIServer) Start() error { // Validate listen address before starting if w.listen != "" { @@ -30,17 +196,30 @@ func (w *WebUIServer) Start() error { } } + // Start session cleanup routine + go func() { + ticker := time.NewTicker(1 * time.Hour) + defer ticker.Stop() + for range ticker.C { + w.cleanupExpiredSessions() + } + }() + mux := http.NewServeMux() + // Authentication endpoints - no auth required + mux.HandleFunc("/auth/login", w.loginHandler) + mux.HandleFunc("/auth/logout", w.logoutHandler) + // Setup static files handler (implementation varies by build) - setupStaticHandler(mux) + setupStaticHandler(mux, w) - // Serve any file by path (implementation varies by build) - mux.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { + // Serve any file by path (implementation varies by build) - with auth + mux.HandleFunc("/", w.authMiddleware(func(rw http.ResponseWriter, r *http.Request) { serveFile(rw, r, w.log) - }) + })) - // Health check endpoint + // Health check endpoint - no auth required mux.HandleFunc("/health", func(rw http.ResponseWriter, r *http.Request) { rw.WriteHeader(http.StatusOK) _, _ = rw.Write([]byte("OK")) diff --git a/src/webui/server_dev.go b/src/webui/server_dev.go index 5ea9196b..93c7f044 100644 --- a/src/webui/server_dev.go +++ b/src/webui/server_dev.go @@ -14,9 +14,12 @@ import ( ) // setupStaticHandler configures static file serving for development (files from disk) -func setupStaticHandler(mux *http.ServeMux) { - // Serve static files from disk for development - mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("src/webui/static/")))) +func setupStaticHandler(mux *http.ServeMux, server *WebUIServer) { + // Serve static files from disk for development - with auth + staticHandler := http.StripPrefix("/static/", http.FileServer(http.Dir("src/webui/static/"))) + mux.HandleFunc("/static/", server.authMiddleware(func(rw http.ResponseWriter, r *http.Request) { + staticHandler.ServeHTTP(rw, r) + })) } // serveFile serves any file from disk or returns 404 if not found diff --git a/src/webui/server_prod.go b/src/webui/server_prod.go index 116805dc..7a81d246 100644 --- a/src/webui/server_prod.go +++ b/src/webui/server_prod.go @@ -18,15 +18,19 @@ import ( var staticFiles embed.FS // setupStaticHandler configures static file serving for production (embedded files) -func setupStaticHandler(mux *http.ServeMux) { +func setupStaticHandler(mux *http.ServeMux, server *WebUIServer) { // Get the embedded file system for static files staticFS, err := fs.Sub(staticFiles, "static") if err != nil { panic("failed to get embedded static files: " + err.Error()) } - // Serve static files from embedded FS - mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.FS(staticFS)))) + // Serve static files from embedded FS - with auth + staticHandler := http.FileServer(http.FS(staticFS)) + mux.HandleFunc("/static/", server.authMiddleware(func(rw http.ResponseWriter, r *http.Request) { + // Strip the /static/ prefix before serving + http.StripPrefix("/static/", staticHandler).ServeHTTP(rw, r) + })) } // serveFile serves any file from embedded files or returns 404 if not found diff --git a/src/webui/server_test.go b/src/webui/server_test.go index 42cb9835..7b1c6f7a 100644 --- a/src/webui/server_test.go +++ b/src/webui/server_test.go @@ -26,7 +26,7 @@ func TestWebUIServer_Creation(t *testing.T) { logger := createTestLogger() listen := getTestAddress() - server := Server(listen, logger) + server := Server(listen, "", logger) if server == nil { t.Fatal("Server function returned nil") @@ -49,7 +49,7 @@ func TestWebUIServer_StartStop(t *testing.T) { logger := createTestLogger() listen := getTestAddress() - server := Server(listen, logger) + server := Server(listen, "", logger) // Start server in goroutine errChan := make(chan error, 1) @@ -86,7 +86,7 @@ func TestWebUIServer_StopWithoutStart(t *testing.T) { logger := createTestLogger() listen := getTestAddress() - server := Server(listen, logger) + server := Server(listen, "", logger) // Stop server that was never started should not error err := server.Stop() @@ -100,7 +100,8 @@ func TestWebUIServer_HealthEndpoint(t *testing.T) { // Create a test server using net/http/httptest for reliable testing mux := http.NewServeMux() - setupStaticHandler(mux) + testServer := Server("127.0.0.1:0", "", logger) + setupStaticHandler(mux, testServer) mux.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { serveFile(rw, r, logger) }) @@ -135,7 +136,7 @@ func TestWebUIServer_HealthEndpoint(t *testing.T) { func TestWebUIServer_Timeouts(t *testing.T) { logger := createTestLogger() - server := Server("127.0.0.1:0", logger) + server := Server("127.0.0.1:0", "", logger) // Start server go func() { @@ -173,7 +174,7 @@ func TestWebUIServer_ConcurrentStartStop(t *testing.T) { // Test concurrent start/stop operations with separate servers for i := 0; i < 3; i++ { - server := Server("127.0.0.1:0", logger) + server := Server("127.0.0.1:0", "", logger) // Start server startDone := make(chan error, 1) diff --git a/src/webui/static/index.html b/src/webui/static/index.html index c68ce3bc..3c8d7a72 100644 --- a/src/webui/static/index.html +++ b/src/webui/static/index.html @@ -11,8 +11,15 @@
-

🌳 Yggdrasil Web Interface

-

Network mesh management dashboard

+
+
+

🌳 Yggdrasil Web Interface

+

Network mesh management dashboard

+
+
+ +
+
@@ -50,6 +57,14 @@

Yggdrasil Network • Minimal WebUI v1.0

+ + \ No newline at end of file diff --git a/src/webui/static/login.html b/src/webui/static/login.html new file mode 100644 index 00000000..d6835999 --- /dev/null +++ b/src/webui/static/login.html @@ -0,0 +1,168 @@ + + + + + + + Yggdrasil Web Interface - Login + + + + + + + + + + + \ No newline at end of file diff --git a/src/webui/static/style.css b/src/webui/static/style.css index 86b056af..81f27757 100644 --- a/src/webui/static/style.css +++ b/src/webui/static/style.css @@ -18,11 +18,22 @@ body { } header { - text-align: center; margin-bottom: 40px; color: white; } +.header-content { + display: flex; + justify-content: space-between; + align-items: center; + text-align: left; +} + +.header-content > div:first-child { + text-align: center; + flex: 1; +} + header h1 { font-size: 2.5rem; margin-bottom: 10px; @@ -34,6 +45,21 @@ header p { opacity: 0.9; } +.logout-btn { + background: rgba(255, 255, 255, 0.2); + color: white; + border: 1px solid rgba(255, 255, 255, 0.3); + padding: 8px 16px; + border-radius: 6px; + cursor: pointer; + font-size: 14px; + transition: background 0.2s ease; +} + +.logout-btn:hover { + background: rgba(255, 255, 255, 0.3); +} + main { background: white; border-radius: 12px; @@ -122,6 +148,15 @@ footer { padding: 10px; } + .header-content { + flex-direction: column; + gap: 20px; + } + + .header-content > div:first-child { + text-align: center; + } + header h1 { font-size: 2rem; } diff --git a/src/webui/static_files_prod_test.go b/src/webui/static_files_prod_test.go index 60d33c9d..28d4e1a4 100644 --- a/src/webui/static_files_prod_test.go +++ b/src/webui/static_files_prod_test.go @@ -59,7 +59,7 @@ func TestStaticFiles_ProdMode_SetupStaticHandler(t *testing.T) { mux := http.NewServeMux() // This should not panic - setupStaticHandler(mux) + testServer := Server("127.0.0.1:0", "", createTestLogger()); setupStaticHandler(mux, testServer) server := httptest.NewServer(mux) defer server.Close() diff --git a/src/webui/static_files_test.go b/src/webui/static_files_test.go index 8bb6a87f..ddf4512e 100644 --- a/src/webui/static_files_test.go +++ b/src/webui/static_files_test.go @@ -128,7 +128,7 @@ func TestStaticFiles_DevMode_SetupStaticHandler(t *testing.T) { // Create HTTP server with static handler mux := http.NewServeMux() - setupStaticHandler(mux) + testServer := Server("127.0.0.1:0", "", createTestLogger()); setupStaticHandler(mux, testServer) server := httptest.NewServer(mux) defer server.Close() From a984fba30df01f68bc67d2329153efc2764d88c7 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Wed, 30 Jul 2025 09:19:05 +0000 Subject: [PATCH 13/46] Add brute force protection to authentication system - Implemented IP-based blocking after 3 failed login attempts, with a 1-minute lockout period. - Enhanced login handler to check for blocked IPs and record failed attempts. - Added tests for brute force protection and successful login clearing failed attempts. - Updated README and example configuration to document new security features. --- src/webui/README.md | 5 ++ src/webui/auth_test.go | 140 +++++++++++++++++++++++++++++ src/webui/example_config.hjson | 6 +- src/webui/server.go | 155 +++++++++++++++++++++++++++++---- src/webui/static/login.html | 23 ++++- 5 files changed, 309 insertions(+), 20 deletions(-) diff --git a/src/webui/README.md b/src/webui/README.md index b5f122c8..c170d363 100644 --- a/src/webui/README.md +++ b/src/webui/README.md @@ -9,6 +9,7 @@ This module provides a web interface for managing Yggdrasil node through a brows - ✅ Development and production build modes - ✅ Custom session-based authentication - ✅ Beautiful login page (password-only) +- ✅ **Brute force protection** with IP blocking - ✅ Session management with automatic cleanup - ✅ IPv4 and IPv6 support - ✅ Path traversal attack protection @@ -90,6 +91,10 @@ server.Stop() - Custom session-based authentication (password protection) - HttpOnly and Secure cookies - Session expiration (24 hours) +- **Brute force protection**: IP blocking after 3 failed attempts +- **Temporary lockout**: 1-minute timeout for blocked IPs +- Automatic cleanup of expired blocks and sessions +- Real IP detection (supports X-Forwarded-For, X-Real-IP headers) - Health check endpoint always accessible without authentication ## Testing diff --git a/src/webui/auth_test.go b/src/webui/auth_test.go index f32cb5be..c745b1ae 100644 --- a/src/webui/auth_test.go +++ b/src/webui/auth_test.go @@ -145,3 +145,143 @@ func TestHealthEndpointNoAuth(t *testing.T) { t.Errorf("Expected 'OK', got '%s'", rr.Body.String()) } } + +func TestBruteForceProtection(t *testing.T) { + logger := log.New(nil, "test: ", log.Flags()) + server := Server("127.0.0.1:0", "testpassword", logger) + + // Test multiple failed attempts from same IP + clientIP := "192.168.1.100" + + // First 3 attempts should be allowed but fail + for i := 1; i <= 3; i++ { + t.Run(fmt.Sprintf("Failed_attempt_%d", i), func(t *testing.T) { + loginData := `{"password":"wrongpassword"}` + req := httptest.NewRequest("POST", "/auth/login", strings.NewReader(loginData)) + req.Header.Set("Content-Type", "application/json") + req.RemoteAddr = clientIP + ":12345" + + rr := httptest.NewRecorder() + server.loginHandler(rr, req) + + if rr.Code != http.StatusUnauthorized { + t.Errorf("Expected 401 for failed attempt %d, got %d", i, rr.Code) + } + }) + } + + // 4th attempt should be blocked + t.Run("Blocked_attempt", func(t *testing.T) { + loginData := `{"password":"wrongpassword"}` + req := httptest.NewRequest("POST", "/auth/login", strings.NewReader(loginData)) + req.Header.Set("Content-Type", "application/json") + req.RemoteAddr = clientIP + ":12345" + + rr := httptest.NewRecorder() + server.loginHandler(rr, req) + + if rr.Code != http.StatusTooManyRequests { + t.Errorf("Expected 429 for blocked attempt, got %d", rr.Code) + } + }) + + // Even correct password should be blocked during block period + t.Run("Correct_password_while_blocked", func(t *testing.T) { + loginData := `{"password":"testpassword"}` + req := httptest.NewRequest("POST", "/auth/login", strings.NewReader(loginData)) + req.Header.Set("Content-Type", "application/json") + req.RemoteAddr = clientIP + ":12345" + + rr := httptest.NewRecorder() + server.loginHandler(rr, req) + + if rr.Code != http.StatusTooManyRequests { + t.Errorf("Expected 429 even for correct password while blocked, got %d", rr.Code) + } + }) +} + +func TestBruteForceProtectionDifferentIPs(t *testing.T) { + logger := log.New(nil, "test: ", log.Flags()) + server := Server("127.0.0.1:0", "testpassword", logger) + + // Failed attempts from one IP shouldn't affect another IP + ip1 := "192.168.1.100" + ip2 := "192.168.1.101" + + // Block first IP + for i := 1; i <= 3; i++ { + loginData := `{"password":"wrongpassword"}` + req := httptest.NewRequest("POST", "/auth/login", strings.NewReader(loginData)) + req.Header.Set("Content-Type", "application/json") + req.RemoteAddr = ip1 + ":12345" + + rr := httptest.NewRecorder() + server.loginHandler(rr, req) + + if rr.Code != http.StatusUnauthorized { + t.Errorf("Expected 401 for failed attempt %d from IP1, got %d", i, rr.Code) + } + } + + // Second IP should still be able to attempt login + t.Run("Different_IP_not_blocked", func(t *testing.T) { + loginData := `{"password":"wrongpassword"}` + req := httptest.NewRequest("POST", "/auth/login", strings.NewReader(loginData)) + req.Header.Set("Content-Type", "application/json") + req.RemoteAddr = ip2 + ":12345" + + rr := httptest.NewRecorder() + server.loginHandler(rr, req) + + if rr.Code != http.StatusUnauthorized { + t.Errorf("Expected 401 for different IP (not blocked), got %d", rr.Code) + } + }) +} + +func TestSuccessfulLoginClearsFailedAttempts(t *testing.T) { + logger := log.New(nil, "test: ", log.Flags()) + server := Server("127.0.0.1:0", "testpassword", logger) + + clientIP := "192.168.1.100" + + // Make 2 failed attempts + for i := 1; i <= 2; i++ { + loginData := `{"password":"wrongpassword"}` + req := httptest.NewRequest("POST", "/auth/login", strings.NewReader(loginData)) + req.Header.Set("Content-Type", "application/json") + req.RemoteAddr = clientIP + ":12345" + + rr := httptest.NewRecorder() + server.loginHandler(rr, req) + + if rr.Code != http.StatusUnauthorized { + t.Errorf("Expected 401 for failed attempt %d, got %d", i, rr.Code) + } + } + + // Successful login should clear failed attempts + t.Run("Successful_login_clears_attempts", func(t *testing.T) { + loginData := `{"password":"testpassword"}` + req := httptest.NewRequest("POST", "/auth/login", strings.NewReader(loginData)) + req.Header.Set("Content-Type", "application/json") + req.RemoteAddr = clientIP + ":12345" + + rr := httptest.NewRecorder() + server.loginHandler(rr, req) + + if rr.Code != http.StatusOK { + t.Errorf("Expected 200 for correct password, got %d", rr.Code) + } + + // Verify failed attempts were cleared + server.attemptsMux.RLock() + _, exists := server.failedAttempts[clientIP] + server.attemptsMux.RUnlock() + + if exists { + t.Error("Failed attempts should be cleared after successful login") + } + }) +} diff --git a/src/webui/example_config.hjson b/src/webui/example_config.hjson index b96a858f..19b738ec 100644 --- a/src/webui/example_config.hjson +++ b/src/webui/example_config.hjson @@ -33,9 +33,13 @@ // - Session-based authentication with secure cookies // - 24-hour session expiration // - Automatic session cleanup +// - Brute force protection (3 failed attempts = 1 minute block) +// - IP-based blocking with automatic cleanup // // Security recommendations: // - Use a strong, unique password (12+ characters) // - Bind to localhost (127.0.0.1) unless you need remote access // - Consider using HTTPS reverse proxy for production deployments -// - Sessions are stored in memory and lost on server restart \ No newline at end of file +// - Sessions are stored in memory and lost on server restart +// - Failed login attempts are tracked per IP address +// - If behind a reverse proxy, ensure X-Forwarded-For headers are set correctly \ No newline at end of file diff --git a/src/webui/server.go b/src/webui/server.go index c0a5f3c6..11957ab2 100644 --- a/src/webui/server.go +++ b/src/webui/server.go @@ -16,24 +16,39 @@ import ( ) type WebUIServer struct { - server *http.Server - log core.Logger - listen string - password string - sessions map[string]time.Time // sessionID -> expiry time - sessionsMux sync.RWMutex + server *http.Server + log core.Logger + listen string + password string + sessions map[string]time.Time // sessionID -> expiry time + sessionsMux sync.RWMutex + failedAttempts map[string]*FailedLoginInfo // IP -> failed login info + attemptsMux sync.RWMutex } type LoginRequest struct { Password string `json:"password"` } +type FailedLoginInfo struct { + Count int + LastAttempt time.Time + BlockedUntil time.Time +} + +const ( + MaxFailedAttempts = 3 + BlockDuration = 1 * time.Minute + AttemptWindow = 15 * time.Minute // Reset counter if no attempts in 15 minutes +) + func Server(listen string, password string, log core.Logger) *WebUIServer { return &WebUIServer{ - listen: listen, - password: password, - log: log, - sessions: make(map[string]time.Time), + listen: listen, + password: password, + log: log, + sessions: make(map[string]time.Time), + failedAttempts: make(map[string]*FailedLoginInfo), } } @@ -79,6 +94,89 @@ func (w *WebUIServer) createSession() string { return sessionID } +// getClientIP extracts the real client IP from request +func (w *WebUIServer) getClientIP(r *http.Request) string { + // Check for forwarded IP headers (for reverse proxies) + forwarded := r.Header.Get("X-Forwarded-For") + if forwarded != "" { + // Take the first IP in the chain + ips := strings.Split(forwarded, ",") + return strings.TrimSpace(ips[0]) + } + + realIP := r.Header.Get("X-Real-IP") + if realIP != "" { + return realIP + } + + // Extract IP from RemoteAddr + ip, _, _ := net.SplitHostPort(r.RemoteAddr) + return ip +} + +// isIPBlocked checks if an IP address is currently blocked +func (w *WebUIServer) isIPBlocked(ip string) bool { + w.attemptsMux.RLock() + defer w.attemptsMux.RUnlock() + + info, exists := w.failedAttempts[ip] + if !exists { + return false + } + + return time.Now().Before(info.BlockedUntil) +} + +// recordFailedAttempt records a failed login attempt for an IP +func (w *WebUIServer) recordFailedAttempt(ip string) { + w.attemptsMux.Lock() + defer w.attemptsMux.Unlock() + + now := time.Now() + info, exists := w.failedAttempts[ip] + + if !exists { + info = &FailedLoginInfo{} + w.failedAttempts[ip] = info + } + + // Reset counter if last attempt was too long ago + if now.Sub(info.LastAttempt) > AttemptWindow { + info.Count = 0 + } + + info.Count++ + info.LastAttempt = now + + // Block IP if too many failed attempts + if info.Count >= MaxFailedAttempts { + info.BlockedUntil = now.Add(BlockDuration) + w.log.Warnf("IP %s blocked for %v after %d failed login attempts", ip, BlockDuration, info.Count) + } +} + +// clearFailedAttempts clears failed attempts for an IP (on successful login) +func (w *WebUIServer) clearFailedAttempts(ip string) { + w.attemptsMux.Lock() + defer w.attemptsMux.Unlock() + + delete(w.failedAttempts, ip) +} + +// cleanupFailedAttempts removes old failed attempt records +func (w *WebUIServer) cleanupFailedAttempts() { + w.attemptsMux.Lock() + defer w.attemptsMux.Unlock() + + now := time.Now() + for ip, info := range w.failedAttempts { + // Remove if block period has expired and no recent attempts + if now.After(info.BlockedUntil) && now.Sub(info.LastAttempt) > AttemptWindow { + delete(w.failedAttempts, ip) + } + } +} + // cleanupExpiredSessions removes expired sessions func (w *WebUIServer) cleanupExpiredSessions() { w.sessionsMux.Lock() @@ -126,13 +224,22 @@ func (w *WebUIServer) authMiddleware(next http.HandlerFunc) http.HandlerFunc { } } -// loginHandler handles password authentication +// loginHandler handles password authentication with brute force protection func (w *WebUIServer) loginHandler(rw http.ResponseWriter, r *http.Request) { if r.Method != http.MethodPost { http.Error(rw, "Method not allowed", http.StatusMethodNotAllowed) return } + clientIP := w.getClientIP(r) + + // Check if IP is blocked + if w.isIPBlocked(clientIP) { + w.log.Warnf("Blocked login attempt from %s (IP is temporarily blocked)", clientIP) + http.Error(rw, "Too many failed attempts. Please try again later.", http.StatusTooManyRequests) + return + } + var loginReq LoginRequest if err := json.NewDecoder(r.Body).Decode(&loginReq); err != nil { http.Error(rw, "Invalid request", http.StatusBadRequest) @@ -141,11 +248,15 @@ func (w *WebUIServer) loginHandler(rw http.ResponseWriter, r *http.Request) { // Check password if subtle.ConstantTimeCompare([]byte(loginReq.Password), []byte(w.password)) != 1 { - w.log.Debugf("Authentication failed for request from %s", r.RemoteAddr) + w.log.Debugf("Authentication failed for request from %s", clientIP) + w.recordFailedAttempt(clientIP) http.Error(rw, "Invalid password", http.StatusUnauthorized) return } + // Successful login - clear any failed attempts + w.clearFailedAttempts(clientIP) + // Create session sessionID := w.createSession() @@ -160,7 +271,7 @@ func (w *WebUIServer) loginHandler(rw http.ResponseWriter, r *http.Request) { MaxAge: 24 * 60 * 60, // 24 hours }) - w.log.Debugf("Successful authentication for request from %s", r.RemoteAddr) + w.log.Infof("Successful authentication for IP %s", clientIP) rw.WriteHeader(http.StatusOK) } @@ -196,12 +307,20 @@ func (w *WebUIServer) Start() error { } } - // Start session cleanup routine + // Start cleanup routines go func() { - ticker := time.NewTicker(1 * time.Hour) - defer ticker.Stop() - for range ticker.C { - w.cleanupExpiredSessions() + sessionTicker := time.NewTicker(1 * time.Hour) + attemptsTicker := time.NewTicker(5 * time.Minute) // Clean failed attempts more frequently + defer sessionTicker.Stop() + defer attemptsTicker.Stop() + + for { + select { + case <-sessionTicker.C: + w.cleanupExpiredSessions() + case <-attemptsTicker.C: + w.cleanupFailedAttempts() + } } }() diff --git a/src/webui/static/login.html b/src/webui/static/login.html index d6835999..43e38a7f 100644 --- a/src/webui/static/login.html +++ b/src/webui/static/login.html @@ -63,6 +63,13 @@ box-shadow: 0 0 0 3px rgba(102, 126, 234, 0.1); } + .form-group input:disabled { + background-color: #f8f9fa; + border-color: #e9ecef; + color: #6c757d; + cursor: not-allowed; + } + .login-button { width: 100%; background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); @@ -144,8 +151,22 @@ if (response.ok) { // Success - redirect to main page window.location.href = '/'; + } else if (response.status === 429) { + // Too many requests - IP blocked + errorMessage.textContent = 'Too many failed attempts. Please wait 1 minute before trying again.'; + errorMessage.style.display = 'block'; + document.getElementById('password').value = ''; + document.getElementById('password').disabled = true; + + // Re-enable after 1 minute + setTimeout(() => { + document.getElementById('password').disabled = false; + document.getElementById('password').focus(); + errorMessage.style.display = 'none'; + }, 60000); } else { - // Show error message + // Invalid password + errorMessage.textContent = 'Invalid password. Please try again.'; errorMessage.style.display = 'block'; document.getElementById('password').value = ''; document.getElementById('password').focus(); From 008ac3d864369ae133bd6a8705108a42edd0eace Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Wed, 30 Jul 2025 09:19:25 +0000 Subject: [PATCH 14/46] Enhance WebUI with multilingual support --- src/webui/static/index.html | 172 ++++++++++++++++++++++++++++++------ src/webui/static/lang/en.js | 33 +++++++ src/webui/static/lang/ru.js | 33 +++++++ src/webui/static/style.css | 169 +++++++++++++++++++++++++++++++---- 4 files changed, 362 insertions(+), 45 deletions(-) create mode 100644 src/webui/static/lang/en.js create mode 100644 src/webui/static/lang/ru.js diff --git a/src/webui/static/index.html b/src/webui/static/index.html index 3c8d7a72..20f7d66b 100644 --- a/src/webui/static/index.html +++ b/src/webui/static/index.html @@ -6,6 +6,8 @@ Yggdrasil Web Interface + + @@ -13,57 +15,169 @@
-

🌳 Yggdrasil Web Interface

-

Network mesh management dashboard

+

🌳 Yggdrasil Web Interface

+

Network mesh management dashboard

- +
+ + +
+
-
-
-

Node Status

-
- - Active -
-

WebUI is running and accessible

-
+
+ -
-
-

Configuration

-

Manage node settings and peers

- Coming soon... +
+
+
+

Состояние узла

+
+ + Активен +
+

WebUI запущен и доступен

+
+ +
+
+

Сетевая информация

+

Адрес: 200:1234:5678:9abc::1

+

Подсеть: 300:1234:5678:9abc::/64

+
+ +
+

Статистика

+

Время работы: 2д 15ч 42м

+

Активных соединений: 3

+
+
-
-

Peers

-

View and manage peer connections

- Coming soon... +
+
+

Управление пирами

+

Просмотр и управление соединениями с пирами

+
+ +
+
+

Активные пиры

+

Количество активных соединений

+ Функция в разработке... +
+ +
+

Добавить пир

+

Подключение к новому узлу

+ Функция в разработке... +
+
-
-

Network

-

Network topology and routing

- Coming soon... +
+
+

Конфигурация

+

Настройки узла и параметры сети

+
+ +
+
+

Основные настройки

+

Базовая конфигурация узла

+ Функция в разработке... +
+ +
+

Сетевые настройки

+

Параметры сетевого взаимодействия

+ Функция в разработке... +
+
-
-
+
+
-

Yggdrasil Network • Minimal WebUI v1.0

+

Yggdrasil Network • Minimal WebUI v1.0

diff --git a/src/webui/static/lang/en.js b/src/webui/static/lang/en.js new file mode 100644 index 00000000..7001e9c2 --- /dev/null +++ b/src/webui/static/lang/en.js @@ -0,0 +1,33 @@ +window.translations = window.translations || {}; +window.translations.en = { + 'title': '🌳 Yggdrasil Web Interface', + 'subtitle': 'Network mesh management dashboard', + 'logout': 'Logout', + 'nav_status': 'Status', + 'nav_peers': 'Peers', + 'nav_config': 'Configuration', + 'status_title': 'Node Status', + 'status_active': 'Active', + 'status_description': 'WebUI is running and accessible', + 'network_info': 'Network Information', + 'address': 'Address', + 'subnet': 'Subnet', + 'statistics': 'Statistics', + 'uptime': 'Uptime', + 'connections': 'Active connections', + 'peers_title': 'Peer Management', + 'peers_description': 'View and manage peer connections', + 'active_peers': 'Active Peers', + 'active_connections': 'Number of active connections', + 'add_peer': 'Add Peer', + 'add_peer_description': 'Connect to a new node', + 'config_title': 'Configuration', + 'config_description': 'Node settings and network parameters', + 'basic_settings': 'Basic Settings', + 'basic_settings_description': 'Basic node configuration', + 'network_settings': 'Network Settings', + 'network_settings_description': 'Network interaction parameters', + 'coming_soon': 'Coming soon...', + 'footer_text': 'Yggdrasil Network • Minimal WebUI v1.0', + 'logout_confirm': 'Are you sure you want to logout?' +}; \ No newline at end of file diff --git a/src/webui/static/lang/ru.js b/src/webui/static/lang/ru.js new file mode 100644 index 00000000..09586a6f --- /dev/null +++ b/src/webui/static/lang/ru.js @@ -0,0 +1,33 @@ +window.translations = window.translations || {}; +window.translations.ru = { + 'title': '🌳 Yggdrasil Web Interface', + 'subtitle': 'Панель управления mesh-сетью', + 'logout': 'Выход', + 'nav_status': 'Состояние', + 'nav_peers': 'Пиры', + 'nav_config': 'Конфигурация', + 'status_title': 'Состояние узла', + 'status_active': 'Активен', + 'status_description': 'WebUI запущен и доступен', + 'network_info': 'Сетевая информация', + 'address': 'Адрес', + 'subnet': 'Подсеть', + 'statistics': 'Статистика', + 'uptime': 'Время работы', + 'connections': 'Активных соединений', + 'peers_title': 'Управление пирами', + 'peers_description': 'Просмотр и управление соединениями с пирами', + 'active_peers': 'Активные пиры', + 'active_connections': 'Количество активных соединений', + 'add_peer': 'Добавить пир', + 'add_peer_description': 'Подключение к новому узлу', + 'config_title': 'Конфигурация', + 'config_description': 'Настройки узла и параметры сети', + 'basic_settings': 'Основные настройки', + 'basic_settings_description': 'Базовая конфигурация узла', + 'network_settings': 'Сетевые настройки', + 'network_settings_description': 'Параметры сетевого взаимодействия', + 'coming_soon': 'Функция в разработке...', + 'footer_text': 'Yggdrasil Network • Minimal WebUI v1.0', + 'logout_confirm': 'Вы уверены, что хотите выйти?' +}; \ No newline at end of file diff --git a/src/webui/static/style.css b/src/webui/static/style.css index 81f27757..c03300a1 100644 --- a/src/webui/static/style.css +++ b/src/webui/static/style.css @@ -29,6 +29,41 @@ header { text-align: left; } +.header-actions { + display: flex; + align-items: center; + gap: 15px; +} + +.language-switcher { + display: flex; + background: rgba(255, 255, 255, 0.15); + border-radius: 8px; + padding: 4px; + border: 1px solid rgba(255, 255, 255, 0.2); +} + +.lang-btn { + background: transparent; + color: white; + border: none; + padding: 6px 12px; + border-radius: 6px; + cursor: pointer; + font-size: 12px; + font-weight: 500; + transition: all 0.2s ease; +} + +.lang-btn:hover { + background: rgba(255, 255, 255, 0.2); +} + +.lang-btn.active { + background: rgba(255, 255, 255, 0.3); + box-shadow: 0 2px 4px rgba(0,0,0,0.2); +} + .header-content > div:first-child { text-align: center; flex: 1; @@ -60,20 +95,88 @@ header p { background: rgba(255, 255, 255, 0.3); } -main { - background: white; - border-radius: 12px; - padding: 30px; - box-shadow: 0 8px 32px rgba(0,0,0,0.1); +.layout { + display: flex; + gap: 20px; margin-bottom: 20px; } -.status-card { - background: #f8f9fa; - border-radius: 8px; +.sidebar { + min-width: 250px; + background: rgba(255, 255, 255, 0.15); + backdrop-filter: blur(10px); + border-radius: 12px; padding: 20px; + box-shadow: 0 8px 32px rgba(0,0,0,0.1); + border: 1px solid rgba(255, 255, 255, 0.18); +} + +.nav-menu { + display: flex; + flex-direction: column; + gap: 10px; +} + +.nav-item { + display: flex; + align-items: center; + gap: 12px; + padding: 15px 18px; + background: rgba(255, 255, 255, 0.1); + border-radius: 10px; + cursor: pointer; + transition: all 0.3s ease; + color: white; + border: 1px solid rgba(255, 255, 255, 0.2); +} + +.nav-item:hover { + background: rgba(255, 255, 255, 0.2); + transform: translateY(-2px); + box-shadow: 0 4px 15px rgba(0,0,0,0.2); +} + +.nav-item.active { + background: rgba(255, 255, 255, 0.25); + border-color: rgba(255, 255, 255, 0.4); + box-shadow: 0 4px 15px rgba(0,0,0,0.2); +} + +.nav-icon { + font-size: 20px; +} + +.nav-text { + font-weight: 500; + font-size: 16px; +} + +.main-content { + flex: 1; + background: rgba(255, 255, 255, 0.95); + border-radius: 12px; + padding: 30px; + box-shadow: 0 8px 32px rgba(0,0,0,0.1); + backdrop-filter: blur(10px); + border: 1px solid rgba(255, 255, 255, 0.18); +} + +.content-section { + display: none; +} + +.content-section.active { + display: block; +} + +.status-card { + background: linear-gradient(135deg, #f8f9fa 0%, #e9ecef 100%); + border-radius: 15px; + padding: 25px; margin-bottom: 30px; text-align: center; + box-shadow: 0 4px 20px rgba(0,0,0,0.08); + border: 1px solid rgba(255, 255, 255, 0.5); } .status-indicator { @@ -109,17 +212,19 @@ main { } .info-card { - background: #ffffff; - border: 1px solid #e9ecef; - border-radius: 8px; - padding: 20px; + background: linear-gradient(135deg, #ffffff 0%, #f8f9fa 100%); + border: 1px solid rgba(233, 236, 239, 0.6); + border-radius: 15px; + padding: 25px; text-align: center; - transition: transform 0.2s ease, box-shadow 0.2s ease; + transition: all 0.3s ease; + box-shadow: 0 2px 10px rgba(0,0,0,0.05); } .info-card:hover { - transform: translateY(-2px); - box-shadow: 0 4px 12px rgba(0,0,0,0.1); + transform: translateY(-5px); + box-shadow: 0 8px 25px rgba(0,0,0,0.15); + border-color: rgba(102, 126, 234, 0.3); } .info-card h3 { @@ -153,6 +258,11 @@ footer { gap: 20px; } + .header-actions { + flex-direction: column; + gap: 10px; + } + .header-content > div:first-child { text-align: center; } @@ -161,8 +271,35 @@ footer { font-size: 2rem; } - main { + .layout { + flex-direction: column; + gap: 15px; + } + + .sidebar { + min-width: auto; + order: 2; + } + + .nav-menu { + flex-direction: row; + overflow-x: auto; + gap: 8px; + } + + .nav-item { + min-width: 120px; + justify-content: center; + padding: 12px 15px; + } + + .nav-text { + font-size: 14px; + } + + .main-content { padding: 20px; + order: 1; } .info-grid { From fc354865ea5b8c3d8a35f05a68f482c54f16bf62 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Wed, 30 Jul 2025 13:21:23 +0000 Subject: [PATCH 15/46] Implement theme toggle functionality and enhance UI styles --- src/webui/static/index.html | 5 +++- src/webui/static/style.css | 56 +++++++++++++++++++++++++++++++------ 2 files changed, 52 insertions(+), 9 deletions(-) diff --git a/src/webui/static/index.html b/src/webui/static/index.html index 20f7d66b..f41d9c98 100644 --- a/src/webui/static/index.html +++ b/src/webui/static/index.html @@ -23,7 +23,6 @@ - @@ -44,6 +43,10 @@ Конфигурация + +
+ +
diff --git a/src/webui/static/style.css b/src/webui/static/style.css index c03300a1..3aae1d3a 100644 --- a/src/webui/static/style.css +++ b/src/webui/static/style.css @@ -80,19 +80,38 @@ header p { opacity: 0.9; } +.sidebar-footer { + margin-top: 20px; + padding-top: 20px; + border-top: 1px solid rgba(255, 255, 255, 0.2); +} + .logout-btn { - background: rgba(255, 255, 255, 0.2); + width: 100%; + background: rgba(220, 53, 69, 0.2); color: white; - border: 1px solid rgba(255, 255, 255, 0.3); - padding: 8px 16px; - border-radius: 6px; + border: 1px solid rgba(220, 53, 69, 0.3); + padding: 12px 16px; + border-radius: 10px; cursor: pointer; font-size: 14px; - transition: background 0.2s ease; + font-weight: 500; + transition: all 0.3s ease; + display: flex; + align-items: center; + justify-content: center; + gap: 8px; } .logout-btn:hover { - background: rgba(255, 255, 255, 0.3); + background: rgba(220, 53, 69, 0.3); + transform: translateY(-2px); + box-shadow: 0 4px 15px rgba(220, 53, 69, 0.2); +} + +.logout-btn:before { + content: "🚪"; + font-size: 16px; } .layout { @@ -109,6 +128,9 @@ header p { padding: 20px; box-shadow: 0 8px 32px rgba(0,0,0,0.1); border: 1px solid rgba(255, 255, 255, 0.18); + display: flex; + flex-direction: column; + justify-content: space-between; } .nav-menu { @@ -259,8 +281,7 @@ footer { } .header-actions { - flex-direction: column; - gap: 10px; + justify-content: center; } .header-content > div:first-child { @@ -279,6 +300,25 @@ footer { .sidebar { min-width: auto; order: 2; + flex-direction: row; + align-items: center; + padding: 15px; + } + + .sidebar-footer { + margin-top: 0; + margin-left: 15px; + padding-top: 0; + border-top: none; + border-left: 1px solid rgba(255, 255, 255, 0.2); + padding-left: 15px; + } + + .logout-btn { + width: auto; + min-width: 80px; + padding: 10px 12px; + font-size: 12px; } .nav-menu { From 31871147806c2b4a17130f1c9e7de6c2cc7f9cc0 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Wed, 30 Jul 2025 13:21:30 +0000 Subject: [PATCH 16/46] Refactor static file serving in WebUI to allow CSS and JS access without authentication, and implement theme toggle functionality in login and main pages --- src/webui/server_dev.go | 17 ++- src/webui/server_prod.go | 20 ++- src/webui/static/index.html | 33 ++++- src/webui/static/lang/en.js | 9 +- src/webui/static/lang/ru.js | 9 +- src/webui/static/login.html | 173 +++++++++++++++++------ src/webui/static/style.css | 273 ++++++++++++++++++++++++++---------- 7 files changed, 408 insertions(+), 126 deletions(-) diff --git a/src/webui/server_dev.go b/src/webui/server_dev.go index 93c7f044..1da01b37 100644 --- a/src/webui/server_dev.go +++ b/src/webui/server_dev.go @@ -15,11 +15,20 @@ import ( // setupStaticHandler configures static file serving for development (files from disk) func setupStaticHandler(mux *http.ServeMux, server *WebUIServer) { - // Serve static files from disk for development - with auth + // Serve static files from disk for development staticHandler := http.StripPrefix("/static/", http.FileServer(http.Dir("src/webui/static/"))) - mux.HandleFunc("/static/", server.authMiddleware(func(rw http.ResponseWriter, r *http.Request) { - staticHandler.ServeHTTP(rw, r) - })) + mux.HandleFunc("/static/", func(rw http.ResponseWriter, r *http.Request) { + // Allow access to CSS and JS files without auth (needed for login page) + path := strings.TrimPrefix(r.URL.Path, "/static/") + if strings.HasSuffix(path, ".css") || strings.HasSuffix(path, ".js") { + staticHandler.ServeHTTP(rw, r) + return + } + // For other static files, require auth + server.authMiddleware(func(rw http.ResponseWriter, r *http.Request) { + staticHandler.ServeHTTP(rw, r) + })(rw, r) + }) } // serveFile serves any file from disk or returns 404 if not found diff --git a/src/webui/server_prod.go b/src/webui/server_prod.go index 7a81d246..5558b742 100644 --- a/src/webui/server_prod.go +++ b/src/webui/server_prod.go @@ -25,12 +25,22 @@ func setupStaticHandler(mux *http.ServeMux, server *WebUIServer) { panic("failed to get embedded static files: " + err.Error()) } - // Serve static files from embedded FS - with auth + // Serve static files from embedded FS staticHandler := http.FileServer(http.FS(staticFS)) - mux.HandleFunc("/static/", server.authMiddleware(func(rw http.ResponseWriter, r *http.Request) { - // Strip the /static/ prefix before serving - http.StripPrefix("/static/", staticHandler).ServeHTTP(rw, r) - })) + mux.HandleFunc("/static/", func(rw http.ResponseWriter, r *http.Request) { + // Allow access to CSS and JS files without auth (needed for login page) + path := strings.TrimPrefix(r.URL.Path, "/static/") + if strings.HasSuffix(path, ".css") || strings.HasSuffix(path, ".js") { + // Strip the /static/ prefix before serving + http.StripPrefix("/static/", staticHandler).ServeHTTP(rw, r) + return + } + // For other static files, require auth + server.authMiddleware(func(rw http.ResponseWriter, r *http.Request) { + // Strip the /static/ prefix before serving + http.StripPrefix("/static/", staticHandler).ServeHTTP(rw, r) + })(rw, r) + }) } // serveFile serves any file from embedded files or returns 404 if not found diff --git a/src/webui/static/index.html b/src/webui/static/index.html index f41d9c98..5a8cf906 100644 --- a/src/webui/static/index.html +++ b/src/webui/static/index.html @@ -19,7 +19,10 @@

Network mesh management dashboard

-
+
+
@@ -126,6 +129,7 @@ diff --git a/src/webui/static/lang/en.js b/src/webui/static/lang/en.js index 7001e9c2..ca88564d 100644 --- a/src/webui/static/lang/en.js +++ b/src/webui/static/lang/en.js @@ -29,5 +29,12 @@ window.translations.en = { 'network_settings_description': 'Network interaction parameters', 'coming_soon': 'Coming soon...', 'footer_text': 'Yggdrasil Network • Minimal WebUI v1.0', - 'logout_confirm': 'Are you sure you want to logout?' + 'logout_confirm': 'Are you sure you want to logout?', + 'theme_light': 'Light theme', + 'theme_dark': 'Dark theme', + 'login_subtitle': 'Enter password to access the web interface', + 'password_label': 'Password:', + 'access_dashboard': 'Access Dashboard', + 'error_invalid_password': 'Invalid password. Please try again.', + 'error_too_many_attempts': 'Too many failed attempts. Please wait 1 minute before trying again.' }; \ No newline at end of file diff --git a/src/webui/static/lang/ru.js b/src/webui/static/lang/ru.js index 09586a6f..7dd6b5c1 100644 --- a/src/webui/static/lang/ru.js +++ b/src/webui/static/lang/ru.js @@ -29,5 +29,12 @@ window.translations.ru = { 'network_settings_description': 'Параметры сетевого взаимодействия', 'coming_soon': 'Функция в разработке...', 'footer_text': 'Yggdrasil Network • Minimal WebUI v1.0', - 'logout_confirm': 'Вы уверены, что хотите выйти?' + 'logout_confirm': 'Вы уверены, что хотите выйти?', + 'theme_light': 'Светлая тема', + 'theme_dark': 'Темная тема', + 'login_subtitle': 'Введите пароль для доступа к веб-интерфейсу', + 'password_label': 'Пароль:', + 'access_dashboard': 'Войти в панель', + 'error_invalid_password': 'Неверный пароль. Попробуйте снова.', + 'error_too_many_attempts': 'Слишком много неудачных попыток. Подождите 1 минуту перед повторной попыткой.' }; \ No newline at end of file diff --git a/src/webui/static/login.html b/src/webui/static/login.html index 43e38a7f..c829aa34 100644 --- a/src/webui/static/login.html +++ b/src/webui/static/login.html @@ -6,7 +6,18 @@ Yggdrasil Web Interface - Login + + + + diff --git a/src/webui/static/style.css b/src/webui/static/style.css index 3aae1d3a..0249120e 100644 --- a/src/webui/static/style.css +++ b/src/webui/static/style.css @@ -1,3 +1,91 @@ +/* Light theme (default) */ +:root { + /* Background colors */ + --bg-primary: #667eea; + --bg-secondary: #764ba2; + --bg-sidebar: #ffffff; + --bg-nav-item: #f8f9fa; + --bg-nav-hover: #e9ecef; + --bg-nav-active: #3498db; + --bg-nav-active-border: #2980b9; + --bg-main-content: #fafafa; + --bg-status-card: #f5f5f5; + --bg-info-card: #ffffff; + --bg-logout: #dc3545; + --bg-logout-hover: #c82333; + --bg-lang-switcher: rgba(255, 255, 255, 0.2); + --bg-lang-btn-hover: rgba(255, 255, 255, 0.3); + --bg-lang-btn-active: rgba(255, 255, 255, 0.4); + + /* Border colors */ + --border-sidebar: #e0e0e0; + --border-nav-item: #dee2e6; + --border-main: #e0e0e0; + --border-card: #e0e0e0; + --border-hover: #3498db; + --border-footer: #dee2e6; + --border-logout: #c82333; + --border-lang: rgba(255, 255, 255, 0.3); + + /* Text colors */ + --text-primary: #333; + --text-white: white; + --text-nav: #495057; + --text-heading: #343a40; + --text-body: #495057; + --text-muted: #6c757d; + + /* Shadow colors */ + --shadow-light: rgba(0, 0, 0, 0.1); + --shadow-medium: rgba(0, 0, 0, 0.15); + --shadow-dark: rgba(0, 0, 0, 0.2); + --shadow-heavy: rgba(0, 0, 0, 0.3); +} + +/* Dark theme */ +[data-theme="dark"] { + /* Background colors */ + --bg-primary: #2c3e50; + --bg-secondary: #34495e; + --bg-sidebar: #37474f; + --bg-nav-item: #455a64; + --bg-nav-hover: #546e7a; + --bg-nav-active: #3498db; + --bg-nav-active-border: #2980b9; + --bg-main-content: #37474f; + --bg-status-card: #455a64; + --bg-info-card: #455a64; + --bg-logout: #dc3545; + --bg-logout-hover: #c82333; + --bg-lang-switcher: rgba(0, 0, 0, 0.3); + --bg-lang-btn-hover: rgba(255, 255, 255, 0.1); + --bg-lang-btn-active: rgba(255, 255, 255, 0.2); + + /* Border colors */ + --border-sidebar: #455a64; + --border-nav-item: #546e7a; + --border-main: #455a64; + --border-card: #546e7a; + --border-hover: #3498db; + --border-footer: #546e7a; + --border-logout: #c82333; + --border-lang: rgba(255, 255, 255, 0.3); + + /* Text colors */ + --text-primary: #333; + --text-white: white; + --text-nav: #eceff1; + --text-heading: #eceff1; + --text-body: #cfd8dc; + --text-muted: #b0bec5; + + /* Shadow colors */ + --shadow-light: rgba(0, 0, 0, 0.2); + --shadow-medium: rgba(0, 0, 0, 0.3); + --shadow-dark: rgba(0, 0, 0, 0.4); + --shadow-heavy: rgba(0, 0, 0, 0.5); +} + * { margin: 0; padding: 0; @@ -5,10 +93,10 @@ } body { - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; - background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); + font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; + background: linear-gradient(135deg, var(--bg-primary) 0%, var(--bg-secondary) 100%); min-height: 100vh; - color: #333; + color: var(--text-primary); } .container { @@ -19,7 +107,7 @@ body { header { margin-bottom: 40px; - color: white; + color: var(--text-white); } .header-content { @@ -35,33 +123,58 @@ header { gap: 15px; } -.language-switcher { +.controls-group { display: flex; - background: rgba(255, 255, 255, 0.15); - border-radius: 8px; - padding: 4px; - border: 1px solid rgba(255, 255, 255, 0.2); + background: var(--bg-lang-switcher); + border-radius: 2px; + padding: 2px; + border: 1px solid var(--border-lang); + gap: 2px; +} + +.theme-btn { + background: transparent; + color: var(--text-white); + border: none; + padding: 6px 12px; + border-radius: 1px; + cursor: pointer; + font-size: 12px; + font-weight: 600; + transition: background 0.2s ease; + display: flex; + align-items: center; + justify-content: center; +} + +.theme-btn:hover { + background: var(--bg-lang-btn-hover); +} + +.theme-icon { + display: block; + transition: transform 0.3s ease; + font-size: 12px; } .lang-btn { background: transparent; - color: white; + color: var(--text-white); border: none; padding: 6px 12px; - border-radius: 6px; + border-radius: 1px; cursor: pointer; font-size: 12px; - font-weight: 500; - transition: all 0.2s ease; + font-weight: 600; + transition: background 0.2s ease; } .lang-btn:hover { - background: rgba(255, 255, 255, 0.2); + background: var(--bg-lang-btn-hover); } .lang-btn.active { - background: rgba(255, 255, 255, 0.3); - box-shadow: 0 2px 4px rgba(0,0,0,0.2); + background: var(--bg-lang-btn-active); } .header-content > div:first-child { @@ -70,9 +183,11 @@ header { } header h1 { - font-size: 2.5rem; + font-size: 2.2rem; margin-bottom: 10px; - text-shadow: 2px 2px 4px rgba(0,0,0,0.3); + text-shadow: 1px 1px 2px var(--shadow-heavy); + font-weight: 700; + letter-spacing: -0.5px; } header p { @@ -83,20 +198,20 @@ header p { .sidebar-footer { margin-top: 20px; padding-top: 20px; - border-top: 1px solid rgba(255, 255, 255, 0.2); + border-top: 1px solid var(--border-footer); } .logout-btn { width: 100%; - background: rgba(220, 53, 69, 0.2); - color: white; - border: 1px solid rgba(220, 53, 69, 0.3); - padding: 12px 16px; - border-radius: 10px; + background: var(--bg-logout); + color: var(--text-white); + border: 1px solid var(--border-logout); + padding: 10px 16px; + border-radius: 2px; cursor: pointer; font-size: 14px; - font-weight: 500; - transition: all 0.3s ease; + font-weight: 600; + transition: background 0.2s ease; display: flex; align-items: center; justify-content: center; @@ -104,9 +219,7 @@ header p { } .logout-btn:hover { - background: rgba(220, 53, 69, 0.3); - transform: translateY(-2px); - box-shadow: 0 4px 15px rgba(220, 53, 69, 0.2); + background: var(--bg-logout-hover); } .logout-btn:before { @@ -122,12 +235,11 @@ header p { .sidebar { min-width: 250px; - background: rgba(255, 255, 255, 0.15); - backdrop-filter: blur(10px); - border-radius: 12px; + background: var(--bg-sidebar); + border-radius: 4px; padding: 20px; - box-shadow: 0 8px 32px rgba(0,0,0,0.1); - border: 1px solid rgba(255, 255, 255, 0.18); + box-shadow: 0 2px 8px var(--shadow-heavy); + border: 1px solid var(--border-sidebar); display: flex; flex-direction: column; justify-content: space-between; @@ -143,25 +255,24 @@ header p { display: flex; align-items: center; gap: 12px; - padding: 15px 18px; - background: rgba(255, 255, 255, 0.1); - border-radius: 10px; + padding: 12px 16px; + background: var(--bg-nav-item); + border-radius: 2px; cursor: pointer; - transition: all 0.3s ease; - color: white; - border: 1px solid rgba(255, 255, 255, 0.2); + transition: background 0.2s ease; + color: var(--text-nav); + border: 1px solid var(--border-nav-item); + font-weight: 500; } .nav-item:hover { - background: rgba(255, 255, 255, 0.2); - transform: translateY(-2px); - box-shadow: 0 4px 15px rgba(0,0,0,0.2); + background: var(--bg-nav-hover); } .nav-item.active { - background: rgba(255, 255, 255, 0.25); - border-color: rgba(255, 255, 255, 0.4); - box-shadow: 0 4px 15px rgba(0,0,0,0.2); + background: var(--bg-nav-active); + border-color: var(--bg-nav-active-border); + color: var(--text-white); } .nav-icon { @@ -175,12 +286,11 @@ header p { .main-content { flex: 1; - background: rgba(255, 255, 255, 0.95); - border-radius: 12px; + background: var(--bg-main-content); + border-radius: 4px; padding: 30px; - box-shadow: 0 8px 32px rgba(0,0,0,0.1); - backdrop-filter: blur(10px); - border: 1px solid rgba(255, 255, 255, 0.18); + box-shadow: 0 2px 8px var(--shadow-dark); + border: 1px solid var(--border-main); } .content-section { @@ -192,13 +302,25 @@ header p { } .status-card { - background: linear-gradient(135deg, #f8f9fa 0%, #e9ecef 100%); - border-radius: 15px; - padding: 25px; + background: var(--bg-status-card); + border-radius: 4px; + padding: 20px; margin-bottom: 30px; text-align: center; - box-shadow: 0 4px 20px rgba(0,0,0,0.08); - border: 1px solid rgba(255, 255, 255, 0.5); + box-shadow: 0 1px 4px var(--shadow-light); + border: 1px solid var(--border-card); +} + +.status-card h2 { + color: var(--text-heading); + font-weight: 700; + margin-bottom: 15px; + font-size: 1.3rem; +} + +.status-card p { + color: var(--text-body); + font-weight: 500; } .status-indicator { @@ -213,11 +335,11 @@ header p { width: 12px; height: 12px; border-radius: 50%; - background: #6c757d; + background: var(--text-muted); } .status-dot.active { - background: #28a745; + background: var(--bg-nav-active); animation: pulse 2s infinite; } @@ -234,39 +356,44 @@ header p { } .info-card { - background: linear-gradient(135deg, #ffffff 0%, #f8f9fa 100%); - border: 1px solid rgba(233, 236, 239, 0.6); - border-radius: 15px; - padding: 25px; + background: var(--bg-info-card); + border: 1px solid var(--border-card); + border-radius: 4px; + padding: 20px; text-align: center; - transition: all 0.3s ease; - box-shadow: 0 2px 10px rgba(0,0,0,0.05); + transition: box-shadow 0.2s ease; + box-shadow: 0 1px 4px var(--shadow-light); } .info-card:hover { - transform: translateY(-5px); - box-shadow: 0 8px 25px rgba(0,0,0,0.15); - border-color: rgba(102, 126, 234, 0.3); + box-shadow: 0 2px 8px var(--shadow-medium); + border-color: var(--border-hover); } .info-card h3 { - color: #495057; + color: var(--text-heading); margin-bottom: 10px; + font-weight: 600; + font-size: 1.1rem; } .info-card p { - color: #6c757d; + color: var(--text-body); margin-bottom: 10px; + font-weight: 500; } .info-card small { - color: #adb5bd; - font-style: italic; + color: var(--text-muted); + font-weight: 500; + text-transform: uppercase; + font-size: 0.75rem; + letter-spacing: 0.5px; } footer { text-align: center; - color: white; + color: var(--text-white); opacity: 0.8; } @@ -310,7 +437,7 @@ footer { margin-left: 15px; padding-top: 0; border-top: none; - border-left: 1px solid rgba(255, 255, 255, 0.2); + border-left: 1px solid var(--border-footer); padding-left: 15px; } From 675e2e71a56b915af7948934341993e7043b7f61 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Wed, 30 Jul 2025 15:53:09 +0000 Subject: [PATCH 17/46] Implement Admin API integration in WebUI for enhanced node management --- cmd/yggdrasil/main.go | 6 + src/admin/admin.go | 37 ++++ src/config/config.go | 9 +- src/webui/server.go | 72 ++++++++ src/webui/static/api.js | 181 +++++++++++++++++++ src/webui/static/app.js | 275 ++++++++++++++++++++++++++++ src/webui/static/index.html | 160 ++++++++++++----- src/webui/static/lang/en.js | 9 +- src/webui/static/lang/ru.js | 9 +- src/webui/static/style.css | 344 ++++++++++++++++++++++++++++++++++++ 10 files changed, 1055 insertions(+), 47 deletions(-) create mode 100644 src/webui/static/api.js create mode 100644 src/webui/static/app.js diff --git a/cmd/yggdrasil/main.go b/cmd/yggdrasil/main.go index d66ef779..36eedb41 100644 --- a/cmd/yggdrasil/main.go +++ b/cmd/yggdrasil/main.go @@ -309,6 +309,12 @@ func main() { } 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 { diff --git a/src/admin/admin.go b/src/admin/admin.go index 54c1a124..7f0a238f 100644 --- a/src/admin/admin.go +++ b/src/admin/admin.go @@ -277,6 +277,43 @@ func (a *AdminSocket) Stop() error { return nil } +// CallHandler calls an admin handler directly by name without using socket +func (a *AdminSocket) CallHandler(name string, args json.RawMessage) (interface{}, error) { + if a == nil { + return nil, errors.New("admin socket not initialized") + } + + reqname := strings.ToLower(name) + handler, ok := a.handlers[reqname] + if !ok { + return nil, fmt.Errorf("unknown action '%s', try 'list' for help", reqname) + } + + return handler.handler(args) +} + +// GetAvailableCommands returns list of available admin commands +func (a *AdminSocket) GetAvailableCommands() []ListEntry { + if a == nil { + return nil + } + + var list []ListEntry + for name, handler := range a.handlers { + list = append(list, ListEntry{ + Command: name, + Description: handler.desc, + Fields: handler.args, + }) + } + + sort.SliceStable(list, func(i, j int) bool { + return strings.Compare(list[i].Command, list[j].Command) < 0 + }) + + return list +} + // listen is run by start and manages API connections. func (a *AdminSocket) listen() { defer a.listener.Close() diff --git a/src/config/config.go b/src/config/config.go index 5f4d965b..0358da8b 100644 --- a/src/config/config.go +++ b/src/config/config.go @@ -40,18 +40,18 @@ import ( // options that are necessary for an Yggdrasil node to run. You will need to // supply one of these structs to the Yggdrasil core when starting a node. type NodeConfig struct { - PrivateKey KeyBytes `comment:"Your private key. DO NOT share this with anyone!"` - PrivateKeyPath string `comment:"The path to your private key file in PEM format."` + PrivateKey KeyBytes `json:",omitempty" comment:"Your private key. DO NOT share this with anyone!"` + PrivateKeyPath string `json:",omitempty" comment:"The path to your private key file in PEM format."` Certificate *tls.Certificate `json:"-"` Peers []string `comment:"List of outbound peer connection strings (e.g. tls://a.b.c.d:e or\nsocks://a.b.c.d:e/f.g.h.i:j). Connection strings can contain options,\nsee https://yggdrasil-network.github.io/configurationref.html#peers.\nYggdrasil has no concept of bootstrap nodes - all network traffic\nwill transit peer connections. Therefore make sure to only peer with\nnearby nodes that have good connectivity and low latency. Avoid adding\npeers to this list from distant countries as this will worsen your\nnode's connectivity and performance considerably."` InterfacePeers map[string][]string `comment:"List of connection strings for outbound peer connections in URI format,\narranged by source interface, e.g. { \"eth0\": [ \"tls://a.b.c.d:e\" ] }.\nYou should only use this option if your machine is multi-homed and you\nwant to establish outbound peer connections on different interfaces.\nOtherwise you should use \"Peers\"."` Listen []string `comment:"Listen addresses for incoming connections. You will need to add\nlisteners in order to accept incoming peerings from non-local nodes.\nThis is not required if you wish to establish outbound peerings only.\nMulticast peer discovery will work regardless of any listeners set\nhere. Each listener should be specified in URI format as above, e.g.\ntls://0.0.0.0:0 or tls://[::]:0 to listen on all interfaces."` - AdminListen string `comment:"Listen address for admin connections. Default is to listen for local\nconnections either on TCP/9001 or a UNIX socket depending on your\nplatform. Use this value for yggdrasilctl -endpoint=X. To disable\nthe admin socket, use the value \"none\" instead."` + AdminListen string `json:",omitempty" comment:"Listen address for admin connections. Default is to listen for local\nconnections either on TCP/9001 or a UNIX socket depending on your\nplatform. Use this value for yggdrasilctl -endpoint=X. To disable\nthe admin socket, use the value \"none\" instead."` MulticastInterfaces []MulticastInterfaceConfig `comment:"Configuration for which interfaces multicast peer discovery should be\nenabled on. Regex is a regular expression which is matched against an\ninterface name, and interfaces use the first configuration that they\nmatch against. Beacon controls whether or not your node advertises its\npresence to others, whereas Listen controls whether or not your node\nlistens out for and tries to connect to other advertising nodes. See\nhttps://yggdrasil-network.github.io/configurationref.html#multicastinterfaces\nfor more supported options."` AllowedPublicKeys []string `comment:"List of peer public keys to allow incoming peering connections\nfrom. If left empty/undefined then all connections will be allowed\nby default. This does not affect outgoing peerings, nor does it\naffect link-local peers discovered via multicast.\nWARNING: THIS IS NOT A FIREWALL and DOES NOT limit who can reach\nopen ports or services running on your machine!"` IfName string `comment:"Local network interface name for TUN adapter, or \"auto\" to select\nan interface automatically, or \"none\" to run without TUN."` IfMTU uint64 `comment:"Maximum Transmission Unit (MTU) size for your local TUN interface.\nDefault is the largest supported size for your platform. The lowest\npossible value is 1280."` - LogLookups bool `comment:"Log lookups for peers and nodes. This is useful for debugging and\nmonitoring the network. It is disabled by default."` + LogLookups bool `json:",omitempty" comment:"Log lookups for peers and nodes. This is useful for debugging and\nmonitoring the network. It is disabled by default."` NodeInfoPrivacy bool `comment:"By default, nodeinfo contains some defaults including the platform,\narchitecture and Yggdrasil version. These can help when surveying\nthe network and diagnosing network routing problems. Enabling\nnodeinfo privacy prevents this, so that only items specified in\n\"NodeInfo\" are sent back if specified."` NodeInfo map[string]interface{} `comment:"Optional nodeinfo. This must be a { \"key\": \"value\", ... } map\nor set as null. This is entirely optional but, if set, is visible\nto the whole network on request."` WebUI WebUIConfig `comment:"Web interface configuration for managing the node through a browser."` @@ -82,7 +82,6 @@ func GenerateConfig() *NodeConfig { // Create a node configuration and populate it. cfg := new(NodeConfig) cfg.NewPrivateKey() - cfg.PrivateKeyPath = "" cfg.Listen = []string{} cfg.AdminListen = defaults.DefaultAdminListen cfg.Peers = []string{} diff --git a/src/webui/server.go b/src/webui/server.go index 11957ab2..da2bdffd 100644 --- a/src/webui/server.go +++ b/src/webui/server.go @@ -12,6 +12,7 @@ import ( "sync" "time" + "github.com/yggdrasil-network/yggdrasil-go/src/admin" "github.com/yggdrasil-network/yggdrasil-go/src/core" ) @@ -24,6 +25,7 @@ type WebUIServer struct { sessionsMux sync.RWMutex failedAttempts map[string]*FailedLoginInfo // IP -> failed login info attemptsMux sync.RWMutex + admin *admin.AdminSocket // Admin socket reference for direct API calls } type LoginRequest struct { @@ -49,9 +51,15 @@ func Server(listen string, password string, log core.Logger) *WebUIServer { log: log, sessions: make(map[string]time.Time), failedAttempts: make(map[string]*FailedLoginInfo), + admin: nil, // Will be set later via SetAdmin } } +// SetAdmin sets the admin socket reference for direct API calls +func (w *WebUIServer) SetAdmin(admin *admin.AdminSocket) { + w.admin = admin +} + // generateSessionID creates a random session ID func (w *WebUIServer) generateSessionID() string { bytes := make([]byte, 32) @@ -299,6 +307,67 @@ func (w *WebUIServer) logoutHandler(rw http.ResponseWriter, r *http.Request) { http.Redirect(rw, r, "/login.html", http.StatusSeeOther) } +// adminAPIHandler handles direct admin API calls +func (w *WebUIServer) adminAPIHandler(rw http.ResponseWriter, r *http.Request) { + if w.admin == nil { + http.Error(rw, "Admin API not available", http.StatusServiceUnavailable) + return + } + + // Extract command from URL path + // /api/admin/getSelf -> getSelf + path := strings.TrimPrefix(r.URL.Path, "/api/admin/") + command := strings.Split(path, "/")[0] + + if command == "" { + // Return list of available commands + commands := w.admin.GetAvailableCommands() + rw.Header().Set("Content-Type", "application/json") + json.NewEncoder(rw).Encode(map[string]interface{}{ + "status": "success", + "commands": commands, + }) + return + } + + var args map[string]interface{} + if r.Method == http.MethodPost { + if err := json.NewDecoder(r.Body).Decode(&args); err != nil { + args = make(map[string]interface{}) + } + } else { + args = make(map[string]interface{}) + } + + // Call admin handler directly + result, err := w.callAdminHandler(command, args) + if err != nil { + rw.Header().Set("Content-Type", "application/json") + rw.WriteHeader(http.StatusBadRequest) + json.NewEncoder(rw).Encode(map[string]interface{}{ + "status": "error", + "error": err.Error(), + }) + return + } + + rw.Header().Set("Content-Type", "application/json") + json.NewEncoder(rw).Encode(map[string]interface{}{ + "status": "success", + "response": result, + }) +} + +// callAdminHandler calls admin handlers directly without socket +func (w *WebUIServer) callAdminHandler(command string, args map[string]interface{}) (interface{}, error) { + argsBytes, err := json.Marshal(args) + if err != nil { + argsBytes = []byte("{}") + } + + return w.admin.CallHandler(command, argsBytes) +} + func (w *WebUIServer) Start() error { // Validate listen address before starting if w.listen != "" { @@ -330,6 +399,9 @@ func (w *WebUIServer) Start() error { mux.HandleFunc("/auth/login", w.loginHandler) mux.HandleFunc("/auth/logout", w.logoutHandler) + // Admin API endpoints - with auth + mux.HandleFunc("/api/admin/", w.authMiddleware(w.adminAPIHandler)) + // Setup static files handler (implementation varies by build) setupStaticHandler(mux, w) diff --git a/src/webui/static/api.js b/src/webui/static/api.js new file mode 100644 index 00000000..9ba45008 --- /dev/null +++ b/src/webui/static/api.js @@ -0,0 +1,181 @@ +/** + * Yggdrasil Admin API Client + * Provides JavaScript interface for accessing Yggdrasil admin functions + */ +class YggdrasilAPI { + constructor() { + this.baseURL = '/api/admin'; + } + + /** + * Generic method to call admin API endpoints + * @param {string} command - Admin command name + * @param {Object} args - Command arguments + * @returns {Promise} - API response + */ + async callAdmin(command, args = {}) { + const url = command ? `${this.baseURL}/${command}` : this.baseURL; + const options = { + method: Object.keys(args).length > 0 ? 'POST' : 'GET', + headers: { + 'Content-Type': 'application/json', + }, + credentials: 'same-origin' // Include session cookies + }; + + if (Object.keys(args).length > 0) { + options.body = JSON.stringify(args); + } + + try { + const response = await fetch(url, options); + + if (!response.ok) { + throw new Error(`HTTP ${response.status}: ${response.statusText}`); + } + + const data = await response.json(); + + if (data.status === 'error') { + throw new Error(data.error || 'Unknown API error'); + } + + return data.response || data.commands; + } catch (error) { + console.error(`API call failed for ${command}:`, error); + throw error; + } + } + + /** + * Get list of available admin commands + * @returns {Promise} - List of available commands + */ + async getCommands() { + return await this.callAdmin(''); + } + + /** + * Get information about this node + * @returns {Promise} - Node information + */ + async getSelf() { + return await this.callAdmin('getSelf'); + } + + /** + * Get list of connected peers + * @returns {Promise} - Peers information + */ + async getPeers() { + return await this.callAdmin('getPeers'); + } + + /** + * Get tree routing information + * @returns {Promise} - Tree information + */ + async getTree() { + return await this.callAdmin('getTree'); + } + + /** + * Get established paths through this node + * @returns {Promise} - Paths information + */ + async getPaths() { + return await this.callAdmin('getPaths'); + } + + /** + * Get established traffic sessions with remote nodes + * @returns {Promise} - Sessions information + */ + async getSessions() { + return await this.callAdmin('getSessions'); + } + + /** + * Add a peer to the peer list + * @param {string} uri - Peer URI (e.g., "tls://example.com:12345") + * @param {string} int - Network interface (optional) + * @returns {Promise} - Add peer response + */ + async addPeer(uri, int = '') { + return await this.callAdmin('addPeer', { uri, int }); + } + + /** + * Remove a peer from the peer list + * @param {string} uri - Peer URI to remove + * @param {string} int - Network interface (optional) + * @returns {Promise} - Remove peer response + */ + async removePeer(uri, int = '') { + return await this.callAdmin('removePeer', { uri, int }); + } +} + +/** + * Data formatting utilities + */ +class YggdrasilUtils { + /** + * Format bytes to human readable format + * @param {number} bytes - Bytes count + * @returns {string} - Formatted string (e.g., "1.5 MB") + */ + static formatBytes(bytes) { + if (bytes === 0) return '0 B'; + + const k = 1024; + const sizes = ['B', 'KB', 'MB', 'GB', 'TB']; + const i = Math.floor(Math.log(bytes) / Math.log(k)); + + return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i]; + } + + /** + * Format duration to human readable format + * @param {number} seconds - Duration in seconds + * @returns {string} - Formatted duration + */ + static formatDuration(seconds) { + if (seconds < 60) return `${Math.round(seconds)}s`; + if (seconds < 3600) return `${Math.round(seconds / 60)}m`; + if (seconds < 86400) return `${Math.round(seconds / 3600)}h`; + return `${Math.round(seconds / 86400)}d`; + } + + /** + * Format public key for display (show first 8 and last 8 chars) + * @param {string} key - Full public key + * @returns {string} - Shortened key + */ + static formatPublicKey(key) { + if (!key || key.length < 16) return key; + return `${key.substring(0, 8)}...${key.substring(key.length - 8)}`; + } + + /** + * Get status color class based on peer state + * @param {boolean} up - Whether peer is up + * @returns {string} - CSS class name + */ + static getPeerStatusClass(up) { + return up ? 'status-online' : 'status-offline'; + } + + /** + * Get status text based on peer state + * @param {boolean} up - Whether peer is up + * @returns {string} - Status text + */ + static getPeerStatusText(up) { + return up ? 'Online' : 'Offline'; + } +} + +// Create global API instance +window.yggAPI = new YggdrasilAPI(); +window.yggUtils = YggdrasilUtils; \ No newline at end of file diff --git a/src/webui/static/app.js b/src/webui/static/app.js new file mode 100644 index 00000000..0444adcf --- /dev/null +++ b/src/webui/static/app.js @@ -0,0 +1,275 @@ +/** + * Yggdrasil WebUI Application Logic + * Integrates admin API with the user interface + */ + +// Global state +let nodeInfo = null; +let peersData = null; +let isLoading = false; + +/** + * Load and display node information + */ +async function loadNodeInfo() { + try { + const info = await window.yggAPI.getSelf(); + nodeInfo = info; + updateNodeInfoDisplay(info); + return info; + } catch (error) { + console.error('Failed to load node info:', error); + showError('Failed to load node information: ' + error.message); + throw error; + } +} + +/** + * Load and display peers information + */ +async function loadPeers() { + try { + const data = await window.yggAPI.getPeers(); + peersData = data; + updatePeersDisplay(data); + return data; + } catch (error) { + console.error('Failed to load peers:', error); + showError('Failed to load peers information: ' + error.message); + throw error; + } +} + +/** + * Update node information in the UI + */ +function updateNodeInfoDisplay(info) { + // Update status section elements + updateElementText('node-address', info.address || 'N/A'); + updateElementText('node-subnet', info.subnet || 'N/A'); + updateElementText('node-key', yggUtils.formatPublicKey(info.key) || 'N/A'); + updateElementText('node-version', `${info.build_name} ${info.build_version}` || 'N/A'); + updateElementText('routing-entries', info.routing_entries || '0'); + + // Update full key display (for copy functionality) + updateElementData('node-key-full', info.key || ''); +} + +/** + * Update peers information in the UI + */ +function updatePeersDisplay(data) { + const peersContainer = document.getElementById('peers-list'); + if (!peersContainer) return; + + peersContainer.innerHTML = ''; + + if (!data.peers || data.peers.length === 0) { + peersContainer.innerHTML = '
No peers connected
'; + return; + } + + data.peers.forEach(peer => { + const peerElement = createPeerElement(peer); + peersContainer.appendChild(peerElement); + }); + + // Update peer count + updateElementText('peers-count', data.peers.length.toString()); + updateElementText('peers-online', data.peers.filter(p => p.up).length.toString()); +} + +/** + * Create HTML element for a single peer + */ +function createPeerElement(peer) { + const div = document.createElement('div'); + div.className = 'peer-item'; + + const statusClass = yggUtils.getPeerStatusClass(peer.up); + const statusText = yggUtils.getPeerStatusText(peer.up); + + div.innerHTML = ` +
+
${peer.address || 'N/A'}
+
${statusText}
+
+
+
${peer.remote || 'N/A'}
+
+ ↓ ${yggUtils.formatBytes(peer.bytes_recvd || 0)} + ↑ ${yggUtils.formatBytes(peer.bytes_sent || 0)} + ${peer.up && peer.latency ? `RTT: ${(peer.latency / 1000000).toFixed(1)}ms` : ''} +
+
+ ${peer.remote ? `` : ''} + `; + + return div; +} + +/** + * Add a new peer + */ +async function addPeer() { + const uri = prompt('Enter peer URI:\nExamples:\n• tcp://example.com:54321\n• tls://peer.yggdrasil.network:443'); + if (!uri || uri.trim() === '') { + showWarning('Peer URI is required'); + return; + } + + // Basic URI validation + if (!uri.includes('://')) { + showError('Invalid URI format. Must include protocol (tcp://, tls://, etc.)'); + return; + } + + try { + showInfo('Adding peer...'); + await window.yggAPI.addPeer(uri.trim()); + showSuccess(`Peer added successfully: ${uri.trim()}`); + await loadPeers(); // Refresh peer list + } catch (error) { + showError('Failed to add peer: ' + error.message); + } +} + +/** + * Remove peer with confirmation + */ +function removePeerConfirm(uri) { + if (confirm(`Remove peer?\n${uri}`)) { + removePeer(uri); + } +} + +/** + * Remove a peer + */ +async function removePeer(uri) { + try { + showInfo('Removing peer...'); + await window.yggAPI.removePeer(uri); + showSuccess(`Peer removed successfully: ${uri}`); + await loadPeers(); // Refresh peer list + } catch (error) { + showError('Failed to remove peer: ' + error.message); + } +} + +/** + * Helper function to update element text content + */ +function updateElementText(id, text) { + const element = document.getElementById(id); + if (element) { + element.textContent = text; + } +} + +/** + * Helper function to update element data attribute + */ +function updateElementData(id, data) { + const element = document.getElementById(id); + if (element) { + element.setAttribute('data-value', data); + } +} + +/** + * Copy text to clipboard + */ +async function copyToClipboard(text) { + try { + await navigator.clipboard.writeText(text); + showSuccess('Copied to clipboard'); + } catch (error) { + console.error('Failed to copy:', error); + showError('Failed to copy to clipboard'); + } +} + +/** + * Copy node key to clipboard + */ +function copyNodeKey() { + const element = document.getElementById('node-key-full'); + if (element) { + const key = element.getAttribute('data-value'); + if (key) { + copyToClipboard(key); + } + } +} + +/** + * Auto-refresh data + */ +function startAutoRefresh() { + // Refresh every 30 seconds + setInterval(async () => { + if (!isLoading) { + try { + await Promise.all([loadNodeInfo(), loadPeers()]); + } catch (error) { + console.error('Auto-refresh failed:', error); + } + } + }, 30000); +} + +/** + * Initialize application + */ +async function initializeApp() { + try { + // Ensure API is available + if (typeof window.yggAPI === 'undefined') { + console.error('yggAPI is not available'); + showError('Failed to initialize API client'); + return; + } + + isLoading = true; + showInfo('Loading dashboard...'); + + // Load initial data + await Promise.all([loadNodeInfo(), loadPeers()]); + + showSuccess('Dashboard loaded successfully'); + + // Start auto-refresh + startAutoRefresh(); + + } catch (error) { + showError('Failed to initialize dashboard: ' + error.message); + } finally { + isLoading = false; + } +} + +// Wait for DOM and API to be ready +function waitForAPI() { + console.log('Checking for yggAPI...', typeof window.yggAPI); + + if (typeof window.yggAPI !== 'undefined') { + console.log('yggAPI found, initializing app...'); + initializeApp(); + } else { + console.log('yggAPI not ready yet, retrying...'); + // Retry after a short delay + setTimeout(waitForAPI, 100); + } +} + +// Initialize when DOM is ready +console.log('App.js loaded, document ready state:', document.readyState); + +if (document.readyState === 'loading') { + console.log('Document still loading, waiting for DOMContentLoaded...'); + document.addEventListener('DOMContentLoaded', waitForAPI); +} else { + console.log('Document already loaded, starting API check...'); + initializeApp(); +} \ No newline at end of file diff --git a/src/webui/static/index.html b/src/webui/static/index.html index 5a8cf906..9e41333c 100644 --- a/src/webui/static/index.html +++ b/src/webui/static/index.html @@ -6,8 +6,10 @@ Yggdrasil Web Interface + + - + @@ -56,24 +58,36 @@

Состояние узла

-
- - Активен -
-

WebUI запущен и доступен

+

Информация о текущем состоянии вашего узла Yggdrasil

-

Сетевая информация

-

Адрес: 200:1234:5678:9abc::1

-

Подсеть: 300:1234:5678:9abc::/64

+

Информация об узле

+

Публичный ключ: Загрузка...

+

Версия: Загрузка...

+

Записей маршрутизации: Загрузка...

+
-

Статистика

-

Время работы: 2д 15ч 42м

-

Активных соединений: 3

+

Сетевая информация

+

Адрес: Загрузка...

+

Подсеть: Загрузка...

+
+ +
+

Статистика пиров

+

Всего пиров: Загрузка...

+

Онлайн пиров: Загрузка...

@@ -85,16 +99,17 @@
-
-

Активные пиры

-

Количество активных соединений

- Функция в разработке... -
-

Добавить пир

Подключение к новому узлу

- Функция в разработке... + +
+
+ +
+

Подключенные пиры

+
+
Загрузка...
@@ -127,6 +142,9 @@ + +
+ + - + @@ -145,152 +146,7 @@
- \ No newline at end of file diff --git a/src/webui/static/lang/en.js b/src/webui/static/lang/en.js index 3266c606..cb30a1e0 100644 --- a/src/webui/static/lang/en.js +++ b/src/webui/static/lang/en.js @@ -8,19 +8,28 @@ window.translations.en = { 'nav_config': 'Configuration', 'status_title': 'Node Status', 'status_active': 'Active', - 'status_description': 'WebUI is running and accessible', + 'status_description': 'Information about your Yggdrasil node current status', + 'node_info': 'Node Information', + 'public_key': 'Public Key', + 'version': 'Version', + 'routing_entries': 'Routing Entries', + 'loading': 'Loading...', 'network_info': 'Network Information', 'address': 'Address', 'subnet': 'Subnet', - 'statistics': 'Statistics', + 'statistics': 'Peer Statistics', + 'total_peers': 'Total Peers', + 'online_peers': 'Online Peers', 'uptime': 'Uptime', 'connections': 'Active connections', 'peers_title': 'Peer Management', 'peers_description': 'View and manage peer connections', + 'connected_peers': 'Connected Peers', 'active_peers': 'Active Peers', 'active_connections': 'Number of active connections', 'add_peer': 'Add Peer', 'add_peer_description': 'Connect to a new node', + 'add_peer_btn': 'Add Peer', 'config_title': 'Configuration', 'config_description': 'Node settings and network parameters', 'basic_settings': 'Basic Settings', @@ -37,7 +46,6 @@ window.translations.en = { 'access_dashboard': 'Access Dashboard', 'error_invalid_password': 'Invalid password. Please try again.', 'error_too_many_attempts': 'Too many failed attempts. Please wait 1 minute before trying again.', - 'add_peer_btn': 'Add Peer', 'notification_success': 'Success', 'notification_error': 'Error', 'notification_warning': 'Warning', diff --git a/src/webui/static/lang/ru.js b/src/webui/static/lang/ru.js index 40b2eee3..5cd95181 100644 --- a/src/webui/static/lang/ru.js +++ b/src/webui/static/lang/ru.js @@ -8,19 +8,28 @@ window.translations.ru = { 'nav_config': 'Конфигурация', 'status_title': 'Состояние узла', 'status_active': 'Активен', - 'status_description': 'WebUI запущен и доступен', + 'status_description': 'Информация о текущем состоянии вашего узла Yggdrasil', + 'node_info': 'Информация об узле', + 'public_key': 'Публичный ключ', + 'version': 'Версия', + 'routing_entries': 'Записей маршрутизации', + 'loading': 'Загрузка...', 'network_info': 'Сетевая информация', 'address': 'Адрес', 'subnet': 'Подсеть', - 'statistics': 'Статистика', + 'statistics': 'Статистика пиров', + 'total_peers': 'Всего пиров', + 'online_peers': 'Онлайн пиров', 'uptime': 'Время работы', 'connections': 'Активных соединений', 'peers_title': 'Управление пирами', 'peers_description': 'Просмотр и управление соединениями с пирами', + 'connected_peers': 'Подключенные пиры', 'active_peers': 'Активные пиры', 'active_connections': 'Количество активных соединений', 'add_peer': 'Добавить пир', 'add_peer_description': 'Подключение к новому узлу', + 'add_peer_btn': 'Добавить пир', 'config_title': 'Конфигурация', 'config_description': 'Настройки узла и параметры сети', 'basic_settings': 'Основные настройки', @@ -37,7 +46,6 @@ window.translations.ru = { 'access_dashboard': 'Войти в панель', 'error_invalid_password': 'Неверный пароль. Попробуйте снова.', 'error_too_many_attempts': 'Слишком много неудачных попыток. Подождите 1 минуту перед повторной попыткой.', - 'add_peer_btn': 'Добавить пир', 'notification_success': 'Успешно', 'notification_error': 'Ошибка', 'notification_warning': 'Предупреждение', diff --git a/src/webui/static/main.js b/src/webui/static/main.js new file mode 100644 index 00000000..6f257d92 --- /dev/null +++ b/src/webui/static/main.js @@ -0,0 +1,266 @@ +/** + * Main JavaScript logic for Yggdrasil Web Interface + * Handles language switching, theme management, notifications, and UI interactions + */ + +// Global state variables +let currentLanguage = localStorage.getItem('yggdrasil-language') || 'ru'; +let currentTheme = localStorage.getItem('yggdrasil-theme') || 'light'; + +// Elements that should not be overwritten by translations when they contain data +const dataElements = [ + 'node-key', 'node-version', 'routing-entries', 'node-address', + 'node-subnet', 'peers-count', 'peers-online' +]; + +/** + * Check if an element contains actual data (not just loading text or empty) + */ +function hasDataContent(element) { + const text = element.textContent.trim(); + const loadingTexts = ['Loading...', 'Загрузка...', 'N/A', '']; + return !loadingTexts.includes(text); +} + +/** + * Update all text elements based on current language + */ +function updateTexts() { + const elements = document.querySelectorAll('[data-key]'); + elements.forEach(element => { + const key = element.getAttribute('data-key'); + const elementId = element.id; + + // Skip data elements that already have content loaded + if (elementId && dataElements.includes(elementId) && hasDataContent(element)) { + return; + } + + if (window.translations && window.translations[currentLanguage] && window.translations[currentLanguage][key]) { + element.textContent = window.translations[currentLanguage][key]; + } + }); +} + +/** + * Refresh displayed data after language change + */ +function refreshDataDisplay() { + // If we have node info, refresh its display + if (window.nodeInfo) { + window.updateNodeInfoDisplay(window.nodeInfo); + } + + // If we have peers data, refresh its display + if (window.peersData) { + window.updatePeersDisplay(window.peersData); + } +} + +/** + * Toggle between light and dark theme + */ +function toggleTheme() { + currentTheme = currentTheme === 'light' ? 'dark' : 'light'; + applyTheme(); + localStorage.setItem('yggdrasil-theme', currentTheme); +} + +/** + * Apply the current theme to the document + */ +function applyTheme() { + document.documentElement.setAttribute('data-theme', currentTheme); + const themeBtn = document.getElementById('theme-btn'); + if (themeBtn) { + const icon = themeBtn.querySelector('.theme-icon'); + if (icon) { + icon.textContent = currentTheme === 'light' ? '🌙' : '☀️'; + } + } +} + +/** + * Switch application language + * @param {string} lang - Language code (ru, en) + */ +function switchLanguage(lang) { + currentLanguage = lang; + localStorage.setItem('yggdrasil-language', lang); + + // Update button states + document.querySelectorAll('.lang-btn').forEach(btn => btn.classList.remove('active')); + document.getElementById('lang-' + lang).classList.add('active'); + + // Update all texts + updateTexts(); + + // Refresh data display to preserve loaded data + refreshDataDisplay(); +} + +/** + * Show a specific content section and hide others + * @param {string} sectionName - Name of the section to show + */ +function showSection(sectionName) { + // Hide all sections + const sections = document.querySelectorAll('.content-section'); + sections.forEach(section => section.classList.remove('active')); + + // Remove active class from all nav items + const navItems = document.querySelectorAll('.nav-item'); + navItems.forEach(item => item.classList.remove('active')); + + // Show selected section + const targetSection = document.getElementById(sectionName + '-section'); + if (targetSection) { + targetSection.classList.add('active'); + } + + // Add active class to clicked nav item + if (event && event.target) { + event.target.closest('.nav-item').classList.add('active'); + } +} + +/** + * Logout function (placeholder) + */ +function logout() { + if (confirm('Are you sure you want to logout?')) { + // Clear stored preferences + localStorage.removeItem('yggdrasil-language'); + localStorage.removeItem('yggdrasil-theme'); + + // Redirect or refresh + window.location.reload(); + } +} + +// Notification system +let notificationId = 0; + +/** + * Show a notification to the user + * @param {string} message - Notification message + * @param {string} type - Notification type (info, success, error, warning) + * @param {string} title - Optional custom title + * @param {number} duration - Auto-hide duration in milliseconds (0 = no auto-hide) + * @returns {number} Notification ID + */ +function showNotification(message, type = 'info', title = null, duration = 5000) { + const container = document.getElementById('notifications-container'); + const id = ++notificationId; + + const icons = { + success: '✅', + error: '❌', + warning: '⚠️', + info: 'ℹ️' + }; + + const titles = { + success: window.translations[currentLanguage]['notification_success'] || 'Success', + error: window.translations[currentLanguage]['notification_error'] || 'Error', + warning: window.translations[currentLanguage]['notification_warning'] || 'Warning', + info: window.translations[currentLanguage]['notification_info'] || 'Information' + }; + + const notification = document.createElement('div'); + notification.className = `notification ${type}`; + notification.id = `notification-${id}`; + + notification.innerHTML = ` +
${icons[type] || icons.info}
+
+
${title || titles[type]}
+
${message}
+
+ + `; + + container.appendChild(notification); + + // Auto remove after duration + if (duration > 0) { + setTimeout(() => { + removeNotification(id); + }, duration); + } + + return id; +} + +/** + * Remove a notification by ID + * @param {number} id - Notification ID to remove + */ +function removeNotification(id) { + const notification = document.getElementById(`notification-${id}`); + if (notification) { + notification.classList.add('removing'); + setTimeout(() => { + if (notification.parentNode) { + notification.parentNode.removeChild(notification); + } + }, 300); + } +} + +/** + * Show success notification + * @param {string} message - Success message + * @param {string} title - Optional custom title + * @returns {number} Notification ID + */ +function showSuccess(message, title = null) { + return showNotification(message, 'success', title); +} + +/** + * Show error notification + * @param {string} message - Error message + * @param {string} title - Optional custom title + * @returns {number} Notification ID + */ +function showError(message, title = null) { + return showNotification(message, 'error', title); +} + +/** + * Show warning notification + * @param {string} message - Warning message + * @param {string} title - Optional custom title + * @returns {number} Notification ID + */ +function showWarning(message, title = null) { + return showNotification(message, 'warning', title); +} + +/** + * Show info notification + * @param {string} message - Info message + * @param {string} title - Optional custom title + * @returns {number} Notification ID + */ +function showInfo(message, title = null) { + return showNotification(message, 'info', title); +} + +/** + * Initialize the application when DOM is loaded + */ +function initializeMain() { + // Set active language button + document.getElementById('lang-' + currentLanguage).classList.add('active'); + + // Update all texts + updateTexts(); + + // Apply saved theme + applyTheme(); +} + +// Initialize when DOM is ready +document.addEventListener('DOMContentLoaded', initializeMain); \ No newline at end of file diff --git a/src/webui/static/style.css b/src/webui/static/style.css index 4b350f3a..acdc13f6 100644 --- a/src/webui/static/style.css +++ b/src/webui/static/style.css @@ -524,7 +524,7 @@ header p { .info-grid { display: grid; - grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); + grid-template-columns: 1fr; gap: 20px; } From 428d29b176646fae52ff0bd1786fd17fc7475ae3 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Wed, 30 Jul 2025 16:15:34 +0000 Subject: [PATCH 19/46] Update authMiddleware to redirect to main page if no password is set and user accesses login page --- src/webui/server.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/webui/server.go b/src/webui/server.go index da2bdffd..6f074780 100644 --- a/src/webui/server.go +++ b/src/webui/server.go @@ -201,8 +201,12 @@ func (w *WebUIServer) cleanupExpiredSessions() { // authMiddleware checks for valid session or redirects to login func (w *WebUIServer) authMiddleware(next http.HandlerFunc) http.HandlerFunc { return func(rw http.ResponseWriter, r *http.Request) { - // Skip authentication if no password is set + // If no password is set and user tries to access login page, redirect to main page if w.password == "" { + if r.URL.Path == "/login.html" { + http.Redirect(rw, r, "/", http.StatusSeeOther) + return + } next(rw, r) return } From 83bd279ffacc7622dd892e578409df04ee85c143 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Wed, 30 Jul 2025 17:03:16 +0000 Subject: [PATCH 20/46] Enhance WebUI footer and mobile controls --- src/webui/static/app.js | 5 +- src/webui/static/index.html | 18 +- src/webui/static/lang/en.js | 2 +- src/webui/static/lang/ru.js | 2 +- src/webui/static/main.js | 34 ++- src/webui/static/style.css | 446 ++++++++++++++++++++++++++++-------- 6 files changed, 401 insertions(+), 106 deletions(-) diff --git a/src/webui/static/app.js b/src/webui/static/app.js index 4a370874..38f9eb82 100644 --- a/src/webui/static/app.js +++ b/src/webui/static/app.js @@ -51,6 +51,9 @@ function updateNodeInfoDisplay(info) { updateElementText('node-version', `${info.build_name} ${info.build_version}` || 'N/A'); updateElementText('routing-entries', info.routing_entries || '0'); + // Update footer version + updateElementText('footer-version', info.build_version || 'unknown'); + // Update full key display (for copy functionality) updateElementData('node-key-full', info.key || ''); } @@ -244,8 +247,6 @@ async function initializeApp() { updateElementText('peers-count', '0'); updateElementText('peers-online', '0'); - showInfo('Loading dashboard...'); - // Load initial data await Promise.all([loadNodeInfo(), loadPeers()]); diff --git a/src/webui/static/index.html b/src/webui/static/index.html index b4e6bc3c..00ea40ee 100644 --- a/src/webui/static/index.html +++ b/src/webui/static/index.html @@ -28,6 +28,7 @@ + @@ -49,10 +50,6 @@ Конфигурация - -
- -
@@ -138,8 +135,19 @@
+
+
+ + + + +
+
+
-

Yggdrasil Network • Minimal WebUI v1.0

+

Yggdrasil Network •

diff --git a/src/webui/static/lang/en.js b/src/webui/static/lang/en.js index cb30a1e0..d3826993 100644 --- a/src/webui/static/lang/en.js +++ b/src/webui/static/lang/en.js @@ -37,7 +37,7 @@ window.translations.en = { 'network_settings': 'Network Settings', 'network_settings_description': 'Network interaction parameters', 'coming_soon': 'Coming soon...', - 'footer_text': 'Yggdrasil Network • Minimal WebUI v1.0', + 'footer_text': 'Yggdrasil Network • ', 'logout_confirm': 'Are you sure you want to logout?', 'theme_light': 'Light theme', 'theme_dark': 'Dark theme', diff --git a/src/webui/static/lang/ru.js b/src/webui/static/lang/ru.js index 5cd95181..bc52fd99 100644 --- a/src/webui/static/lang/ru.js +++ b/src/webui/static/lang/ru.js @@ -37,7 +37,7 @@ window.translations.ru = { 'network_settings': 'Сетевые настройки', 'network_settings_description': 'Параметры сетевого взаимодействия', 'coming_soon': 'Функция в разработке...', - 'footer_text': 'Yggdrasil Network • Minimal WebUI v1.0', + 'footer_text': 'Yggdrasil Network • loading...', 'logout_confirm': 'Вы уверены, что хотите выйти?', 'theme_light': 'Светлая тема', 'theme_dark': 'Темная тема', diff --git a/src/webui/static/main.js b/src/webui/static/main.js index 6f257d92..6b47103a 100644 --- a/src/webui/static/main.js +++ b/src/webui/static/main.js @@ -37,7 +37,12 @@ function updateTexts() { } if (window.translations && window.translations[currentLanguage] && window.translations[currentLanguage][key]) { - element.textContent = window.translations[currentLanguage][key]; + // Special handling for footer_text which contains HTML + if (key === 'footer_text') { + element.innerHTML = window.translations[currentLanguage][key]; + } else { + element.textContent = window.translations[currentLanguage][key]; + } } }); } @@ -71,6 +76,8 @@ function toggleTheme() { */ function applyTheme() { document.documentElement.setAttribute('data-theme', currentTheme); + + // Update desktop theme button const themeBtn = document.getElementById('theme-btn'); if (themeBtn) { const icon = themeBtn.querySelector('.theme-icon'); @@ -78,6 +85,15 @@ function applyTheme() { icon.textContent = currentTheme === 'light' ? '🌙' : '☀️'; } } + + // Update mobile theme button + const themeBtnMobile = document.getElementById('theme-btn-mobile'); + if (themeBtnMobile) { + const icon = themeBtnMobile.querySelector('.theme-icon'); + if (icon) { + icon.textContent = currentTheme === 'light' ? '🌙' : '☀️'; + } + } } /** @@ -88,9 +104,13 @@ function switchLanguage(lang) { currentLanguage = lang; localStorage.setItem('yggdrasil-language', lang); - // Update button states + // Update button states for both desktop and mobile document.querySelectorAll('.lang-btn').forEach(btn => btn.classList.remove('active')); - document.getElementById('lang-' + lang).classList.add('active'); + const desktopBtn = document.getElementById('lang-' + lang); + const mobileBtn = document.getElementById('lang-' + lang + '-mobile'); + + if (desktopBtn) desktopBtn.classList.add('active'); + if (mobileBtn) mobileBtn.classList.add('active'); // Update all texts updateTexts(); @@ -252,8 +272,12 @@ function showInfo(message, title = null) { * Initialize the application when DOM is loaded */ function initializeMain() { - // Set active language button - document.getElementById('lang-' + currentLanguage).classList.add('active'); + // Set active language button for both desktop and mobile + const desktopBtn = document.getElementById('lang-' + currentLanguage); + const mobileBtn = document.getElementById('lang-' + currentLanguage + '-mobile'); + + if (desktopBtn) desktopBtn.classList.add('active'); + if (mobileBtn) mobileBtn.classList.add('active'); // Update all texts updateTexts(); diff --git a/src/webui/static/style.css b/src/webui/static/style.css index acdc13f6..d2379896 100644 --- a/src/webui/static/style.css +++ b/src/webui/static/style.css @@ -17,6 +17,14 @@ --bg-lang-btn-hover: rgba(255, 255, 255, 0.3); --bg-lang-btn-active: rgba(255, 255, 255, 0.4); + /* Status background colors */ + --bg-success: #d4edda; + --bg-error: #f8d7da; + --bg-warning: #fff3cd; + --bg-success-dark: #28a745; + --bg-error-dark: #dc3545; + --bg-warning-dark: #ffc107; + /* Border colors */ --border-sidebar: #e0e0e0; --border-nav-item: #dee2e6; @@ -26,6 +34,9 @@ --border-footer: #dee2e6; --border-logout: #c82333; --border-lang: rgba(255, 255, 255, 0.3); + --border-success: #c3e6cb; + --border-error: #f5c6cb; + --border-warning: #ffeaa7; /* Text colors */ --text-primary: #333; @@ -34,6 +45,9 @@ --text-heading: #343a40; --text-body: #495057; --text-muted: #6c757d; + --text-success: #155724; + --text-error: #721c24; + --text-warning: #856404; /* Shadow colors */ --shadow-light: rgba(0, 0, 0, 0.1); @@ -61,6 +75,14 @@ --bg-lang-btn-hover: rgba(255, 255, 255, 0.1); --bg-lang-btn-active: rgba(255, 255, 255, 0.2); + /* Status background colors */ + --bg-success: #155724; + --bg-error: #721c24; + --bg-warning: #856404; + --bg-success-dark: #28a745; + --bg-error-dark: #dc3545; + --bg-warning-dark: #ffc107; + /* Border colors */ --border-sidebar: #455a64; --border-nav-item: #546e7a; @@ -70,6 +92,9 @@ --border-footer: #546e7a; --border-logout: #c82333; --border-lang: rgba(255, 255, 255, 0.3); + --border-success: #c3e6cb; + --border-error: #f5c6cb; + --border-warning: #ffeaa7; /* Text colors */ --text-primary: #333; @@ -78,6 +103,9 @@ --text-heading: #eceff1; --text-body: #cfd8dc; --text-muted: #b0bec5; + --text-success: #d4edda; + --text-error: #f8d7da; + --text-warning: #fff3cd; /* Shadow colors */ --shadow-light: rgba(0, 0, 0, 0.2); @@ -130,6 +158,7 @@ header { padding: 2px; border: 1px solid var(--border-lang); gap: 2px; + align-items: center; } .theme-btn { @@ -177,6 +206,26 @@ header { background: var(--bg-lang-btn-active); } +.logout-btn-header { + background: var(--bg-logout); + color: var(--text-white); + border: none; + padding: 6px 12px; + border-radius: 1px; + cursor: pointer; + font-size: 12px; + font-weight: 600; + transition: background 0.2s ease; + display: flex; + align-items: center; + justify-content: center; + margin-left: 2px; +} + +.logout-btn-header:hover { + background: var(--bg-logout-hover); +} + .header-content > div:first-child { text-align: center; flex: 1; @@ -195,37 +244,7 @@ header p { opacity: 0.9; } -.sidebar-footer { - margin-top: 20px; - padding-top: 20px; - border-top: 1px solid var(--border-footer); -} -.logout-btn { - width: 100%; - background: var(--bg-logout); - color: var(--text-white); - border: 1px solid var(--border-logout); - padding: 10px 16px; - border-radius: 2px; - cursor: pointer; - font-size: 14px; - font-weight: 600; - transition: background 0.2s ease; - display: flex; - align-items: center; - justify-content: center; - gap: 8px; -} - -.logout-btn:hover { - background: var(--bg-logout-hover); -} - -.logout-btn:before { - content: "🚪"; - font-size: 16px; -} .action-btn { background: var(--bg-nav-active); @@ -281,15 +300,15 @@ header p { } .notification.success::before { - background: #28a745; + background: var(--bg-success-dark); } .notification.error::before { - background: #dc3545; + background: var(--bg-error-dark); } .notification.warning::before { - background: #ffc107; + background: var(--bg-warning-dark); } .notification.info::before { @@ -413,9 +432,6 @@ header p { padding: 20px; box-shadow: 0 2px 8px var(--shadow-heavy); border: 1px solid var(--border-sidebar); - display: flex; - flex-direction: column; - justify-content: space-between; } .nav-menu { @@ -476,24 +492,27 @@ header p { .status-card { background: var(--bg-status-card); - border-radius: 4px; - padding: 20px; + border-radius: 2px 2px 0px 0px; + padding: 10px; margin-bottom: 30px; text-align: center; box-shadow: 0 1px 4px var(--shadow-light); - border: 1px solid var(--border-card); + margin-top: -30px; + margin-left: -30px; + margin-right: -30px; } .status-card h2 { color: var(--text-heading); font-weight: 700; - margin-bottom: 15px; + margin-bottom: 5px; font-size: 1.3rem; } .status-card p { color: var(--text-body); font-weight: 500; + font-size: 0.7rem; } .status-indicator { @@ -564,6 +583,10 @@ header p { letter-spacing: 0.5px; } +.mobile-controls { + display: none; +} + footer { text-align: center; color: var(--text-white); @@ -577,10 +600,15 @@ footer { .header-content { flex-direction: column; - gap: 20px; + gap: 15px; } .header-actions { + display: none; + } + + .controls-group { + flex-wrap: wrap; justify-content: center; } @@ -589,7 +617,11 @@ footer { } header h1 { - font-size: 2rem; + font-size: 1.8rem; + } + + header p { + font-size: 1rem; } .layout { @@ -597,53 +629,297 @@ footer { gap: 15px; } + .container { + display: flex; + flex-direction: column; + } + .sidebar { min-width: auto; - order: 2; - flex-direction: row; - align-items: center; + order: 1; padding: 15px; } - .sidebar-footer { - margin-top: 0; - margin-left: 15px; - padding-top: 0; - border-top: none; - border-left: 1px solid var(--border-footer); - padding-left: 15px; - } - - .logout-btn { - width: auto; - min-width: 80px; - padding: 10px 12px; - font-size: 12px; - } - .nav-menu { + display: flex; flex-direction: row; - overflow-x: auto; gap: 8px; + margin-bottom: 0; + justify-content: space-around; } .nav-item { - min-width: 120px; justify-content: center; - padding: 12px 15px; + padding: 12px; + min-height: 50px; + min-width: 50px; + flex: 1; + text-align: center; } .nav-text { - font-size: 14px; + display: none; + } + + .nav-icon { + font-size: 20px; } .main-content { - padding: 20px; - order: 1; + padding: 20px 15px; + order: 2; + } + + .status-card { + margin-left: -15px; + margin-right: -15px; + margin-top: -20px; + padding: 15px; + } + + .status-card h2 { + font-size: 1.1rem; + } + + .status-card p { + font-size: 0.75rem; } .info-grid { grid-template-columns: 1fr; + gap: 15px; + } + + .info-card { + padding: 15px; + } + + .info-card h3 { + font-size: 1rem; + margin-bottom: 8px; + } + + .info-card p { + font-size: 0.9rem; + margin-bottom: 8px; + word-break: break-word; + } + + .info-card small { + font-size: 0.7rem; + } + + .peers-container { + margin-top: 1.5rem; + } + + .peer-item { + padding: 12px; + } + + .peer-header { + flex-direction: column; + align-items: flex-start; + gap: 8px; + } + + .peer-address { + font-size: 0.8rem; + word-break: break-all; + } + + .peer-status { + align-self: flex-start; + font-size: 0.75rem; + padding: 0.2rem 0.6rem; + } + + .peer-uri { + font-size: 0.75rem; + } + + .peer-stats { + flex-direction: column; + gap: 0.5rem; + font-size: 0.75rem; + } + + .peer-stats span { + padding: 0.2rem 0.4rem; + font-size: 0.7rem; + } + + .peer-remove-btn { + padding: 0.4rem 0.8rem; + font-size: 0.75rem; + } + + .mobile-controls { + display: flex; + justify-content: center; + margin: 0px 0px 20px 0px; + order: 3; + } + + footer { + order: 4; + } + + .mobile-controls .controls-group { + background: var(--bg-lang-switcher); + border-radius: 4px; + padding: 4px; + border: 1px solid var(--border-lang); + gap: 4px; + } +} + +/* Additional mobile optimizations for very small screens */ +@media (max-width: 480px) { + .container { + padding: 8px; + } + + header h1 { + font-size: 1.6rem; + margin-bottom: 8px; + } + + header p { + font-size: 0.9rem; + } + + .mobile-controls .controls-group { + width: auto; + justify-content: center; + } + + .mobile-controls .theme-btn, + .mobile-controls .lang-btn, + .mobile-controls .logout-btn-header { + padding: 8px 12px; + font-size: 11px; + } + + .mobile-controls .logout-btn-header:before { + font-size: 11px; + } + + .sidebar { + padding: 10px; + } + + .nav-menu { + gap: 6px; + } + + .nav-item { + padding: 10px; + min-height: 45px; + min-width: 45px; + } + + .nav-icon { + font-size: 18px; + } + + .main-content { + padding: 15px 10px; + } + + .status-card { + margin-left: -10px; + margin-right: -10px; + margin-top: -15px; + padding: 12px; + } + + .status-card h2 { + font-size: 1rem; + } + + .info-card { + padding: 12px; + } + + .info-card h3 { + font-size: 0.95rem; + } + + .info-card p { + font-size: 0.85rem; + } + + #node-key, #node-version, #node-address, #node-subnet, #routing-entries, #peers-count, #peers-online { + font-size: 0.8rem; + word-break: break-all; + } + + .peer-item { + padding: 10px; + } + + .peer-address { + font-size: 0.75rem; + } + + .notifications-container { + bottom: 8px; + right: 8px; + left: 8px; + } + + .notification { + padding: 10px; + } + + .notification-title { + font-size: 12px; + } + + .notification-message { + font-size: 11px; + } +} + +/* Landscape orientation optimizations for mobile */ +@media (max-width: 768px) and (orientation: landscape) { + .header-actions { + display: flex; + justify-content: center; + } + + .mobile-controls { + display: none; + } + + .layout { + flex-direction: row; + } + + .sidebar { + order: 1; + min-width: 200px; + max-width: 250px; + } + + .nav-menu { + grid-template-columns: 1fr; + gap: 6px; + } + + .nav-item { + padding: 8px 10px; + min-height: auto; + } + + .nav-text { + font-size: 12px; + } + + .main-content { + order: 2; + flex: 1; } } @@ -700,25 +976,25 @@ footer { } .peer-status.status-online { - background: #d4edda; - color: #155724; - border: 1px solid #c3e6cb; + background: var(--bg-success); + color: var(--text-success); + border: 1px solid var(--border-success); } .peer-status.status-offline { - background: #f8d7da; - color: #721c24; - border: 1px solid #f5c6cb; + background: var(--bg-error); + color: var(--text-error); + border: 1px solid var(--border-error); } [data-theme="dark"] .peer-status.status-online { - background: #155724; - color: #d4edda; + background: var(--bg-success); + color: var(--text-success); } [data-theme="dark"] .peer-status.status-offline { - background: #721c24; - color: #f8d7da; + background: var(--bg-error); + color: var(--text-error); } .peer-details { @@ -750,7 +1026,7 @@ footer { .peer-remove-btn { background: var(--bg-logout); - color: white; + color: var(--text-white); border: none; padding: 0.5rem 1rem; border-radius: 4px; @@ -802,18 +1078,4 @@ button[onclick="copyNodeKey()"]:hover { /* Responsive design for peer items */ @media (max-width: 768px) { - .peer-header { - flex-direction: column; - align-items: flex-start; - gap: 0.5rem; - } - - .peer-stats { - flex-direction: column; - gap: 0.5rem; - } - - .peer-address { - font-size: 0.8rem; - } } \ No newline at end of file From 791214c18bfa85e93d3715c4e4393d0651a0b364 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Thu, 31 Jul 2025 04:29:28 +0000 Subject: [PATCH 21/46] Enhance WebUI with new peer display features and multilingual support --- src/webui/static/api.js | 86 +++++++++ src/webui/static/app.js | 172 ++++++++++++++++-- src/webui/static/index.html | 157 ++++++++--------- src/webui/static/lang/en.js | 29 ++- src/webui/static/lang/ru.js | 31 +++- src/webui/static/main.js | 29 ++- src/webui/static/style.css | 343 +++++++++++++++++++++++++++++------- 7 files changed, 679 insertions(+), 168 deletions(-) diff --git a/src/webui/static/api.js b/src/webui/static/api.js index 9ba45008..2c0e10e2 100644 --- a/src/webui/static/api.js +++ b/src/webui/static/api.js @@ -172,8 +172,94 @@ class YggdrasilUtils { * @returns {string} - Status text */ static getPeerStatusText(up) { + const currentLang = window.getCurrentLanguage ? window.getCurrentLanguage() : 'en'; + if (window.translations && window.translations[currentLang]) { + return up + ? window.translations[currentLang]['peer_status_online'] || 'Online' + : window.translations[currentLang]['peer_status_offline'] || 'Offline'; + } return up ? 'Online' : 'Offline'; } + + /** + * Format latency to human readable format + * @param {number} latency - Latency in nanoseconds + * @returns {string} - Formatted latency + */ + static formatLatency(latency) { + if (!latency || latency === 0) return 'N/A'; + const ms = latency / 1000000; + if (ms < 1) return `${(latency / 1000).toFixed(0)}μs`; + if (ms < 1000) return `${ms.toFixed(1)}ms`; + return `${(ms / 1000).toFixed(2)}s`; + } + + /** + * Get direction text and icon + * @param {boolean} inbound - Whether connection is inbound + * @returns {Object} - Object with text and icon + */ + static getConnectionDirection(inbound) { + const currentLang = window.getCurrentLanguage ? window.getCurrentLanguage() : 'en'; + let text; + if (window.translations && window.translations[currentLang]) { + text = inbound + ? window.translations[currentLang]['peer_direction_inbound'] || 'Inbound' + : window.translations[currentLang]['peer_direction_outbound'] || 'Outbound'; + } else { + text = inbound ? 'Inbound' : 'Outbound'; + } + return { + text: text, + icon: inbound ? '↓' : '↑' + }; + } + + /** + * Format port number for display + * @param {number} port - Port number + * @returns {string} - Formatted port + */ + static formatPort(port) { + return port ? `Port ${port}` : 'N/A'; + } + + /** + * Get quality indicator based on cost + * @param {number} cost - Connection cost + * @returns {Object} - Object with class and text + */ + static getQualityIndicator(cost) { + const currentLang = window.getCurrentLanguage ? window.getCurrentLanguage() : 'en'; + let text; + if (window.translations && window.translations[currentLang]) { + if (!cost || cost === 0) { + text = window.translations[currentLang]['peer_quality_unknown'] || 'Unknown'; + return { class: 'quality-unknown', text: text }; + } + if (cost <= 100) { + text = window.translations[currentLang]['peer_quality_excellent'] || 'Excellent'; + return { class: 'quality-excellent', text: text }; + } + if (cost <= 200) { + text = window.translations[currentLang]['peer_quality_good'] || 'Good'; + return { class: 'quality-good', text: text }; + } + if (cost <= 400) { + text = window.translations[currentLang]['peer_quality_fair'] || 'Fair'; + return { class: 'quality-fair', text: text }; + } + text = window.translations[currentLang]['peer_quality_poor'] || 'Poor'; + return { class: 'quality-poor', text: text }; + } + + // Fallback to English + if (!cost || cost === 0) return { class: 'quality-unknown', text: 'Unknown' }; + if (cost <= 100) return { class: 'quality-excellent', text: 'Excellent' }; + if (cost <= 200) return { class: 'quality-good', text: 'Good' }; + if (cost <= 400) return { class: 'quality-fair', text: 'Fair' }; + return { class: 'quality-poor', text: 'Poor' }; + } } // Create global API instance diff --git a/src/webui/static/app.js b/src/webui/static/app.js index 38f9eb82..7e44f93a 100644 --- a/src/webui/static/app.js +++ b/src/webui/static/app.js @@ -54,8 +54,10 @@ function updateNodeInfoDisplay(info) { // Update footer version updateElementText('footer-version', info.build_version || 'unknown'); - // Update full key display (for copy functionality) + // Update full values for copy functionality updateElementData('node-key-full', info.key || ''); + updateElementData('node-address', info.address || ''); + updateElementData('node-subnet', info.subnet || ''); } /** @@ -75,7 +77,11 @@ function updatePeersDisplay(data) { updateElementText('peers-online', onlineCount.toString()); if (!data.peers || data.peers.length === 0) { - peersContainer.innerHTML = '
No peers connected
'; + const currentLang = window.getCurrentLanguage ? window.getCurrentLanguage() : 'en'; + const message = window.translations && window.translations[currentLang] + ? window.translations[currentLang]['no_peers_connected'] || 'No peers connected' + : 'No peers connected'; + peersContainer.innerHTML = `
${message}
`; return; } @@ -83,12 +89,24 @@ function updatePeersDisplay(data) { const peerElement = createPeerElement(peer); peersContainer.appendChild(peerElement); }); + + // Update translations for newly added peer elements + if (typeof updateTexts === 'function') { + updateTexts(); + } } // Expose update functions to window for access from other scripts window.updateNodeInfoDisplay = updateNodeInfoDisplay; window.updatePeersDisplay = updatePeersDisplay; +// Expose copy functions to window for access from HTML onclick handlers +window.copyNodeKey = copyNodeKey; +window.copyNodeAddress = copyNodeAddress; +window.copyNodeSubnet = copyNodeSubnet; +window.copyPeerAddress = copyPeerAddress; +window.copyPeerKey = copyPeerKey; + /** * Create HTML element for a single peer */ @@ -98,21 +116,101 @@ function createPeerElement(peer) { const statusClass = yggUtils.getPeerStatusClass(peer.up); const statusText = yggUtils.getPeerStatusText(peer.up); + const direction = yggUtils.getConnectionDirection(peer.inbound); + const quality = yggUtils.getQualityIndicator(peer.cost); + const uptimeText = peer.uptime ? yggUtils.formatDuration(peer.uptime) : 'N/A'; + const latencyText = yggUtils.formatLatency(peer.latency); + + // Get translations for labels + const currentLang = window.getCurrentLanguage ? window.getCurrentLanguage() : 'en'; + const t = window.translations && window.translations[currentLang] ? window.translations[currentLang] : {}; + + const labels = { + connection: t['peer_connection'] || 'Connection', + performance: t['peer_performance'] || 'Performance', + traffic: t['peer_traffic'] || 'Traffic', + uptime: t['peer_uptime'] || 'Uptime', + port: t['peer_port'] || 'Port', + priority: t['peer_priority'] || 'Priority', + latency: t['peer_latency'] || 'Latency', + cost: t['peer_cost'] || 'Cost', + quality: t['peer_quality'] || 'Quality', + received: t['peer_received'] || '↓ Received', + sent: t['peer_sent'] || '↑ Sent', + total: t['peer_total'] || 'Total', + remove: t['peer_remove'] || 'Remove' + }; div.innerHTML = `
-
${peer.address || 'N/A'}
-
${statusText}
+
+
${peer.address || 'N/A'}
+
${yggUtils.formatPublicKey(peer.key) || 'N/A'}
+
+
+
${statusText}
+
+ ${direction.icon} ${direction.text} +
+
${peer.remote || 'N/A'}
-
- ↓ ${yggUtils.formatBytes(peer.bytes_recvd || 0)} - ↑ ${yggUtils.formatBytes(peer.bytes_sent || 0)} - ${peer.up && peer.latency ? `RTT: ${(peer.latency / 1000000).toFixed(1)}ms` : ''} +
+
+
${labels.connection}
+
+ + ${labels.uptime}: + ${uptimeText} + + + ${labels.port}: + ${peer.port || 'N/A'} + + + ${labels.priority}: + ${peer.priority !== undefined ? peer.priority : 'N/A'} + +
+
+
+
${labels.performance}
+
+ + ${labels.latency}: + ${latencyText} + + + ${labels.cost}: + ${peer.cost !== undefined ? peer.cost : 'N/A'} + + + ${labels.quality}: + ${quality.text} + +
+
+
+
${labels.traffic}
+
+ + ${labels.received}: + ${yggUtils.formatBytes(peer.bytes_recvd || 0)} + + + ${labels.sent}: + ${yggUtils.formatBytes(peer.bytes_sent || 0)} + + + ${labels.total}: + ${yggUtils.formatBytes((peer.bytes_recvd || 0) + (peer.bytes_sent || 0))} + +
+
- ${peer.remote ? `` : ''} + ${peer.remote ? `` : ''} `; return div; @@ -193,7 +291,11 @@ function updateElementData(id, data) { async function copyToClipboard(text) { try { await navigator.clipboard.writeText(text); - showSuccess('Copied to clipboard'); + const currentLang = window.getCurrentLanguage ? window.getCurrentLanguage() : 'en'; + const message = window.translations && window.translations[currentLang] + ? window.translations[currentLang]['copied_to_clipboard'] || 'Copied to clipboard' + : 'Copied to clipboard'; + showSuccess(message); } catch (error) { console.error('Failed to copy:', error); showError('Failed to copy to clipboard'); @@ -213,6 +315,50 @@ function copyNodeKey() { } } +/** + * Copy node address to clipboard + */ +function copyNodeAddress() { + const element = document.getElementById('node-address'); + if (element) { + const address = element.getAttribute('data-value') || element.textContent; + if (address && address !== 'N/A' && address !== 'Загрузка...') { + copyToClipboard(address); + } + } +} + +/** + * Copy node subnet to clipboard + */ +function copyNodeSubnet() { + const element = document.getElementById('node-subnet'); + if (element) { + const subnet = element.getAttribute('data-value') || element.textContent; + if (subnet && subnet !== 'N/A' && subnet !== 'Загрузка...') { + copyToClipboard(subnet); + } + } +} + +/** + * Copy peer address to clipboard + */ +function copyPeerAddress(address) { + if (address && address !== 'N/A') { + copyToClipboard(address); + } +} + +/** + * Copy peer key to clipboard + */ +function copyPeerKey(key) { + if (key && key !== 'N/A') { + copyToClipboard(key); + } +} + /** * Auto-refresh data */ @@ -250,7 +396,11 @@ async function initializeApp() { // Load initial data await Promise.all([loadNodeInfo(), loadPeers()]); - showSuccess('Dashboard loaded successfully'); + const currentLang = window.getCurrentLanguage ? window.getCurrentLanguage() : 'en'; + const message = window.translations && window.translations[currentLang] + ? window.translations[currentLang]['dashboard_loaded'] || 'Dashboard loaded successfully' + : 'Dashboard loaded successfully'; + showSuccess(message); // Start auto-refresh startAutoRefresh(); diff --git a/src/webui/static/index.html b/src/webui/static/index.html index 00ea40ee..f25cae1a 100644 --- a/src/webui/static/index.html +++ b/src/webui/static/index.html @@ -34,106 +34,93 @@
-
- + -
-
-
-

Состояние узла

-

Информация о текущем состоянии вашего узла Yggdrasil

+
+
+
+
+

Информация об узле

+

Публичный ключ: Загрузка...

+

Версия: Загрузка...

+

Записей маршрутизации: Загрузка...

+
-
-
-

Информация об узле

-

Публичный ключ: Загрузка...

-

Версия: Загрузка...

-

Записей маршрутизации: Загрузка...

- -
+
+

Сетевая информация

+

Адрес: Загрузка... +

+

Подсеть: Загрузка... +

+
-
-

Сетевая информация

-

Адрес: Загрузка...

-

Подсеть: Загрузка...

-
+
+

Статистика пиров

+

Всего пиров: Загрузка...

+

Онлайн пиров: Загрузка...

+
+
+
-
-

Статистика пиров

-

Всего пиров: Загрузка...

-

Онлайн пиров: Загрузка...

-
+
+
+
+

Добавить пир

+

Подключение к новому узлу

+
-
-
-

Управление пирами

-

Просмотр и управление соединениями с пирами

-
- -
-
-

Добавить пир

-

Подключение к новому узлу

- -
-
- -
-

Подключенные пиры

-
-
Загрузка...
-
+
+

Подключенные пиры

+
+
Загрузка...
+
-
-
-

Конфигурация

-

Настройки узла и параметры сети

+
+
+
+

Основные настройки

+

Базовая конфигурация узла

+ Функция в разработке...
-
-
-

Основные настройки

-

Базовая конфигурация узла

- Функция в разработке... -
- -
-

Сетевые настройки

-

Параметры сетевого взаимодействия

- Функция в разработке... -
+
+

Сетевые настройки

+

Параметры сетевого взаимодействия

+ Функция в разработке...
-
-
+
+
diff --git a/src/webui/static/lang/en.js b/src/webui/static/lang/en.js index d3826993..c4bc3c39 100644 --- a/src/webui/static/lang/en.js +++ b/src/webui/static/lang/en.js @@ -51,5 +51,32 @@ window.translations.en = { 'notification_warning': 'Warning', 'notification_info': 'Information', 'dashboard_loaded': 'Dashboard loaded successfully', - 'welcome': 'Welcome' + 'welcome': 'Welcome', + 'copy_tooltip': 'Click to copy', + 'copy_address_tooltip': 'Click to copy address', + 'copy_key_tooltip': 'Click to copy key', + 'copied_to_clipboard': 'Copied to clipboard', + 'no_peers_connected': 'No peers connected', + 'peer_connection': 'Connection', + 'peer_performance': 'Performance', + 'peer_traffic': 'Traffic', + 'peer_uptime': 'Uptime', + 'peer_port': 'Port', + 'peer_priority': 'Priority', + 'peer_latency': 'Latency', + 'peer_cost': 'Cost', + 'peer_quality': 'Quality', + 'peer_received': '↓ Received', + 'peer_sent': '↑ Sent', + 'peer_total': 'Total', + 'peer_remove': 'Remove', + 'peer_status_online': 'Online', + 'peer_status_offline': 'Offline', + 'peer_direction_inbound': 'Inbound', + 'peer_direction_outbound': 'Outbound', + 'peer_quality_excellent': 'Excellent', + 'peer_quality_good': 'Good', + 'peer_quality_fair': 'Fair', + 'peer_quality_poor': 'Poor', + 'peer_quality_unknown': 'Unknown' }; \ No newline at end of file diff --git a/src/webui/static/lang/ru.js b/src/webui/static/lang/ru.js index bc52fd99..10fb59c0 100644 --- a/src/webui/static/lang/ru.js +++ b/src/webui/static/lang/ru.js @@ -37,7 +37,7 @@ window.translations.ru = { 'network_settings': 'Сетевые настройки', 'network_settings_description': 'Параметры сетевого взаимодействия', 'coming_soon': 'Функция в разработке...', - 'footer_text': 'Yggdrasil Network • loading...', + 'footer_text': 'Yggdrasil Network • ', 'logout_confirm': 'Вы уверены, что хотите выйти?', 'theme_light': 'Светлая тема', 'theme_dark': 'Темная тема', @@ -51,5 +51,32 @@ window.translations.ru = { 'notification_warning': 'Предупреждение', 'notification_info': 'Информация', 'dashboard_loaded': 'Панель загружена успешно', - 'welcome': 'Добро пожаловать' + 'welcome': 'Добро пожаловать', + 'copy_tooltip': 'Нажмите для копирования', + 'copy_address_tooltip': 'Нажмите для копирования адреса', + 'copy_key_tooltip': 'Нажмите для копирования ключа', + 'copied_to_clipboard': 'Скопировано в буфер обмена', + 'no_peers_connected': 'Пиры не подключены', + 'peer_connection': 'Соединение', + 'peer_performance': 'Производительность', + 'peer_traffic': 'Трафик', + 'peer_uptime': 'Время работы', + 'peer_port': 'Порт', + 'peer_priority': 'Приоритет', + 'peer_latency': 'Задержка', + 'peer_cost': 'Стоимость', + 'peer_quality': 'Качество', + 'peer_received': '↓ Получено', + 'peer_sent': '↑ Отправлено', + 'peer_total': 'Всего', + 'peer_remove': 'Удалить', + 'peer_status_online': 'Онлайн', + 'peer_status_offline': 'Офлайн', + 'peer_direction_inbound': 'Входящее', + 'peer_direction_outbound': 'Исходящее', + 'peer_quality_excellent': 'Отличное', + 'peer_quality_good': 'Хорошее', + 'peer_quality_fair': 'Приемлемое', + 'peer_quality_poor': 'Плохое', + 'peer_quality_unknown': 'Неизвестно' }; \ No newline at end of file diff --git a/src/webui/static/main.js b/src/webui/static/main.js index 6b47103a..c029d1e6 100644 --- a/src/webui/static/main.js +++ b/src/webui/static/main.js @@ -5,12 +5,15 @@ // Global state variables let currentLanguage = localStorage.getItem('yggdrasil-language') || 'ru'; + +// Export currentLanguage to window for access from other scripts +window.getCurrentLanguage = () => currentLanguage; let currentTheme = localStorage.getItem('yggdrasil-theme') || 'light'; // Elements that should not be overwritten by translations when they contain data const dataElements = [ 'node-key', 'node-version', 'routing-entries', 'node-address', - 'node-subnet', 'peers-count', 'peers-online' + 'node-subnet', 'peers-count', 'peers-online', 'footer-version' ]; /** @@ -18,7 +21,7 @@ const dataElements = [ */ function hasDataContent(element) { const text = element.textContent.trim(); - const loadingTexts = ['Loading...', 'Загрузка...', 'N/A', '']; + const loadingTexts = ['Loading...', 'Загрузка...', 'N/A', '', 'unknown']; return !loadingTexts.includes(text); } @@ -39,12 +42,34 @@ function updateTexts() { if (window.translations && window.translations[currentLanguage] && window.translations[currentLanguage][key]) { // Special handling for footer_text which contains HTML if (key === 'footer_text') { + // Save current version value if it exists + const versionElement = document.getElementById('footer-version'); + const currentVersion = versionElement ? versionElement.textContent : ''; + + // Update footer text element.innerHTML = window.translations[currentLanguage][key]; + + // Restore version value if it was there + if (currentVersion && currentVersion !== '' && currentVersion !== 'unknown') { + const newVersionElement = document.getElementById('footer-version'); + if (newVersionElement) { + newVersionElement.textContent = currentVersion; + } + } } else { element.textContent = window.translations[currentLanguage][key]; } } }); + + // Handle title translations + const titleElements = document.querySelectorAll('[data-key-title]'); + titleElements.forEach(element => { + const titleKey = element.getAttribute('data-key-title'); + if (window.translations && window.translations[currentLanguage] && window.translations[currentLanguage][titleKey]) { + element.title = window.translations[currentLanguage][titleKey]; + } + }); } /** diff --git a/src/webui/static/style.css b/src/webui/static/style.css index d2379896..11597f87 100644 --- a/src/webui/static/style.css +++ b/src/webui/static/style.css @@ -123,19 +123,30 @@ body { font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; background: linear-gradient(135deg, var(--bg-primary) 0%, var(--bg-secondary) 100%); - min-height: 100vh; + height: 100vh; color: var(--text-primary); + overflow: hidden; /* Prevent body scroll */ } .container { - max-width: 1200px; - margin: 0 auto; - padding: 20px; + display: grid; + grid-template-columns: 250px 1fr; + grid-template-rows: auto 1fr auto; + grid-template-areas: + "header header" + "sidebar main" + "footer footer"; + height: 100vh; + width: 100vw; } header { - margin-bottom: 40px; + grid-area: header; color: var(--text-white); + padding: 20px; + background: linear-gradient(135deg, var(--bg-primary) 0%, var(--bg-secondary) 100%); + box-shadow: 0 2px 4px var(--shadow-medium); + z-index: 100; } .header-content { @@ -244,8 +255,6 @@ header p { opacity: 0.9; } - - .action-btn { background: var(--bg-nav-active); color: var(--text-white); @@ -419,19 +428,13 @@ header p { } } -.layout { - display: flex; - gap: 20px; - margin-bottom: 20px; -} - .sidebar { - min-width: 250px; + grid-area: sidebar; background: var(--bg-sidebar); - border-radius: 4px; padding: 20px; - box-shadow: 0 2px 8px var(--shadow-heavy); - border: 1px solid var(--border-sidebar); + box-shadow: 2px 0 4px var(--shadow-light); + border-right: 1px solid var(--border-sidebar); + overflow-y: auto; } .nav-menu { @@ -474,12 +477,10 @@ header p { } .main-content { - flex: 1; + grid-area: main; background: var(--bg-main-content); - border-radius: 4px; padding: 30px; - box-shadow: 0 2px 8px var(--shadow-dark); - border: 1px solid var(--border-main); + overflow-y: auto; } .content-section { @@ -588,14 +589,26 @@ header p { } footer { + grid-area: footer; text-align: center; color: var(--text-white); opacity: 0.8; + padding: 15px; + background: linear-gradient(135deg, var(--bg-primary) 0%, var(--bg-secondary) 100%); + border-top: 1px solid var(--border-footer); } @media (max-width: 768px) { + body { + overflow: auto; /* Allow body scroll on mobile */ + } + .container { + display: block; /* Reset grid for mobile */ padding: 10px; + height: auto; + width: auto; + min-height: 100vh; } .header-content { @@ -616,6 +629,11 @@ footer { text-align: center; } + header { + padding: 20px 10px; + margin-bottom: 40px; + } + header h1 { font-size: 1.8rem; } @@ -624,20 +642,13 @@ footer { font-size: 1rem; } - .layout { - flex-direction: column; - gap: 15px; - } - - .container { - display: flex; - flex-direction: column; - } - .sidebar { min-width: auto; - order: 1; padding: 15px; + border-right: none; + border-bottom: 1px solid var(--border-sidebar); + box-shadow: 0 2px 4px var(--shadow-light); + margin-bottom: 15px; } .nav-menu { @@ -667,7 +678,9 @@ footer { .main-content { padding: 20px 15px; - order: 2; + overflow-y: visible; + height: auto; + margin-bottom: 15px; } .status-card { @@ -721,31 +734,73 @@ footer { flex-direction: column; align-items: flex-start; gap: 8px; + margin-bottom: 0.5rem; + } + + .peer-address-section { + width: 100%; } .peer-address { font-size: 0.8rem; word-break: break-all; + margin-bottom: 0.125rem; + } + + .peer-key { + font-size: 0.7rem; + } + + .peer-status-section { + flex-direction: row; + align-items: center; + gap: 0.5rem; + align-self: flex-start; } .peer-status { - align-self: flex-start; - font-size: 0.75rem; - padding: 0.2rem 0.6rem; + font-size: 0.7rem; + padding: 0.2rem 0.5rem; + } + + .peer-direction { + font-size: 0.7rem; + padding: 0.15rem 0.4rem; } .peer-uri { font-size: 0.75rem; + padding: 0.375rem; } - .peer-stats { - flex-direction: column; - gap: 0.5rem; + .peer-info-grid { + grid-template-columns: 1fr; + gap: 0.75rem; + margin-top: 0.375rem; + } + + .peer-info-section { + padding: 0.5rem; + } + + .peer-info-title { font-size: 0.75rem; + margin-bottom: 0.375rem; } - .peer-stats span { - padding: 0.2rem 0.4rem; + .peer-info-stats { + gap: 0.25rem; + } + + .info-item { + font-size: 0.7rem; + } + + .info-label { + flex: 1; + } + + .info-value { font-size: 0.7rem; } @@ -758,11 +813,10 @@ footer { display: flex; justify-content: center; margin: 0px 0px 20px 0px; - order: 3; } footer { - order: 4; + padding: 15px 10px; } .mobile-controls .controls-group { @@ -882,6 +936,30 @@ footer { } } +/* Alternative background solution for mobile devices */ +@media (max-width: 768px) { + html { + height: 100%; + } + + body { + position: relative; + background: none; + min-height: 100vh; + } + + body::before { + content: ''; + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: linear-gradient(135deg, var(--bg-primary) 0%, var(--bg-secondary) 100%); + z-index: -1; + } +} + /* Landscape orientation optimizations for mobile */ @media (max-width: 768px) and (orientation: landscape) { .header-actions { @@ -893,14 +971,18 @@ footer { display: none; } - .layout { - flex-direction: row; + .container { + display: grid; + grid-template-columns: 200px 1fr; + grid-template-rows: auto 1fr auto; } .sidebar { - order: 1; min-width: 200px; max-width: 250px; + border-right: 1px solid var(--border-sidebar); + border-bottom: none; + margin-bottom: 0; } .nav-menu { @@ -918,8 +1000,7 @@ footer { } .main-content { - order: 2; - flex: 1; + overflow-y: auto; } } @@ -957,8 +1038,14 @@ footer { .peer-header { display: flex; justify-content: space-between; - align-items: center; - margin-bottom: 0.5rem; + align-items: flex-start; + margin-bottom: 0.75rem; + gap: 1rem; +} + +.peer-address-section { + flex: 1; + min-width: 0; } .peer-address { @@ -966,19 +1053,32 @@ footer { font-weight: bold; color: var(--text-heading); font-size: 0.9rem; + margin-bottom: 0.25rem; +} + +.peer-key { + font-family: 'Courier New', monospace; + font-size: 0.8rem; + color: var(--text-muted); + word-break: break-all; +} + +.peer-status-section { + display: flex; + flex-direction: column; + align-items: flex-end; + gap: 0.25rem; } .peer-status { padding: 0.25rem 0.75rem; - border-radius: 12px; font-size: 0.8rem; font-weight: bold; + white-space: nowrap; } .peer-status.status-online { - background: var(--bg-success); color: var(--text-success); - border: 1px solid var(--border-success); } .peer-status.status-offline { @@ -987,8 +1087,24 @@ footer { border: 1px solid var(--border-error); } +.peer-direction { + font-size: 0.75rem; + font-weight: 600; + padding: 0.2rem 0.5rem; + white-space: nowrap; +} + +.peer-direction.inbound { + background: var(--bg-nav-item); + color: var(--text-nav); +} + +.peer-direction.outbound { + background: var(--bg-nav-item); + color: var(--text-nav); +} + [data-theme="dark"] .peer-status.status-online { - background: var(--bg-success); color: var(--text-success); } @@ -1000,7 +1116,7 @@ footer { .peer-details { display: flex; flex-direction: column; - gap: 0.5rem; + gap: 0.75rem; } .peer-uri { @@ -1008,20 +1124,78 @@ footer { font-size: 0.85rem; color: var(--text-muted); word-break: break-all; -} - -.peer-stats { - display: flex; - gap: 1rem; - font-size: 0.8rem; - color: var(--text-muted); -} - -.peer-stats span { + padding: 0.5rem; background: var(--bg-nav-item); - padding: 0.25rem 0.5rem; border-radius: 4px; - border: 1px solid var(--border-card); + border: 1px solid var(--border-nav-item); +} + +.peer-info-grid { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); + gap: 1rem; + margin-top: 0.5rem; +} + +.peer-info-section { + background: var(--bg-nav-item); + border: 1px solid var(--border-nav-item); + border-radius: 6px; + padding: 0.75rem; +} + +.peer-info-title { + font-weight: 600; + font-size: 0.85rem; + color: var(--text-heading); + margin-bottom: 0.5rem; + text-transform: uppercase; + letter-spacing: 0.5px; +} + +.peer-info-stats { + display: flex; + flex-direction: column; + gap: 0.375rem; +} + +.info-item { + display: flex; + justify-content: space-between; + align-items: center; + font-size: 0.8rem; +} + +.info-label { + color: var(--text-body); + font-weight: 500; +} + +.info-value { + font-family: 'Courier New', monospace; + font-weight: bold; + color: var(--text-heading); +} + +/* Quality indicators */ +.quality-excellent .info-value { + color: var(--text-success); +} + +.quality-good .info-value { + color: var(--bg-nav-active); +} + +.quality-fair .info-value { + color: var(--text-warning); +} + +.quality-poor .info-value { + color: var(--text-error); +} + +.quality-unknown .info-value { + color: var(--text-muted); } .peer-remove-btn { @@ -1062,6 +1236,41 @@ footer { color: var(--text-heading); } +/* Copyable fields styling */ +.copyable-field { + cursor: pointer; + padding: 2px 4px; + border-radius: 3px; + transition: all 0.2s ease; + position: relative; +} + +.copyable-field:hover { + background: var(--bg-nav-hover); + color: var(--border-hover); +} + +.copyable-field:active { + transform: scale(0.98); +} + +/* Peer copyable fields */ +.peer-address.copyable, .peer-key.copyable { + cursor: pointer; + padding: 2px 4px; + border-radius: 3px; + transition: all 0.2s ease; +} + +.peer-address.copyable:hover, .peer-key.copyable:hover { + background: var(--bg-nav-hover); + color: var(--border-hover); +} + +.peer-address.copyable:active, .peer-key.copyable:active { + transform: scale(0.98); +} + /* Copy button styling */ button[onclick="copyNodeKey()"] { background: var(--bg-nav-item); From 1f75299312afe7fbdfbc52b740f545eb631628d5 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Thu, 31 Jul 2025 04:31:33 +0000 Subject: [PATCH 22/46] Improve error handling and fallback mechanisms in WebUI server --- src/webui/server.go | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/webui/server.go b/src/webui/server.go index 6f074780..be480dc4 100644 --- a/src/webui/server.go +++ b/src/webui/server.go @@ -63,7 +63,10 @@ func (w *WebUIServer) SetAdmin(admin *admin.AdminSocket) { // generateSessionID creates a random session ID func (w *WebUIServer) generateSessionID() string { bytes := make([]byte, 32) - rand.Read(bytes) + if _, err := rand.Read(bytes); err != nil { + // Fallback to timestamp-based ID if random generation fails + return hex.EncodeToString([]byte(fmt.Sprintf("%d", time.Now().UnixNano()))) + } return hex.EncodeToString(bytes) } @@ -327,10 +330,12 @@ func (w *WebUIServer) adminAPIHandler(rw http.ResponseWriter, r *http.Request) { // Return list of available commands commands := w.admin.GetAvailableCommands() rw.Header().Set("Content-Type", "application/json") - json.NewEncoder(rw).Encode(map[string]interface{}{ + if err := json.NewEncoder(rw).Encode(map[string]interface{}{ "status": "success", "commands": commands, - }) + }); err != nil { + http.Error(rw, "Failed to encode response", http.StatusInternalServerError) + } return } @@ -348,18 +353,22 @@ func (w *WebUIServer) adminAPIHandler(rw http.ResponseWriter, r *http.Request) { if err != nil { rw.Header().Set("Content-Type", "application/json") rw.WriteHeader(http.StatusBadRequest) - json.NewEncoder(rw).Encode(map[string]interface{}{ + if encErr := json.NewEncoder(rw).Encode(map[string]interface{}{ "status": "error", "error": err.Error(), - }) + }); encErr != nil { + http.Error(rw, "Failed to encode error response", http.StatusInternalServerError) + } return } rw.Header().Set("Content-Type", "application/json") - json.NewEncoder(rw).Encode(map[string]interface{}{ + if err := json.NewEncoder(rw).Encode(map[string]interface{}{ "status": "success", "response": result, - }) + }); err != nil { + http.Error(rw, "Failed to encode response", http.StatusInternalServerError) + } } // callAdminHandler calls admin handlers directly without socket From fcb5efd753a76f6666cd087b3952436e31892113 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Thu, 31 Jul 2025 04:51:55 +0000 Subject: [PATCH 23/46] Add timeout handling and loading state management in API calls --- src/webui/static/api.js | 16 +++++++++++++++- src/webui/static/app.js | 29 ++++++++++++++++++++++++++++- src/webui/static/index.html | 5 +++++ src/webui/static/style.css | 28 ++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+), 2 deletions(-) diff --git a/src/webui/static/api.js b/src/webui/static/api.js index 2c0e10e2..2b012b1e 100644 --- a/src/webui/static/api.js +++ b/src/webui/static/api.js @@ -15,12 +15,18 @@ class YggdrasilAPI { */ async callAdmin(command, args = {}) { const url = command ? `${this.baseURL}/${command}` : this.baseURL; + + // Create AbortController for timeout functionality + const controller = new AbortController(); + const timeoutId = setTimeout(() => controller.abort(), 5000); // 5 second timeout + const options = { method: Object.keys(args).length > 0 ? 'POST' : 'GET', headers: { 'Content-Type': 'application/json', }, - credentials: 'same-origin' // Include session cookies + credentials: 'same-origin', // Include session cookies + signal: controller.signal }; if (Object.keys(args).length > 0) { @@ -29,6 +35,7 @@ class YggdrasilAPI { try { const response = await fetch(url, options); + clearTimeout(timeoutId); // Clear timeout on successful response if (!response.ok) { throw new Error(`HTTP ${response.status}: ${response.statusText}`); @@ -42,6 +49,13 @@ class YggdrasilAPI { return data.response || data.commands; } catch (error) { + clearTimeout(timeoutId); // Clear timeout on error + + if (error.name === 'AbortError') { + console.error(`API call timeout for ${command}:`, error); + throw new Error('Request timeout - service may be unavailable'); + } + console.error(`API call failed for ${command}:`, error); throw error; } diff --git a/src/webui/static/app.js b/src/webui/static/app.js index 7e44f93a..480226d5 100644 --- a/src/webui/static/app.js +++ b/src/webui/static/app.js @@ -7,12 +7,22 @@ window.nodeInfo = null; window.peersData = null; let isLoading = false; +let isLoadingNodeInfo = false; +let isLoadingPeers = false; + + /** * Load and display node information */ async function loadNodeInfo() { + if (isLoadingNodeInfo) { + console.log('Node info request already in progress, skipping...'); + return window.nodeInfo; + } + try { + isLoadingNodeInfo = true; const info = await window.yggAPI.getSelf(); window.nodeInfo = info; updateNodeInfoDisplay(info); @@ -21,6 +31,8 @@ async function loadNodeInfo() { console.error('Failed to load node info:', error); showError('Failed to load node information: ' + error.message); throw error; + } finally { + isLoadingNodeInfo = false; } } @@ -28,7 +40,13 @@ async function loadNodeInfo() { * Load and display peers information */ async function loadPeers() { + if (isLoadingPeers) { + console.log('Peers request already in progress, skipping...'); + return window.peersData; + } + try { + isLoadingPeers = true; const data = await window.yggAPI.getPeers(); window.peersData = data; updatePeersDisplay(data); @@ -37,6 +55,8 @@ async function loadPeers() { console.error('Failed to load peers:', error); showError('Failed to load peers information: ' + error.message); throw error; + } finally { + isLoadingPeers = false; } } @@ -100,6 +120,8 @@ function updatePeersDisplay(data) { window.updateNodeInfoDisplay = updateNodeInfoDisplay; window.updatePeersDisplay = updatePeersDisplay; + + // Expose copy functions to window for access from HTML onclick handlers window.copyNodeKey = copyNodeKey; window.copyNodeAddress = copyNodeAddress; @@ -359,18 +381,23 @@ function copyPeerKey(key) { } } + + /** * Auto-refresh data */ function startAutoRefresh() { // Refresh every 30 seconds setInterval(async () => { - if (!isLoading) { + // Only proceed if individual requests are not already in progress + if (!isLoadingNodeInfo && !isLoadingPeers) { try { await Promise.all([loadNodeInfo(), loadPeers()]); } catch (error) { console.error('Auto-refresh failed:', error); } + } else { + console.log('Skipping auto-refresh - requests already in progress'); } }, 30000); } diff --git a/src/webui/static/index.html b/src/webui/static/index.html index f25cae1a..b2fb9880 100644 --- a/src/webui/static/index.html +++ b/src/webui/static/index.html @@ -14,6 +14,11 @@ + +
+
+
+
diff --git a/src/webui/static/style.css b/src/webui/static/style.css index 11597f87..aa708f53 100644 --- a/src/webui/static/style.css +++ b/src/webui/static/style.css @@ -114,6 +114,16 @@ --shadow-heavy: rgba(0, 0, 0, 0.5); } +/* Dark theme progress bar adjustments */ +[data-theme="dark"] .progress-timer-container { + background: rgba(0, 0, 0, 0.4); +} + +[data-theme="dark"] .progress-timer-bar { + background: linear-gradient(90deg, #3498db, #27ae60); + box-shadow: 0 0 10px rgba(52, 152, 219, 0.3); +} + * { margin: 0; padding: 0; @@ -128,6 +138,24 @@ body { overflow: hidden; /* Prevent body scroll */ } +/* Decorative progress bar */ +.progress-timer-container { + position: fixed; + top: 0; + left: 0; + right: 0; + height: 4px; + background: rgba(255, 255, 255, 0.2); + z-index: 1000; +} + +.progress-timer-bar { + height: 100%; + background: linear-gradient(90deg, #3498db, #2ecc71); + width: 100%; + box-shadow: 0 0 10px rgba(52, 152, 219, 0.5); +} + .container { display: grid; grid-template-columns: 250px 1fr; From 19710fbc19169abc857b0122d83012f13458f1ee Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Thu, 31 Jul 2025 14:25:38 +0000 Subject: [PATCH 24/46] Implement modal system for adding peers and logout confirmation in WebUI --- src/webui/static/app.js | 73 +++++-- src/webui/static/index.html | 16 ++ src/webui/static/lang/en.js | 22 +- src/webui/static/lang/ru.js | 22 +- src/webui/static/main.js | 25 ++- src/webui/static/modal.js | 415 ++++++++++++++++++++++++++++++++++++ src/webui/static/style.css | 248 +++++++++++++++++++++ 7 files changed, 789 insertions(+), 32 deletions(-) create mode 100644 src/webui/static/modal.js diff --git a/src/webui/static/app.js b/src/webui/static/app.js index 480226d5..6054a92b 100644 --- a/src/webui/static/app.js +++ b/src/webui/static/app.js @@ -239,29 +239,60 @@ function createPeerElement(peer) { } /** - * Add a new peer + * Add a new peer with modal form */ async function addPeer() { - const uri = prompt('Enter peer URI:\nExamples:\n• tcp://example.com:54321\n• tls://peer.yggdrasil.network:443'); - if (!uri || uri.trim() === '') { - showWarning('Peer URI is required'); - return; - } - - // Basic URI validation - if (!uri.includes('://')) { - showError('Invalid URI format. Must include protocol (tcp://, tls://, etc.)'); - return; - } - - try { - showInfo('Adding peer...'); - await window.yggAPI.addPeer(uri.trim()); - showSuccess(`Peer added successfully: ${uri.trim()}`); - await loadPeers(); // Refresh peer list - } catch (error) { - showError('Failed to add peer: ' + error.message); - } + showModal({ + title: 'add_peer', + content: 'add_peer_modal_description', + size: 'medium', + inputs: [ + { + type: 'text', + name: 'peer_uri', + label: 'peer_uri_label', + placeholder: 'peer_uri_placeholder', + required: true, + help: 'peer_uri_help' + } + ], + buttons: [ + { + text: 'modal_cancel', + type: 'secondary', + action: 'close' + }, + { + text: 'add_peer_btn', + type: 'primary', + callback: async (formData) => { + const uri = formData.peer_uri?.trim(); + + if (!uri) { + showWarning('Peer URI is required'); + return false; // Don't close modal + } + + // Basic URI validation + if (!uri.includes('://')) { + showError('Invalid URI format. Must include protocol (tcp://, tls://, etc.)'); + return false; // Don't close modal + } + + try { + showInfo('Adding peer...'); + await window.yggAPI.addPeer(uri); + showSuccess(`Peer added successfully: ${uri}`); + await loadPeers(); // Refresh peer list + return true; // Close modal + } catch (error) { + showError('Failed to add peer: ' + error.message); + return false; // Don't close modal + } + } + } + ] + }); } /** diff --git a/src/webui/static/index.html b/src/webui/static/index.html index b2fb9880..df76aee0 100644 --- a/src/webui/static/index.html +++ b/src/webui/static/index.html @@ -9,6 +9,7 @@ + @@ -146,6 +147,21 @@
+ + diff --git a/src/webui/static/lang/en.js b/src/webui/static/lang/en.js index c4bc3c39..0d0d91ae 100644 --- a/src/webui/static/lang/en.js +++ b/src/webui/static/lang/en.js @@ -78,5 +78,25 @@ window.translations.en = { 'peer_quality_good': 'Good', 'peer_quality_fair': 'Fair', 'peer_quality_poor': 'Poor', - 'peer_quality_unknown': 'Unknown' + 'peer_quality_unknown': 'Unknown', + + // Modal translations + 'modal_close': 'Close', + 'modal_cancel': 'Cancel', + 'modal_ok': 'OK', + 'modal_confirm': 'Confirmation', + 'modal_confirm_yes': 'Yes', + 'modal_confirm_message': 'Are you sure?', + 'modal_alert': 'Alert', + 'modal_input': 'Input', + 'modal_error': 'Error', + 'modal_success': 'Success', + 'modal_warning': 'Warning', + 'modal_info': 'Information', + + // Add peer modal + 'add_peer_modal_description': 'Enter peer URI to connect to a new network node', + 'peer_uri_label': 'Peer URI', + 'peer_uri_placeholder': 'tcp://example.com:54321', + 'peer_uri_help': 'Examples: tcp://example.com:54321, tls://peer.yggdrasil.network:443' }; \ No newline at end of file diff --git a/src/webui/static/lang/ru.js b/src/webui/static/lang/ru.js index 10fb59c0..5ff168ca 100644 --- a/src/webui/static/lang/ru.js +++ b/src/webui/static/lang/ru.js @@ -78,5 +78,25 @@ window.translations.ru = { 'peer_quality_good': 'Хорошее', 'peer_quality_fair': 'Приемлемое', 'peer_quality_poor': 'Плохое', - 'peer_quality_unknown': 'Неизвестно' + 'peer_quality_unknown': 'Неизвестно', + + // Modal translations + 'modal_close': 'Закрыть', + 'modal_cancel': 'Отмена', + 'modal_ok': 'ОК', + 'modal_confirm': 'Подтверждение', + 'modal_confirm_yes': 'Да', + 'modal_confirm_message': 'Вы уверены?', + 'modal_alert': 'Уведомление', + 'modal_input': 'Ввод данных', + 'modal_error': 'Ошибка', + 'modal_success': 'Успешно', + 'modal_warning': 'Предупреждение', + 'modal_info': 'Информация', + + // Add peer modal + 'add_peer_modal_description': 'Введите URI пира для подключения к новому узлу сети', + 'peer_uri_label': 'URI пира', + 'peer_uri_placeholder': 'tcp://example.com:54321', + 'peer_uri_help': 'Примеры: tcp://example.com:54321, tls://peer.yggdrasil.network:443' }; \ No newline at end of file diff --git a/src/webui/static/main.js b/src/webui/static/main.js index c029d1e6..1a048899 100644 --- a/src/webui/static/main.js +++ b/src/webui/static/main.js @@ -170,17 +170,24 @@ function showSection(sectionName) { } /** - * Logout function (placeholder) + * Logout function with modal confirmation */ function logout() { - if (confirm('Are you sure you want to logout?')) { - // Clear stored preferences - localStorage.removeItem('yggdrasil-language'); - localStorage.removeItem('yggdrasil-theme'); - - // Redirect or refresh - window.location.reload(); - } + showConfirmModal({ + title: 'modal_confirm', + message: 'logout_confirm', + confirmText: 'modal_confirm_yes', + cancelText: 'modal_cancel', + type: 'danger', + onConfirm: () => { + // Clear stored preferences + localStorage.removeItem('yggdrasil-language'); + localStorage.removeItem('yggdrasil-theme'); + + // Redirect or refresh + window.location.reload(); + } + }); } // Notification system diff --git a/src/webui/static/modal.js b/src/webui/static/modal.js new file mode 100644 index 00000000..9fc85239 --- /dev/null +++ b/src/webui/static/modal.js @@ -0,0 +1,415 @@ +/** + * Modal System for Yggdrasil Web Interface + * Provides flexible modal dialogs with multiple action buttons and input forms + */ + +// Global modal state +let currentModal = null; +let modalCallbacks = {}; + +/** + * Show a modal dialog + * @param {Object} options - Modal configuration + * @param {string} options.title - Modal title (supports localization key) + * @param {string|HTMLElement} options.content - Modal content (supports localization key) + * @param {Array} options.buttons - Array of button configurations + * @param {Array} options.inputs - Array of input field configurations + * @param {Function} options.onClose - Callback when modal is closed + * @param {boolean} options.closable - Whether modal can be closed by clicking overlay or X button + * @param {string} options.size - Modal size: 'small', 'medium', 'large' + */ +function showModal(options = {}) { + const { + title = 'Modal', + content = '', + buttons = [{ text: 'modal_close', type: 'secondary', action: 'close' }], + inputs = [], + onClose = null, + closable = true, + size = 'medium' + } = options; + + const overlay = document.getElementById('modal-overlay'); + const container = document.getElementById('modal-container'); + const titleElement = document.getElementById('modal-title'); + const contentElement = document.getElementById('modal-content'); + const footerElement = document.getElementById('modal-footer'); + const closeBtn = document.getElementById('modal-close-btn'); + + if (!overlay || !container) { + console.error('Modal elements not found in DOM'); + return; + } + + // Set modal size + container.className = `modal-container modal-${size}`; + + // Set title (with localization support) + titleElement.textContent = getLocalizedText(title); + + // Set content + if (typeof content === 'string') { + contentElement.innerHTML = `

${getLocalizedText(content)}

`; + } else if (content instanceof HTMLElement) { + contentElement.innerHTML = ''; + contentElement.appendChild(content); + } else { + contentElement.innerHTML = content; + } + + // Add input fields if provided + if (inputs && inputs.length > 0) { + const formContainer = document.createElement('div'); + formContainer.className = 'modal-form-container'; + + inputs.forEach((input, index) => { + const formGroup = createFormGroup(input, index); + formContainer.appendChild(formGroup); + }); + + contentElement.appendChild(formContainer); + } + + // Create buttons + footerElement.innerHTML = ''; + buttons.forEach((button, index) => { + const btn = createModalButton(button, index); + footerElement.appendChild(btn); + }); + + // Configure close button + closeBtn.style.display = closable ? 'flex' : 'none'; + + // Set up event handlers + modalCallbacks.onClose = onClose; + + // Close on overlay click (if closable) + if (closable) { + overlay.onclick = (e) => { + if (e.target === overlay) { + closeModal(); + } + }; + } else { + overlay.onclick = null; + } + + // Close on Escape key (if closable) + if (closable) { + document.addEventListener('keydown', handleEscapeKey); + } + + // Show modal + currentModal = options; + overlay.classList.add('show'); + + // Focus first input if available + setTimeout(() => { + const firstInput = contentElement.querySelector('.modal-form-input'); + if (firstInput) { + firstInput.focus(); + } + }, 100); +} + +/** + * Close the current modal + */ +function closeModal() { + const overlay = document.getElementById('modal-overlay'); + if (!overlay) return; + + overlay.classList.remove('show'); + + // Clean up event listeners + document.removeEventListener('keydown', handleEscapeKey); + overlay.onclick = null; + + // Call onClose callback if provided + if (modalCallbacks.onClose) { + modalCallbacks.onClose(); + } + + // Clear state + currentModal = null; + modalCallbacks = {}; +} + +/** + * Create a form group element + */ +function createFormGroup(input, index) { + const { + type = 'text', + name = `input_${index}`, + label = '', + placeholder = '', + value = '', + required = false, + help = '', + options = [] // for select inputs + } = input; + + const formGroup = document.createElement('div'); + formGroup.className = 'modal-form-group'; + + // Create label + if (label) { + const labelElement = document.createElement('label'); + labelElement.className = 'modal-form-label'; + labelElement.textContent = getLocalizedText(label); + labelElement.setAttribute('for', name); + formGroup.appendChild(labelElement); + } + + // Create input element + let inputElement; + + if (type === 'textarea') { + inputElement = document.createElement('textarea'); + inputElement.className = 'modal-form-textarea'; + } else if (type === 'select') { + inputElement = document.createElement('select'); + inputElement.className = 'modal-form-select'; + + // Add options + options.forEach(option => { + const optionElement = document.createElement('option'); + optionElement.value = option.value || option; + optionElement.textContent = getLocalizedText(option.text || option); + if (option.selected || option.value === value) { + optionElement.selected = true; + } + inputElement.appendChild(optionElement); + }); + } else { + inputElement = document.createElement('input'); + inputElement.type = type; + inputElement.className = 'modal-form-input'; + inputElement.value = value; + } + + inputElement.name = name; + inputElement.id = name; + + if (placeholder) { + inputElement.placeholder = getLocalizedText(placeholder); + } + + if (required) { + inputElement.required = true; + } + + formGroup.appendChild(inputElement); + + // Create help text + if (help) { + const helpElement = document.createElement('div'); + helpElement.className = 'modal-form-help'; + helpElement.textContent = getLocalizedText(help); + formGroup.appendChild(helpElement); + } + + return formGroup; +} + +/** + * Create a modal button + */ +function createModalButton(button, index) { + const { + text = 'Button', + type = 'secondary', + action = null, + callback = null, + disabled = false + } = button; + + const btn = document.createElement('button'); + btn.className = `modal-btn modal-btn-${type}`; + btn.textContent = getLocalizedText(text); + btn.disabled = disabled; + + btn.onclick = () => { + if (action === 'close') { + closeModal(); + } else if (callback) { + const formData = getModalFormData(); + const result = callback(formData); + + // If callback returns false, don't close modal + if (result !== false) { + closeModal(); + } + } + }; + + return btn; +} + +/** + * Get form data from modal inputs + */ +function getModalFormData() { + const formData = {}; + const inputs = document.querySelectorAll('#modal-content .modal-form-input, #modal-content .modal-form-textarea, #modal-content .modal-form-select'); + + inputs.forEach(input => { + formData[input.name] = input.value; + }); + + return formData; +} + +/** + * Handle Escape key press + */ +function handleEscapeKey(e) { + if (e.key === 'Escape' && currentModal) { + closeModal(); + } +} + +/** + * Get localized text or return original if not found + */ +function getLocalizedText(key) { + if (typeof key !== 'string') return key; + + const currentLang = window.getCurrentLanguage ? window.getCurrentLanguage() : 'en'; + + if (window.translations && + window.translations[currentLang] && + window.translations[currentLang][key]) { + return window.translations[currentLang][key]; + } + + return key; +} + +// Convenience functions for common modal types + +/** + * Show a confirmation dialog + */ +function showConfirmModal(options = {}) { + const { + title = 'modal_confirm', + message = 'modal_confirm_message', + confirmText = 'modal_confirm_yes', + cancelText = 'modal_cancel', + onConfirm = null, + onCancel = null, + type = 'danger' // danger, primary, success + } = options; + + showModal({ + title, + content: message, + closable: true, + buttons: [ + { + text: cancelText, + type: 'secondary', + action: 'close', + callback: onCancel + }, + { + text: confirmText, + type: type, + callback: () => { + if (onConfirm) onConfirm(); + return true; // Close modal + } + } + ] + }); +} + +/** + * Show an alert dialog + */ +function showAlertModal(options = {}) { + const { + title = 'modal_alert', + message = '', + buttonText = 'modal_ok', + type = 'primary', + onClose = null + } = options; + + showModal({ + title, + content: message, + closable: true, + onClose, + buttons: [ + { + text: buttonText, + type: type, + action: 'close' + } + ] + }); +} + +/** + * Show a prompt dialog with input + */ +function showPromptModal(options = {}) { + const { + title = 'modal_input', + message = '', + inputLabel = '', + inputPlaceholder = '', + inputValue = '', + inputType = 'text', + inputRequired = true, + confirmText = 'modal_ok', + cancelText = 'modal_cancel', + onConfirm = null, + onCancel = null + } = options; + + showModal({ + title, + content: message, + closable: true, + inputs: [ + { + type: inputType, + name: 'input_value', + label: inputLabel, + placeholder: inputPlaceholder, + value: inputValue, + required: inputRequired + } + ], + buttons: [ + { + text: cancelText, + type: 'secondary', + action: 'close', + callback: onCancel + }, + { + text: confirmText, + type: 'primary', + callback: (formData) => { + if (inputRequired && !formData.input_value.trim()) { + return false; // Don't close modal + } + if (onConfirm) onConfirm(formData.input_value); + return true; // Close modal + } + } + ] + }); +} + +// Export functions to global scope +window.showModal = showModal; +window.closeModal = closeModal; +window.showConfirmModal = showConfirmModal; +window.showAlertModal = showAlertModal; +window.showPromptModal = showPromptModal; \ No newline at end of file diff --git a/src/webui/static/style.css b/src/webui/static/style.css index aa708f53..53c7137c 100644 --- a/src/webui/static/style.css +++ b/src/webui/static/style.css @@ -1315,4 +1315,252 @@ button[onclick="copyNodeKey()"]:hover { /* Responsive design for peer items */ @media (max-width: 768px) { +} + +/* ======================== */ +/* MODAL SYSTEM */ +/* ======================== */ + +/* Modal overlay background */ +.modal-overlay { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: rgba(0, 0, 0, 0.6); + backdrop-filter: blur(4px); + display: flex; + align-items: center; + justify-content: center; + z-index: 10000; + opacity: 0; + visibility: hidden; + transition: all 0.3s ease; +} + +.modal-overlay.show { + opacity: 1; + visibility: visible; +} + +/* Modal container */ +.modal-container { + background: var(--bg-info-card); + border-radius: 12px; + box-shadow: 0 20px 60px var(--shadow-heavy); + max-width: 500px; + width: 90%; + max-height: 80vh; + overflow: hidden; + transform: scale(0.9) translateY(-20px); + transition: all 0.3s ease; + border: 1px solid var(--border-card); +} + +/* Modal sizes */ +.modal-small { + max-width: 400px; +} + +.modal-medium { + max-width: 500px; +} + +.modal-large { + max-width: 700px; +} + +.modal-overlay.show .modal-container { + transform: scale(1) translateY(0); +} + +/* Modal header */ +.modal-header { + padding: 20px 24px 16px; + border-bottom: 1px solid var(--border-card); + display: flex; + align-items: center; + justify-content: space-between; + background: var(--bg-nav-item); +} + +.modal-title { + margin: 0; + color: var(--text-heading); + font-size: 1.25rem; + font-weight: 600; +} + +.modal-close-btn { + background: none; + border: none; + font-size: 20px; + color: var(--text-muted); + cursor: pointer; + padding: 4px; + border-radius: 4px; + transition: all 0.2s ease; + display: flex; + align-items: center; + justify-content: center; + width: 32px; + height: 32px; +} + +.modal-close-btn:hover { + background: var(--bg-nav-hover); + color: var(--text-heading); +} + +/* Modal content */ +.modal-content { + padding: 24px; + max-height: 60vh; + overflow-y: auto; + color: var(--text-body); +} + +.modal-content p { + margin: 0 0 16px 0; + line-height: 1.5; +} + +.modal-content p:last-child { + margin-bottom: 0; +} + +/* Modal footer */ +.modal-footer { + padding: 16px 24px 20px; + border-top: 1px solid var(--border-card); + display: flex; + gap: 12px; + justify-content: flex-end; + background: var(--bg-nav-item); +} + +/* Modal buttons */ +.modal-btn { + padding: 10px 20px; + border: none; + border-radius: 6px; + font-size: 14px; + font-weight: 500; + cursor: pointer; + transition: all 0.2s ease; + min-width: 80px; +} + +.modal-btn-primary { + background: var(--bg-nav-active); + color: var(--text-white); +} + +.modal-btn-primary:hover { + background: var(--bg-nav-active-border); + transform: translateY(-1px); +} + +.modal-btn-secondary { + background: var(--bg-nav-item); + color: var(--text-nav); + border: 1px solid var(--border-nav-item); +} + +.modal-btn-secondary:hover { + background: var(--bg-nav-hover); +} + +.modal-btn-danger { + background: var(--bg-logout); + color: var(--text-white); +} + +.modal-btn-danger:hover { + background: var(--bg-logout-hover); + transform: translateY(-1px); +} + +.modal-btn-success { + background: var(--bg-success-dark); + color: var(--text-white); +} + +.modal-btn-success:hover { + background: #218838; + transform: translateY(-1px); +} + +/* Modal form elements */ +.modal-form-group { + margin-bottom: 20px; +} + +.modal-form-group:last-child { + margin-bottom: 0; +} + +.modal-form-label { + display: block; + margin-bottom: 6px; + color: var(--text-heading); + font-weight: 500; + font-size: 14px; +} + +.modal-form-input, +.modal-form-textarea, +.modal-form-select { + width: 100%; + padding: 10px 12px; + border: 1px solid var(--border-nav-item); + border-radius: 6px; + font-size: 14px; + background: var(--bg-info-card); + color: var(--text-body); + transition: border-color 0.2s ease; + box-sizing: border-box; +} + +.modal-form-input:focus, +.modal-form-textarea:focus, +.modal-form-select:focus { + outline: none; + border-color: var(--bg-nav-active); +} + +.modal-form-textarea { + resize: vertical; + min-height: 80px; +} + +.modal-form-help { + margin-top: 6px; + font-size: 12px; + color: var(--text-muted); +} + +/* Responsive design */ +@media (max-width: 600px) { + .modal-container { + width: 95%; + margin: 20px; + max-height: 90vh; + } + + .modal-header, + .modal-content, + .modal-footer { + padding-left: 16px; + padding-right: 16px; + } + + .modal-footer { + flex-direction: column-reverse; + } + + .modal-btn { + width: 100%; + } } \ No newline at end of file From ee470d32a72c33512821984066e2d73a98bcf6e9 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Mon, 4 Aug 2025 08:30:55 +0000 Subject: [PATCH 25/46] Implement configuration management in WebUI with API integration for loading and saving configurations --- .gitignore | 3 +- cmd/yggdrasil/main.go | 5 + src/config/config.go | 188 +++++++++++++++++ src/webui/server.go | 104 +++++++++ src/webui/static/config.js | 411 ++++++++++++++++++++++++++++++++++++ src/webui/static/index.html | 20 +- src/webui/static/lang/en.js | 15 +- src/webui/static/lang/ru.js | 15 +- src/webui/static/main.js | 5 + src/webui/static/style.css | 404 ++++++++++++++++++++++++++++++++--- 10 files changed, 1120 insertions(+), 50 deletions(-) create mode 100644 src/webui/static/config.js diff --git a/.gitignore b/.gitignore index 78a92910..f0dcf29e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ **/TODO /yggdrasil /yggdrasilctl -/yggdrasil.conf -/yggdrasil.json +/yggdrasil.* /run /test \ No newline at end of file diff --git a/cmd/yggdrasil/main.go b/cmd/yggdrasil/main.go index 36eedb41..19cfcfb1 100644 --- a/cmd/yggdrasil/main.go +++ b/cmd/yggdrasil/main.go @@ -107,6 +107,7 @@ func main() { } cfg := config.GenerateConfig() + var configPath string var err error switch { case *ver: @@ -124,6 +125,7 @@ func main() { } case *useconffile != "": + configPath = *useconffile f, err := os.Open(*useconffile) if err != nil { panic(err) @@ -206,6 +208,9 @@ func main() { return } + // Set current config for web UI + config.SetCurrentConfig(configPath, cfg) + n := &node{} // Set up the Yggdrasil node itself. diff --git a/src/config/config.go b/src/config/config.go index 0358da8b..09946ec1 100644 --- a/src/config/config.go +++ b/src/config/config.go @@ -30,6 +30,7 @@ import ( "io" "math/big" "os" + "path/filepath" "time" "github.com/hjson/hjson-go/v4" @@ -274,3 +275,190 @@ func (k *KeyBytes) UnmarshalJSON(b []byte) error { *k, err = hex.DecodeString(s) return err } + +// ConfigInfo contains information about the configuration file +type ConfigInfo struct { + Path string `json:"path"` + Format string `json:"format"` + Data interface{} `json:"data"` + Writable bool `json:"writable"` +} + +// Global variables to track the current configuration state +var ( + currentConfigPath string + currentConfigData *NodeConfig +) + +// SetCurrentConfig sets the current configuration data and path +func SetCurrentConfig(path string, cfg *NodeConfig) { + currentConfigPath = path + currentConfigData = cfg +} + +// GetCurrentConfig returns the current configuration information +func GetCurrentConfig() (*ConfigInfo, error) { + var configPath string + var configData *NodeConfig + var format string = "hjson" + var writable bool = false + + // Use current config if available, otherwise try to read from default location + if currentConfigPath != "" && currentConfigData != nil { + configPath = currentConfigPath + configData = currentConfigData + } else { + // Fallback to default path + defaults := GetDefaults() + configPath = defaults.DefaultConfigFile + + // Try to read existing config file + if _, err := os.Stat(configPath); err == nil { + data, err := os.ReadFile(configPath) + if err == nil { + cfg := GenerateConfig() + if err := hjson.Unmarshal(data, cfg); err == nil { + configData = cfg + // Detect format + var jsonTest interface{} + if json.Unmarshal(data, &jsonTest) == nil { + format = "json" + } + } else { + return nil, fmt.Errorf("failed to parse config file: %v", err) + } + } + } else { + // No config file exists, use default + configData = GenerateConfig() + } + } + + // Detect format from file if path is known + if configPath != "" { + if _, err := os.Stat(configPath); err == nil { + data, err := os.ReadFile(configPath) + if err == nil { + var jsonTest interface{} + if json.Unmarshal(data, &jsonTest) == nil { + format = "json" + } + } + } + } + + // Check if writable + if configPath != "" { + if _, err := os.Stat(configPath); err == nil { + // File exists, check if writable + if file, err := os.OpenFile(configPath, os.O_WRONLY, 0); err == nil { + writable = true + file.Close() + } + } else { + // File doesn't exist, check if directory is writable + dir := filepath.Dir(configPath) + if stat, err := os.Stat(dir); err == nil && stat.IsDir() { + testFile := filepath.Join(dir, ".yggdrasil_write_test") + if file, err := os.Create(testFile); err == nil { + file.Close() + os.Remove(testFile) + writable = true + } + } + } + } + + return &ConfigInfo{ + Path: configPath, + Format: format, + Data: configData, + Writable: writable, + }, nil +} + +// SaveConfig saves configuration to file +func SaveConfig(configData interface{}, configPath, format string) error { + // Validate config data + var testConfig NodeConfig + configBytes, err := json.Marshal(configData) + if err != nil { + return fmt.Errorf("failed to marshal config data: %v", err) + } + + if err := json.Unmarshal(configBytes, &testConfig); err != nil { + return fmt.Errorf("invalid configuration data: %v", err) + } + + // Determine target path + targetPath := configPath + if targetPath == "" { + if currentConfigPath != "" { + targetPath = currentConfigPath + } else { + defaults := GetDefaults() + targetPath = defaults.DefaultConfigFile + } + } + + // Determine format if not specified + targetFormat := format + if targetFormat == "" { + if _, err := os.Stat(targetPath); err == nil { + data, readErr := os.ReadFile(targetPath) + if readErr == nil { + var jsonTest interface{} + if json.Unmarshal(data, &jsonTest) == nil { + targetFormat = "json" + } else { + targetFormat = "hjson" + } + } + } + if targetFormat == "" { + targetFormat = "hjson" + } + } + + // Create backup if file exists + if _, err := os.Stat(targetPath); err == nil { + backupPath := targetPath + ".backup" + if data, err := os.ReadFile(targetPath); err == nil { + if err := os.WriteFile(backupPath, data, 0600); err != nil { + return fmt.Errorf("failed to create backup: %v", err) + } + } + } + + // Ensure directory exists + dir := filepath.Dir(targetPath) + if err := os.MkdirAll(dir, 0755); err != nil { + return fmt.Errorf("failed to create config directory: %v", err) + } + + // Marshal to target format + var outputData []byte + if targetFormat == "json" { + outputData, err = json.MarshalIndent(configData, "", " ") + if err != nil { + return fmt.Errorf("failed to marshal JSON: %v", err) + } + } else { + outputData, err = hjson.Marshal(configData) + if err != nil { + return fmt.Errorf("failed to marshal HJSON: %v", err) + } + } + + // Write file + if err := os.WriteFile(targetPath, outputData, 0600); err != nil { + return fmt.Errorf("failed to write config file: %v", err) + } + + // Update current config if this is the current config file + if targetPath == currentConfigPath { + currentConfigData = &testConfig + } + + return nil +} diff --git a/src/webui/server.go b/src/webui/server.go index be480dc4..0848d101 100644 --- a/src/webui/server.go +++ b/src/webui/server.go @@ -13,6 +13,7 @@ import ( "time" "github.com/yggdrasil-network/yggdrasil-go/src/admin" + "github.com/yggdrasil-network/yggdrasil-go/src/config" "github.com/yggdrasil-network/yggdrasil-go/src/core" ) @@ -381,6 +382,105 @@ func (w *WebUIServer) callAdminHandler(command string, args map[string]interface return w.admin.CallHandler(command, argsBytes) } +// Configuration response structures +type ConfigResponse struct { + ConfigPath string `json:"config_path"` + ConfigFormat string `json:"config_format"` + ConfigData interface{} `json:"config_data"` + IsWritable bool `json:"is_writable"` +} + +type ConfigSetRequest struct { + ConfigData interface{} `json:"config_data"` + ConfigPath string `json:"config_path,omitempty"` + Format string `json:"format,omitempty"` +} + +type ConfigSetResponse struct { + Success bool `json:"success"` + Message string `json:"message"` + ConfigPath string `json:"config_path"` + BackupPath string `json:"backup_path,omitempty"` +} + +// getConfigHandler handles configuration file reading +func (w *WebUIServer) getConfigHandler(rw http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodGet { + http.Error(rw, "Method not allowed", http.StatusMethodNotAllowed) + return + } + + // Use config package to get current configuration + configInfo, err := config.GetCurrentConfig() + if err != nil { + w.log.Errorf("Failed to get current config: %v", err) + http.Error(rw, "Failed to get configuration", http.StatusInternalServerError) + return + } + + response := ConfigResponse{ + ConfigPath: configInfo.Path, + ConfigFormat: configInfo.Format, + ConfigData: configInfo.Data, + IsWritable: configInfo.Writable, + } + + rw.Header().Set("Content-Type", "application/json") + if err := json.NewEncoder(rw).Encode(response); err != nil { + w.log.Errorf("Failed to encode config response: %v", err) + http.Error(rw, "Failed to encode response", http.StatusInternalServerError) + } +} + +// setConfigHandler handles configuration file writing +func (w *WebUIServer) setConfigHandler(rw http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodPost { + http.Error(rw, "Method not allowed", http.StatusMethodNotAllowed) + return + } + + var req ConfigSetRequest + if err := json.NewDecoder(r.Body).Decode(&req); err != nil { + http.Error(rw, "Invalid request body", http.StatusBadRequest) + return + } + + // Use config package to save configuration + err := config.SaveConfig(req.ConfigData, req.ConfigPath, req.Format) + if err != nil { + response := ConfigSetResponse{ + Success: false, + Message: err.Error(), + } + w.writeJSONResponse(rw, response) + return + } + + // Get current config info for response + configInfo, err := config.GetCurrentConfig() + var configPath string = req.ConfigPath + if err == nil && configInfo != nil { + configPath = configInfo.Path + } + + response := ConfigSetResponse{ + Success: true, + Message: "Configuration saved successfully", + ConfigPath: configPath, + BackupPath: configPath + ".backup", + } + w.writeJSONResponse(rw, response) +} + +// writeJSONResponse helper function +func (w *WebUIServer) writeJSONResponse(rw http.ResponseWriter, data interface{}) { + rw.Header().Set("Content-Type", "application/json") + if err := json.NewEncoder(rw).Encode(data); err != nil { + w.log.Errorf("Failed to encode JSON response: %v", err) + http.Error(rw, "Failed to encode response", http.StatusInternalServerError) + } +} + func (w *WebUIServer) Start() error { // Validate listen address before starting if w.listen != "" { @@ -415,6 +515,10 @@ func (w *WebUIServer) Start() error { // Admin API endpoints - with auth mux.HandleFunc("/api/admin/", w.authMiddleware(w.adminAPIHandler)) + // Configuration API endpoints - with auth + mux.HandleFunc("/api/config/get", w.authMiddleware(w.getConfigHandler)) + mux.HandleFunc("/api/config/set", w.authMiddleware(w.setConfigHandler)) + // Setup static files handler (implementation varies by build) setupStaticHandler(mux, w) diff --git a/src/webui/static/config.js b/src/webui/static/config.js new file mode 100644 index 00000000..28e8d0f5 --- /dev/null +++ b/src/webui/static/config.js @@ -0,0 +1,411 @@ +// Configuration management functions + +let currentConfig = null; +let configMeta = null; + +// Initialize config section +async function initConfigSection() { + try { + await loadConfiguration(); + } catch (error) { + console.error('Failed to load configuration:', error); + showNotification('Ошибка загрузки конфигурации', 'error'); + } +} + +// Load current configuration +async function loadConfiguration() { + try { + const response = await fetch('/api/config/get', { + method: 'GET', + credentials: 'same-origin' + }); + + if (!response.ok) { + throw new Error(`HTTP ${response.status}: ${response.statusText}`); + } + + const data = await response.json(); + currentConfig = data.config_data; + configMeta = { + path: data.config_path, + format: data.config_format, + isWritable: data.is_writable + }; + + renderConfigEditor(); + updateConfigStatus(); + } catch (error) { + console.error('Error loading configuration:', error); + throw error; + } +} + +// Render configuration editor +function renderConfigEditor() { + const configSection = document.getElementById('config-section'); + + const configEditor = ` +
+
+
+

Файл конфигурации

+
+ ${configMeta.path} + ${configMeta.format.toUpperCase()} + + ${configMeta.isWritable ? '✏️ Редактируемый' : '🔒 Только чтение'} + +
+
+
+ + ${configMeta.isWritable ? ` + + ` : ''} +
+
+ +
+
+ ${renderConfigGroups()} +
+
+
+ `; + + configSection.innerHTML = configEditor; + updateTexts(); +} + +// Render configuration groups +function renderConfigGroups() { + const groups = [ + { + key: 'network', + title: 'Сетевые настройки', + fields: ['Peers', 'InterfacePeers', 'Listen', 'AllowedPublicKeys'] + }, + { + key: 'identity', + title: 'Идентификация', + fields: ['PrivateKey', 'PrivateKeyPath'] + }, + { + key: 'interface', + title: 'Сетевой интерфейс', + fields: ['IfName', 'IfMTU'] + }, + { + key: 'multicast', + title: 'Multicast', + fields: ['MulticastInterfaces'] + }, + { + key: 'admin', + title: 'Администрирование', + fields: ['AdminListen'] + }, + { + key: 'webui', + title: 'Веб-интерфейс', + fields: ['WebUI'] + }, + { + key: 'nodeinfo', + title: 'Информация об узле', + fields: ['NodeInfo', 'NodeInfoPrivacy', 'LogLookups'] + } + ]; + + return groups.map(group => ` +
+
+

${group.title}

+ ▼ +
+
+ ${group.fields.map(field => renderConfigField(field)).join('')} +
+
+ `).join(''); +} + +// Render individual config field +function renderConfigField(fieldName) { + const value = currentConfig[fieldName]; + const fieldType = getFieldType(fieldName, value); + const fieldDescription = getFieldDescription(fieldName); + + return ` +
+
+ + ${fieldType} +
+
${fieldDescription}
+
+ ${renderConfigInput(fieldName, value, fieldType)} +
+
+ `; +} + +// Render config input based on type +function renderConfigInput(fieldName, value, fieldType) { + switch (fieldType) { + case 'boolean': + return ` + + `; + + case 'number': + return ` + + `; + + case 'string': + return ` + + `; + + case 'array': + return ` +
+ + Одно значение на строку +
+ `; + + case 'object': + return ` +
+ + JSON формат +
+ `; + + case 'private_key': + return ` +
+ + Приватный ключ (только для чтения) +
+ `; + + default: + return ` + + `; + } +} + +// Get field type for rendering +function getFieldType(fieldName, value) { + if (fieldName === 'PrivateKey') return 'private_key'; + if (fieldName.includes('MTU') || fieldName === 'Port') return 'number'; + if (typeof value === 'boolean') return 'boolean'; + if (typeof value === 'number') return 'number'; + if (typeof value === 'string') return 'string'; + if (Array.isArray(value)) return 'array'; + if (typeof value === 'object') return 'object'; + return 'string'; +} + +// Get field description +function getFieldDescription(fieldName) { + const descriptions = { + 'Peers': 'Список исходящих peer соединений (например: tls://адрес:порт)', + 'InterfacePeers': 'Peer соединения по интерфейсам', + 'Listen': 'Адреса для входящих соединений', + 'AllowedPublicKeys': 'Разрешенные публичные ключи для входящих соединений', + 'PrivateKey': 'Приватный ключ узла (НЕ ПЕРЕДАВАЙТЕ НИКОМУ!)', + 'PrivateKeyPath': 'Путь к файлу с приватным ключом в формате PEM', + 'IfName': 'Имя TUN интерфейса ("auto" для автовыбора, "none" для отключения)', + 'IfMTU': 'Максимальный размер передаваемого блока (MTU) для TUN интерфейса', + 'MulticastInterfaces': 'Настройки multicast интерфейсов для обнаружения peers', + 'AdminListen': 'Адрес для подключения админского интерфейса', + 'WebUI': 'Настройки веб-интерфейса', + 'NodeInfo': 'Дополнительная информация об узле (видна всей сети)', + 'NodeInfoPrivacy': 'Скрыть информацию о платформе и версии', + 'LogLookups': 'Логировать поиск peers и узлов' + }; + + return descriptions[fieldName] || 'Параметр конфигурации'; +} + +// Update config value +function updateConfigValue(fieldName, value) { + if (currentConfig) { + currentConfig[fieldName] = value; + markConfigAsModified(); + } +} + +// Update array config value +function updateConfigArrayValue(fieldName, value) { + if (currentConfig) { + const lines = value.split('\n').filter(line => line.trim() !== ''); + currentConfig[fieldName] = lines; + markConfigAsModified(); + } +} + +// Update object config value +function updateConfigObjectValue(fieldName, value) { + if (currentConfig) { + try { + currentConfig[fieldName] = JSON.parse(value); + markConfigAsModified(); + } catch (error) { + console.error('Invalid JSON for field', fieldName, ':', error); + } + } +} + +// Mark config as modified +function markConfigAsModified() { + const saveButton = document.querySelector('.save-btn'); + if (saveButton) { + saveButton.classList.add('modified'); + } +} + +// Toggle config group +function toggleConfigGroup(groupKey) { + const content = document.getElementById(`config-group-${groupKey}`); + const icon = content.parentNode.querySelector('.toggle-icon'); + + if (content.style.display === 'none') { + content.style.display = 'block'; + icon.textContent = '▼'; + } else { + content.style.display = 'none'; + icon.textContent = '▶'; + } +} + +// Update config status display +function updateConfigStatus() { + // This function could show config validation status, etc. +} + +// Refresh configuration +async function refreshConfiguration() { + try { + await loadConfiguration(); + showNotification('Конфигурация обновлена', 'success'); + } catch (error) { + showNotification('Ошибка обновления конфигурации', 'error'); + } +} + +// Save configuration +async function saveConfiguration() { + if (!configMeta.isWritable) { + showNotification('Файл конфигурации доступен только для чтения', 'error'); + return; + } + + showModal({ + title: 'config_save_confirm_title', + content: ` +
+

Вы уверены, что хотите сохранить изменения в конфигурационный файл?

+
+

Файл: ${configMeta.path}

+

Формат: ${configMeta.format.toUpperCase()}

+

Резервная копия: Будет создана автоматически

+
+
+ ⚠️ Внимание: Неправильная конфигурация может привести к сбою работы узла! +
+
+ `, + buttons: [ + { + text: 'modal_cancel', + type: 'secondary', + action: 'close' + }, + { + text: 'save_config', + type: 'danger', + callback: () => { + confirmSaveConfiguration(); + return true; // Close modal + } + } + ] + }); +} + +// Confirm and perform save +async function confirmSaveConfiguration() { + + try { + const response = await fetch('/api/config/set', { + method: 'POST', + headers: { + 'Content-Type': 'application/json' + }, + credentials: 'same-origin', + body: JSON.stringify({ + config_data: currentConfig, + config_path: configMeta.path, + format: configMeta.format + }) + }); + + if (!response.ok) { + throw new Error(`HTTP ${response.status}: ${response.statusText}`); + } + + const data = await response.json(); + + if (data.success) { + showNotification(`Конфигурация сохранена: ${data.config_path}`, 'success'); + if (data.backup_path) { + showNotification(`Резервная копия: ${data.backup_path}`, 'info'); + } + + // Remove modified indicator + const saveButton = document.querySelector('.save-btn'); + if (saveButton) { + saveButton.classList.remove('modified'); + } + } else { + showNotification(`Ошибка сохранения: ${data.message}`, 'error'); + } + } catch (error) { + console.error('Error saving configuration:', error); + showNotification('Ошибка сохранения конфигурации', 'error'); + } +} \ No newline at end of file diff --git a/src/webui/static/index.html b/src/webui/static/index.html index df76aee0..d0d1e0a9 100644 --- a/src/webui/static/index.html +++ b/src/webui/static/index.html @@ -10,16 +10,12 @@ + - -
-
-
-
@@ -112,19 +108,7 @@
-
-
-

Основные настройки

-

Базовая конфигурация узла

- Функция в разработке... -
- -
-

Сетевые настройки

-

Параметры сетевого взаимодействия

- Функция в разработке... -
-
+
Загрузка конфигурации...
diff --git a/src/webui/static/lang/en.js b/src/webui/static/lang/en.js index 0d0d91ae..c48eb20a 100644 --- a/src/webui/static/lang/en.js +++ b/src/webui/static/lang/en.js @@ -98,5 +98,18 @@ window.translations.en = { 'add_peer_modal_description': 'Enter peer URI to connect to a new network node', 'peer_uri_label': 'Peer URI', 'peer_uri_placeholder': 'tcp://example.com:54321', - 'peer_uri_help': 'Examples: tcp://example.com:54321, tls://peer.yggdrasil.network:443' + 'peer_uri_help': 'Examples: tcp://example.com:54321, tls://peer.yggdrasil.network:443', + + // Configuration + 'configuration_file': 'Configuration File', + 'refresh': 'Refresh', + 'save_config': 'Save', + 'config_save_success': 'Configuration saved successfully', + 'config_save_error': 'Error saving configuration', + 'config_load_error': 'Error loading configuration', + 'config_readonly': 'Configuration file is read-only', + 'config_save_confirm_title': 'Confirm Save', + 'config_save_confirm_text': 'Are you sure you want to save changes to the configuration file?', + 'config_backup_info': 'Backup will be created automatically', + 'config_warning': '⚠️ Warning: Incorrect configuration may cause node failure!' }; \ No newline at end of file diff --git a/src/webui/static/lang/ru.js b/src/webui/static/lang/ru.js index 5ff168ca..43594121 100644 --- a/src/webui/static/lang/ru.js +++ b/src/webui/static/lang/ru.js @@ -98,5 +98,18 @@ window.translations.ru = { 'add_peer_modal_description': 'Введите URI пира для подключения к новому узлу сети', 'peer_uri_label': 'URI пира', 'peer_uri_placeholder': 'tcp://example.com:54321', - 'peer_uri_help': 'Примеры: tcp://example.com:54321, tls://peer.yggdrasil.network:443' + 'peer_uri_help': 'Примеры: tcp://example.com:54321, tls://peer.yggdrasil.network:443', + + // Configuration + 'configuration_file': 'Файл конфигурации', + 'refresh': 'Обновить', + 'save_config': 'Сохранить', + 'config_save_success': 'Конфигурация сохранена успешно', + 'config_save_error': 'Ошибка сохранения конфигурации', + 'config_load_error': 'Ошибка загрузки конфигурации', + 'config_readonly': 'Файл конфигурации доступен только для чтения', + 'config_save_confirm_title': 'Подтверждение сохранения', + 'config_save_confirm_text': 'Вы уверены, что хотите сохранить изменения в конфигурационный файл?', + 'config_backup_info': 'Резервная копия будет создана автоматически', + 'config_warning': '⚠️ Внимание: Неправильная конфигурация может привести к сбою работы узла!' }; \ No newline at end of file diff --git a/src/webui/static/main.js b/src/webui/static/main.js index 1a048899..42ec4cf2 100644 --- a/src/webui/static/main.js +++ b/src/webui/static/main.js @@ -167,6 +167,11 @@ function showSection(sectionName) { if (event && event.target) { event.target.closest('.nav-item').classList.add('active'); } + + // Initialize section-specific functionality + if (sectionName === 'config') { + initConfigSection(); + } } /** diff --git a/src/webui/static/style.css b/src/webui/static/style.css index 53c7137c..12dbcea4 100644 --- a/src/webui/static/style.css +++ b/src/webui/static/style.css @@ -114,16 +114,6 @@ --shadow-heavy: rgba(0, 0, 0, 0.5); } -/* Dark theme progress bar adjustments */ -[data-theme="dark"] .progress-timer-container { - background: rgba(0, 0, 0, 0.4); -} - -[data-theme="dark"] .progress-timer-bar { - background: linear-gradient(90deg, #3498db, #27ae60); - box-shadow: 0 0 10px rgba(52, 152, 219, 0.3); -} - * { margin: 0; padding: 0; @@ -138,24 +128,6 @@ body { overflow: hidden; /* Prevent body scroll */ } -/* Decorative progress bar */ -.progress-timer-container { - position: fixed; - top: 0; - left: 0; - right: 0; - height: 4px; - background: rgba(255, 255, 255, 0.2); - z-index: 1000; -} - -.progress-timer-bar { - height: 100%; - background: linear-gradient(90deg, #3498db, #2ecc71); - width: 100%; - box-shadow: 0 0 10px rgba(52, 152, 219, 0.5); -} - .container { display: grid; grid-template-columns: 250px 1fr; @@ -1563,4 +1535,380 @@ button[onclick="copyNodeKey()"]:hover { .modal-btn { width: 100%; } +} + +/* Configuration Editor Styles */ +.config-container { + max-width: 1200px; + margin: 0 auto; + padding: 20px; +} + +.config-header { + display: flex; + justify-content: space-between; + align-items: flex-start; + margin-bottom: 30px; + padding: 20px; + background: var(--bg-info-card); + border: 1px solid var(--border-card); + border-radius: 8px; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); +} + +.config-info h3 { + margin: 0 0 10px 0; + color: var(--text-heading); + font-size: 1.5em; +} + +.config-meta { + display: flex; + gap: 15px; + flex-wrap: wrap; + align-items: center; +} + +.config-path { + font-family: 'Courier New', monospace; + background: var(--bg-nav-item); + padding: 4px 8px; + border-radius: 4px; + font-size: 0.9em; + color: var(--text-body); + max-width: 300px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.config-format { + padding: 4px 8px; + border-radius: 4px; + font-size: 0.8em; + font-weight: bold; + text-transform: uppercase; +} + +.config-format.json { + background: #e3f2fd; + color: #1976d2; +} + +.config-format.hjson { + background: #f3e5f5; + color: #7b1fa2; +} + +.config-status { + padding: 4px 8px; + border-radius: 4px; + font-size: 0.8em; + font-weight: bold; +} + +.config-status.writable { + background: var(--bg-success); + color: var(--text-success); +} + +.config-status.readonly { + background: var(--bg-warning); + color: var(--text-warning); +} + +.config-actions { + display: flex; + gap: 10px; +} + +.refresh-btn { + background: var(--bg-nav-active); + color: white; +} + +.save-btn { + background: var(--bg-success-dark); + color: white; +} + +.save-btn.modified { + background: var(--bg-warning-dark); + animation: pulse 2s infinite; +} + +@keyframes pulse { + 0% { opacity: 1; } + 50% { opacity: 0.7; } + 100% { opacity: 1; } +} + +/* Configuration Groups */ +.config-groups { + display: flex; + flex-direction: column; + gap: 20px; +} + +.config-group { + background: var(--bg-info-card); + border: 1px solid var(--border-card); + border-radius: 8px; + overflow: hidden; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); +} + +.config-group-header { + display: flex; + justify-content: space-between; + align-items: center; + padding: 15px 20px; + background: var(--bg-nav-item); + cursor: pointer; + transition: background-color 0.2s; +} + +.config-group-header:hover { + background: var(--bg-nav-hover); +} + +.config-group-header h4 { + margin: 0; + color: var(--text-heading); + font-size: 1.2em; +} + +.toggle-icon { + font-size: 1.2em; + color: var(--text-muted); + transition: transform 0.2s; +} + +.config-group-content { + padding: 0; +} + +/* Configuration Fields */ +.config-field { + padding: 20px; + border-bottom: 1px solid var(--border-card); +} + +.config-field:last-child { + border-bottom: none; +} + +.config-field-header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 8px; +} + +.config-field-header label { + font-weight: bold; + color: var(--text-heading); + font-family: 'Courier New', monospace; +} + +.field-type { + padding: 2px 6px; + background: var(--bg-nav-item); + color: var(--text-muted); + border-radius: 3px; + font-size: 0.8em; + font-weight: normal; +} + +.config-field-description { + color: var(--text-muted); + font-size: 0.9em; + margin-bottom: 12px; + line-height: 1.4; +} + +.config-field-input { + position: relative; +} + +/* Input Styles */ +.config-input, .config-textarea { + width: 100%; + padding: 10px 12px; + border: 1px solid var(--border-card); + border-radius: 4px; + font-family: 'Courier New', monospace; + font-size: 0.9em; + background: var(--bg-info-card); + color: var(--text-body); + transition: border-color 0.2s; +} + +.config-input:focus, .config-textarea:focus { + outline: none; + border-color: var(--border-hover); + box-shadow: 0 0 0 2px rgba(52, 152, 219, 0.2); +} + +.config-textarea { + resize: vertical; + min-height: 80px; + font-family: 'Courier New', monospace; +} + +.private-key { + font-family: monospace; + letter-spacing: 1px; +} + +/* Switch Styles */ +.switch { + position: relative; + display: inline-block; + width: 60px; + height: 34px; +} + +.switch input { + opacity: 0; + width: 0; + height: 0; +} + +.slider { + position: absolute; + cursor: pointer; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-color: #ccc; + transition: 0.4s; + border-radius: 34px; +} + +.slider:before { + position: absolute; + content: ""; + height: 26px; + width: 26px; + left: 4px; + bottom: 4px; + background-color: white; + transition: 0.4s; + border-radius: 50%; +} + +input:checked + .slider { + background-color: var(--bg-nav-active); +} + +input:focus + .slider { + box-shadow: 0 0 1px var(--bg-nav-active); +} + +input:checked + .slider:before { + transform: translateX(26px); +} + +/* Array and Object Input Styles */ +.array-input, .object-input, .private-key-input { + position: relative; +} + +.array-input small, .object-input small, .private-key-input small { + display: block; + margin-top: 5px; + color: var(--text-muted); + font-size: 0.8em; +} + +/* Save Confirmation Modal */ +.save-config-confirmation { + text-align: center; +} + +.config-save-info { + background: var(--bg-nav-item); + padding: 15px; + border-radius: 4px; + margin: 15px 0; + text-align: left; +} + +.config-save-info p { + margin: 5px 0; + font-family: 'Courier New', monospace; + font-size: 0.9em; +} + +.warning { + background: var(--bg-warning); + border: 1px solid var(--border-warning); + color: var(--text-warning); + padding: 15px; + border-radius: 4px; + margin-top: 15px; +} + +/* Responsive Design */ +@media (max-width: 768px) { + .config-container { + padding: 10px; + } + + .config-header { + flex-direction: column; + gap: 15px; + align-items: stretch; + } + + .config-meta { + flex-direction: column; + gap: 10px; + align-items: flex-start; + } + + .config-path { + max-width: 100%; + } + + .config-actions { + justify-content: center; + } + + .config-field { + padding: 15px; + } + + .config-field-header { + flex-direction: column; + align-items: flex-start; + gap: 5px; + } +} + +/* Dark Theme Support */ +[data-theme="dark"] .config-container, +[data-theme="dark"] .config-group, +[data-theme="dark"] .config-header { + background: var(--bg-info-card); + border-color: var(--border-card); +} + +[data-theme="dark"] .config-input, +[data-theme="dark"] .config-textarea { + background: var(--bg-nav-item); + border-color: var(--border-card); + color: var(--text-body); +} + +[data-theme="dark"] .config-save-info { + background: var(--bg-nav-item); +} + +[data-theme="dark"] .warning { + background: rgba(255, 193, 7, 0.1); + border-color: var(--border-warning); + color: var(--text-warning); } \ No newline at end of file From 8ee5c9fbe1a9ace21d941397dcbe168f985a7f3b Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Fri, 15 Aug 2025 14:25:58 +0000 Subject: [PATCH 26/46] Enhance peer display by including peer names alongside IP addresses in the WebUI and CLI. Update peer data retrieval to fetch names from node information. --- .vscode/launch.json | 38 ++++++++++++++++++++++++++++++++++++++ cmd/yggdrasilctl/main.go | 9 ++++++++- src/admin/getpeers.go | 24 ++++++++++++++++++++++++ src/webui/static/app.js | 4 +++- 4 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..686e1dfc --- /dev/null +++ b/.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" + } + ] +} \ No newline at end of file diff --git a/cmd/yggdrasilctl/main.go b/cmd/yggdrasilctl/main.go index 51c25dcd..9fbd2626 100644 --- a/cmd/yggdrasilctl/main.go +++ b/cmd/yggdrasilctl/main.go @@ -208,11 +208,18 @@ func run() int { if peer.TXRate > 0 { txr = peer.TXRate.String() + "/s" } + + // Format IP address with name if available + ipDisplay := peer.IPAddress + if peer.Name != "" { + ipDisplay = fmt.Sprintf("%s (%s)", peer.Name, peer.IPAddress) + } + table.Append([]string{ uristring, state, dir, - peer.IPAddress, + ipDisplay, (time.Duration(peer.Uptime) * time.Second).String(), rtt, peer.RXBytes.String(), diff --git a/src/admin/getpeers.go b/src/admin/getpeers.go index 0384b792..8d3145c7 100644 --- a/src/admin/getpeers.go +++ b/src/admin/getpeers.go @@ -2,12 +2,16 @@ package admin import ( "encoding/hex" + "fmt" "net" "slices" "strings" "time" + "encoding/json" + "github.com/yggdrasil-network/yggdrasil-go/src/address" + "github.com/yggdrasil-network/yggdrasil-go/src/core" ) type GetPeersRequest struct { @@ -34,6 +38,7 @@ type PeerEntry struct { Latency time.Duration `json:"latency,omitempty"` LastErrorTime time.Duration `json:"last_error_time,omitempty"` LastError string `json:"last_error,omitempty"` + Name string `json:"name,omitempty"` } func (a *AdminSocket) getPeersHandler(_ *GetPeersRequest, res *GetPeersResponse) error { @@ -64,6 +69,25 @@ func (a *AdminSocket) getPeersHandler(_ *GetPeersRequest, res *GetPeersResponse) peer.LastError = p.LastError.Error() peer.LastErrorTime = time.Since(p.LastErrorTime) } + + // Get nodeinfo from peer to extract name + if p.Up && len(p.Key) > 0 { + if nodeInfo, err := a.CallHandler("getNodeInfo", []byte(fmt.Sprintf(`{"key":"%s"}`, hex.EncodeToString(p.Key[:])))); err == nil { + if nodeInfoMap, ok := nodeInfo.(core.GetNodeInfoResponse); ok { + for _, nodeInfoData := range nodeInfoMap { + var nodeInfoObj map[string]interface{} + if json.Unmarshal(nodeInfoData, &nodeInfoObj) == nil { + if name, exists := nodeInfoObj["name"]; exists { + if nameStr, ok := name.(string); ok { + peer.Name = nameStr + } + } + } + } + } + } + } + res.Peers = append(res.Peers, peer) } slices.SortStableFunc(res.Peers, func(a, b PeerEntry) int { diff --git a/src/webui/static/app.js b/src/webui/static/app.js index 6054a92b..e973b9fc 100644 --- a/src/webui/static/app.js +++ b/src/webui/static/app.js @@ -166,7 +166,9 @@ function createPeerElement(peer) { div.innerHTML = `
-
${peer.address || 'N/A'}
+
+ ${peer.name || 'N/A'} (${peer.address || 'N/A'}) +
${yggUtils.formatPublicKey(peer.key) || 'N/A'}
From c0a9bc802af93ba9f3c93911180ddc7bc93cd04d Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Fri, 15 Aug 2025 14:49:01 +0000 Subject: [PATCH 27/46] Refactor peer display in CLI by removing name formatting and directly showing IP addresses. Clean up unused code related to peer name retrieval in admin handler. --- cmd/yggdrasilctl/main.go | 8 +------- src/admin/getpeers.go | 26 +------------------------- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/cmd/yggdrasilctl/main.go b/cmd/yggdrasilctl/main.go index 9fbd2626..b63826d6 100644 --- a/cmd/yggdrasilctl/main.go +++ b/cmd/yggdrasilctl/main.go @@ -209,17 +209,11 @@ func run() int { txr = peer.TXRate.String() + "/s" } - // Format IP address with name if available - ipDisplay := peer.IPAddress - if peer.Name != "" { - ipDisplay = fmt.Sprintf("%s (%s)", peer.Name, peer.IPAddress) - } - table.Append([]string{ uristring, state, dir, - ipDisplay, + peer.IPAddress, (time.Duration(peer.Uptime) * time.Second).String(), rtt, peer.RXBytes.String(), diff --git a/src/admin/getpeers.go b/src/admin/getpeers.go index 8d3145c7..90736ad6 100644 --- a/src/admin/getpeers.go +++ b/src/admin/getpeers.go @@ -2,16 +2,11 @@ package admin import ( "encoding/hex" - "fmt" + "github.com/yggdrasil-network/yggdrasil-go/src/address" "net" "slices" "strings" "time" - - "encoding/json" - - "github.com/yggdrasil-network/yggdrasil-go/src/address" - "github.com/yggdrasil-network/yggdrasil-go/src/core" ) type GetPeersRequest struct { @@ -38,7 +33,6 @@ type PeerEntry struct { Latency time.Duration `json:"latency,omitempty"` LastErrorTime time.Duration `json:"last_error_time,omitempty"` LastError string `json:"last_error,omitempty"` - Name string `json:"name,omitempty"` } func (a *AdminSocket) getPeersHandler(_ *GetPeersRequest, res *GetPeersResponse) error { @@ -70,24 +64,6 @@ func (a *AdminSocket) getPeersHandler(_ *GetPeersRequest, res *GetPeersResponse) peer.LastErrorTime = time.Since(p.LastErrorTime) } - // Get nodeinfo from peer to extract name - if p.Up && len(p.Key) > 0 { - if nodeInfo, err := a.CallHandler("getNodeInfo", []byte(fmt.Sprintf(`{"key":"%s"}`, hex.EncodeToString(p.Key[:])))); err == nil { - if nodeInfoMap, ok := nodeInfo.(core.GetNodeInfoResponse); ok { - for _, nodeInfoData := range nodeInfoMap { - var nodeInfoObj map[string]interface{} - if json.Unmarshal(nodeInfoData, &nodeInfoObj) == nil { - if name, exists := nodeInfoObj["name"]; exists { - if nameStr, ok := name.(string); ok { - peer.Name = nameStr - } - } - } - } - } - } - } - res.Peers = append(res.Peers, peer) } slices.SortStableFunc(res.Peers, func(a, b PeerEntry) int { From 1f8f36860f3ddfbe521bb127282a7d0e70300216 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Fri, 15 Aug 2025 15:17:49 +0000 Subject: [PATCH 28/46] Add NodeInfo field to PeerEntry and PeerInfo structures, and update related handlers to include NodeInfo in peer data retrieval and handshake processes. --- src/admin/getpeers.go | 6 ++++++ src/core/api.go | 6 ++++++ src/core/link.go | 33 ++++++++++++++++++++++++++++++--- src/core/version.go | 21 +++++++++++++++++++++ 4 files changed, 63 insertions(+), 3 deletions(-) diff --git a/src/admin/getpeers.go b/src/admin/getpeers.go index 90736ad6..a013d12a 100644 --- a/src/admin/getpeers.go +++ b/src/admin/getpeers.go @@ -33,6 +33,7 @@ type PeerEntry struct { Latency time.Duration `json:"latency,omitempty"` LastErrorTime time.Duration `json:"last_error_time,omitempty"` LastError string `json:"last_error,omitempty"` + NodeInfo string `json:"nodeinfo,omitempty"` // NodeInfo from peer handshake } func (a *AdminSocket) getPeersHandler(_ *GetPeersRequest, res *GetPeersResponse) error { @@ -63,6 +64,11 @@ func (a *AdminSocket) getPeersHandler(_ *GetPeersRequest, res *GetPeersResponse) peer.LastError = p.LastError.Error() peer.LastErrorTime = time.Since(p.LastErrorTime) } + + // Add NodeInfo if available + if len(p.NodeInfo) > 0 { + peer.NodeInfo = string(p.NodeInfo) + } res.Peers = append(res.Peers, peer) } diff --git a/src/core/api.go b/src/core/api.go index cc1bde32..d4b96391 100644 --- a/src/core/api.go +++ b/src/core/api.go @@ -37,6 +37,7 @@ type PeerInfo struct { TXRate uint64 Uptime time.Duration Latency time.Duration + NodeInfo []byte // NodeInfo received during handshake } type TreeEntryInfo struct { @@ -92,6 +93,11 @@ func (c *Core) GetPeers() []PeerInfo { peerinfo.RXRate = atomic.LoadUint64(&c.rxrate) peerinfo.TXRate = atomic.LoadUint64(&c.txrate) peerinfo.Uptime = time.Since(c.up) + // Add NodeInfo from handshake + if len(state._nodeInfo) > 0 { + peerinfo.NodeInfo = make([]byte, len(state._nodeInfo)) + copy(peerinfo.NodeInfo, state._nodeInfo) + } } if p, ok := conns[conn]; ok { peerinfo.Key = p.Key diff --git a/src/core/link.go b/src/core/link.go index dce19278..7645aa3d 100644 --- a/src/core/link.go +++ b/src/core/link.go @@ -64,9 +64,10 @@ type link struct { linkType linkType // Type of link, i.e. outbound/inbound, persistent/ephemeral linkProto string // Protocol carrier of link, e.g. TCP, AWDL // The remaining fields can only be modified safely from within the links actor - _conn *linkConn // Connected link, if any, nil if not connected - _err error // Last error on the connection, if any - _errtime time.Time // Last time an error occurred + _conn *linkConn // Connected link, if any, nil if not connected + _err error // Last error on the connection, if any + _errtime time.Time // Last time an error occurred + _nodeInfo []byte // NodeInfo received from peer during handshake } type linkOptions struct { @@ -246,6 +247,7 @@ func (l *links) add(u *url.URL, sintf string, linkType linkType) error { linkType: linkType, linkProto: strings.ToUpper(u.Scheme), kick: make(chan struct{}), + _nodeInfo: nil, // Initialize NodeInfo field } state.ctx, state.cancel = context.WithCancel(l.core.ctx) @@ -524,6 +526,7 @@ func (l *links) listen(u *url.URL, sintf string, local bool) (*Listener, error) linkType: linkTypeIncoming, linkProto: strings.ToUpper(u.Scheme), kick: make(chan struct{}), + _nodeInfo: nil, // Initialize NodeInfo field } } if state._conn != nil { @@ -605,6 +608,16 @@ func (l *links) handler(linkType linkType, options linkOptions, conn net.Conn, s meta := version_getBaseMetadata() meta.publicKey = l.core.public meta.priority = options.priority + + // Add our NodeInfo to handshake if available + phony.Block(&l.core.proto.nodeinfo, func() { + nodeInfo := l.core.proto.nodeinfo._getNodeInfo() + if len(nodeInfo) > 0 { + meta.nodeInfo = make([]byte, len(nodeInfo)) + copy(meta.nodeInfo, nodeInfo) + } + }) + metaBytes, err := meta.encode(l.core.secret, options.password) if err != nil { return fmt.Errorf("failed to generate handshake: %w", err) @@ -661,6 +674,20 @@ func (l *links) handler(linkType linkType, options linkOptions, conn net.Conn, s } } + // Store the received NodeInfo in the link state + if len(meta.nodeInfo) > 0 { + phony.Block(l, func() { + // Find the link state for this connection + for _, state := range l._links { + if state._conn != nil && state._conn.Conn == conn { + state._nodeInfo = make([]byte, len(meta.nodeInfo)) + copy(state._nodeInfo, meta.nodeInfo) + break + } + } + }) + } + dir := "outbound" if linkType == linkTypeIncoming { dir = "inbound" diff --git a/src/core/version.go b/src/core/version.go index bb3b9538..05b5c810 100644 --- a/src/core/version.go +++ b/src/core/version.go @@ -8,6 +8,7 @@ import ( "bytes" "crypto/ed25519" "encoding/binary" + "fmt" "io" "golang.org/x/crypto/blake2b" @@ -21,6 +22,7 @@ type version_metadata struct { minorVer uint16 publicKey ed25519.PublicKey priority uint8 + nodeInfo []byte // NodeInfo data from configuration } const ( @@ -35,6 +37,7 @@ const ( metaVersionMinor // uint16 metaPublicKey // [32]byte metaPriority // uint8 + metaNodeInfo // []byte ) type handshakeError string @@ -52,6 +55,7 @@ func version_getBaseMetadata() version_metadata { return version_metadata{ majorVer: ProtocolVersionMajor, minorVer: ProtocolVersionMinor, + nodeInfo: nil, // Will be set during handshake } } @@ -77,6 +81,16 @@ func (m *version_metadata) encode(privateKey ed25519.PrivateKey, password []byte bs = binary.BigEndian.AppendUint16(bs, 1) bs = append(bs, m.priority) + // Add NodeInfo if available (with size validation) + if len(m.nodeInfo) > 0 { + if len(m.nodeInfo) > 16384 { + return nil, fmt.Errorf("NodeInfo exceeds max length of 16384 bytes") + } + bs = binary.BigEndian.AppendUint16(bs, metaNodeInfo) + bs = binary.BigEndian.AppendUint16(bs, uint16(len(m.nodeInfo))) + bs = append(bs, m.nodeInfo...) + } + hasher, err := blake2b.New512(password) if err != nil { return nil, err @@ -135,6 +149,13 @@ func (m *version_metadata) decode(r io.Reader, password []byte) error { case metaPriority: m.priority = bs[0] + + case metaNodeInfo: + if oplen > 16384 { + return fmt.Errorf("received NodeInfo exceeds max length of 16384 bytes") + } + m.nodeInfo = make([]byte, oplen) + copy(m.nodeInfo, bs[:oplen]) } bs = bs[oplen:] } From 795cc506fd24144fc12cc7edb1a8f5b50219b917 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Fri, 15 Aug 2025 15:38:27 +0000 Subject: [PATCH 29/46] Update peer handling to extract and display NodeInfo names in CLI and admin responses. Enhance debug logging for NodeInfo processing in various components. --- cmd/yggdrasilctl/main.go | 30 ++++++++++++++++++++++++++++-- src/admin/getpeers.go | 9 +++++++-- src/core/api.go | 4 ++++ src/core/link.go | 31 ++++++++++++++++++------------- 4 files changed, 57 insertions(+), 17 deletions(-) diff --git a/cmd/yggdrasilctl/main.go b/cmd/yggdrasilctl/main.go index b63826d6..e06d497d 100644 --- a/cmd/yggdrasilctl/main.go +++ b/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,31 @@ func run() int { if peer.Inbound { dir = "In" } + + // Extract name from NodeInfo if available + if peer.NodeInfo != "" { + fmt.Printf("[DEBUG] Peer %s has NodeInfo: %s\n", peer.IPAddress, peer.NodeInfo) + var nodeInfo map[string]interface{} + if err := json.Unmarshal([]byte(peer.NodeInfo), &nodeInfo); err == nil { + fmt.Printf("[DEBUG] Parsed NodeInfo for %s: %+v\n", peer.IPAddress, nodeInfo) + if nameValue, ok := nodeInfo["name"]; ok { + fmt.Printf("[DEBUG] Found name field for %s: %v (type: %T)\n", peer.IPAddress, nameValue, nameValue) + if nameStr, ok := nameValue.(string); ok && nameStr != "" { + name = nameStr + fmt.Printf("[DEBUG] Set name for %s: %s\n", peer.IPAddress, name) + } else { + fmt.Printf("[DEBUG] Name field for %s is not a non-empty string\n", peer.IPAddress) + } + } else { + fmt.Printf("[DEBUG] No 'name' field found in NodeInfo for %s\n", peer.IPAddress) + } + } else { + fmt.Printf("[DEBUG] Failed to parse NodeInfo JSON for %s: %v\n", peer.IPAddress, err) + } + } else { + fmt.Printf("[DEBUG] Peer %s has empty NodeInfo\n", peer.IPAddress) + } + uristring := peer.URI if uri, err := url.Parse(peer.URI); err == nil { uri.RawQuery = "" @@ -213,6 +238,7 @@ func run() int { uristring, state, dir, + name, peer.IPAddress, (time.Duration(peer.Uptime) * time.Second).String(), rtt, diff --git a/src/admin/getpeers.go b/src/admin/getpeers.go index a013d12a..f54decdf 100644 --- a/src/admin/getpeers.go +++ b/src/admin/getpeers.go @@ -2,11 +2,13 @@ package admin import ( "encoding/hex" - "github.com/yggdrasil-network/yggdrasil-go/src/address" + "fmt" "net" "slices" "strings" "time" + + "github.com/yggdrasil-network/yggdrasil-go/src/address" ) type GetPeersRequest struct { @@ -64,10 +66,13 @@ func (a *AdminSocket) getPeersHandler(_ *GetPeersRequest, res *GetPeersResponse) peer.LastError = p.LastError.Error() peer.LastErrorTime = time.Since(p.LastErrorTime) } - + // Add NodeInfo if available if len(p.NodeInfo) > 0 { peer.NodeInfo = string(p.NodeInfo) + fmt.Printf("[DEBUG] Admin: Added NodeInfo for peer %s: %s\n", peer.IPAddress, peer.NodeInfo) + } else { + fmt.Printf("[DEBUG] Admin: No NodeInfo for peer %s\n", peer.IPAddress) } res.Peers = append(res.Peers, peer) diff --git a/src/core/api.go b/src/core/api.go index d4b96391..beaeb025 100644 --- a/src/core/api.go +++ b/src/core/api.go @@ -3,6 +3,7 @@ package core import ( "crypto/ed25519" "encoding/json" + "fmt" "net" "net/url" "sync/atomic" @@ -97,6 +98,9 @@ func (c *Core) GetPeers() []PeerInfo { if len(state._nodeInfo) > 0 { peerinfo.NodeInfo = make([]byte, len(state._nodeInfo)) copy(peerinfo.NodeInfo, state._nodeInfo) + fmt.Printf("[DEBUG] Core: Added NodeInfo from handshake for link state: %s\n", string(state._nodeInfo)) + } else { + fmt.Printf("[DEBUG] Core: No NodeInfo in link state\n") } } if p, ok := conns[conn]; ok { diff --git a/src/core/link.go b/src/core/link.go index 7645aa3d..97cadcd2 100644 --- a/src/core/link.go +++ b/src/core/link.go @@ -367,7 +367,7 @@ func (l *links) add(u *url.URL, sintf string, linkType linkType) error { // Give the connection to the handler. The handler will block // for the lifetime of the connection. - switch err = l.handler(linkType, options, lc, resetBackoff, false); { + switch err = l.handler(linkType, options, lc, resetBackoff, false, state); { case err == nil: case errors.Is(err, io.EOF): case errors.Is(err, net.ErrClosed): @@ -563,7 +563,7 @@ func (l *links) listen(u *url.URL, sintf string, local bool) (*Listener, error) // Give the connection to the handler. The handler will block // for the lifetime of the connection. - switch err = l.handler(linkTypeIncoming, options, lc, nil, local); { + switch err = l.handler(linkTypeIncoming, options, lc, nil, local, state); { case err == nil: case errors.Is(err, io.EOF): case errors.Is(err, net.ErrClosed): @@ -604,7 +604,7 @@ func (l *links) connect(ctx context.Context, u *url.URL, info linkInfo, options return dialer.dial(ctx, u, info, options) } -func (l *links) handler(linkType linkType, options linkOptions, conn net.Conn, success func(), local bool) error { +func (l *links) handler(linkType linkType, options linkOptions, conn net.Conn, success func(), local bool, linkState *link) error { meta := version_getBaseMetadata() meta.publicKey = l.core.public meta.priority = options.priority @@ -615,6 +615,9 @@ func (l *links) handler(linkType linkType, options linkOptions, conn net.Conn, s if len(nodeInfo) > 0 { meta.nodeInfo = make([]byte, len(nodeInfo)) copy(meta.nodeInfo, nodeInfo) + fmt.Printf("[DEBUG] Link: Adding our NodeInfo to handshake: %s\n", string(nodeInfo)) + } else { + fmt.Printf("[DEBUG] Link: No NodeInfo to add to handshake\n") } }) @@ -676,16 +679,18 @@ func (l *links) handler(linkType linkType, options linkOptions, conn net.Conn, s // Store the received NodeInfo in the link state if len(meta.nodeInfo) > 0 { - phony.Block(l, func() { - // Find the link state for this connection - for _, state := range l._links { - if state._conn != nil && state._conn.Conn == conn { - state._nodeInfo = make([]byte, len(meta.nodeInfo)) - copy(state._nodeInfo, meta.nodeInfo) - break - } - } - }) + fmt.Printf("[DEBUG] Link: Received NodeInfo from peer: %s\n", string(meta.nodeInfo)) + if linkState != nil { + phony.Block(l, func() { + linkState._nodeInfo = make([]byte, len(meta.nodeInfo)) + copy(linkState._nodeInfo, meta.nodeInfo) + fmt.Printf("[DEBUG] Link: Stored NodeInfo in link state\n") + }) + } else { + fmt.Printf("[DEBUG] Link: linkState is nil, cannot store NodeInfo\n") + } + } else { + fmt.Printf("[DEBUG] Link: No NodeInfo received from peer\n") } dir := "outbound" From e473c62936f0fff6df0df779bda6a29b3189d8dd Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Fri, 15 Aug 2025 15:42:09 +0000 Subject: [PATCH 30/46] Add methods to extract NodeInfo names and improve peer display in WebUI. Enhance debug logging for NodeInfo processing. --- src/webui/static/api.js | 37 +++++++++++++++++++++++++++++++++++++ src/webui/static/app.js | 21 ++++++++++++++++++++- 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/src/webui/static/api.js b/src/webui/static/api.js index 2b012b1e..93826a94 100644 --- a/src/webui/static/api.js +++ b/src/webui/static/api.js @@ -274,6 +274,43 @@ class YggdrasilUtils { if (cost <= 400) return { class: 'quality-fair', text: 'Fair' }; return { class: 'quality-poor', text: 'Poor' }; } + + /** + * Extract name from NodeInfo JSON string + * @param {string} nodeinfo - NodeInfo JSON string + * @returns {string} - Extracted name or null + */ + static extractNodeInfoName(nodeinfo) { + if (!nodeinfo || typeof nodeinfo !== 'string') { + return null; + } + + try { + const parsed = JSON.parse(nodeinfo); + return parsed.name && typeof parsed.name === 'string' ? parsed.name : null; + } catch (error) { + console.warn('Failed to parse NodeInfo:', error); + return null; + } + } + + /** + * Get display name for peer (from NodeInfo or fallback to address) + * @param {Object} peer - Peer object with nodeinfo and address + * @returns {string} - Display name + */ + static getPeerDisplayName(peer) { + // Try to get name from NodeInfo first + if (peer.nodeinfo) { + const name = this.extractNodeInfoName(peer.nodeinfo); + if (name) { + return name; + } + } + + // Fallback to address or "Unknown" + return peer.address || 'Unknown'; + } } // Create global API instance diff --git a/src/webui/static/app.js b/src/webui/static/app.js index e973b9fc..4461dc9a 100644 --- a/src/webui/static/app.js +++ b/src/webui/static/app.js @@ -106,6 +106,22 @@ function updatePeersDisplay(data) { } data.peers.forEach(peer => { + // Debug: log NodeInfo for each peer + if (peer.nodeinfo) { + console.log(`[DEBUG WebUI] Peer ${peer.address} has NodeInfo:`, peer.nodeinfo); + try { + const parsed = JSON.parse(peer.nodeinfo); + console.log(`[DEBUG WebUI] Parsed NodeInfo for ${peer.address}:`, parsed); + if (parsed.name) { + console.log(`[DEBUG WebUI] Found name for ${peer.address}: ${parsed.name}`); + } + } catch (e) { + console.warn(`[DEBUG WebUI] Failed to parse NodeInfo for ${peer.address}:`, e); + } + } else { + console.log(`[DEBUG WebUI] Peer ${peer.address} has no NodeInfo`); + } + const peerElement = createPeerElement(peer); peersContainer.appendChild(peerElement); }); @@ -163,11 +179,14 @@ function createPeerElement(peer) { remove: t['peer_remove'] || 'Remove' }; + // Extract name from NodeInfo + const displayName = yggUtils.getPeerDisplayName(peer); + div.innerHTML = `
- ${peer.name || 'N/A'} (${peer.address || 'N/A'}) + ${displayName} ${peer.address ? `(${peer.address})` : ''}
${yggUtils.formatPublicKey(peer.key) || 'N/A'}
From 4935fcf226ebd988ad9ed0b872d516310d32c75e Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Fri, 15 Aug 2025 15:46:45 +0000 Subject: [PATCH 31/46] Remove debug logging related to NodeInfo processing in various components to clean up the codebase. --- cmd/yggdrasilctl/main.go | 12 ------------ src/admin/getpeers.go | 4 ---- src/core/api.go | 4 ---- src/core/link.go | 9 --------- 4 files changed, 29 deletions(-) diff --git a/cmd/yggdrasilctl/main.go b/cmd/yggdrasilctl/main.go index e06d497d..a9ee2402 100644 --- a/cmd/yggdrasilctl/main.go +++ b/cmd/yggdrasilctl/main.go @@ -200,26 +200,14 @@ func run() int { // Extract name from NodeInfo if available if peer.NodeInfo != "" { - fmt.Printf("[DEBUG] Peer %s has NodeInfo: %s\n", peer.IPAddress, peer.NodeInfo) var nodeInfo map[string]interface{} if err := json.Unmarshal([]byte(peer.NodeInfo), &nodeInfo); err == nil { - fmt.Printf("[DEBUG] Parsed NodeInfo for %s: %+v\n", peer.IPAddress, nodeInfo) if nameValue, ok := nodeInfo["name"]; ok { - fmt.Printf("[DEBUG] Found name field for %s: %v (type: %T)\n", peer.IPAddress, nameValue, nameValue) if nameStr, ok := nameValue.(string); ok && nameStr != "" { name = nameStr - fmt.Printf("[DEBUG] Set name for %s: %s\n", peer.IPAddress, name) - } else { - fmt.Printf("[DEBUG] Name field for %s is not a non-empty string\n", peer.IPAddress) } - } else { - fmt.Printf("[DEBUG] No 'name' field found in NodeInfo for %s\n", peer.IPAddress) } - } else { - fmt.Printf("[DEBUG] Failed to parse NodeInfo JSON for %s: %v\n", peer.IPAddress, err) } - } else { - fmt.Printf("[DEBUG] Peer %s has empty NodeInfo\n", peer.IPAddress) } uristring := peer.URI diff --git a/src/admin/getpeers.go b/src/admin/getpeers.go index f54decdf..fd2de773 100644 --- a/src/admin/getpeers.go +++ b/src/admin/getpeers.go @@ -2,7 +2,6 @@ package admin import ( "encoding/hex" - "fmt" "net" "slices" "strings" @@ -70,9 +69,6 @@ func (a *AdminSocket) getPeersHandler(_ *GetPeersRequest, res *GetPeersResponse) // Add NodeInfo if available if len(p.NodeInfo) > 0 { peer.NodeInfo = string(p.NodeInfo) - fmt.Printf("[DEBUG] Admin: Added NodeInfo for peer %s: %s\n", peer.IPAddress, peer.NodeInfo) - } else { - fmt.Printf("[DEBUG] Admin: No NodeInfo for peer %s\n", peer.IPAddress) } res.Peers = append(res.Peers, peer) diff --git a/src/core/api.go b/src/core/api.go index beaeb025..d4b96391 100644 --- a/src/core/api.go +++ b/src/core/api.go @@ -3,7 +3,6 @@ package core import ( "crypto/ed25519" "encoding/json" - "fmt" "net" "net/url" "sync/atomic" @@ -98,9 +97,6 @@ func (c *Core) GetPeers() []PeerInfo { if len(state._nodeInfo) > 0 { peerinfo.NodeInfo = make([]byte, len(state._nodeInfo)) copy(peerinfo.NodeInfo, state._nodeInfo) - fmt.Printf("[DEBUG] Core: Added NodeInfo from handshake for link state: %s\n", string(state._nodeInfo)) - } else { - fmt.Printf("[DEBUG] Core: No NodeInfo in link state\n") } } if p, ok := conns[conn]; ok { diff --git a/src/core/link.go b/src/core/link.go index 97cadcd2..949a8f10 100644 --- a/src/core/link.go +++ b/src/core/link.go @@ -615,9 +615,6 @@ func (l *links) handler(linkType linkType, options linkOptions, conn net.Conn, s if len(nodeInfo) > 0 { meta.nodeInfo = make([]byte, len(nodeInfo)) copy(meta.nodeInfo, nodeInfo) - fmt.Printf("[DEBUG] Link: Adding our NodeInfo to handshake: %s\n", string(nodeInfo)) - } else { - fmt.Printf("[DEBUG] Link: No NodeInfo to add to handshake\n") } }) @@ -679,18 +676,12 @@ func (l *links) handler(linkType linkType, options linkOptions, conn net.Conn, s // Store the received NodeInfo in the link state if len(meta.nodeInfo) > 0 { - fmt.Printf("[DEBUG] Link: Received NodeInfo from peer: %s\n", string(meta.nodeInfo)) if linkState != nil { phony.Block(l, func() { linkState._nodeInfo = make([]byte, len(meta.nodeInfo)) copy(linkState._nodeInfo, meta.nodeInfo) - fmt.Printf("[DEBUG] Link: Stored NodeInfo in link state\n") }) - } else { - fmt.Printf("[DEBUG] Link: linkState is nil, cannot store NodeInfo\n") } - } else { - fmt.Printf("[DEBUG] Link: No NodeInfo received from peer\n") } dir := "outbound" From 0d0f524071cc06885c517cd298a78f19a4799700 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Fri, 15 Aug 2025 15:59:00 +0000 Subject: [PATCH 32/46] Implement JSON configuration editor in WebUI with save and restart functionality. Enhance configuration handling by converting data to JSON format and adding validation features. Update styles for improved user experience. --- src/webui/server.go | 85 +++++-- src/webui/static/config-editor.js | 313 +++++++++++++++++++++++++ src/webui/static/config.js | 375 ++++-------------------------- src/webui/static/index.html | 1 + src/webui/static/lang/en.js | 5 + src/webui/static/lang/ru.js | 5 + src/webui/static/style.css | 218 ++++++++++++++++- 7 files changed, 650 insertions(+), 352 deletions(-) create mode 100644 src/webui/static/config-editor.js diff --git a/src/webui/server.go b/src/webui/server.go index 0848d101..73f24979 100644 --- a/src/webui/server.go +++ b/src/webui/server.go @@ -8,8 +8,10 @@ import ( "fmt" "net" "net/http" + "os" "strings" "sync" + "syscall" "time" "github.com/yggdrasil-network/yggdrasil-go/src/admin" @@ -384,23 +386,25 @@ func (w *WebUIServer) callAdminHandler(command string, args map[string]interface // Configuration response structures type ConfigResponse struct { - ConfigPath string `json:"config_path"` - ConfigFormat string `json:"config_format"` - ConfigData interface{} `json:"config_data"` - IsWritable bool `json:"is_writable"` + ConfigPath string `json:"config_path"` + ConfigFormat string `json:"config_format"` + ConfigJSON string `json:"config_json"` + IsWritable bool `json:"is_writable"` } type ConfigSetRequest struct { - ConfigData interface{} `json:"config_data"` - ConfigPath string `json:"config_path,omitempty"` - Format string `json:"format,omitempty"` + ConfigJSON string `json:"config_json"` + ConfigPath string `json:"config_path,omitempty"` + Format string `json:"format,omitempty"` + Restart bool `json:"restart,omitempty"` } type ConfigSetResponse struct { - Success bool `json:"success"` - Message string `json:"message"` - ConfigPath string `json:"config_path"` - BackupPath string `json:"backup_path,omitempty"` + Success bool `json:"success"` + Message string `json:"message"` + ConfigPath string `json:"config_path"` + BackupPath string `json:"backup_path,omitempty"` + RestartRequired bool `json:"restart_required"` } // getConfigHandler handles configuration file reading @@ -418,10 +422,18 @@ func (w *WebUIServer) getConfigHandler(rw http.ResponseWriter, r *http.Request) return } + // Convert config data to formatted JSON string + configBytes, err := json.MarshalIndent(configInfo.Data, "", " ") + if err != nil { + w.log.Errorf("Failed to marshal config to JSON: %v", err) + http.Error(rw, "Failed to format configuration", http.StatusInternalServerError) + return + } + response := ConfigResponse{ ConfigPath: configInfo.Path, ConfigFormat: configInfo.Format, - ConfigData: configInfo.Data, + ConfigJSON: string(configBytes), IsWritable: configInfo.Writable, } @@ -445,8 +457,19 @@ func (w *WebUIServer) setConfigHandler(rw http.ResponseWriter, r *http.Request) return } + // Parse JSON configuration + var configData interface{} + if err := json.Unmarshal([]byte(req.ConfigJSON), &configData); err != nil { + response := ConfigSetResponse{ + Success: false, + Message: fmt.Sprintf("Invalid JSON configuration: %v", err), + } + w.writeJSONResponse(rw, response) + return + } + // Use config package to save configuration - err := config.SaveConfig(req.ConfigData, req.ConfigPath, req.Format) + err := config.SaveConfig(configData, req.ConfigPath, req.Format) if err != nil { response := ConfigSetResponse{ Success: false, @@ -464,11 +487,19 @@ func (w *WebUIServer) setConfigHandler(rw http.ResponseWriter, r *http.Request) } response := ConfigSetResponse{ - Success: true, - Message: "Configuration saved successfully", - ConfigPath: configPath, - BackupPath: configPath + ".backup", + Success: true, + Message: "Configuration saved successfully", + ConfigPath: configPath, + BackupPath: configPath + ".backup", + RestartRequired: req.Restart, } + + // If restart is requested, trigger server restart + if req.Restart { + w.log.Infof("Configuration saved with restart request") + go w.restartServer() + } + w.writeJSONResponse(rw, response) } @@ -556,3 +587,23 @@ func (w *WebUIServer) Stop() error { } return nil } + +// restartServer triggers a graceful restart of the Yggdrasil process +func (w *WebUIServer) restartServer() { + w.log.Infof("Initiating server restart after configuration change") + + // Give some time for the response to be sent + time.Sleep(1 * time.Second) + + // Send SIGUSR1 signal to trigger a graceful restart + // This assumes the main process handles SIGUSR1 for restart + proc, err := os.FindProcess(os.Getpid()) + if err != nil { + w.log.Errorf("Failed to find current process: %v", err) + return + } + + if err := proc.Signal(syscall.SIGUSR1); err != nil { + w.log.Errorf("Failed to send restart signal: %v", err) + } +} diff --git a/src/webui/static/config-editor.js b/src/webui/static/config-editor.js new file mode 100644 index 00000000..d0f69468 --- /dev/null +++ b/src/webui/static/config-editor.js @@ -0,0 +1,313 @@ +// JSON Editor functionality for configuration + +// Initialize JSON editor with basic syntax highlighting and features +function initJSONEditor() { + const textarea = document.getElementById('config-json-textarea'); + const lineNumbersContainer = document.getElementById('line-numbers-container'); + const statusElement = document.getElementById('editor-status'); + const cursorElement = document.getElementById('cursor-position'); + + if (!textarea) return; + + // Set initial content + textarea.value = currentConfigJSON || ''; + + // Update line numbers + updateLineNumbers(); + + // Add event listeners + textarea.addEventListener('input', function() { + updateLineNumbers(); + updateEditorStatus(); + onConfigChange(); + }); + + textarea.addEventListener('scroll', syncLineNumbers); + textarea.addEventListener('keydown', handleEditorKeydown); + textarea.addEventListener('selectionchange', updateCursorPosition); + textarea.addEventListener('click', updateCursorPosition); + textarea.addEventListener('keyup', updateCursorPosition); + + // Initial status update + updateEditorStatus(); + updateCursorPosition(); +} + +// Update line numbers +function updateLineNumbers() { + const textarea = document.getElementById('config-json-textarea'); + const lineNumbersContainer = document.getElementById('line-numbers-container'); + + if (!textarea || !lineNumbersContainer) return; + + const lines = textarea.value.split('\n'); + const lineNumbers = lines.map((_, index) => + `${index + 1}` + ).join(''); + + lineNumbersContainer.innerHTML = lineNumbers; +} + +// Sync line numbers scroll with textarea +function syncLineNumbers() { + const textarea = document.getElementById('config-json-textarea'); + const lineNumbersContainer = document.getElementById('line-numbers-container'); + + if (!textarea || !lineNumbersContainer) return; + + lineNumbersContainer.scrollTop = textarea.scrollTop; +} + +// Toggle line numbers visibility +function toggleLineNumbers() { + const checkbox = document.getElementById('line-numbers'); + const lineNumbersContainer = document.getElementById('line-numbers-container'); + const editorWrapper = document.querySelector('.editor-wrapper'); + + if (checkbox.checked) { + lineNumbersContainer.style.display = 'block'; + editorWrapper.classList.add('with-line-numbers'); + } else { + lineNumbersContainer.style.display = 'none'; + editorWrapper.classList.remove('with-line-numbers'); + } +} + +// Handle special editor keydown events +function handleEditorKeydown(event) { + const textarea = event.target; + + // Tab handling for indentation + if (event.key === 'Tab') { + event.preventDefault(); + const start = textarea.selectionStart; + const end = textarea.selectionEnd; + + if (event.shiftKey) { + // Remove indentation + const beforeCursor = textarea.value.substring(0, start); + const lineStart = beforeCursor.lastIndexOf('\n') + 1; + const currentLine = textarea.value.substring(lineStart, end); + + if (currentLine.startsWith(' ')) { + textarea.value = textarea.value.substring(0, lineStart) + + currentLine.substring(2) + + textarea.value.substring(end); + textarea.selectionStart = Math.max(lineStart, start - 2); + textarea.selectionEnd = end - 2; + } + } else { + // Add indentation + textarea.value = textarea.value.substring(0, start) + + ' ' + + textarea.value.substring(end); + textarea.selectionStart = start + 2; + textarea.selectionEnd = start + 2; + } + + updateLineNumbers(); + updateEditorStatus(); + } + + // Auto-closing brackets and quotes + if (event.key === '{') { + insertMatchingCharacter(textarea, '{', '}'); + event.preventDefault(); + } else if (event.key === '[') { + insertMatchingCharacter(textarea, '[', ']'); + event.preventDefault(); + } else if (event.key === '"') { + insertMatchingCharacter(textarea, '"', '"'); + event.preventDefault(); + } +} + +// Insert matching character (auto-closing) +function insertMatchingCharacter(textarea, open, close) { + const start = textarea.selectionStart; + const end = textarea.selectionEnd; + const selectedText = textarea.value.substring(start, end); + + textarea.value = textarea.value.substring(0, start) + + open + selectedText + close + + textarea.value.substring(end); + + if (selectedText) { + textarea.selectionStart = start + 1; + textarea.selectionEnd = start + 1 + selectedText.length; + } else { + textarea.selectionStart = start + 1; + textarea.selectionEnd = start + 1; + } +} + +// Update editor status (validation) +function updateEditorStatus() { + const textarea = document.getElementById('config-json-textarea'); + const statusElement = document.getElementById('editor-status'); + + if (!textarea || !statusElement) return; + + try { + if (textarea.value.trim() === '') { + statusElement.textContent = 'Пустая конфигурация'; + statusElement.className = 'status-text warning'; + return; + } + + JSON.parse(textarea.value); + statusElement.textContent = 'Валидный JSON'; + statusElement.className = 'status-text success'; + } catch (error) { + statusElement.textContent = `Ошибка JSON: ${error.message}`; + statusElement.className = 'status-text error'; + } +} + +// Update cursor position display +function updateCursorPosition() { + const textarea = document.getElementById('config-json-textarea'); + const cursorElement = document.getElementById('cursor-position'); + + if (!textarea || !cursorElement) return; + + const cursorPos = textarea.selectionStart; + const beforeCursor = textarea.value.substring(0, cursorPos); + const line = beforeCursor.split('\n').length; + const column = beforeCursor.length - beforeCursor.lastIndexOf('\n'); + + cursorElement.textContent = `Строка ${line}, Столбец ${column}`; +} + +// Format JSON with proper indentation +function formatJSON() { + const textarea = document.getElementById('config-json-textarea'); + + if (!textarea) return; + + try { + const parsed = JSON.parse(textarea.value); + const formatted = JSON.stringify(parsed, null, 2); + textarea.value = formatted; + updateLineNumbers(); + updateEditorStatus(); + showNotification('JSON отформатирован', 'success'); + } catch (error) { + showNotification(`Ошибка форматирования: ${error.message}`, 'error'); + } +} + +// Validate JSON configuration +function validateJSON() { + const textarea = document.getElementById('config-json-textarea'); + + if (!textarea) return; + + try { + JSON.parse(textarea.value); + showNotification('JSON конфигурация валидна', 'success'); + } catch (error) { + showNotification(`Ошибка валидации JSON: ${error.message}`, 'error'); + } +} + +// Save configuration +async function saveConfiguration(restart = false) { + const textarea = document.getElementById('config-json-textarea'); + + if (!textarea) { + showNotification('Редактор не найден', 'error'); + return; + } + + // Validate JSON before saving + try { + JSON.parse(textarea.value); + } catch (error) { + showNotification(`Невозможно сохранить: ${error.message}`, 'error'); + return; + } + + try { + const response = await fetch('/api/config/set', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + credentials: 'same-origin', + body: JSON.stringify({ + config_json: textarea.value, + restart: restart + }) + }); + + const result = await response.json(); + + if (result.success) { + currentConfigJSON = textarea.value; + if (restart) { + showNotification('Конфигурация сохранена. Сервер перезапускается...', 'success'); + } else { + showNotification('Конфигурация сохранена успешно', 'success'); + } + onConfigChange(); // Update button states + } else { + showNotification(`Ошибка сохранения: ${result.message}`, 'error'); + } + } catch (error) { + console.error('Error saving configuration:', error); + showNotification(`Ошибка сохранения: ${error.message}`, 'error'); + } +} + +// Save configuration and restart server +async function saveAndRestartConfiguration() { + const confirmation = confirm('Сохранить конфигурацию и перезапустить сервер?\n\nВнимание: Соединение будет прервано на время перезапуска.'); + + if (confirmation) { + await saveConfiguration(true); + } +} + +// Refresh configuration from server +async function refreshConfiguration() { + const textarea = document.getElementById('config-json-textarea'); + + // Check if there are unsaved changes + if (textarea && textarea.value !== currentConfigJSON) { + const confirmation = confirm('У вас есть несохраненные изменения. Продолжить обновление?'); + if (!confirmation) { + return; + } + } + + try { + await loadConfiguration(); + showNotification('Конфигурация обновлена', 'success'); + } catch (error) { + showNotification('Ошибка обновления конфигурации', 'error'); + } +} + +// Update configuration status +function updateConfigStatus() { + // This function can be used to show additional status information + // Currently handled by updateEditorStatus +} + +// Handle configuration changes +function onConfigChange() { + // Mark configuration as modified + const saveBtn = document.querySelector('.save-btn'); + const restartBtn = document.querySelector('.restart-btn'); + + const textarea = document.getElementById('config-json-textarea'); + const hasChanges = textarea && textarea.value !== currentConfigJSON; + + if (saveBtn) { + saveBtn.style.fontWeight = hasChanges ? 'bold' : 'normal'; + } + if (restartBtn) { + restartBtn.style.fontWeight = hasChanges ? 'bold' : 'normal'; + } +} \ No newline at end of file diff --git a/src/webui/static/config.js b/src/webui/static/config.js index 28e8d0f5..575c200c 100644 --- a/src/webui/static/config.js +++ b/src/webui/static/config.js @@ -1,7 +1,8 @@ // Configuration management functions -let currentConfig = null; +let currentConfigJSON = null; let configMeta = null; +let configEditor = null; // Initialize config section async function initConfigSection() { @@ -26,7 +27,7 @@ async function loadConfiguration() { } const data = await response.json(); - currentConfig = data.config_data; + currentConfigJSON = data.config_json; configMeta = { path: data.config_path, format: data.config_format, @@ -41,7 +42,7 @@ async function loadConfiguration() { } } -// Render configuration editor +// Render configuration editor with JSON syntax highlighting function renderConfigEditor() { const configSection = document.getElementById('config-section'); @@ -62,17 +63,50 @@ function renderConfigEditor() { + + ${configMeta.isWritable ? ` + ` : ''}
-
- ${renderConfigGroups()} +
+
+ JSON Конфигурация +
+ + + + +
+
+
+
+ +
+
+ + +
@@ -80,332 +114,5 @@ function renderConfigEditor() { configSection.innerHTML = configEditor; updateTexts(); -} - -// Render configuration groups -function renderConfigGroups() { - const groups = [ - { - key: 'network', - title: 'Сетевые настройки', - fields: ['Peers', 'InterfacePeers', 'Listen', 'AllowedPublicKeys'] - }, - { - key: 'identity', - title: 'Идентификация', - fields: ['PrivateKey', 'PrivateKeyPath'] - }, - { - key: 'interface', - title: 'Сетевой интерфейс', - fields: ['IfName', 'IfMTU'] - }, - { - key: 'multicast', - title: 'Multicast', - fields: ['MulticastInterfaces'] - }, - { - key: 'admin', - title: 'Администрирование', - fields: ['AdminListen'] - }, - { - key: 'webui', - title: 'Веб-интерфейс', - fields: ['WebUI'] - }, - { - key: 'nodeinfo', - title: 'Информация об узле', - fields: ['NodeInfo', 'NodeInfoPrivacy', 'LogLookups'] - } - ]; - - return groups.map(group => ` -
-
-

${group.title}

- ▼ -
-
- ${group.fields.map(field => renderConfigField(field)).join('')} -
-
- `).join(''); -} - -// Render individual config field -function renderConfigField(fieldName) { - const value = currentConfig[fieldName]; - const fieldType = getFieldType(fieldName, value); - const fieldDescription = getFieldDescription(fieldName); - - return ` -
-
- - ${fieldType} -
-
${fieldDescription}
-
- ${renderConfigInput(fieldName, value, fieldType)} -
-
- `; -} - -// Render config input based on type -function renderConfigInput(fieldName, value, fieldType) { - switch (fieldType) { - case 'boolean': - return ` - - `; - - case 'number': - return ` - - `; - - case 'string': - return ` - - `; - - case 'array': - return ` -
- - Одно значение на строку -
- `; - - case 'object': - return ` -
- - JSON формат -
- `; - - case 'private_key': - return ` -
- - Приватный ключ (только для чтения) -
- `; - - default: - return ` - - `; - } -} - -// Get field type for rendering -function getFieldType(fieldName, value) { - if (fieldName === 'PrivateKey') return 'private_key'; - if (fieldName.includes('MTU') || fieldName === 'Port') return 'number'; - if (typeof value === 'boolean') return 'boolean'; - if (typeof value === 'number') return 'number'; - if (typeof value === 'string') return 'string'; - if (Array.isArray(value)) return 'array'; - if (typeof value === 'object') return 'object'; - return 'string'; -} - -// Get field description -function getFieldDescription(fieldName) { - const descriptions = { - 'Peers': 'Список исходящих peer соединений (например: tls://адрес:порт)', - 'InterfacePeers': 'Peer соединения по интерфейсам', - 'Listen': 'Адреса для входящих соединений', - 'AllowedPublicKeys': 'Разрешенные публичные ключи для входящих соединений', - 'PrivateKey': 'Приватный ключ узла (НЕ ПЕРЕДАВАЙТЕ НИКОМУ!)', - 'PrivateKeyPath': 'Путь к файлу с приватным ключом в формате PEM', - 'IfName': 'Имя TUN интерфейса ("auto" для автовыбора, "none" для отключения)', - 'IfMTU': 'Максимальный размер передаваемого блока (MTU) для TUN интерфейса', - 'MulticastInterfaces': 'Настройки multicast интерфейсов для обнаружения peers', - 'AdminListen': 'Адрес для подключения админского интерфейса', - 'WebUI': 'Настройки веб-интерфейса', - 'NodeInfo': 'Дополнительная информация об узле (видна всей сети)', - 'NodeInfoPrivacy': 'Скрыть информацию о платформе и версии', - 'LogLookups': 'Логировать поиск peers и узлов' - }; - - return descriptions[fieldName] || 'Параметр конфигурации'; -} - -// Update config value -function updateConfigValue(fieldName, value) { - if (currentConfig) { - currentConfig[fieldName] = value; - markConfigAsModified(); - } -} - -// Update array config value -function updateConfigArrayValue(fieldName, value) { - if (currentConfig) { - const lines = value.split('\n').filter(line => line.trim() !== ''); - currentConfig[fieldName] = lines; - markConfigAsModified(); - } -} - -// Update object config value -function updateConfigObjectValue(fieldName, value) { - if (currentConfig) { - try { - currentConfig[fieldName] = JSON.parse(value); - markConfigAsModified(); - } catch (error) { - console.error('Invalid JSON for field', fieldName, ':', error); - } - } -} - -// Mark config as modified -function markConfigAsModified() { - const saveButton = document.querySelector('.save-btn'); - if (saveButton) { - saveButton.classList.add('modified'); - } -} - -// Toggle config group -function toggleConfigGroup(groupKey) { - const content = document.getElementById(`config-group-${groupKey}`); - const icon = content.parentNode.querySelector('.toggle-icon'); - - if (content.style.display === 'none') { - content.style.display = 'block'; - icon.textContent = '▼'; - } else { - content.style.display = 'none'; - icon.textContent = '▶'; - } -} - -// Update config status display -function updateConfigStatus() { - // This function could show config validation status, etc. -} - -// Refresh configuration -async function refreshConfiguration() { - try { - await loadConfiguration(); - showNotification('Конфигурация обновлена', 'success'); - } catch (error) { - showNotification('Ошибка обновления конфигурации', 'error'); - } -} - -// Save configuration -async function saveConfiguration() { - if (!configMeta.isWritable) { - showNotification('Файл конфигурации доступен только для чтения', 'error'); - return; - } - - showModal({ - title: 'config_save_confirm_title', - content: ` -
-

Вы уверены, что хотите сохранить изменения в конфигурационный файл?

-
-

Файл: ${configMeta.path}

-

Формат: ${configMeta.format.toUpperCase()}

-

Резервная копия: Будет создана автоматически

-
-
- ⚠️ Внимание: Неправильная конфигурация может привести к сбою работы узла! -
-
- `, - buttons: [ - { - text: 'modal_cancel', - type: 'secondary', - action: 'close' - }, - { - text: 'save_config', - type: 'danger', - callback: () => { - confirmSaveConfiguration(); - return true; // Close modal - } - } - ] - }); -} - -// Confirm and perform save -async function confirmSaveConfiguration() { - - try { - const response = await fetch('/api/config/set', { - method: 'POST', - headers: { - 'Content-Type': 'application/json' - }, - credentials: 'same-origin', - body: JSON.stringify({ - config_data: currentConfig, - config_path: configMeta.path, - format: configMeta.format - }) - }); - - if (!response.ok) { - throw new Error(`HTTP ${response.status}: ${response.statusText}`); - } - - const data = await response.json(); - - if (data.success) { - showNotification(`Конфигурация сохранена: ${data.config_path}`, 'success'); - if (data.backup_path) { - showNotification(`Резервная копия: ${data.backup_path}`, 'info'); - } - - // Remove modified indicator - const saveButton = document.querySelector('.save-btn'); - if (saveButton) { - saveButton.classList.remove('modified'); - } - } else { - showNotification(`Ошибка сохранения: ${data.message}`, 'error'); - } - } catch (error) { - console.error('Error saving configuration:', error); - showNotification('Ошибка сохранения конфигурации', 'error'); - } -} \ No newline at end of file + initJSONEditor(); +} \ No newline at end of file diff --git a/src/webui/static/index.html b/src/webui/static/index.html index d0d1e0a9..99f7e15b 100644 --- a/src/webui/static/index.html +++ b/src/webui/static/index.html @@ -11,6 +11,7 @@ + diff --git a/src/webui/static/lang/en.js b/src/webui/static/lang/en.js index c48eb20a..6b7f2a31 100644 --- a/src/webui/static/lang/en.js +++ b/src/webui/static/lang/en.js @@ -104,6 +104,11 @@ window.translations.en = { 'configuration_file': 'Configuration File', 'refresh': 'Refresh', 'save_config': 'Save', + 'save_and_restart': 'Save and Restart', + 'format': 'Format', + 'validate': 'Validate', + 'json_configuration': 'JSON Configuration', + 'line_numbers': 'Line Numbers', 'config_save_success': 'Configuration saved successfully', 'config_save_error': 'Error saving configuration', 'config_load_error': 'Error loading configuration', diff --git a/src/webui/static/lang/ru.js b/src/webui/static/lang/ru.js index 43594121..b4b0d3c5 100644 --- a/src/webui/static/lang/ru.js +++ b/src/webui/static/lang/ru.js @@ -104,6 +104,11 @@ window.translations.ru = { 'configuration_file': 'Файл конфигурации', 'refresh': 'Обновить', 'save_config': 'Сохранить', + 'save_and_restart': 'Сохранить и перезапустить', + 'format': 'Форматировать', + 'validate': 'Проверить', + 'json_configuration': 'JSON Конфигурация', + 'line_numbers': 'Номера строк', 'config_save_success': 'Конфигурация сохранена успешно', 'config_save_error': 'Ошибка сохранения конфигурации', 'config_load_error': 'Ошибка загрузки конфигурации', diff --git a/src/webui/static/style.css b/src/webui/static/style.css index 12dbcea4..81630570 100644 --- a/src/webui/static/style.css +++ b/src/webui/static/style.css @@ -1911,4 +1911,220 @@ input:checked + .slider:before { background: rgba(255, 193, 7, 0.1); border-color: var(--border-warning); color: var(--text-warning); -} \ No newline at end of file +} + +/* JSON Editor Styles */ +.config-json-editor { + background: var(--bg-info-card); + border: 1px solid var(--border-card); + border-radius: 8px; + overflow: hidden; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); +} + +.editor-header { + display: flex; + justify-content: space-between; + align-items: center; + padding: 15px 20px; + background: var(--bg-nav-item); + border-bottom: 1px solid var(--border-card); +} + +.editor-title { + font-weight: bold; + color: var(--text-heading); + font-size: 1.1em; +} + +.editor-controls { + display: flex; + align-items: center; + gap: 15px; +} + +.line-numbers-toggle { + display: flex; + align-items: center; + gap: 6px; + font-size: 0.9em; + color: var(--text-muted); +} + +.line-numbers-toggle input[type="checkbox"] { + margin: 0; +} + +.editor-wrapper { + position: relative; + display: flex; + height: 500px; + font-family: 'Courier New', Monaco, 'Lucida Console', monospace; +} + +.editor-wrapper.with-line-numbers .json-editor { + padding-left: 60px; +} + +.line-numbers { + position: absolute; + left: 0; + top: 0; + width: 50px; + height: 100%; + background: var(--bg-nav-item); + border-right: 1px solid var(--border-card); + overflow: hidden; + font-size: 0.9em; + line-height: 1.4; + padding: 10px 5px; + box-sizing: border-box; + z-index: 1; +} + +.line-number { + display: block; + text-align: right; + color: var(--text-muted); + user-select: none; + padding-right: 8px; + min-height: 1.4em; +} + +.json-editor { + flex: 1; + border: none; + outline: none; + resize: none; + font-family: 'Courier New', Monaco, 'Lucida Console', monospace; + font-size: 14px; + line-height: 1.4; + padding: 10px; + background: var(--bg-info-card); + color: var(--text-body); + white-space: pre; + overflow-wrap: normal; + overflow-x: auto; + tab-size: 2; +} + +.json-editor:focus { + outline: none; + background: var(--bg-info-card); +} + +.json-editor::placeholder { + color: var(--text-muted); + font-style: italic; +} + +.editor-status { + display: flex; + justify-content: space-between; + align-items: center; + padding: 10px 15px; + background: var(--bg-nav-item); + border-top: 1px solid var(--border-card); + font-size: 0.9em; +} + +.status-text { + font-weight: 500; +} + +.status-text.success { + color: var(--text-success); +} + +.status-text.error { + color: var(--text-error); +} + +.status-text.warning { + color: var(--text-warning); +} + +.cursor-position { + color: var(--text-muted); + font-family: 'Courier New', monospace; + font-size: 0.8em; +} + +/* Additional action buttons */ +.format-btn { + background: var(--bg-nav-active); + color: white; +} + +.validate-btn { + background: var(--bg-warning-dark); + color: white; +} + +.restart-btn { + background: var(--text-error); + color: white; +} + +.restart-btn:hover { + background: #c62828; +} + +/* JSON Syntax highlighting (basic) */ +.json-editor { + color: var(--text-body); +} + +/* Mobile responsiveness for JSON editor */ +@media (max-width: 768px) { + .editor-header { + flex-direction: column; + gap: 10px; + align-items: stretch; + } + + .editor-controls { + justify-content: center; + } + + .editor-wrapper { + height: 400px; + } + + .json-editor { + font-size: 12px; + } + + .line-numbers { + width: 40px; + padding: 10px 3px; + font-size: 0.8em; + } + + .editor-wrapper.with-line-numbers .json-editor { + padding-left: 45px; + } + + .config-actions { + flex-wrap: wrap; + } + + .action-btn { + flex: 1; + min-width: 120px; + } +} + +/* Dark theme support for JSON editor */ +[data-theme="dark"] .config-json-editor, +[data-theme="dark"] .editor-header, +[data-theme="dark"] .editor-status, +[data-theme="dark"] .line-numbers { + background: var(--bg-info-card); + border-color: var(--border-card); +} + +[data-theme="dark"] .json-editor { + background: var(--bg-info-card); + color: var(--text-body); +} \ No newline at end of file From 87251c5695377ed9ef38358da4269c0ae9c923a3 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Fri, 15 Aug 2025 16:05:35 +0000 Subject: [PATCH 33/46] Update fallback return value in YggdrasilUtils to use 'Anonymous' instead of 'Unknown' for peer address. --- src/webui/static/api.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/webui/static/api.js b/src/webui/static/api.js index 93826a94..c4b383f6 100644 --- a/src/webui/static/api.js +++ b/src/webui/static/api.js @@ -308,8 +308,8 @@ class YggdrasilUtils { } } - // Fallback to address or "Unknown" - return peer.address || 'Unknown'; + // Fallback to address or "Anonymous" + return 'Anonymous'; } } From 9e11f76fc345bb9bf7f6b3d256547f85df302dfb Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Fri, 15 Aug 2025 16:07:26 +0000 Subject: [PATCH 34/46] Update fallback return value in YggdrasilUtils to return 'N/A' when peer address is not available. --- src/webui/static/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webui/static/api.js b/src/webui/static/api.js index c4b383f6..5dabe86c 100644 --- a/src/webui/static/api.js +++ b/src/webui/static/api.js @@ -309,7 +309,7 @@ class YggdrasilUtils { } // Fallback to address or "Anonymous" - return 'Anonymous'; + return peer.address ? 'Anonymous' : 'N/A'; } } From 1c6126987749c7a46945ebe3bec90fcdc9a3836b Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Fri, 15 Aug 2025 19:22:07 +0000 Subject: [PATCH 35/46] Refactor configuration editor to always display line numbers and update UI elements for better user experience. Replace toggle functionality with a fixed display of line numbers. Enhance notification messages and confirmation dialogs with translation support for improved localization. --- src/webui/static/config-editor.js | 99 ++++++++++++++++++----------- src/webui/static/config.js | 44 ++++++------- src/webui/static/lang/en.js | 26 +++++++- src/webui/static/lang/ru.js | 26 +++++++- src/webui/static/style.css | 101 ++++++++++++++---------------- 5 files changed, 179 insertions(+), 117 deletions(-) diff --git a/src/webui/static/config-editor.js b/src/webui/static/config-editor.js index d0f69468..0ed612b3 100644 --- a/src/webui/static/config-editor.js +++ b/src/webui/static/config-editor.js @@ -15,6 +15,12 @@ function initJSONEditor() { // Update line numbers updateLineNumbers(); + // Always enable line numbers since toggle was removed + const editorWrapper = document.querySelector('.editor-wrapper'); + if (editorWrapper) { + editorWrapper.classList.add('with-line-numbers'); + } + // Add event listeners textarea.addEventListener('input', function() { updateLineNumbers(); @@ -58,20 +64,7 @@ function syncLineNumbers() { lineNumbersContainer.scrollTop = textarea.scrollTop; } -// Toggle line numbers visibility -function toggleLineNumbers() { - const checkbox = document.getElementById('line-numbers'); - const lineNumbersContainer = document.getElementById('line-numbers-container'); - const editorWrapper = document.querySelector('.editor-wrapper'); - - if (checkbox.checked) { - lineNumbersContainer.style.display = 'block'; - editorWrapper.classList.add('with-line-numbers'); - } else { - lineNumbersContainer.style.display = 'none'; - editorWrapper.classList.remove('with-line-numbers'); - } -} + // Handle special editor keydown events function handleEditorKeydown(event) { @@ -150,13 +143,13 @@ function updateEditorStatus() { try { if (textarea.value.trim() === '') { - statusElement.textContent = 'Пустая конфигурация'; + statusElement.innerHTML = 'Пустая конфигурация'; statusElement.className = 'status-text warning'; return; } JSON.parse(textarea.value); - statusElement.textContent = 'Валидный JSON'; + statusElement.innerHTML = ''; statusElement.className = 'status-text success'; } catch (error) { statusElement.textContent = `Ошибка JSON: ${error.message}`; @@ -176,7 +169,7 @@ function updateCursorPosition() { const line = beforeCursor.split('\n').length; const column = beforeCursor.length - beforeCursor.lastIndexOf('\n'); - cursorElement.textContent = `Строка ${line}, Столбец ${column}`; + cursorElement.innerHTML = `Строка ${line}, Столбец ${column}`; } // Format JSON with proper indentation @@ -191,7 +184,10 @@ function formatJSON() { textarea.value = formatted; updateLineNumbers(); updateEditorStatus(); - showNotification('JSON отформатирован', 'success'); + const formattedMessage = window.translations && window.translations[currentLanguage] && window.translations[currentLanguage]['json_formatted'] + ? window.translations[currentLanguage]['json_formatted'] + : 'JSON отформатирован'; + showNotification(formattedMessage, 'success'); } catch (error) { showNotification(`Ошибка форматирования: ${error.message}`, 'error'); } @@ -205,7 +201,10 @@ function validateJSON() { try { JSON.parse(textarea.value); - showNotification('JSON конфигурация валидна', 'success'); + const validationMessage = window.translations && window.translations[currentLanguage] && window.translations[currentLanguage]['json_validation_success'] + ? window.translations[currentLanguage]['json_validation_success'] + : 'JSON конфигурация валидна'; + showNotification(validationMessage, 'success'); } catch (error) { showNotification(`Ошибка валидации JSON: ${error.message}`, 'error'); } @@ -246,9 +245,15 @@ async function saveConfiguration(restart = false) { if (result.success) { currentConfigJSON = textarea.value; if (restart) { - showNotification('Конфигурация сохранена. Сервер перезапускается...', 'success'); + const restartMessage = window.translations && window.translations[currentLanguage] && window.translations[currentLanguage]['config_saved_restarting'] + ? window.translations[currentLanguage]['config_saved_restarting'] + : 'Конфигурация сохранена. Сервер перезапускается...'; + showNotification(restartMessage, 'success'); } else { - showNotification('Конфигурация сохранена успешно', 'success'); + const successMessage = window.translations && window.translations[currentLanguage] && window.translations[currentLanguage]['config_saved_success'] + ? window.translations[currentLanguage]['config_saved_success'] + : 'Конфигурация сохранена успешно'; + showNotification(successMessage, 'success'); } onConfigChange(); // Update button states } else { @@ -262,11 +267,22 @@ async function saveConfiguration(restart = false) { // Save configuration and restart server async function saveAndRestartConfiguration() { - const confirmation = confirm('Сохранить конфигурацию и перезапустить сервер?\n\nВнимание: Соединение будет прервано на время перезапуска.'); + const title = window.translations && window.translations[currentLanguage] && window.translations[currentLanguage]['save_and_restart_title'] + ? window.translations[currentLanguage]['save_and_restart_title'] + : 'Сохранить и перезапустить'; - if (confirmation) { - await saveConfiguration(true); - } + const message = window.translations && window.translations[currentLanguage] && window.translations[currentLanguage]['save_and_restart_message'] + ? window.translations[currentLanguage]['save_and_restart_message'] + : 'Сохранить конфигурацию и перезапустить сервер?\n\nВнимание: Соединение будет прервано на время перезапуска.'; + + showConfirmModal({ + title: title, + message: message, + type: 'danger', + onConfirm: async () => { + await saveConfiguration(true); + } + }); } // Refresh configuration from server @@ -275,18 +291,31 @@ async function refreshConfiguration() { // Check if there are unsaved changes if (textarea && textarea.value !== currentConfigJSON) { - const confirmation = confirm('У вас есть несохраненные изменения. Продолжить обновление?'); - if (!confirmation) { - return; - } + const title = window.translations && window.translations[currentLanguage] && window.translations[currentLanguage]['refresh_unsaved_changes_title'] + ? window.translations[currentLanguage]['refresh_unsaved_changes_title'] + : 'Несохраненные изменения'; + + const message = window.translations && window.translations[currentLanguage] && window.translations[currentLanguage]['refresh_unsaved_changes_message'] + ? window.translations[currentLanguage]['refresh_unsaved_changes_message'] + : 'У вас есть несохраненные изменения. Продолжить обновление?'; + + showConfirmModal({ + title: title, + message: message, + type: 'warning', + onConfirm: async () => { + try { + await loadConfiguration(); + showNotification('Конфигурация обновлена', 'success'); + } catch (error) { + showNotification('Ошибка обновления конфигурации', 'error'); + } + } + }); + return; } - try { - await loadConfiguration(); - showNotification('Конфигурация обновлена', 'success'); - } catch (error) { - showNotification('Ошибка обновления конфигурации', 'error'); - } + } // Update configuration status diff --git a/src/webui/static/config.js b/src/webui/static/config.js index 575c200c..9183037d 100644 --- a/src/webui/static/config.js +++ b/src/webui/static/config.js @@ -55,29 +55,10 @@ function renderConfigEditor() { ${configMeta.path} ${configMeta.format.toUpperCase()} - ${configMeta.isWritable ? '✏️ Редактируемый' : '🔒 Только чтение'} + ${configMeta.isWritable ? '✏️ Редактируемый' : '🔒 Только чтение'}
-
- - - - ${configMeta.isWritable ? ` - - - ` : ''} -
@@ -85,10 +66,25 @@ function renderConfigEditor() {
JSON Конфигурация
- - - - +
+
+ Обновить +
+
+ Форматировать +
+
+ Проверить +
+ ${configMeta.isWritable ? ` +
+ Сохранить +
+
+ Сохранить и перезапустить +
+ ` : ''} +
diff --git a/src/webui/static/lang/en.js b/src/webui/static/lang/en.js index 6b7f2a31..41d65886 100644 --- a/src/webui/static/lang/en.js +++ b/src/webui/static/lang/en.js @@ -108,7 +108,7 @@ window.translations.en = { 'format': 'Format', 'validate': 'Validate', 'json_configuration': 'JSON Configuration', - 'line_numbers': 'Line Numbers', + 'config_save_success': 'Configuration saved successfully', 'config_save_error': 'Error saving configuration', 'config_load_error': 'Error loading configuration', @@ -116,5 +116,27 @@ window.translations.en = { 'config_save_confirm_title': 'Confirm Save', 'config_save_confirm_text': 'Are you sure you want to save changes to the configuration file?', 'config_backup_info': 'Backup will be created automatically', - 'config_warning': '⚠️ Warning: Incorrect configuration may cause node failure!' + 'config_warning': '⚠️ Warning: Incorrect configuration may cause node failure!', + + // Editor status translations + 'editable': 'Editable', + 'readonly': 'Read Only', + 'empty_config': 'Empty Configuration', + 'valid_json': 'Valid JSON', + 'line': 'Line', + 'column': 'Column', + + // Configuration save messages + 'config_saved_restarting': 'Configuration saved. Server is restarting...', + 'config_saved_success': 'Configuration saved successfully', + + // Validation messages + 'json_validation_success': 'JSON configuration is valid', + 'json_formatted': 'JSON formatted', + + // Confirmation dialogs + 'save_and_restart_title': 'Save and Restart', + 'save_and_restart_message': 'Save configuration and restart server?\n\nWarning: Connection will be interrupted during restart.', + 'refresh_unsaved_changes_title': 'Unsaved Changes', + 'refresh_unsaved_changes_message': 'You have unsaved changes. Continue refreshing?' }; \ No newline at end of file diff --git a/src/webui/static/lang/ru.js b/src/webui/static/lang/ru.js index b4b0d3c5..e9e0ed2f 100644 --- a/src/webui/static/lang/ru.js +++ b/src/webui/static/lang/ru.js @@ -108,7 +108,7 @@ window.translations.ru = { 'format': 'Форматировать', 'validate': 'Проверить', 'json_configuration': 'JSON Конфигурация', - 'line_numbers': 'Номера строк', + 'config_save_success': 'Конфигурация сохранена успешно', 'config_save_error': 'Ошибка сохранения конфигурации', 'config_load_error': 'Ошибка загрузки конфигурации', @@ -116,5 +116,27 @@ window.translations.ru = { 'config_save_confirm_title': 'Подтверждение сохранения', 'config_save_confirm_text': 'Вы уверены, что хотите сохранить изменения в конфигурационный файл?', 'config_backup_info': 'Резервная копия будет создана автоматически', - 'config_warning': '⚠️ Внимание: Неправильная конфигурация может привести к сбою работы узла!' + 'config_warning': '⚠️ Внимание: Неправильная конфигурация может привести к сбою работы узла!', + + // Editor status translations + 'editable': 'Редактируемый', + 'readonly': 'Только чтение', + 'empty_config': 'Пустая конфигурация', + 'valid_json': 'Валидный JSON', + 'line': 'Строка', + 'column': 'Столбец', + + // Configuration save messages + 'config_saved_restarting': 'Конфигурация сохранена. Сервер перезапускается...', + 'config_saved_success': 'Конфигурация сохранена успешно', + + // Validation messages + 'json_validation_success': 'JSON конфигурация валидна', + 'json_formatted': 'JSON отформатирован', + + // Confirmation dialogs + 'save_and_restart_title': 'Сохранить и перезапустить', + 'save_and_restart_message': 'Сохранить конфигурацию и перезапустить сервер?\n\nВнимание: Соединение будет прервано на время перезапуска.', + 'refresh_unsaved_changes_title': 'Несохраненные изменения', + 'refresh_unsaved_changes_message': 'У вас есть несохраненные изменения. Продолжить обновление?' }; \ No newline at end of file diff --git a/src/webui/static/style.css b/src/webui/static/style.css index 81630570..1ebf7e1f 100644 --- a/src/webui/static/style.css +++ b/src/webui/static/style.css @@ -1539,7 +1539,6 @@ button[onclick="copyNodeKey()"]:hover { /* Configuration Editor Styles */ .config-container { - max-width: 1200px; margin: 0 auto; padding: 20px; } @@ -1556,6 +1555,11 @@ button[onclick="copyNodeKey()"]:hover { box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); } +.config-info { + display: flex; + flex-direction: column; +} + .config-info h3 { margin: 0 0 10px 0; color: var(--text-heading); @@ -1617,31 +1621,7 @@ button[onclick="copyNodeKey()"]:hover { color: var(--text-warning); } -.config-actions { - display: flex; - gap: 10px; -} -.refresh-btn { - background: var(--bg-nav-active); - color: white; -} - -.save-btn { - background: var(--bg-success-dark); - color: white; -} - -.save-btn.modified { - background: var(--bg-warning-dark); - animation: pulse 2s infinite; -} - -@keyframes pulse { - 0% { opacity: 1; } - 50% { opacity: 0.7; } - 100% { opacity: 1; } -} /* Configuration Groups */ .config-groups { @@ -1943,17 +1923,7 @@ input:checked + .slider:before { gap: 15px; } -.line-numbers-toggle { - display: flex; - align-items: center; - gap: 6px; - font-size: 0.9em; - color: var(--text-muted); -} -.line-numbers-toggle input[type="checkbox"] { - margin: 0; -} .editor-wrapper { position: relative; @@ -2050,24 +2020,34 @@ input:checked + .slider:before { font-size: 0.8em; } -/* Additional action buttons */ -.format-btn { - background: var(--bg-nav-active); - color: white; +/* Action buttons group */ +.action-buttons-group { + display: flex; + gap: 8px; + flex-wrap: wrap; + justify-content: flex-end; } -.validate-btn { - background: var(--bg-warning-dark); - color: white; +.action-buttons-group .action-btn { + background: var(--bg-nav-item); + color: var(--text-nav); + border: none; + padding: 8px 16px; + border-radius: 4px; + cursor: pointer; + font-size: 13px; + font-weight: 500; + transition: all 0.2s ease; + margin: 0; + user-select: none; + display: flex; + align-items: center; + justify-content: center; } -.restart-btn { - background: var(--text-error); - color: white; -} - -.restart-btn:hover { - background: #c62828; +.action-buttons-group .action-btn:hover { + background: var(--bg-nav-hover); + transform: translateY(-1px); } /* JSON Syntax highlighting (basic) */ @@ -2105,13 +2085,16 @@ input:checked + .slider:before { padding-left: 45px; } - .config-actions { - flex-wrap: wrap; + .action-buttons-group { + flex-direction: row; + gap: 4px; + justify-content: center; } - .action-btn { - flex: 1; - min-width: 120px; + .action-buttons-group .action-btn { + flex: none; + min-width: auto; + justify-content: center; } } @@ -2127,4 +2110,14 @@ input:checked + .slider:before { [data-theme="dark"] .json-editor { background: var(--bg-info-card); color: var(--text-body); +} + +/* Dark theme support for action buttons */ +[data-theme="dark"] .action-buttons-group .action-btn { + color: var(--text-nav); +} + +[data-theme="dark"] .action-buttons-group .action-btn:hover { + background: var(--bg-nav-hover); + transform: translateY(-1px); } \ No newline at end of file From 9931a87240d588b52fa6b17106a63c820e69469b Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Sat, 16 Aug 2025 03:30:28 +0800 Subject: [PATCH 36/46] Added information about PR to CHANGELOG --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7ac1d80..638cd9d4 100644 --- a/CHANGELOG.md +++ b/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 From 03c08876461f412a50577b175dbabab06e176c5e Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Sat, 16 Aug 2025 03:32:18 +0800 Subject: [PATCH 37/46] Update CHANGELOG to include development environment improvements, highlighting Docker and VS Code Dev Container support for enhanced setup and workflow consistency. --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 638cd9d4..1b3e4e5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. * 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 +* Development environment improvements + * Docker and VS Code Dev Container support for easier development setup + * Enhanced development container configuration with Oh My Zsh + * Improved development workflow and environment consistency ## [0.5.12] - 2024-12-18 From 8d0cbfd0ad5a5a05d3559e71d0b2ee1ba97a72a7 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Fri, 15 Aug 2025 19:38:49 +0000 Subject: [PATCH 38/46] Implement cross-platform restart handling in WebUIServer. Add sendRestartSignal function to manage process signals based on the operating system, improving server restart functionality. --- src/webui/server.go | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/webui/server.go b/src/webui/server.go index 73f24979..d897a0ee 100644 --- a/src/webui/server.go +++ b/src/webui/server.go @@ -9,6 +9,7 @@ import ( "net" "net/http" "os" + "runtime" "strings" "sync" "syscall" @@ -595,15 +596,31 @@ func (w *WebUIServer) restartServer() { // Give some time for the response to be sent time.Sleep(1 * time.Second) - // Send SIGUSR1 signal to trigger a graceful restart - // This assumes the main process handles SIGUSR1 for restart + // Cross-platform restart handling proc, err := os.FindProcess(os.Getpid()) if err != nil { w.log.Errorf("Failed to find current process: %v", err) return } - if err := proc.Signal(syscall.SIGUSR1); err != nil { + // Try to send restart signal (platform-specific) + if err := sendRestartSignal(proc); err != nil { w.log.Errorf("Failed to send restart signal: %v", err) + w.log.Infof("Please restart Yggdrasil manually to apply configuration changes") + } +} + +// sendRestartSignal sends a restart signal to the process in a cross-platform way +func sendRestartSignal(proc *os.Process) error { + // Platform-specific signal handling + switch runtime.GOOS { + case "windows": + // Windows doesn't support SIGUSR1, so we'll use a different approach + // For now, we'll just log that manual restart is needed + // In the future, this could be enhanced with Windows-specific restart mechanisms + return fmt.Errorf("automatic restart not supported on Windows") + default: + // Unix-like systems support SIGUSR1 + return proc.Signal(syscall.SIGUSR1) } } From 82b681367e3ecf335b6e4e2937406d86ba4e6166 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Fri, 15 Aug 2025 19:45:14 +0000 Subject: [PATCH 39/46] Remove sendRestartSignal function from WebUIServer as it is no longer needed for cross-platform restart handling. Clean up code by eliminating unused imports and comments related to platform-specific signal handling. --- src/webui/server.go | 17 ----------------- src/webui/server_unix.go | 13 +++++++++++++ src/webui/server_windows.go | 16 ++++++++++++++++ 3 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 src/webui/server_unix.go create mode 100644 src/webui/server_windows.go diff --git a/src/webui/server.go b/src/webui/server.go index d897a0ee..a697442f 100644 --- a/src/webui/server.go +++ b/src/webui/server.go @@ -9,10 +9,8 @@ import ( "net" "net/http" "os" - "runtime" "strings" "sync" - "syscall" "time" "github.com/yggdrasil-network/yggdrasil-go/src/admin" @@ -609,18 +607,3 @@ func (w *WebUIServer) restartServer() { w.log.Infof("Please restart Yggdrasil manually to apply configuration changes") } } - -// sendRestartSignal sends a restart signal to the process in a cross-platform way -func sendRestartSignal(proc *os.Process) error { - // Platform-specific signal handling - switch runtime.GOOS { - case "windows": - // Windows doesn't support SIGUSR1, so we'll use a different approach - // For now, we'll just log that manual restart is needed - // In the future, this could be enhanced with Windows-specific restart mechanisms - return fmt.Errorf("automatic restart not supported on Windows") - default: - // Unix-like systems support SIGUSR1 - return proc.Signal(syscall.SIGUSR1) - } -} diff --git a/src/webui/server_unix.go b/src/webui/server_unix.go new file mode 100644 index 00000000..aed6d1ec --- /dev/null +++ b/src/webui/server_unix.go @@ -0,0 +1,13 @@ +//go:build !windows + +package webui + +import ( + "os" + "syscall" +) + +// sendRestartSignal sends a restart signal to the process on Unix-like systems +func sendRestartSignal(proc *os.Process) error { + return proc.Signal(syscall.SIGUSR1) +} diff --git a/src/webui/server_windows.go b/src/webui/server_windows.go new file mode 100644 index 00000000..bc5c77b7 --- /dev/null +++ b/src/webui/server_windows.go @@ -0,0 +1,16 @@ +//go:build windows + +package webui + +import ( + "fmt" + "os" +) + +// sendRestartSignal sends a restart signal to the process on Windows +func sendRestartSignal(proc *os.Process) error { + // Windows doesn't support SIGUSR1, so we'll use a different approach + // For now, we'll just log that manual restart is needed + // In the future, this could be enhanced with Windows-specific restart mechanisms + return fmt.Errorf("automatic restart not supported on Windows") +} From eeae6ee5cd4ccc940ce4271d766383e69a206d52 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Fri, 15 Aug 2025 19:52:07 +0000 Subject: [PATCH 40/46] Refactor node version display logic to ensure proper formatting only when both build name and version are available. Update CSS styles for login container and footer margins for improved layout consistency. --- src/webui/static/app.js | 2 +- src/webui/static/login.html | 7 ++----- src/webui/static/style.css | 15 +++++---------- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/webui/static/app.js b/src/webui/static/app.js index 4461dc9a..c12e61cc 100644 --- a/src/webui/static/app.js +++ b/src/webui/static/app.js @@ -68,7 +68,7 @@ function updateNodeInfoDisplay(info) { updateElementText('node-address', info.address || 'N/A'); updateElementText('node-subnet', info.subnet || 'N/A'); updateElementText('node-key', yggUtils.formatPublicKey(info.key) || 'N/A'); - updateElementText('node-version', `${info.build_name} ${info.build_version}` || 'N/A'); + updateElementText('node-version', info.build_name && info.build_version ? `${info.build_name} ${info.build_version}` : 'N/A'); updateElementText('routing-entries', info.routing_entries || '0'); // Update footer version diff --git a/src/webui/static/login.html b/src/webui/static/login.html index c829aa34..2ac879da 100644 --- a/src/webui/static/login.html +++ b/src/webui/static/login.html @@ -24,6 +24,8 @@ justify-content: center; min-height: 100vh; padding: 20px; + position: relative; + z-index: 1; } .login-form { @@ -128,11 +130,6 @@ right: 20px; z-index: 10; } - - .login-container { - position: relative; - z-index: 1; - } diff --git a/src/webui/static/style.css b/src/webui/static/style.css index 1ebf7e1f..001d6bd1 100644 --- a/src/webui/static/style.css +++ b/src/webui/static/style.css @@ -812,7 +812,7 @@ footer { .mobile-controls { display: flex; justify-content: center; - margin: 0px 0px 20px 0px; + margin: 0 0 20px; } footer { @@ -1285,9 +1285,7 @@ button[onclick="copyNodeKey()"]:hover { border-color: var(--border-hover); } -/* Responsive design for peer items */ -@media (max-width: 768px) { -} + /* ======================== */ /* MODAL SYSTEM */ @@ -1394,7 +1392,7 @@ button[onclick="copyNodeKey()"]:hover { } .modal-content p { - margin: 0 0 16px 0; + margin: 0 0 16px; line-height: 1.5; } @@ -1561,7 +1559,7 @@ button[onclick="copyNodeKey()"]:hover { } .config-info h3 { - margin: 0 0 10px 0; + margin: 0 0 10px; color: var(--text-heading); font-size: 1.5em; } @@ -2050,10 +2048,7 @@ input:checked + .slider:before { transform: translateY(-1px); } -/* JSON Syntax highlighting (basic) */ -.json-editor { - color: var(--text-body); -} + /* Mobile responsiveness for JSON editor */ @media (max-width: 768px) { From 102e8e265ef31cc70c4f129b6e37cd1894d3181e Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Fri, 15 Aug 2025 19:56:30 +0000 Subject: [PATCH 41/46] Add path validation for configuration files to prevent path traversal attacks. Implemented validateConfigPath function to sanitize and check file paths before use in configuration settings. Updated relevant functions to utilize this validation, ensuring security and integrity of file operations. --- src/config/SECURITY.md | 60 ++++++++++++++++++++++ src/config/config.go | 113 +++++++++++++++++++++++++++++++++++------ 2 files changed, 158 insertions(+), 15 deletions(-) create mode 100644 src/config/SECURITY.md diff --git a/src/config/SECURITY.md b/src/config/SECURITY.md new file mode 100644 index 00000000..9019a32d --- /dev/null +++ b/src/config/SECURITY.md @@ -0,0 +1,60 @@ +# Security Improvements in Config Package + +## Path Traversal Prevention + +This package has been updated to prevent path traversal attacks by implementing the following security measures: + +### 1. Path Validation Function + +The `validateConfigPath()` function performs comprehensive validation of file paths: + +- **Path Cleaning**: Uses `filepath.Clean()` to resolve `.` and `..` components +- **Absolute Path Resolution**: Converts all paths to absolute paths to prevent relative path issues +- **Traversal Pattern Detection**: Explicitly checks for `..` and `//` patterns +- **Control Character Filtering**: Prevents paths containing null bytes or control characters +- **File Extension Validation**: Restricts file extensions to known configuration formats + +### 2. Secure File Operations + +All file operations now use validated paths: + +- **Config File Reading/Writing**: All `os.ReadFile()` and `os.WriteFile()` operations use validated paths +- **Backup File Creation**: Backup paths are also validated to prevent attacks +- **Directory Creation**: Directory paths are cleaned before `os.MkdirAll()` operations +- **Private Key Loading**: Private key file paths are validated in `postprocessConfig()` + +### 3. Defense in Depth + +Multiple layers of protection: + +- **Input Validation**: All user-provided paths are validated before use +- **Path Canonicalization**: Paths are converted to canonical form +- **Extension Whitelisting**: Only allowed file extensions are permitted +- **Error Handling**: Invalid paths return descriptive errors without exposing system details + +## Allowed File Extensions + +The following file extensions are permitted for configuration files: +- `.json` - JSON configuration files +- `.hjson` - Human JSON configuration files +- `.conf` - Generic configuration files +- `.config` - Configuration files +- `.yml` - YAML configuration files +- `.yaml` - YAML configuration files +- (no extension) - Files without extensions + +## Migration Notes + +Existing code using this package should continue to work without changes. Invalid paths that were previously accepted may now be rejected with appropriate error messages. + +## Testing + +To verify path validation is working correctly: + +```go +// Valid paths +validPath, err := validateConfigPath("/etc/yggdrasil/config.json") +// Invalid paths (should return errors) +_, err = validateConfigPath("../../../etc/passwd") +_, err = validateConfigPath("/config/../../../etc/shadow") +``` \ No newline at end of file diff --git a/src/config/config.go b/src/config/config.go index 09946ec1..4912fb51 100644 --- a/src/config/config.go +++ b/src/config/config.go @@ -31,6 +31,7 @@ import ( "math/big" "os" "path/filepath" + "strings" "time" "github.com/hjson/hjson-go/v4" @@ -145,6 +146,13 @@ func (cfg *NodeConfig) UnmarshalHJSON(b []byte) error { func (cfg *NodeConfig) postprocessConfig() error { if cfg.PrivateKeyPath != "" { + // Validate the private key path to prevent path traversal attacks + validatedPath, err := validateConfigPath(cfg.PrivateKeyPath) + if err != nil { + return fmt.Errorf("invalid private key path: %v", err) + } + cfg.PrivateKeyPath = validatedPath + cfg.PrivateKey = nil f, err := os.ReadFile(cfg.PrivateKeyPath) if err != nil { @@ -290,9 +298,63 @@ var ( currentConfigData *NodeConfig ) +// validateConfigPath validates and cleans a configuration file path to prevent path traversal attacks +func validateConfigPath(path string) (string, error) { + if path == "" { + return "", fmt.Errorf("path cannot be empty") + } + + // Clean the path to resolve any ".." or "." components + cleanPath := filepath.Clean(path) + + // Convert to absolute path to prevent relative path issues + absPath, err := filepath.Abs(cleanPath) + if err != nil { + return "", fmt.Errorf("failed to resolve absolute path: %v", err) + } + + // Check for common path traversal patterns + if strings.Contains(path, "..") || strings.Contains(path, "//") { + return "", fmt.Errorf("invalid path: contains path traversal sequences") + } + + // Ensure the path is within reasonable bounds (no null bytes or control characters) + for _, r := range absPath { + if r < 32 && r != '\t' && r != '\n' && r != '\r' { + return "", fmt.Errorf("invalid path: contains control characters") + } + } + + // Basic sanity check on file extension for config files + ext := strings.ToLower(filepath.Ext(absPath)) + allowedExts := []string{".json", ".hjson", ".conf", ".config", ".yml", ".yaml", ""} + validExt := false + for _, allowed := range allowedExts { + if ext == allowed { + validExt = true + break + } + } + if !validExt { + return "", fmt.Errorf("invalid file extension: %s", ext) + } + + return absPath, nil +} + // SetCurrentConfig sets the current configuration data and path func SetCurrentConfig(path string, cfg *NodeConfig) { - currentConfigPath = path + // Validate the path before setting it + if path != "" { + if validatedPath, err := validateConfigPath(path); err == nil { + currentConfigPath = validatedPath + } else { + // Log the error but don't fail completely + currentConfigPath = "" + } + } else { + currentConfigPath = path + } currentConfigData = cfg } @@ -349,21 +411,26 @@ func GetCurrentConfig() (*ConfigInfo, error) { // Check if writable if configPath != "" { - if _, err := os.Stat(configPath); err == nil { - // File exists, check if writable - if file, err := os.OpenFile(configPath, os.O_WRONLY, 0); err == nil { - writable = true - file.Close() - } - } else { - // File doesn't exist, check if directory is writable - dir := filepath.Dir(configPath) - if stat, err := os.Stat(dir); err == nil && stat.IsDir() { - testFile := filepath.Join(dir, ".yggdrasil_write_test") - if file, err := os.Create(testFile); err == nil { - file.Close() - os.Remove(testFile) + // Validate the config path before using it + validatedConfigPath, err := validateConfigPath(configPath) + if err == nil { + configPath = validatedConfigPath + if _, err := os.Stat(configPath); err == nil { + // File exists, check if writable + if file, err := os.OpenFile(configPath, os.O_WRONLY, 0); err == nil { writable = true + file.Close() + } + } else { + // File doesn't exist, check if directory is writable + dir := filepath.Clean(filepath.Dir(configPath)) + if stat, err := os.Stat(dir); err == nil && stat.IsDir() { + testFile := filepath.Join(dir, ".yggdrasil_write_test") + if file, err := os.Create(testFile); err == nil { + file.Close() + os.Remove(testFile) + writable = true + } } } } @@ -401,6 +468,13 @@ func SaveConfig(configData interface{}, configPath, format string) error { } } + // Validate and clean the target path to prevent path traversal attacks + validatedPath, err := validateConfigPath(targetPath) + if err != nil { + return fmt.Errorf("invalid target path: %v", err) + } + targetPath = validatedPath + // Determine format if not specified targetFormat := format if targetFormat == "" { @@ -423,6 +497,13 @@ func SaveConfig(configData interface{}, configPath, format string) error { // Create backup if file exists if _, err := os.Stat(targetPath); err == nil { backupPath := targetPath + ".backup" + // Validate backup path as well + validatedBackupPath, err := validateConfigPath(backupPath) + if err != nil { + return fmt.Errorf("invalid backup path: %v", err) + } + backupPath = validatedBackupPath + if data, err := os.ReadFile(targetPath); err == nil { if err := os.WriteFile(backupPath, data, 0600); err != nil { return fmt.Errorf("failed to create backup: %v", err) @@ -432,6 +513,8 @@ func SaveConfig(configData interface{}, configPath, format string) error { // Ensure directory exists dir := filepath.Dir(targetPath) + // Clean the directory path as well + dir = filepath.Clean(dir) if err := os.MkdirAll(dir, 0755); err != nil { return fmt.Errorf("failed to create config directory: %v", err) } From 443f9d0afdfa702a5dc1449b34a4fcac6b239879 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Fri, 15 Aug 2025 20:08:43 +0000 Subject: [PATCH 42/46] Add safe file operation wrappers and enhance path validation in configuration handling. Implemented safeReadFile, safeWriteFile, and safeStat functions to ensure file paths are validated before operations. Added checks for system directory access and path depth limits to improve security. Updated documentation to reflect these changes and included validation comments in the source code. --- src/config/SECURITY.md | 23 +++++++ src/config/config.go | 136 ++++++++++++++++++++++++++++++----------- 2 files changed, 123 insertions(+), 36 deletions(-) diff --git a/src/config/SECURITY.md b/src/config/SECURITY.md index 9019a32d..da03148c 100644 --- a/src/config/SECURITY.md +++ b/src/config/SECURITY.md @@ -32,6 +32,27 @@ Multiple layers of protection: - **Extension Whitelisting**: Only allowed file extensions are permitted - **Error Handling**: Invalid paths return descriptive errors without exposing system details +## Additional Security Measures + +### 4. Safe File Operation Wrappers + +Additional wrapper functions provide extra safety: + +- `safeReadFile()` - Validates paths before reading +- `safeWriteFile()` - Validates paths before writing +- `safeStat()` - Validates paths before stat operations + +### 5. System Directory Protection + +Restricted access to sensitive system directories: +- Blocks access to `/etc/` (except `/etc/yggdrasil/`) +- Blocks access to `/root/`, `/var/` (except `/var/lib/yggdrasil/`) +- Blocks access to `/sys/`, `/proc/`, `/dev/` + +### 6. Path Depth Limiting + +Maximum path depth of 10 levels to prevent deeply nested attacks. + ## Allowed File Extensions The following file extensions are permitted for configuration files: @@ -47,6 +68,8 @@ The following file extensions are permitted for configuration files: Existing code using this package should continue to work without changes. Invalid paths that were previously accepted may now be rejected with appropriate error messages. +All file operations now include validation comments in the source code to indicate when paths have been pre-validated. + ## Testing To verify path validation is working correctly: diff --git a/src/config/config.go b/src/config/config.go index 4912fb51..9dc073e0 100644 --- a/src/config/config.go +++ b/src/config/config.go @@ -154,7 +154,7 @@ func (cfg *NodeConfig) postprocessConfig() error { cfg.PrivateKeyPath = validatedPath cfg.PrivateKey = nil - f, err := os.ReadFile(cfg.PrivateKeyPath) + f, err := os.ReadFile(cfg.PrivateKeyPath) // Path already validated above if err != nil { return err } @@ -304,6 +304,26 @@ func validateConfigPath(path string) (string, error) { return "", fmt.Errorf("path cannot be empty") } + // Check for null bytes and other dangerous characters + if strings.Contains(path, "\x00") { + return "", fmt.Errorf("path contains null bytes") + } + + // Check for common path traversal patterns before cleaning + if strings.Contains(path, "..") || strings.Contains(path, "//") || strings.Contains(path, "\\\\") { + return "", fmt.Errorf("invalid path: contains path traversal sequences") + } + + // Check for absolute paths starting with suspicious patterns + if strings.HasPrefix(path, "/etc/") || strings.HasPrefix(path, "/root/") || + strings.HasPrefix(path, "/var/") || strings.HasPrefix(path, "/sys/") || + strings.HasPrefix(path, "/proc/") || strings.HasPrefix(path, "/dev/") { + // Allow only specific safe paths + if !strings.HasPrefix(path, "/etc/yggdrasil/") && !strings.HasPrefix(path, "/var/lib/yggdrasil/") { + return "", fmt.Errorf("access to system directories not allowed") + } + } + // Clean the path to resolve any ".." or "." components cleanPath := filepath.Clean(path) @@ -313,16 +333,19 @@ func validateConfigPath(path string) (string, error) { return "", fmt.Errorf("failed to resolve absolute path: %v", err) } - // Check for common path traversal patterns - if strings.Contains(path, "..") || strings.Contains(path, "//") { - return "", fmt.Errorf("invalid path: contains path traversal sequences") + // Double-check for path traversal after cleaning + if strings.Contains(absPath, "..") { + return "", fmt.Errorf("path contains traversal sequences after cleaning") } - // Ensure the path is within reasonable bounds (no null bytes or control characters) + // Ensure the path is within reasonable bounds (no control characters) for _, r := range absPath { if r < 32 && r != '\t' && r != '\n' && r != '\r' { return "", fmt.Errorf("invalid path: contains control characters") } + if r == 127 || (r >= 128 && r <= 159) { + return "", fmt.Errorf("invalid path: contains control characters") + } } // Basic sanity check on file extension for config files @@ -339,9 +362,41 @@ func validateConfigPath(path string) (string, error) { return "", fmt.Errorf("invalid file extension: %s", ext) } + // Additional check: ensure the path doesn't escape intended directories + if strings.Count(absPath, "/") > 10 { + return "", fmt.Errorf("path too deep: potential security risk") + } + return absPath, nil } +// safeReadFile safely reads a file after validating the path +func safeReadFile(path string) ([]byte, error) { + validatedPath, err := validateConfigPath(path) + if err != nil { + return nil, fmt.Errorf("invalid file path: %v", err) + } + return os.ReadFile(validatedPath) +} + +// safeWriteFile safely writes a file after validating the path +func safeWriteFile(path string, data []byte, perm os.FileMode) error { + validatedPath, err := validateConfigPath(path) + if err != nil { + return fmt.Errorf("invalid file path: %v", err) + } + return os.WriteFile(validatedPath, data, perm) +} + +// safeStat safely stats a file after validating the path +func safeStat(path string) (os.FileInfo, error) { + validatedPath, err := validateConfigPath(path) + if err != nil { + return nil, fmt.Errorf("invalid file path: %v", err) + } + return os.Stat(validatedPath) +} + // SetCurrentConfig sets the current configuration data and path func SetCurrentConfig(path string, cfg *NodeConfig) { // Validate the path before setting it @@ -367,16 +422,28 @@ func GetCurrentConfig() (*ConfigInfo, error) { // Use current config if available, otherwise try to read from default location if currentConfigPath != "" && currentConfigData != nil { - configPath = currentConfigPath + // Validate the current config path before using it + validatedCurrentPath, err := validateConfigPath(currentConfigPath) + if err != nil { + return nil, fmt.Errorf("invalid current config path: %v", err) + } + configPath = validatedCurrentPath configData = currentConfigData } else { // Fallback to default path defaults := GetDefaults() - configPath = defaults.DefaultConfigFile + defaultPath := defaults.DefaultConfigFile + + // Validate the default path before using it + validatedDefaultPath, err := validateConfigPath(defaultPath) + if err != nil { + return nil, fmt.Errorf("invalid default config path: %v", err) + } + configPath = validatedDefaultPath // Try to read existing config file - if _, err := os.Stat(configPath); err == nil { - data, err := os.ReadFile(configPath) + if _, err := os.Stat(configPath); err == nil { // Path already validated above + data, err := os.ReadFile(configPath) // Path already validated above if err == nil { cfg := GenerateConfig() if err := hjson.Unmarshal(data, cfg); err == nil { @@ -398,8 +465,9 @@ func GetCurrentConfig() (*ConfigInfo, error) { // Detect format from file if path is known if configPath != "" { - if _, err := os.Stat(configPath); err == nil { - data, err := os.ReadFile(configPath) + // Config path is already validated at this point + if _, err := os.Stat(configPath); err == nil { // Path already validated above + data, err := os.ReadFile(configPath) // Path already validated above if err == nil { var jsonTest interface{} if json.Unmarshal(data, &jsonTest) == nil { @@ -411,26 +479,22 @@ func GetCurrentConfig() (*ConfigInfo, error) { // Check if writable if configPath != "" { - // Validate the config path before using it - validatedConfigPath, err := validateConfigPath(configPath) - if err == nil { - configPath = validatedConfigPath - if _, err := os.Stat(configPath); err == nil { - // File exists, check if writable - if file, err := os.OpenFile(configPath, os.O_WRONLY, 0); err == nil { - writable = true + // Config path is already validated at this point + if _, err := os.Stat(configPath); err == nil { // Path already validated above + // File exists, check if writable + if file, err := os.OpenFile(configPath, os.O_WRONLY, 0); err == nil { // Path already validated above + writable = true + file.Close() + } + } else { + // File doesn't exist, check if directory is writable + dir := filepath.Clean(filepath.Dir(configPath)) + if stat, err := os.Stat(dir); err == nil && stat.IsDir() { + testFile := filepath.Join(dir, ".yggdrasil_write_test") + if file, err := os.Create(testFile); err == nil { file.Close() - } - } else { - // File doesn't exist, check if directory is writable - dir := filepath.Clean(filepath.Dir(configPath)) - if stat, err := os.Stat(dir); err == nil && stat.IsDir() { - testFile := filepath.Join(dir, ".yggdrasil_write_test") - if file, err := os.Create(testFile); err == nil { - file.Close() - os.Remove(testFile) - writable = true - } + os.Remove(testFile) + writable = true } } } @@ -478,8 +542,8 @@ func SaveConfig(configData interface{}, configPath, format string) error { // Determine format if not specified targetFormat := format if targetFormat == "" { - if _, err := os.Stat(targetPath); err == nil { - data, readErr := os.ReadFile(targetPath) + if _, err := os.Stat(targetPath); err == nil { // Path already validated above + data, readErr := os.ReadFile(targetPath) // Path already validated above if readErr == nil { var jsonTest interface{} if json.Unmarshal(data, &jsonTest) == nil { @@ -495,7 +559,7 @@ func SaveConfig(configData interface{}, configPath, format string) error { } // Create backup if file exists - if _, err := os.Stat(targetPath); err == nil { + if _, err := os.Stat(targetPath); err == nil { // Path already validated above backupPath := targetPath + ".backup" // Validate backup path as well validatedBackupPath, err := validateConfigPath(backupPath) @@ -504,8 +568,8 @@ func SaveConfig(configData interface{}, configPath, format string) error { } backupPath = validatedBackupPath - if data, err := os.ReadFile(targetPath); err == nil { - if err := os.WriteFile(backupPath, data, 0600); err != nil { + if data, err := os.ReadFile(targetPath); err == nil { // Path already validated above + if err := os.WriteFile(backupPath, data, 0600); err != nil { // Path already validated above return fmt.Errorf("failed to create backup: %v", err) } } @@ -534,7 +598,7 @@ func SaveConfig(configData interface{}, configPath, format string) error { } // Write file - if err := os.WriteFile(targetPath, outputData, 0600); err != nil { + if err := os.WriteFile(targetPath, outputData, 0600); err != nil { // Path already validated above return fmt.Errorf("failed to write config file: %v", err) } From 2180e12b737c93a1c6e5e572d5c1109653dc6639 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Fri, 15 Aug 2025 20:15:57 +0000 Subject: [PATCH 43/46] Remove safe file operation wrappers from configuration handling to streamline code. Update SECURITY.md to reflect the removal of these functions and adjust the section numbering accordingly. --- src/config/SECURITY.md | 12 ++---------- src/config/config.go | 27 --------------------------- 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/src/config/SECURITY.md b/src/config/SECURITY.md index da03148c..f8f72677 100644 --- a/src/config/SECURITY.md +++ b/src/config/SECURITY.md @@ -34,22 +34,14 @@ Multiple layers of protection: ## Additional Security Measures -### 4. Safe File Operation Wrappers - -Additional wrapper functions provide extra safety: - -- `safeReadFile()` - Validates paths before reading -- `safeWriteFile()` - Validates paths before writing -- `safeStat()` - Validates paths before stat operations - -### 5. System Directory Protection +### 4. System Directory Protection Restricted access to sensitive system directories: - Blocks access to `/etc/` (except `/etc/yggdrasil/`) - Blocks access to `/root/`, `/var/` (except `/var/lib/yggdrasil/`) - Blocks access to `/sys/`, `/proc/`, `/dev/` -### 6. Path Depth Limiting +### 5. Path Depth Limiting Maximum path depth of 10 levels to prevent deeply nested attacks. diff --git a/src/config/config.go b/src/config/config.go index 9dc073e0..1da49b96 100644 --- a/src/config/config.go +++ b/src/config/config.go @@ -370,33 +370,6 @@ func validateConfigPath(path string) (string, error) { return absPath, nil } -// safeReadFile safely reads a file after validating the path -func safeReadFile(path string) ([]byte, error) { - validatedPath, err := validateConfigPath(path) - if err != nil { - return nil, fmt.Errorf("invalid file path: %v", err) - } - return os.ReadFile(validatedPath) -} - -// safeWriteFile safely writes a file after validating the path -func safeWriteFile(path string, data []byte, perm os.FileMode) error { - validatedPath, err := validateConfigPath(path) - if err != nil { - return fmt.Errorf("invalid file path: %v", err) - } - return os.WriteFile(validatedPath, data, perm) -} - -// safeStat safely stats a file after validating the path -func safeStat(path string) (os.FileInfo, error) { - validatedPath, err := validateConfigPath(path) - if err != nil { - return nil, fmt.Errorf("invalid file path: %v", err) - } - return os.Stat(validatedPath) -} - // SetCurrentConfig sets the current configuration data and path func SetCurrentConfig(path string, cfg *NodeConfig) { // Validate the path before setting it From 09f600c6cf90dbd76eabe5e5840c8f4a64527e31 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Fri, 15 Aug 2025 20:21:54 +0000 Subject: [PATCH 44/46] Remove checks for absolute paths in validateConfigPath function to simplify path validation logic. This change streamlines the configuration handling process by eliminating unnecessary restrictions on system directory access. --- src/config/config.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/config/config.go b/src/config/config.go index 1da49b96..7bef506b 100644 --- a/src/config/config.go +++ b/src/config/config.go @@ -314,16 +314,6 @@ func validateConfigPath(path string) (string, error) { return "", fmt.Errorf("invalid path: contains path traversal sequences") } - // Check for absolute paths starting with suspicious patterns - if strings.HasPrefix(path, "/etc/") || strings.HasPrefix(path, "/root/") || - strings.HasPrefix(path, "/var/") || strings.HasPrefix(path, "/sys/") || - strings.HasPrefix(path, "/proc/") || strings.HasPrefix(path, "/dev/") { - // Allow only specific safe paths - if !strings.HasPrefix(path, "/etc/yggdrasil/") && !strings.HasPrefix(path, "/var/lib/yggdrasil/") { - return "", fmt.Errorf("access to system directories not allowed") - } - } - // Clean the path to resolve any ".." or "." components cleanPath := filepath.Clean(path) From 8e44b578794c3a47af4d6949cb74149895ceb060 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Fri, 15 Aug 2025 20:25:29 +0000 Subject: [PATCH 45/46] Remove backup creation logic from SaveConfig function and update related documentation. Adjust WebUIServer response structure and translations to reflect the absence of backup path information. --- src/config/SECURITY.md | 1 - src/config/config.go | 17 ----------------- src/webui/server.go | 2 -- src/webui/static/lang/en.js | 1 - src/webui/static/lang/ru.js | 1 - 5 files changed, 22 deletions(-) diff --git a/src/config/SECURITY.md b/src/config/SECURITY.md index f8f72677..13ecf976 100644 --- a/src/config/SECURITY.md +++ b/src/config/SECURITY.md @@ -19,7 +19,6 @@ The `validateConfigPath()` function performs comprehensive validation of file pa All file operations now use validated paths: - **Config File Reading/Writing**: All `os.ReadFile()` and `os.WriteFile()` operations use validated paths -- **Backup File Creation**: Backup paths are also validated to prevent attacks - **Directory Creation**: Directory paths are cleaned before `os.MkdirAll()` operations - **Private Key Loading**: Private key file paths are validated in `postprocessConfig()` diff --git a/src/config/config.go b/src/config/config.go index 7bef506b..283427ea 100644 --- a/src/config/config.go +++ b/src/config/config.go @@ -521,23 +521,6 @@ func SaveConfig(configData interface{}, configPath, format string) error { } } - // Create backup if file exists - if _, err := os.Stat(targetPath); err == nil { // Path already validated above - backupPath := targetPath + ".backup" - // Validate backup path as well - validatedBackupPath, err := validateConfigPath(backupPath) - if err != nil { - return fmt.Errorf("invalid backup path: %v", err) - } - backupPath = validatedBackupPath - - if data, err := os.ReadFile(targetPath); err == nil { // Path already validated above - if err := os.WriteFile(backupPath, data, 0600); err != nil { // Path already validated above - return fmt.Errorf("failed to create backup: %v", err) - } - } - } - // Ensure directory exists dir := filepath.Dir(targetPath) // Clean the directory path as well diff --git a/src/webui/server.go b/src/webui/server.go index a697442f..6457ec10 100644 --- a/src/webui/server.go +++ b/src/webui/server.go @@ -402,7 +402,6 @@ type ConfigSetResponse struct { Success bool `json:"success"` Message string `json:"message"` ConfigPath string `json:"config_path"` - BackupPath string `json:"backup_path,omitempty"` RestartRequired bool `json:"restart_required"` } @@ -489,7 +488,6 @@ func (w *WebUIServer) setConfigHandler(rw http.ResponseWriter, r *http.Request) Success: true, Message: "Configuration saved successfully", ConfigPath: configPath, - BackupPath: configPath + ".backup", RestartRequired: req.Restart, } diff --git a/src/webui/static/lang/en.js b/src/webui/static/lang/en.js index 41d65886..5bf62f41 100644 --- a/src/webui/static/lang/en.js +++ b/src/webui/static/lang/en.js @@ -115,7 +115,6 @@ window.translations.en = { 'config_readonly': 'Configuration file is read-only', 'config_save_confirm_title': 'Confirm Save', 'config_save_confirm_text': 'Are you sure you want to save changes to the configuration file?', - 'config_backup_info': 'Backup will be created automatically', 'config_warning': '⚠️ Warning: Incorrect configuration may cause node failure!', // Editor status translations diff --git a/src/webui/static/lang/ru.js b/src/webui/static/lang/ru.js index e9e0ed2f..711b1012 100644 --- a/src/webui/static/lang/ru.js +++ b/src/webui/static/lang/ru.js @@ -115,7 +115,6 @@ window.translations.ru = { 'config_readonly': 'Файл конфигурации доступен только для чтения', 'config_save_confirm_title': 'Подтверждение сохранения', 'config_save_confirm_text': 'Вы уверены, что хотите сохранить изменения в конфигурационный файл?', - 'config_backup_info': 'Резервная копия будет создана автоматически', 'config_warning': '⚠️ Внимание: Неправильная конфигурация может привести к сбою работы узла!', // Editor status translations From a094c423de682b44c71dca50c7e4835ee781ce4d Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Sat, 16 Aug 2025 05:34:20 +0800 Subject: [PATCH 46/46] Refactor configuration handling by removing writable flag from ConfigInfo and related UI components. Simplify config response structure in WebUIServer and update frontend to reflect these changes. Clean up unused CSS styles for improved layout. --- src/config/config.go | 92 ++++++++------------------------------ src/webui/server.go | 2 - src/webui/static/config.js | 21 +++------ src/webui/static/style.css | 29 ------------ 4 files changed, 26 insertions(+), 118 deletions(-) diff --git a/src/config/config.go b/src/config/config.go index 283427ea..0849a235 100644 --- a/src/config/config.go +++ b/src/config/config.go @@ -286,10 +286,9 @@ func (k *KeyBytes) UnmarshalJSON(b []byte) error { // ConfigInfo contains information about the configuration file type ConfigInfo struct { - Path string `json:"path"` - Format string `json:"format"` - Data interface{} `json:"data"` - Writable bool `json:"writable"` + Path string `json:"path"` + Format string `json:"format"` + Data interface{} `json:"data"` } // Global variables to track the current configuration state @@ -338,20 +337,6 @@ func validateConfigPath(path string) (string, error) { } } - // Basic sanity check on file extension for config files - ext := strings.ToLower(filepath.Ext(absPath)) - allowedExts := []string{".json", ".hjson", ".conf", ".config", ".yml", ".yaml", ""} - validExt := false - for _, allowed := range allowedExts { - if ext == allowed { - validExt = true - break - } - } - if !validExt { - return "", fmt.Errorf("invalid file extension: %s", ext) - } - // Additional check: ensure the path doesn't escape intended directories if strings.Count(absPath, "/") > 10 { return "", fmt.Errorf("path too deep: potential security risk") @@ -381,7 +366,6 @@ func GetCurrentConfig() (*ConfigInfo, error) { var configPath string var configData *NodeConfig var format string = "hjson" - var writable bool = false // Use current config if available, otherwise try to read from default location if currentConfigPath != "" && currentConfigData != nil { @@ -402,72 +386,33 @@ func GetCurrentConfig() (*ConfigInfo, error) { if err != nil { return nil, fmt.Errorf("invalid default config path: %v", err) } - configPath = validatedDefaultPath - // Try to read existing config file - if _, err := os.Stat(configPath); err == nil { // Path already validated above - data, err := os.ReadFile(configPath) // Path already validated above - if err == nil { - cfg := GenerateConfig() - if err := hjson.Unmarshal(data, cfg); err == nil { - configData = cfg - // Detect format - var jsonTest interface{} - if json.Unmarshal(data, &jsonTest) == nil { - format = "json" - } - } else { - return nil, fmt.Errorf("failed to parse config file: %v", err) - } - } - } else { - // No config file exists, use default - configData = GenerateConfig() - } + configPath = validatedDefaultPath + configData = GenerateConfig() } - // Detect format from file if path is known - if configPath != "" { - // Config path is already validated at this point - if _, err := os.Stat(configPath); err == nil { // Path already validated above - data, err := os.ReadFile(configPath) // Path already validated above - if err == nil { + // Try to read existing config file + if _, err := os.Stat(configPath); err == nil { // Path already validated above + data, err := os.ReadFile(configPath) // Path already validated above + if err == nil { + cfg := GenerateConfig() + if err := hjson.Unmarshal(data, cfg); err == nil { + configData = cfg + // Detect format var jsonTest interface{} if json.Unmarshal(data, &jsonTest) == nil { format = "json" } - } - } - } - - // Check if writable - if configPath != "" { - // Config path is already validated at this point - if _, err := os.Stat(configPath); err == nil { // Path already validated above - // File exists, check if writable - if file, err := os.OpenFile(configPath, os.O_WRONLY, 0); err == nil { // Path already validated above - writable = true - file.Close() - } - } else { - // File doesn't exist, check if directory is writable - dir := filepath.Clean(filepath.Dir(configPath)) - if stat, err := os.Stat(dir); err == nil && stat.IsDir() { - testFile := filepath.Join(dir, ".yggdrasil_write_test") - if file, err := os.Create(testFile); err == nil { - file.Close() - os.Remove(testFile) - writable = true - } + } else { + return nil, fmt.Errorf("failed to parse config file: %v", err) } } } return &ConfigInfo{ - Path: configPath, - Format: format, - Data: configData, - Writable: writable, + Path: configPath, + Format: format, + Data: configData, }, nil } @@ -516,6 +461,7 @@ func SaveConfig(configData interface{}, configPath, format string) error { } } } + if targetFormat == "" { targetFormat = "hjson" } diff --git a/src/webui/server.go b/src/webui/server.go index 6457ec10..7a5d1a7a 100644 --- a/src/webui/server.go +++ b/src/webui/server.go @@ -388,7 +388,6 @@ type ConfigResponse struct { ConfigPath string `json:"config_path"` ConfigFormat string `json:"config_format"` ConfigJSON string `json:"config_json"` - IsWritable bool `json:"is_writable"` } type ConfigSetRequest struct { @@ -432,7 +431,6 @@ func (w *WebUIServer) getConfigHandler(rw http.ResponseWriter, r *http.Request) ConfigPath: configInfo.Path, ConfigFormat: configInfo.Format, ConfigJSON: string(configBytes), - IsWritable: configInfo.Writable, } rw.Header().Set("Content-Type", "application/json") diff --git a/src/webui/static/config.js b/src/webui/static/config.js index 9183037d..9540ceff 100644 --- a/src/webui/static/config.js +++ b/src/webui/static/config.js @@ -30,8 +30,7 @@ async function loadConfiguration() { currentConfigJSON = data.config_json; configMeta = { path: data.config_path, - format: data.config_format, - isWritable: data.is_writable + format: data.config_format }; renderConfigEditor(); @@ -54,9 +53,6 @@ function renderConfigEditor() {
${configMeta.path} ${configMeta.format.toUpperCase()} - - ${configMeta.isWritable ? '✏️ Редактируемый' : '🔒 Только чтение'} -
@@ -76,14 +72,12 @@ function renderConfigEditor() {
Проверить
- ${configMeta.isWritable ? ` -
- Сохранить -
-
- Сохранить и перезапустить -
- ` : ''} +
+ Сохранить +
+
+ Сохранить и перезапустить +
@@ -93,7 +87,6 @@ function renderConfigEditor() { id="config-json-textarea" class="json-editor" spellcheck="false" - ${configMeta.isWritable ? '' : 'readonly'} placeholder="Загрузка конфигурации..." oninput="onConfigChange()" onscroll="syncLineNumbers()" diff --git a/src/webui/static/style.css b/src/webui/static/style.css index 001d6bd1..5db33daa 100644 --- a/src/webui/static/style.css +++ b/src/webui/static/style.css @@ -1542,9 +1542,6 @@ button[onclick="copyNodeKey()"]:hover { } .config-header { - display: flex; - justify-content: space-between; - align-items: flex-start; margin-bottom: 30px; padding: 20px; background: var(--bg-info-card); @@ -1564,13 +1561,6 @@ button[onclick="copyNodeKey()"]:hover { font-size: 1.5em; } -.config-meta { - display: flex; - gap: 15px; - flex-wrap: wrap; - align-items: center; -} - .config-path { font-family: 'Courier New', monospace; background: var(--bg-nav-item); @@ -1602,25 +1592,6 @@ button[onclick="copyNodeKey()"]:hover { color: #7b1fa2; } -.config-status { - padding: 4px 8px; - border-radius: 4px; - font-size: 0.8em; - font-weight: bold; -} - -.config-status.writable { - background: var(--bg-success); - color: var(--text-success); -} - -.config-status.readonly { - background: var(--bg-warning); - color: var(--text-warning); -} - - - /* Configuration Groups */ .config-groups { display: flex;