diff --git a/pom.xml b/pom.xml index 20a81025..5c603a36 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.1.1 2.17.1 2.18.1 - 5.47.0 + 5.47.1 1.14.2 1.22.0 2.24.0 @@ -266,7 +266,6 @@ true com.github.nramc.recipes.sources - org.openrewrite.java.security.OwaspTopTen.customized com.github.nramc.recipes.testing diff --git a/rewrite.yml b/rewrite.yml index d1b1654b..82ce5cbd 100644 --- a/rewrite.yml +++ b/rewrite.yml @@ -13,30 +13,6 @@ recipeList: - org.openrewrite.recipes.JavaRecipeBestPractices # - org.openrewrite.java.AddApache2LicenseHeader ---- -type: specs.openrewrite.org/v1beta/recipe -name: org.openrewrite.java.security.OwaspTopTen.customized -displayName: "Remediate vulnerabilities from the OWASP Top Ten" -description: "[ OWASP ](https://owasp.org) publishes a list of the most impactful common security vulnerabilities. These recipes identify and remediate vulnerabilities from the OWASP Top Ten." -recipeList: - - org.openrewrite.java.security.OwaspA01 - - org.openrewrite.java.security.OwaspA02 - - org.openrewrite.java.security.OwaspA03 - - org.openrewrite.java.security.OwaspA05 - - org.openrewrite.java.security.OwaspA06 - # Customized OwaspA08 to exclude CSRF protection recipe - # - org.openrewrite.java.security.OwaspA08 - - org.openrewrite.java.security.marshalling.InsecureJmsDeserialization - - org.openrewrite.java.security.marshalling.SecureSnakeYamlConstructor - - org.openrewrite.java.security.marshalling.SecureJacksonDefaultTyping - - org.openrewrite.java.security.search.FindJacksonDefaultTypeMapping - - org.openrewrite.java.security.search.FindVulnerableJacksonJsonTypeInfo - - org.openrewrite.java.security.SecureTempFileCreation - - org.openrewrite.java.security.FindTextDirectionChanges - - org.openrewrite.java.security.UseFilesCreateTempDirectory -# Excluded CSRF protection recipe due to stateless session -# - org.openrewrite.java.security.spring.CsrfProtection - --- type: specs.openrewrite.org/v1beta/recipe name: com.github.nramc.recipes.testing diff --git a/src/test/java/com/github/nramc/dev/journey/api/core/utils/StringObfuscatorTest.java b/src/test/java/com/github/nramc/dev/journey/api/core/utils/StringObfuscatorTest.java index a854de05..b0a9a667 100644 --- a/src/test/java/com/github/nramc/dev/journey/api/core/utils/StringObfuscatorTest.java +++ b/src/test/java/com/github/nramc/dev/journey/api/core/utils/StringObfuscatorTest.java @@ -12,7 +12,7 @@ class StringObfuscatorTest { @CsvSource({ "Test, T***", "Test Test, T********", - "Test123, T******", + "Test123, T******" }) void obfuscate_WhenNumberOfVisibleCharactersNotSpecified_shouldConsiderDefaultVisibleCharacters(String string, String expectedObfuscatedString) { assertThat(StringObfuscator.obfuscate(string)).isEqualTo(expectedObfuscatedString); diff --git a/src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/update/images/UpdateJourneyImagesDetailsResourceTest.java b/src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/update/images/UpdateJourneyImagesDetailsResourceTest.java index ed48d0e0..911f2bff 100644 --- a/src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/update/images/UpdateJourneyImagesDetailsResourceTest.java +++ b/src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/update/images/UpdateJourneyImagesDetailsResourceTest.java @@ -50,7 +50,7 @@ class UpdateJourneyImagesDetailsResourceTest { jsonPath("$.tags").value(hasItems("travel", "germany", "munich")), jsonPath("$.thumbnail").value("https://example.com/thumbnail.png"), jsonPath("$.journeyDate").value("2024-03-27"), - jsonPath("$.createdDate").value("2024-03-27"), + jsonPath("$.createdDate").value("2024-03-27") }; @Autowired private MockMvc mockMvc; diff --git a/src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/update/publish/PublishJourneyResourceTest.java b/src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/update/publish/PublishJourneyResourceTest.java index 2936cbb0..9c22d7f2 100644 --- a/src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/update/publish/PublishJourneyResourceTest.java +++ b/src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/update/publish/PublishJourneyResourceTest.java @@ -60,7 +60,7 @@ class PublishJourneyResourceTest { jsonPath("$.tags").value(hasItems("travel", "germany", "munich")), jsonPath("$.thumbnail").value("https://example.com/thumbnail.png"), jsonPath("$.journeyDate").value("2024-03-27"), - jsonPath("$.createdDate").value("2024-03-27"), + jsonPath("$.createdDate").value("2024-03-27") }; private static final Set DEFAULT_VISIBILITY = Set.of(MYSELF); @Autowired diff --git a/src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/update/videos/UpdateJourneyVideosDetailsResourceTest.java b/src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/update/videos/UpdateJourneyVideosDetailsResourceTest.java index e380a2d6..3580fc79 100644 --- a/src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/update/videos/UpdateJourneyVideosDetailsResourceTest.java +++ b/src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/update/videos/UpdateJourneyVideosDetailsResourceTest.java @@ -48,7 +48,7 @@ class UpdateJourneyVideosDetailsResourceTest { jsonPath("$.tags").value(hasItems("travel", "germany", "munich")), jsonPath("$.thumbnail").value("https://example.com/thumbnail.png"), jsonPath("$.journeyDate").value("2024-03-27"), - jsonPath("$.createdDate").value("2024-03-27"), + jsonPath("$.createdDate").value("2024-03-27") }; @Autowired