Compare commits
2 Commits
chore/code
...
0bb59bf9c2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0bb59bf9c2 | ||
|
|
dcff249fe5 |
@@ -157,10 +157,10 @@ func buildConfig(log *slog.Logger, params *Params) (*Config, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func loadOrCreateSessionSecret(log *slog.Logger, dataDir string) (string, error) {
|
func loadOrCreateSessionSecret(log *slog.Logger, dataDir string) (string, error) {
|
||||||
secretPath := filepath.Clean(filepath.Join(dataDir, sessionSecretFile))
|
secretPath := filepath.Join(dataDir, sessionSecretFile)
|
||||||
|
|
||||||
// Try to read existing secret
|
// Try to read existing secret
|
||||||
// secretPath is constructed from trusted config (dataDir) and a constant filename.
|
//nolint:gosec // secretPath is constructed from trusted config, not user input
|
||||||
data, err := os.ReadFile(secretPath)
|
data, err := os.ReadFile(secretPath)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
log.Info("loaded session secret from file", "path", secretPath)
|
log.Info("loaded session secret from file", "path", secretPath)
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
@@ -500,11 +499,7 @@ func (h *Handlers) HandleAppLogs() http.HandlerFunc {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Container log output is attacker-controlled (untrusted) data.
|
_, _ = writer.Write([]byte(SanitizeLogs(logs))) // #nosec G705 -- logs sanitized, Content-Type is text/plain
|
||||||
// SanitizeLogs strips ANSI escapes and control characters.
|
|
||||||
// Content-Type is text/plain; XSS is not possible in this context.
|
|
||||||
sanitized := SanitizeLogs(logs)
|
|
||||||
_, _ = io.WriteString(writer, sanitized) // #nosec G705 -- text/plain Content-Type, SanitizeLogs strips control chars
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -586,15 +581,8 @@ func (h *Handlers) HandleDeploymentLogDownload() http.HandlerFunc {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if file exists — logPath is from GetLogFilePath (internal, not user input).
|
// Check if file exists — logPath is constructed internally, not from user input
|
||||||
// filepath.Clean normalizes the path and filepath.Base extracts the filename
|
_, err := os.Stat(logPath) // #nosec G703 -- path from internal GetLogFilePath, not user input
|
||||||
// to prevent directory traversal.
|
|
||||||
cleanPath := filepath.Clean(logPath)
|
|
||||||
safeDir := filepath.Dir(cleanPath)
|
|
||||||
safeName := filepath.Base(cleanPath)
|
|
||||||
safePath := filepath.Join(safeDir, safeName)
|
|
||||||
|
|
||||||
_, err := os.Stat(safePath) // #nosec G703 -- path from internal GetLogFilePath, not user input
|
|
||||||
if os.IsNotExist(err) {
|
if os.IsNotExist(err) {
|
||||||
http.NotFound(writer, request)
|
http.NotFound(writer, request)
|
||||||
|
|
||||||
@@ -602,19 +590,19 @@ func (h *Handlers) HandleDeploymentLogDownload() http.HandlerFunc {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
h.log.Error("failed to stat log file", "error", err, "path", safePath)
|
h.log.Error("failed to stat log file", "error", err, "path", logPath)
|
||||||
http.Error(writer, "Internal Server Error", http.StatusInternalServerError)
|
http.Error(writer, "Internal Server Error", http.StatusInternalServerError)
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Extract filename for Content-Disposition header
|
// Extract filename for Content-Disposition header
|
||||||
filename := safeName
|
filename := filepath.Base(logPath)
|
||||||
|
|
||||||
writer.Header().Set("Content-Type", "text/plain; charset=utf-8")
|
writer.Header().Set("Content-Type", "text/plain; charset=utf-8")
|
||||||
writer.Header().Set("Content-Disposition", "attachment; filename=\""+filename+"\"")
|
writer.Header().Set("Content-Disposition", "attachment; filename=\""+filename+"\"")
|
||||||
|
|
||||||
http.ServeFile(writer, request, safePath)
|
http.ServeFile(writer, request, logPath)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,16 +11,14 @@ import (
|
|||||||
"git.eeqj.de/sneak/upaas/internal/config"
|
"git.eeqj.de/sneak/upaas/internal/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
// testSessionValue is a dummy value for tests (not a real credential).
|
//nolint:gosec // test credentials
|
||||||
const testSessionValue = "test-value-32-bytes-long-enough!"
|
|
||||||
|
|
||||||
func newCORSTestMiddleware(corsOrigins string) *Middleware {
|
func newCORSTestMiddleware(corsOrigins string) *Middleware {
|
||||||
return &Middleware{
|
return &Middleware{
|
||||||
log: slog.Default(),
|
log: slog.Default(),
|
||||||
params: &Params{
|
params: &Params{
|
||||||
Config: &config.Config{
|
Config: &config.Config{
|
||||||
CORSOrigins: corsOrigins,
|
CORSOrigins: corsOrigins,
|
||||||
SessionSecret: testSessionValue,
|
SessionSecret: "test-secret-32-bytes-long-enough",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -242,38 +242,21 @@ func (svc *Service) sendNotifications(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// errInvalidURLScheme indicates the webhook URL uses a disallowed scheme.
|
|
||||||
var errInvalidURLScheme = errors.New("URL scheme not allowed, must be http or https")
|
|
||||||
|
|
||||||
// validateWebhookURL validates that a webhook URL is well-formed and uses http/https.
|
|
||||||
func validateWebhookURL(rawURL string) error {
|
|
||||||
parsed, err := url.ParseRequestURI(rawURL)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("malformed URL: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if parsed.Scheme != "https" && parsed.Scheme != "http" {
|
|
||||||
return fmt.Errorf("%w: got %q", errInvalidURLScheme, parsed.Scheme)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (svc *Service) sendNtfy(
|
func (svc *Service) sendNtfy(
|
||||||
ctx context.Context,
|
ctx context.Context,
|
||||||
topic, title, message, priority string,
|
topic, title, message, priority string,
|
||||||
) error {
|
) error {
|
||||||
svc.log.Debug("sending ntfy notification", "topic", topic, "title", title)
|
svc.log.Debug("sending ntfy notification", "topic", topic, "title", title)
|
||||||
|
|
||||||
urlErr := validateWebhookURL(topic)
|
parsedURL, err := url.ParseRequestURI(topic)
|
||||||
if urlErr != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("invalid ntfy topic URL: %w", urlErr)
|
return fmt.Errorf("invalid ntfy topic URL: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
request, err := http.NewRequestWithContext(
|
request, err := http.NewRequestWithContext(
|
||||||
ctx,
|
ctx,
|
||||||
http.MethodPost,
|
http.MethodPost,
|
||||||
topic,
|
parsedURL.String(),
|
||||||
bytes.NewBufferString(message),
|
bytes.NewBufferString(message),
|
||||||
)
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -363,15 +346,15 @@ func (svc *Service) sendSlack(
|
|||||||
return fmt.Errorf("failed to marshal slack payload: %w", err)
|
return fmt.Errorf("failed to marshal slack payload: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
urlErr := validateWebhookURL(webhookURL)
|
parsedWebhookURL, err := url.ParseRequestURI(webhookURL)
|
||||||
if urlErr != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("invalid slack webhook URL: %w", urlErr)
|
return fmt.Errorf("invalid slack webhook URL: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
request, err := http.NewRequestWithContext(
|
request, err := http.NewRequestWithContext(
|
||||||
ctx,
|
ctx,
|
||||||
http.MethodPost,
|
http.MethodPost,
|
||||||
webhookURL,
|
parsedWebhookURL.String(),
|
||||||
bytes.NewBuffer(body),
|
bytes.NewBuffer(body),
|
||||||
)
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user