Adding upstream version 2.52.6.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
a960158181
commit
6d002e9543
GPG key ID:
FBB4F0E80A80222F
441 changed files with 95392 additions and 0 deletions
68
middleware/envvar/envvar.go
Normal file
68
middleware/envvar/envvar.go
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
package envvar
|
||||
|
||||
import (
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"github.com/gofiber/fiber/v2"
|
||||
)
|
||||
|
||||
// Config defines the config for middleware.
|
||||
type Config struct {
|
||||
// ExportVars specifies the environment variables that should export
|
||||
ExportVars map[string]string
|
||||
// ExcludeVars specifies the environment variables that should not export
|
||||
ExcludeVars map[string]string
|
||||
}
|
||||
|
||||
type EnvVar struct {
|
||||
Vars map[string]string `json:"vars"`
|
||||
}
|
||||
|
||||
func (envVar *EnvVar) set(key, val string) {
|
||||
envVar.Vars[key] = val
|
||||
}
|
||||
|
||||
func New(config ...Config) fiber.Handler {
|
||||
var cfg Config
|
||||
if len(config) > 0 {
|
||||
cfg = config[0]
|
||||
}
|
||||
|
||||
return func(c *fiber.Ctx) error {
|
||||
if c.Method() != fiber.MethodGet {
|
||||
return fiber.ErrMethodNotAllowed
|
||||
}
|
||||
|
||||
envVar := newEnvVar(cfg)
|
||||
varsByte, err := c.App().Config().JSONEncoder(envVar)
|
||||
if err != nil {
|
||||
return c.Status(fiber.StatusInternalServerError).SendString(err.Error())
|
||||
}
|
||||
c.Set(fiber.HeaderContentType, fiber.MIMEApplicationJSONCharsetUTF8)
|
||||
return c.Send(varsByte)
|
||||
}
|
||||
}
|
||||
|
||||
func newEnvVar(cfg Config) *EnvVar {
|
||||
vars := &EnvVar{Vars: make(map[string]string)}
|
||||
|
||||
if len(cfg.ExportVars) > 0 {
|
||||
for key, defaultVal := range cfg.ExportVars {
|
||||
vars.set(key, defaultVal)
|
||||
if envVal, exists := os.LookupEnv(key); exists {
|
||||
vars.set(key, envVal)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
const numElems = 2
|
||||
for _, envVal := range os.Environ() {
|
||||
keyVal := strings.SplitN(envVal, "=", numElems)
|
||||
if _, exists := cfg.ExcludeVars[keyVal[0]]; !exists {
|
||||
vars.set(keyVal[0], keyVal[1])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return vars
|
||||
}
|
||||
172
middleware/envvar/envvar_test.go
Normal file
172
middleware/envvar/envvar_test.go
Normal file
|
|
@ -0,0 +1,172 @@
|
|||
//nolint:bodyclose // Much easier to just ignore memory leaks in tests
|
||||
package envvar
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"io"
|
||||
"net/http"
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
"github.com/gofiber/fiber/v2"
|
||||
"github.com/gofiber/fiber/v2/utils"
|
||||
)
|
||||
|
||||
func TestEnvVarStructWithExportVarsExcludeVars(t *testing.T) {
|
||||
err := os.Setenv("testKey", "testEnvValue")
|
||||
utils.AssertEqual(t, nil, err)
|
||||
err = os.Setenv("anotherEnvKey", "anotherEnvVal")
|
||||
utils.AssertEqual(t, nil, err)
|
||||
err = os.Setenv("excludeKey", "excludeEnvValue")
|
||||
utils.AssertEqual(t, nil, err)
|
||||
defer func() {
|
||||
err := os.Unsetenv("testKey")
|
||||
utils.AssertEqual(t, nil, err)
|
||||
err = os.Unsetenv("anotherEnvKey")
|
||||
utils.AssertEqual(t, nil, err)
|
||||
err = os.Unsetenv("excludeKey")
|
||||
utils.AssertEqual(t, nil, err)
|
||||
}()
|
||||
|
||||
vars := newEnvVar(Config{
|
||||
ExportVars: map[string]string{"testKey": "", "testDefaultKey": "testDefaultVal"},
|
||||
ExcludeVars: map[string]string{"excludeKey": ""},
|
||||
})
|
||||
|
||||
utils.AssertEqual(t, vars.Vars["testKey"], "testEnvValue")
|
||||
utils.AssertEqual(t, vars.Vars["testDefaultKey"], "testDefaultVal")
|
||||
utils.AssertEqual(t, vars.Vars["excludeKey"], "")
|
||||
utils.AssertEqual(t, vars.Vars["anotherEnvKey"], "")
|
||||
}
|
||||
|
||||
func TestEnvVarHandler(t *testing.T) {
|
||||
err := os.Setenv("testKey", "testVal")
|
||||
utils.AssertEqual(t, nil, err)
|
||||
defer func() {
|
||||
err := os.Unsetenv("testKey")
|
||||
utils.AssertEqual(t, nil, err)
|
||||
}()
|
||||
|
||||
expectedEnvVarResponse, err := json.Marshal(
|
||||
struct {
|
||||
Vars map[string]string `json:"vars"`
|
||||
}{
|
||||
map[string]string{"testKey": "testVal"},
|
||||
})
|
||||
utils.AssertEqual(t, nil, err)
|
||||
|
||||
app := fiber.New()
|
||||
app.Use("/envvars", New(Config{
|
||||
ExportVars: map[string]string{"testKey": ""},
|
||||
}))
|
||||
|
||||
req, err := http.NewRequestWithContext(context.Background(), fiber.MethodGet, "http://localhost/envvars", nil)
|
||||
utils.AssertEqual(t, nil, err)
|
||||
resp, err := app.Test(req)
|
||||
utils.AssertEqual(t, nil, err)
|
||||
|
||||
respBody, err := io.ReadAll(resp.Body)
|
||||
utils.AssertEqual(t, nil, err)
|
||||
|
||||
utils.AssertEqual(t, expectedEnvVarResponse, respBody)
|
||||
}
|
||||
|
||||
func TestEnvVarHandlerNotMatched(t *testing.T) {
|
||||
app := fiber.New()
|
||||
app.Use("/envvars", New(Config{
|
||||
ExportVars: map[string]string{"testKey": ""},
|
||||
}))
|
||||
|
||||
app.Get("/another-path", func(ctx *fiber.Ctx) error {
|
||||
utils.AssertEqual(t, nil, ctx.SendString("OK"))
|
||||
return nil
|
||||
})
|
||||
|
||||
req, err := http.NewRequestWithContext(context.Background(), fiber.MethodGet, "http://localhost/another-path", nil)
|
||||
utils.AssertEqual(t, nil, err)
|
||||
resp, err := app.Test(req)
|
||||
utils.AssertEqual(t, nil, err)
|
||||
|
||||
respBody, err := io.ReadAll(resp.Body)
|
||||
utils.AssertEqual(t, nil, err)
|
||||
|
||||
utils.AssertEqual(t, []byte("OK"), respBody)
|
||||
}
|
||||
|
||||
func TestEnvVarHandlerDefaultConfig(t *testing.T) {
|
||||
err := os.Setenv("testEnvKey", "testEnvVal")
|
||||
utils.AssertEqual(t, nil, err)
|
||||
defer func() {
|
||||
err := os.Unsetenv("testEnvKey")
|
||||
utils.AssertEqual(t, nil, err)
|
||||
}()
|
||||
|
||||
app := fiber.New()
|
||||
app.Use("/envvars", New())
|
||||
|
||||
req, err := http.NewRequestWithContext(context.Background(), fiber.MethodGet, "http://localhost/envvars", nil)
|
||||
utils.AssertEqual(t, nil, err)
|
||||
resp, err := app.Test(req)
|
||||
utils.AssertEqual(t, nil, err)
|
||||
|
||||
respBody, err := io.ReadAll(resp.Body)
|
||||
utils.AssertEqual(t, nil, err)
|
||||
|
||||
var envVars EnvVar
|
||||
utils.AssertEqual(t, nil, json.Unmarshal(respBody, &envVars))
|
||||
val := envVars.Vars["testEnvKey"]
|
||||
utils.AssertEqual(t, "testEnvVal", val)
|
||||
}
|
||||
|
||||
func TestEnvVarHandlerMethod(t *testing.T) {
|
||||
app := fiber.New()
|
||||
app.Use("/envvars", New())
|
||||
|
||||
req, err := http.NewRequestWithContext(context.Background(), fiber.MethodPost, "http://localhost/envvars", nil)
|
||||
utils.AssertEqual(t, nil, err)
|
||||
resp, err := app.Test(req)
|
||||
utils.AssertEqual(t, nil, err)
|
||||
utils.AssertEqual(t, fiber.StatusMethodNotAllowed, resp.StatusCode)
|
||||
}
|
||||
|
||||
func TestEnvVarHandlerSpecialValue(t *testing.T) {
|
||||
testEnvKey := "testEnvKey"
|
||||
fakeBase64 := "testBase64:TQ=="
|
||||
err := os.Setenv(testEnvKey, fakeBase64)
|
||||
utils.AssertEqual(t, nil, err)
|
||||
defer func() {
|
||||
err := os.Unsetenv(testEnvKey)
|
||||
utils.AssertEqual(t, nil, err)
|
||||
}()
|
||||
|
||||
app := fiber.New()
|
||||
app.Use("/envvars", New())
|
||||
app.Use("/envvars/export", New(Config{ExportVars: map[string]string{testEnvKey: ""}}))
|
||||
|
||||
req, err := http.NewRequestWithContext(context.Background(), fiber.MethodGet, "http://localhost/envvars", nil)
|
||||
utils.AssertEqual(t, nil, err)
|
||||
resp, err := app.Test(req)
|
||||
utils.AssertEqual(t, nil, err)
|
||||
|
||||
respBody, err := io.ReadAll(resp.Body)
|
||||
utils.AssertEqual(t, nil, err)
|
||||
|
||||
var envVars EnvVar
|
||||
utils.AssertEqual(t, nil, json.Unmarshal(respBody, &envVars))
|
||||
val := envVars.Vars[testEnvKey]
|
||||
utils.AssertEqual(t, fakeBase64, val)
|
||||
|
||||
req, err = http.NewRequestWithContext(context.Background(), fiber.MethodGet, "http://localhost/envvars/export", nil)
|
||||
utils.AssertEqual(t, nil, err)
|
||||
resp, err = app.Test(req)
|
||||
utils.AssertEqual(t, nil, err)
|
||||
|
||||
respBody, err = io.ReadAll(resp.Body)
|
||||
utils.AssertEqual(t, nil, err)
|
||||
|
||||
var envVarsExport EnvVar
|
||||
utils.AssertEqual(t, nil, json.Unmarshal(respBody, &envVarsExport))
|
||||
val = envVarsExport.Vars[testEnvKey]
|
||||
utils.AssertEqual(t, fakeBase64, val)
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue