feat(parser): support HTTP(S) URL config sources with -C flag
Add remote config fetching capability to the -C CLI flag, enabling centralized fleet management of gost nodes. - readConfig() now detects http:// and https:// URLs and fetches them via HTTP GET with a 30s timeout and shared client pool - Format auto-detection from Content-Type header (using mime parsing) with fallback to URL path extension (.yaml/.json) - 10 MiB response size limit to prevent memory exhaustion - URL userinfo stripped from error messages for safety - Fix ReadFile to force viper config type from file extension, preventing format detection ambiguity - Fix viper config search path fallback: skip cfg.Load() when -C flags are explicitly provided, avoiding unwanted merges - Tests: URL fetch (YAML/JSON), non-200, oversize, detectFormat, isHTTPURL, sanitizeURL, and combined file+URL Parse scenario
This commit is contained in:
@@ -1,6 +1,9 @@
|
||||
package parser
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
@@ -285,3 +288,193 @@ func TestParse_MultiFile(t *testing.T) {
|
||||
t.Fatal("Quotas not merged from cfg2")
|
||||
}
|
||||
}
|
||||
|
||||
func TestIsHTTPURL(t *testing.T) {
|
||||
tests := []struct {
|
||||
input string
|
||||
expected bool
|
||||
}{
|
||||
{"http://example.com/config.yaml", true},
|
||||
{"https://example.com/config.json", true},
|
||||
{"ftp://example.com/config.yaml", false},
|
||||
{"config.yaml", false},
|
||||
{"/path/to/config.yml", false},
|
||||
{"http://[::1]:8080/cfg", true},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
if got := isHTTPURL(tt.input); got != tt.expected {
|
||||
t.Errorf("isHTTPURL(%q) = %v, want %v", tt.input, got, tt.expected)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestDetectFormat(t *testing.T) {
|
||||
tests := []struct {
|
||||
contentType string
|
||||
url string
|
||||
want string
|
||||
}{
|
||||
{"", "http://example.com/config.json", "json"},
|
||||
{"", "http://example.com/config.yml", "yaml"},
|
||||
{"", "http://example.com/config.yaml", "yaml"},
|
||||
{"", "http://example.com/config", "yaml"}, // default
|
||||
{"application/json", "http://example.com/config", "json"},
|
||||
{"application/yaml", "http://example.com/config", "yaml"},
|
||||
{"application/x-yaml", "http://example.com/config", "yaml"},
|
||||
{"text/yaml", "http://example.com/config", "yaml"},
|
||||
{"text/x-yaml", "http://example.com/config", "yaml"},
|
||||
{"text/plain; charset=utf-8", "http://example.com/config.json", "json"}, // content-type ignored, extension wins
|
||||
{"text/plain", "http://example.com/config", "yaml"}, // unknown -> default
|
||||
}
|
||||
for _, tt := range tests {
|
||||
if got := detectFormat(tt.contentType, tt.url); got != tt.want {
|
||||
t.Errorf("detectFormat(%q, %q) = %q, want %q", tt.contentType, tt.url, got, tt.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestSanitizeURL(t *testing.T) {
|
||||
tests := []struct {
|
||||
input string
|
||||
expected string
|
||||
}{
|
||||
{"http://user:pass@example.com/path", "http://example.com/path"},
|
||||
{"https://example.com/path", "https://example.com/path"},
|
||||
{"not a url", "not%20a%20url"},
|
||||
{"http://user@example.com/path", "http://example.com/path"}, // user with no password
|
||||
}
|
||||
for _, tt := range tests {
|
||||
if got := sanitizeURL(tt.input); got != tt.expected {
|
||||
t.Errorf("sanitizeURL(%q) = %q, want %q", tt.input, got, tt.expected)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestReadConfigFromURL_YAML(t *testing.T) {
|
||||
// Write a YAML config and serve it via httptest.
|
||||
cfg := &config.Config{
|
||||
Services: []*config.ServiceConfig{{Name: "svc", Addr: ":8080"}},
|
||||
Log: &config.LogConfig{Level: "debug"},
|
||||
}
|
||||
var buf bytes.Buffer
|
||||
if err := cfg.Write(&buf, "yaml"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
body := buf.Bytes()
|
||||
|
||||
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/yaml")
|
||||
w.Write(body)
|
||||
}))
|
||||
defer ts.Close()
|
||||
|
||||
got := &config.Config{}
|
||||
if err := readConfigFromURL(ts.URL, got); err != nil {
|
||||
t.Fatalf("readConfigFromURL: %v", err)
|
||||
}
|
||||
if len(got.Services) != 1 || got.Services[0].Name != "svc" {
|
||||
t.Fatalf("unexpected services: %+v", got.Services)
|
||||
}
|
||||
if got.Log == nil || got.Log.Level != "debug" {
|
||||
t.Fatalf("unexpected log: %+v", got.Log)
|
||||
}
|
||||
}
|
||||
|
||||
func TestReadConfigFromURL_JSON(t *testing.T) {
|
||||
// Remote serving JSON with explicit Content-Type.
|
||||
cfg := &config.Config{
|
||||
Services: []*config.ServiceConfig{{Name: "json-svc", Addr: ":9090"}},
|
||||
}
|
||||
var buf bytes.Buffer
|
||||
if err := cfg.Write(&buf, "json"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
body := buf.Bytes()
|
||||
|
||||
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
w.Write(body)
|
||||
}))
|
||||
defer ts.Close()
|
||||
|
||||
got := &config.Config{}
|
||||
if err := readConfigFromURL(ts.URL, got); err != nil {
|
||||
t.Fatalf("readConfigFromURL: %v", err)
|
||||
}
|
||||
if got.Services[0].Name != "json-svc" {
|
||||
t.Fatalf("unexpected service name: %s", got.Services[0].Name)
|
||||
}
|
||||
}
|
||||
|
||||
func TestReadConfigFromURL_Non200(t *testing.T) {
|
||||
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
w.WriteHeader(http.StatusNotFound)
|
||||
}))
|
||||
defer ts.Close()
|
||||
|
||||
err := readConfigFromURL(ts.URL, &config.Config{})
|
||||
if err == nil {
|
||||
t.Fatal("expected error for 404 response")
|
||||
}
|
||||
}
|
||||
|
||||
func TestReadConfigFromURL_OverSize(t *testing.T) {
|
||||
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/yaml")
|
||||
w.Write(make([]byte, maxConfigSize+1))
|
||||
}))
|
||||
defer ts.Close()
|
||||
|
||||
err := readConfigFromURL(ts.URL, &config.Config{})
|
||||
if err == nil {
|
||||
t.Fatal("expected error for oversized response")
|
||||
}
|
||||
}
|
||||
|
||||
func TestParse_FileAndURL(t *testing.T) {
|
||||
// Create a local file.
|
||||
fileCfg := &config.Config{
|
||||
Services: []*config.ServiceConfig{{Name: "file-svc", Addr: ":8080"}},
|
||||
}
|
||||
tmpDir := t.TempDir()
|
||||
f, err := os.Create(filepath.Join(tmpDir, "local.yml"))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := fileCfg.Write(f, "yaml"); err != nil {
|
||||
f.Close()
|
||||
t.Fatal(err)
|
||||
}
|
||||
f.Close()
|
||||
|
||||
// Serve a second config over HTTP.
|
||||
urlCfg := &config.Config{
|
||||
Services: []*config.ServiceConfig{{Name: "url-svc", Addr: ":8081"}},
|
||||
Log: &config.LogConfig{Level: "debug"},
|
||||
}
|
||||
var buf bytes.Buffer
|
||||
if err := urlCfg.Write(&buf, "yaml"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
body := buf.Bytes()
|
||||
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/yaml")
|
||||
w.Write(body)
|
||||
}))
|
||||
defer ts.Close()
|
||||
|
||||
Init(Args{
|
||||
CfgFiles: []string{filepath.Join(tmpDir, "local.yml"), ts.URL},
|
||||
})
|
||||
|
||||
got, err := Parse()
|
||||
if err != nil {
|
||||
t.Fatalf("Parse(): %v", err)
|
||||
}
|
||||
if len(got.Services) != 2 {
|
||||
t.Fatalf("expected 2 services, got %d", len(got.Services))
|
||||
}
|
||||
if got.Log == nil || got.Log.Level != "debug" {
|
||||
t.Fatal("Log.Level not set from URL config")
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user