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

fix for cross site scripting #72

Merged
merged 1 commit into from
Apr 20, 2023
Merged

fix for cross site scripting #72

Show file tree
Hide file tree
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
26 changes: 16 additions & 10 deletions src/main/java/org/eclipse/tractusx/autosetup/config/SecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@

package org.eclipse.tractusx.autosetup.config;

import lombok.SneakyThrows;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.stream.Stream;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.web.ServerProperties;
import org.springframework.context.annotation.Bean;
Expand All @@ -36,16 +41,12 @@
import org.springframework.security.oauth2.jwt.Jwt;
import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.util.matcher.AnyRequestMatcher;
import org.springframework.security.web.header.writers.XXssProtectionHeaderWriter.HeaderValue;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.CorsConfigurationSource;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;

import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.stream.Stream;
import lombok.SneakyThrows;

@Configuration
@EnableWebSecurity
Expand Down Expand Up @@ -118,9 +119,14 @@ public SecurityFilterChain filterChain(HttpSecurity http, Jwt2AuthenticationConv
.anyRequest().authenticated();
// @formatter:on

http.headers().xssProtection().and()
.contentSecurityPolicy("default-src 'self'; script-src 'self' 'unsafe-inline'").and()
.httpStrictTransportSecurity().requestMatcher(AnyRequestMatcher.INSTANCE);
http.headers().xssProtection(xssProtection -> xssProtection.headerValue(HeaderValue.ENABLED_MODE_BLOCK));

http.headers()
.contentSecurityPolicy("default-src 'self'; script-src 'self'")
.and()
.httpStrictTransportSecurity()
.includeSubDomains(true)
.maxAgeInSeconds(15724800);

return http.build();
}
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/org/eclipse/tractusx/autosetup/controller/AppDetailsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import jakarta.validation.Valid;

@RestController
public class AppDetailsController {
Expand All @@ -54,7 +55,7 @@ public class AppDetailsController {
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = AppDetails.class))) })
@PostMapping("/internal/app-details")
public AppDetails createOrUpdateAppInfo(@RequestBody AppDetailsRequest appDetailsRequest) {
public AppDetails createOrUpdateAppInfo(@Valid @RequestBody AppDetailsRequest appDetailsRequest) {
return appDetailsService.createOrUpdateAppInfo(appDetailsRequest);
}

Expand All @@ -80,7 +81,7 @@ public List<AppDetails> getAllAppInfo() {
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = AppServiceCatalog.class))) })
@PostMapping("/internal/catalog-service")
public AppServiceCatalog createCatalogService(@RequestBody AppServiceCatalogPojo appServiceCatalog) {
public AppServiceCatalog createCatalogService(@Valid @RequestBody AppServiceCatalogPojo appServiceCatalog) {
return appDetailsService.createCatalogService(appServiceCatalog);
}

Expand All @@ -105,7 +106,7 @@ public List<AppServiceCatalog> getAllCatalogService() {
@ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = AppServiceCatalogAndCustomerMapping.class))) })
@PostMapping("/internal/catalog-service-mapping")
public AppServiceCatalogAndCustomerMapping createCatalogServiceMapping(
@RequestBody AppServiceCatalogAndCustomerMappingPojo appServiceCatalogAndCustomerMapping) {
@Valid @RequestBody AppServiceCatalogAndCustomerMappingPojo appServiceCatalogAndCustomerMapping) {
return appDetailsService.createCatalogServiceMapping(appServiceCatalogAndCustomerMapping);
}

Expand Down
31 changes: 27 additions & 4 deletions src/main/java/org/eclipse/tractusx/autosetup/model/AppDetailsRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,54 @@

package org.eclipse.tractusx.autosetup.model;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import lombok.Data;

