Skip to content
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

Configuring the X-XSS-Protection and CSP header value #8767

Merged
merged 9 commits into from
Feb 5, 2025
+345 −272
Merged

Configuring the X-XSS-Protection and CSP header value #8767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6d37234
configuring the x-xss-protrction and csp header value
swatiganesh Jan 30, 2025
7b9ac02
resolving a2_protobus verify pipeline error
swatiganesh Jan 30, 2025
0a5b81f
triggering automate-load-balancer by adding space in plan.sh
swatiganesh Jan 30, 2025
1760b9d
checking pipeline
swatiganesh Jan 31, 2025
3cf7d2a
checking pipeline-2
swatiganesh Feb 3, 2025
0abed1b
checking build and changes for configuration
swatiganesh Feb 3, 2025
9da49e4
solving the conf error in api-proxy componrnt
swatiganesh Feb 3, 2025
bb42952
added values in default.toml and correcting the header path
swatiganesh Feb 4, 2025
4c52596
trigering private pipeline
swatiganesh Feb 4, 2025
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
2 changes: 1 addition & 1 deletion .expeditor/verify_private.pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ env:
HAB_BLDR_CHANNEL: "LTS-2024"
#HAB_STUDIO_SECRET_HAB_BLDR_CHANNEL: "curl8"
#HAB_FALLBACK_CHANNEL: "stable"
HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "stable"
HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"
GOPROXY: "https://proxy.golang.org,direct"
GOSUMDB: "sum.golang.org"
PGGSSENCMODE: "disable"
Expand Down
5 changes: 5 additions & 0 deletions api/config/builder_api_proxy/config_request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ func DefaultConfigRequest() *ConfigRequest {
c.V1.Sys.Http.SslProtocols = w.String("TLSv1.2 TLSv1.3")
c.V1.Sys.Http.SslCiphers = w.String(config.InternalCipherSuite)
c.V1.Sys.Http.SslVerifyDepth = w.Int32(2)
c.V1.Sys.Http.XXssProtection = w.String("1; mode=block")
return c
}

Expand Down Expand Up @@ -60,6 +61,10 @@ func (c *ConfigRequest) SetGlobalConfig(g *config.GlobalConfig) {
if logLevel := g.GetV1().GetLog().GetLevel().GetValue(); logLevel != "" {
c.V1.Sys.Log.Level.Value = config.GlobalLogLevelToNginxLevel(logLevel)
}

if xxssProtextion := g.GetV1().GetSys().GetNgx().GetHttp().GetXXssProtection(); xxssProtextion != nil {
c.V1.Sys.Http.XXssProtection = xxssProtextion
}
}

// PrepareSystemConfig returns a system configuration that can be used
Expand Down
80 changes: 47 additions & 33 deletions api/config/builder_api_proxy/config_request.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/config/builder_api_proxy/config_request.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ message ConfigRequest {
google.protobuf.StringValue ssl_ciphers = 4;
google.protobuf.StringValue ssl_protocols = 5;
google.protobuf.Int32Value ssl_verify_depth = 6;
google.protobuf.StringValue x_xss_protection = 7;
}

message Web {
Expand Down
5 changes: 5 additions & 0 deletions api/config/load_balancer/config_request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ func DefaultConfigRequest() *ConfigRequest {
c.V1.Sys.Ngx.Http.ProxyBusyBuffersSize = w.String("16k")
c.V1.Sys.Ngx.Http.Ipv6Supported = w.Bool(ipV6Supported())
c.V1.Sys.StaticConfig.Products = []string{"automate"}
c.V1.Sys.Ngx.Http.XXssProtection = w.String("1; mode=block")
c.V1.Sys.Ngx.Http.ContentSecurityPolicy = w.String("default-src 'self';frame-ancestors 'self';")
return c
}

Expand Down Expand Up @@ -173,6 +175,9 @@ func (c *ConfigRequest) SetGlobalConfig(g *config.GlobalConfig) {
c.V1.Sys.Ngx.Http.IncludeXForwardedFor = xFwd
}

if xxssProtextion := g.GetV1().GetSys().GetNgx().GetHttp().GetXXssProtection(); xxssProtextion != nil {
c.V1.Sys.Ngx.Http.XXssProtection = xxssProtextion
}
}

// PrepareSystemConfig returns a system configuration that can be used
Expand Down
Loading
Loading