Browse Source
Fix security issues from penetration test report: - M2: Add configurable X-Frame-Options and CSP headers (disabled by default) - L2: Add X-Content-Type-Options and Referrer-Policy headers (enabled by default) - L3: Make CORS allowed-origin-patterns configurable via TB_CORS_* env vars Root cause: ThingsboardSecurityConfiguration called .disable() on the entire HeadersConfigurer, which removed ALL security headers including Cache-Control. Fix uses defaultsDisabled() + selective header enablement via a new HttpSecurityHeadersCustomizer component. Both Spring Boot (tb-node) and Express.js (web-ui) share the same SECURITY_HEADERS_* environment variables for consistent configuration across monolith and microservice deployments.pull/15254/head
8 changed files with 257 additions and 15 deletions
@ -0,0 +1,59 @@ |
|||
/** |
|||
* Copyright © 2016-2026 The Thingsboard Authors |
|||
* |
|||
* Licensed under the Apache License, Version 2.0 (the "License"); |
|||
* you may not use this file except in compliance with the License. |
|||
* You may obtain a copy of the License at |
|||
* |
|||
* http://www.apache.org/licenses/LICENSE-2.0
|
|||
* |
|||
* Unless required by applicable law or agreed to in writing, software |
|||
* distributed under the License is distributed on an "AS IS" BASIS, |
|||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|||
* See the License for the specific language governing permissions and |
|||
* limitations under the License. |
|||
*/ |
|||
package org.thingsboard.server.config; |
|||
|
|||
import lombok.RequiredArgsConstructor; |
|||
import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer; |
|||
import org.springframework.security.web.header.writers.StaticHeadersWriter; |
|||
import org.springframework.stereotype.Component; |
|||
import org.springframework.util.StringUtils; |
|||
|
|||
@Component |
|||
@RequiredArgsConstructor |
|||
public class HttpSecurityHeadersCustomizer { |
|||
|
|||
private final HttpSecurityHeadersProperties properties; |
|||
|
|||
public void customize(HeadersConfigurer<?> headers) { |
|||
if (properties.getXContentTypeOptions().isEnabled()) { |
|||
headers.contentTypeOptions(config -> {}); |
|||
} |
|||
|
|||
if (properties.getReferrerPolicy().isEnabled()) { |
|||
headers.addHeaderWriter(new StaticHeadersWriter("Referrer-Policy", properties.getReferrerPolicy().getValue())); |
|||
} |
|||
|
|||
if (properties.getXFrameOptions().isEnabled()) { |
|||
String value = properties.getXFrameOptions().getValue(); |
|||
if ("DENY".equalsIgnoreCase(value)) { |
|||
headers.frameOptions(HeadersConfigurer.FrameOptionsConfig::deny); |
|||
} else { |
|||
headers.frameOptions(HeadersConfigurer.FrameOptionsConfig::sameOrigin); |
|||
} |
|||
} |
|||
|
|||
if (properties.getContentSecurityPolicy().isEnabled() && StringUtils.hasText(properties.getContentSecurityPolicy().getValue())) { |
|||
headers.contentSecurityPolicy(csp -> { |
|||
csp.policyDirectives(properties.getContentSecurityPolicy().getValue()); |
|||
if (properties.getContentSecurityPolicy().isReportOnly()) { |
|||
csp.reportOnly(); |
|||
} |
|||
}); |
|||
} |
|||
|
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,56 @@ |
|||
/** |
|||
* Copyright © 2016-2026 The Thingsboard Authors |
|||
* |
|||
* Licensed under the Apache License, Version 2.0 (the "License"); |
|||
* you may not use this file except in compliance with the License. |
|||
* You may obtain a copy of the License at |
|||
* |
|||
* http://www.apache.org/licenses/LICENSE-2.0
|
|||
* |
|||
* Unless required by applicable law or agreed to in writing, software |
|||
* distributed under the License is distributed on an "AS IS" BASIS, |
|||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|||
* See the License for the specific language governing permissions and |
|||
* limitations under the License. |
|||
*/ |
|||
package org.thingsboard.server.config; |
|||
|
|||
import lombok.Data; |
|||
import org.springframework.boot.context.properties.ConfigurationProperties; |
|||
import org.springframework.context.annotation.Configuration; |
|||
|
|||
@Configuration |
|||
@ConfigurationProperties(prefix = "security.headers") |
|||
@Data |
|||
public class HttpSecurityHeadersProperties { |
|||
|
|||
private XContentTypeOptions xContentTypeOptions = new XContentTypeOptions(); |
|||
private ReferrerPolicy referrerPolicy = new ReferrerPolicy(); |
|||
private XFrameOptions xFrameOptions = new XFrameOptions(); |
|||
private ContentSecurityPolicy contentSecurityPolicy = new ContentSecurityPolicy(); |
|||
|
|||
@Data |
|||
public static class XContentTypeOptions { |
|||
private boolean enabled = true; |
|||
} |
|||
|
|||
@Data |
|||
public static class ReferrerPolicy { |
|||
private boolean enabled = true; |
|||
private String value = "strict-origin-when-cross-origin"; |
|||
} |
|||
|
|||
@Data |
|||
public static class XFrameOptions { |
|||
private boolean enabled = false; |
|||
private String value = "SAMEORIGIN"; |
|||
} |
|||
|
|||
@Data |
|||
public static class ContentSecurityPolicy { |
|||
private boolean enabled = false; |
|||
private String value = ""; |
|||
private boolean reportOnly = false; |
|||
} |
|||
|
|||
} |
|||
Loading…
Reference in new issue