@Data
public class AppDetailsRequest {

@NotBlank(message = "AppName is mandatory")
@Pattern(regexp = "[a-zA-ZÀ-ÿ0-9][a-zA-ZÀ-ÿ0-9\\-_]+", message = "AppName should not contains special characters")
private String appName;

@NotBlank(message = "ContextCluster is mandatory")
@Pattern(regexp = "[a-zA-ZÀ-ÿ0-9][a-zA-ZÀ-ÿ0-9\\-_]+", message = "ContextCluster should not contains special characters")
private String contextCluster;

@NotBlank(message = "ContextNamespace is mandatory")
@Pattern(regexp = "[a-zA-ZÀ-ÿ0-9][a-zA-ZÀ-ÿ0-9\\-_]+", message = "ContextNamespace should not contains special characters")
private String contextNamespace;

@NotBlank(message = "PackageIdentifier is mandatory")
@Pattern(regexp = "[a-zA-ZÀ-ÿ0-9][a-zA-ZÀ-ÿ0-9\\-_./]+", message = "PackageIdentifier should not contains special characters")
private String packageIdentifier;

@NotBlank(message = "PluginName is mandatory")
@Pattern(regexp = "[a-zA-ZÀ-ÿ0-9][a-zA-ZÀ-ÿ0-9\\-_./]+", message = "PluginName should not contains special characters")
private String pluginName;

@NotBlank(message = "PluginVersion is mandatory")
@Pattern(regexp = "[a-zA-ZÀ-ÿ0-9][a-zA-ZÀ-ÿ0-9\\-_./]+", message = "PluginVersion should not contains special characters")
private String pluginVersion;

@NotBlank(message = "PackageVersion is mandatory")
@Pattern(regexp = "[a-zA-ZÀ-ÿ0-9][a-zA-ZÀ-ÿ0-9\\-_./]+", message = "PackageVersion should not contains special characters")
private String packageVersion;


@NotBlank(message = "ExpectedInputData is mandatory")
@Pattern(regexp = "[a-zA-ZÀ-ÿ0-9 \"$\n\t\\{\\},\\-_./:=\\[\\]]+", message = "ExpectedInputData should not contains special characters")
private String expectedInputData;


@Pattern(regexp = "[a-zA-ZÀ-ÿ0-9][a-zA-ZÀ-ÿ0-9\\-_]+", message = "OutputData should not contains special characters")
private String outputData;


@NotBlank(message = "RequiredYamlConfiguration is mandatory")
@Pattern(regexp = "[a-zA-ZÀ-ÿ0-9 \"$\n\t\\{\\},\\-_./:=\\[\\]]+", message = "RequiredYamlConfiguration should not contains special characters")
private String requiredYamlConfiguration;


@NotBlank(message = "YamlValueFieldType is mandatory")
@Pattern(regexp = "[a-zA-ZÀ-ÿ0-9 \"$\n\t\\{\\},\\-_./:=\\[\\]]+", message = "YamlValueFieldType should not contains special characters")
private String yamlValueFieldType;

}
10 changes: 10 additions & 0 deletions ...in/java/org/eclipse/tractusx/autosetup/model/AppServiceCatalogAndCustomerMappingPojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@

package org.eclipse.tractusx.autosetup.model;

import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
Expand All @@ -31,12 +34,19 @@
@AllArgsConstructor
public class AppServiceCatalogAndCustomerMappingPojo {

@NotBlank(message = "Customer is mandatory")
@Pattern(regexp = "[a-zA-ZÀ-ÿ0-9][a-zA-ZÀ-ÿ0-9\\-_]+", message = "Customer should not contains special characters")
private String customer;

@NotBlank(message = "ServiceId is mandatory")
@Pattern(regexp = "[a-zA-ZÀ-ÿ0-9][a-zA-ZÀ-ÿ0-9\\-_]+", message = "ServiceId should not contains special characters")
private String serviceId;

@Valid
private AppServiceCatalogPojo serviceCatalog;

@NotBlank(message = "CanonicalId is mandatory")
@Pattern(regexp = "[a-zA-ZÀ-ÿ0-9][a-zA-ZÀ-ÿ0-9\\-_]+", message = "CanonicalId should not contains special characters")
private String canonicalId;

}
10 changes: 10 additions & 0 deletions src/main/java/org/eclipse/tractusx/autosetup/model/AppServiceCatalogPojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

package org.eclipse.tractusx.autosetup.model;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
Expand All @@ -31,12 +33,20 @@
@NoArgsConstructor
public class AppServiceCatalogPojo {

@NotBlank(message = "CanonicalServiceId is mandatory")
@Pattern(regexp = "[a-zA-ZÀ-ÿ0-9][a-zA-ZÀ-ÿ0-9\\-_]+", message = "CanonicalServiceId should not contains special characters")
private String canonicalServiceId;

@NotBlank(message = "Name is mandatory")
@Pattern(regexp = "[a-zA-ZÀ-ÿ0-9][a-zA-ZÀ-ÿ0-9\\-_]+", message = "Name should not contains special characters")
private String name;

@NotBlank(message = "Workflow is mandatory")
@Pattern(regexp = "[a-zA-ZÀ-ÿ0-9][a-zA-ZÀ-ÿ0-9\\-_]+", message = "Workflow should not contains special characters")
private String workflow;

@NotBlank(message = "ServiceTools is mandatory")
@Pattern(regexp = "[a-zA-ZÀ-ÿ0-9 \"$\n\t\\{\\},\\-_./:=\\[\\]]+", message = "ServiceTools should not contains special characters")
private String serviceTools;

}