Skip to content

Further improve readability and maintainability of middleware/secure.go #2800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Further improve readability and maintainability of middleware/secure.go #2800

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions middleware/secure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package middleware

import (
"fmt"
"strings"

"github.com/labstack/echo/v4"
)
Expand All @@ -16,6 +17,9 @@ type SecureConfig struct {

// XSSProtection provides protection against cross-site scripting attack (XSS)
// by setting the `X-XSS-Protection` header.
// Note: This header is deprecated in modern browsers. For more information, see
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-XSS-Protection
// and consider using Content-Security-Policy instead.
// Optional. Default value "1; mode=block".
XSSProtection string `yaml:"xss_protection"`

Expand Down Expand Up @@ -118,15 +122,15 @@ func SecureWithConfig(config SecureConfig) echo.MiddlewareFunc {
if config.XFrameOptions != "" {
res.Header().Set(echo.HeaderXFrameOptions, config.XFrameOptions)
}
if (c.IsTLS() || (req.Header.Get(echo.HeaderXForwardedProto) == "https")) && config.HSTSMaxAge != 0 {
subdomains := ""
if (c.IsTLS() || (req.Header.Get(echo.HeaderXForwardedProto) == "https")) && config.HSTSMaxAge > 0 {
hsts := []string{fmt.Sprintf("max-age=%d", config.HSTSMaxAge)}
if !config.HSTSExcludeSubdomains {
subdomains = "; includeSubdomains"
hsts = append(hsts, "includeSubdomains")
}
if config.HSTSPreloadEnabled {
subdomains = fmt.Sprintf("%s; preload", subdomains)
hsts = append(hsts, "preload")
}
res.Header().Set(echo.HeaderStrictTransportSecurity, fmt.Sprintf("max-age=%d%s", config.HSTSMaxAge, subdomains))
res.Header().Set(echo.HeaderStrictTransportSecurity, strings.Join(hsts, "; "))
}
if config.ContentSecurityPolicy != "" {
if config.CSPReportOnly {
Expand Down