Related to #595 This change adds support for custom SSH ports when collecting temperature data from Proxmox nodes, resolving issues for users who run SSH on non-standard ports. **Why SSH is still needed:** Temperature monitoring requires reading /sys/class/hwmon sensors on Proxmox nodes, which is not exposed via the Proxmox API. Even when using API tokens for authentication, Pulse needs SSH access to collect temperature data. **Changes:** - Add `sshPort` configuration to SystemSettings (system.json) - Add `SSHPort` field to Config with environment variable support (SSH_PORT) - Add per-node SSH port override capability for PVE, PBS, and PMG instances - Update TemperatureCollector to accept and use custom SSH port - Update SSH known_hosts manager to support non-standard ports - Add NewTemperatureCollectorWithPort() constructor with port parameter - Maintain backward compatibility with NewTemperatureCollector() (uses port 22) - Update frontend TypeScript types for SSH port configuration **Configuration methods:** 1. Environment variable: SSH_PORT=2222 2. system.json: {"sshPort": 2222} 3. Per-node override in nodes.enc (future UI support) **Default behavior:** - Defaults to port 22 if not configured - Maintains full backward compatibility - No changes required for existing deployments The implementation includes proper ssh-keyscan port handling and known_hosts management for non-standard ports using [host]:port notation per SSH standards.
307 lines
6.8 KiB
Go
307 lines
6.8 KiB
Go
package knownhosts
|
|
|
|
import (
|
|
"bufio"
|
|
"bytes"
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"strconv"
|
|
"strings"
|
|
"sync"
|
|
"time"
|
|
)
|
|
|
|
// Manager exposes operations for ensuring SSH host keys exist locally.
|
|
type Manager interface {
|
|
// Ensure guarantees that the host key for the provided host exists in the
|
|
// managed known_hosts file.
|
|
Ensure(ctx context.Context, host string) error
|
|
// EnsureWithPort guarantees that the host key for the provided host:port exists
|
|
// in the managed known_hosts file.
|
|
EnsureWithPort(ctx context.Context, host string, port int) error
|
|
// Path returns the absolute path to the managed known_hosts file.
|
|
Path() string
|
|
}
|
|
|
|
type manager struct {
|
|
path string
|
|
cache map[string]struct{}
|
|
mu sync.Mutex
|
|
keyscanFn keyscanFunc
|
|
keyscanTimeout time.Duration
|
|
}
|
|
|
|
type keyscanFunc func(ctx context.Context, host string, port int, timeout time.Duration) ([]byte, error)
|
|
|
|
const (
|
|
defaultKeyscanTimeout = 5 * time.Second
|
|
)
|
|
|
|
var (
|
|
// ErrNoHostKeys is returned when ssh-keyscan yields no usable entries.
|
|
ErrNoHostKeys = errors.New("knownhosts: no host keys discovered")
|
|
)
|
|
|
|
// Option allows customizing Manager construction.
|
|
type Option func(*manager)
|
|
|
|
// WithTimeout overrides the ssh-keyscan timeout (defaults to 5 seconds).
|
|
func WithTimeout(d time.Duration) Option {
|
|
return func(m *manager) {
|
|
if d > 0 {
|
|
m.keyscanTimeout = d
|
|
}
|
|
}
|
|
}
|
|
|
|
// WithKeyscanFunc overrides the function used to fetch host keys (mainly for tests).
|
|
func WithKeyscanFunc(fn keyscanFunc) Option {
|
|
return func(m *manager) {
|
|
if fn != nil {
|
|
m.keyscanFn = fn
|
|
}
|
|
}
|
|
}
|
|
|
|
// NewManager returns a Manager writing to the supplied known_hosts path.
|
|
func NewManager(path string, opts ...Option) (Manager, error) {
|
|
if strings.TrimSpace(path) == "" {
|
|
return nil, fmt.Errorf("knownhosts: empty path")
|
|
}
|
|
|
|
m := &manager{
|
|
path: path,
|
|
cache: make(map[string]struct{}),
|
|
keyscanFn: defaultKeyscan,
|
|
keyscanTimeout: defaultKeyscanTimeout,
|
|
}
|
|
|
|
for _, opt := range opts {
|
|
opt(m)
|
|
}
|
|
|
|
return m, nil
|
|
}
|
|
|
|
// Ensure implements Manager.Ensure (uses default port 22).
|
|
func (m *manager) Ensure(ctx context.Context, host string) error {
|
|
return m.EnsureWithPort(ctx, host, 22)
|
|
}
|
|
|
|
// EnsureWithPort implements Manager.EnsureWithPort.
|
|
func (m *manager) EnsureWithPort(ctx context.Context, host string, port int) error {
|
|
if strings.TrimSpace(host) == "" {
|
|
return fmt.Errorf("knownhosts: missing host")
|
|
}
|
|
if port <= 0 {
|
|
port = 22 // Default to standard SSH port
|
|
}
|
|
|
|
cacheKey := fmt.Sprintf("%s:%d", host, port)
|
|
|
|
m.mu.Lock()
|
|
defer m.mu.Unlock()
|
|
|
|
if _, ok := m.cache[cacheKey]; ok {
|
|
return nil
|
|
}
|
|
|
|
if err := m.ensureKnownHostsFile(); err != nil {
|
|
return err
|
|
}
|
|
|
|
// For non-standard ports, check for [host]:port format
|
|
hostSpec := host
|
|
if port != 22 {
|
|
hostSpec = fmt.Sprintf("[%s]:%d", host, port)
|
|
}
|
|
|
|
exists, err := hostKeyExists(m.path, hostSpec)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if exists {
|
|
m.cache[cacheKey] = struct{}{}
|
|
return nil
|
|
}
|
|
|
|
keyData, err := m.keyscanFn(ctx, host, port, m.keyscanTimeout)
|
|
if err != nil {
|
|
return fmt.Errorf("knownhosts: ssh-keyscan failed for %s:%d: %w", host, port, err)
|
|
}
|
|
|
|
entries := sanitizeKeyscanOutput(hostSpec, keyData)
|
|
if len(entries) == 0 {
|
|
return fmt.Errorf("%w for %s:%d", ErrNoHostKeys, host, port)
|
|
}
|
|
|
|
if err := appendHostKey(m.path, entries); err != nil {
|
|
return err
|
|
}
|
|
|
|
m.cache[cacheKey] = struct{}{}
|
|
return nil
|
|
}
|
|
|
|
// Path implements Manager.Path.
|
|
func (m *manager) Path() string {
|
|
return m.path
|
|
}
|
|
|
|
func (m *manager) ensureKnownHostsFile() error {
|
|
dir := filepath.Dir(m.path)
|
|
if err := os.MkdirAll(dir, 0o700); err != nil {
|
|
return fmt.Errorf("knownhosts: mkdir %s: %w", dir, err)
|
|
}
|
|
|
|
if _, err := os.Stat(m.path); err == nil {
|
|
return nil
|
|
} else if !os.IsNotExist(err) {
|
|
return err
|
|
}
|
|
|
|
f, err := os.OpenFile(m.path, os.O_CREATE|os.O_WRONLY, 0o600)
|
|
if err != nil {
|
|
return fmt.Errorf("knownhosts: create %s: %w", m.path, err)
|
|
}
|
|
return f.Close()
|
|
}
|
|
|
|
func hostKeyExists(path, host string) (bool, error) {
|
|
f, err := os.Open(path)
|
|
if err != nil {
|
|
if os.IsNotExist(err) {
|
|
return false, nil
|
|
}
|
|
return false, err
|
|
}
|
|
defer f.Close()
|
|
|
|
scanner := bufio.NewScanner(f)
|
|
for scanner.Scan() {
|
|
if hostLineMatches(host, scanner.Text()) {
|
|
return true, nil
|
|
}
|
|
}
|
|
return false, scanner.Err()
|
|
}
|
|
|
|
func appendHostKey(path string, entries [][]byte) error {
|
|
f, err := os.OpenFile(path, os.O_APPEND|os.O_WRONLY, 0o600)
|
|
if err != nil {
|
|
return fmt.Errorf("knownhosts: open %s: %w", path, err)
|
|
}
|
|
defer f.Close()
|
|
|
|
for _, entry := range entries {
|
|
if len(entry) == 0 {
|
|
continue
|
|
}
|
|
if _, err := f.Write(append(entry, '\n')); err != nil {
|
|
return fmt.Errorf("knownhosts: write entry: %w", err)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func sanitizeKeyscanOutput(host string, raw []byte) [][]byte {
|
|
var entries [][]byte
|
|
|
|
lines := bytes.Split(raw, []byte{'\n'})
|
|
for _, line := range lines {
|
|
line = bytes.TrimSpace(line)
|
|
if len(line) == 0 {
|
|
continue
|
|
}
|
|
if hostLineMatches(host, string(line)) {
|
|
entries = append(entries, line)
|
|
}
|
|
}
|
|
|
|
return entries
|
|
}
|
|
|
|
func hostLineMatches(host, line string) bool {
|
|
trimmed := strings.TrimSpace(line)
|
|
if trimmed == "" || strings.HasPrefix(trimmed, "#") {
|
|
return false
|
|
}
|
|
if strings.HasPrefix(trimmed, "|") {
|
|
return false // hashed entry; we only manage clear-text hosts
|
|
}
|
|
|
|
fields := strings.Fields(trimmed)
|
|
if len(fields) == 0 {
|
|
return false
|
|
}
|
|
|
|
return hostFieldMatches(host, fields[0])
|
|
}
|
|
|
|
func hostFieldMatches(host, field string) bool {
|
|
for _, part := range strings.Split(field, ",") {
|
|
for _, candidate := range hostCandidates(part) {
|
|
if strings.EqualFold(candidate, host) {
|
|
return true
|
|
}
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
func hostCandidates(part string) []string {
|
|
part = strings.TrimSpace(part)
|
|
if part == "" {
|
|
return nil
|
|
}
|
|
|
|
if strings.HasPrefix(part, "[") {
|
|
if idx := strings.Index(part, "]"); idx != -1 {
|
|
host := part[1:idx]
|
|
candidates := []string{part}
|
|
if host != "" {
|
|
candidates = append(candidates, host)
|
|
}
|
|
return candidates
|
|
}
|
|
}
|
|
|
|
candidates := []string{part}
|
|
if strings.Count(part, ":") == 1 {
|
|
if idx := strings.Index(part, ":"); idx > 0 {
|
|
candidates = append(candidates, part[:idx])
|
|
}
|
|
}
|
|
|
|
return candidates
|
|
}
|
|
|
|
func defaultKeyscan(ctx context.Context, host string, port int, timeout time.Duration) ([]byte, error) {
|
|
seconds := int(timeout.Round(time.Second) / time.Second)
|
|
if seconds <= 0 {
|
|
seconds = int(defaultKeyscanTimeout / time.Second)
|
|
}
|
|
if port <= 0 {
|
|
port = 22
|
|
}
|
|
|
|
scanCtx, cancel := context.WithTimeout(ctx, timeout)
|
|
defer cancel()
|
|
|
|
args := []string{"-T", strconv.Itoa(seconds)}
|
|
if port != 22 {
|
|
args = append(args, "-p", strconv.Itoa(port))
|
|
}
|
|
args = append(args, host)
|
|
|
|
cmd := exec.CommandContext(scanCtx, "ssh-keyscan", args...)
|
|
output, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("%w (output: %s)", err, strings.TrimSpace(string(output)))
|
|
}
|
|
return output, nil
|
|
}
|