Skip to content

fix regex expression prone to backtracking in JavaClientCodegen #1388

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

Merged
djankows merged 1 commit into from
Nov 3, 2025
Merged

fix regex expression prone to backtracking in JavaClientCodegen #1388

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
4 changes: 2 additions & 2 deletions src/main/java/io/swagger/codegen/v3/generators/java/JavaClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,8 +608,8 @@ public void setUseRuntimeException(boolean useRuntimeException) {
this.useRuntimeException = useRuntimeException;
}

final private static Pattern JSON_MIME_PATTERN = Pattern.compile("(?i)application\\/json(;.*)?");
final private static Pattern JSON_VENDOR_MIME_PATTERN = Pattern.compile("(?i)application\\/vnd.(.*)+json(;.*)?");
private static final Pattern JSON_MIME_PATTERN = Pattern.compile("(?i)application/json(;.*)?");
private static final Pattern JSON_VENDOR_MIME_PATTERN = Pattern.compile("(?i)application/vnd\\..*\\+json(;.*)?");

/**
* Check if the given MIME is a JSON MIME.
Expand Down
3 changes: 1 addition & 2 deletions src/test/java/io/swagger/codegen/v3/generators/java/JavaCXFClientCodegenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
public class JavaCXFClientCodegenTest extends AbstractCodegenTest {

@Test
public void responseWithoutContent() throws Exception {
public void responseWithoutContent() {
final OpenAPI openAPI = getOpenAPI("3_0_0/response_without_content.yaml");
final Operation operation = openAPI.getPaths().get("/pets").getGet();

Expand All @@ -42,5 +42,4 @@ public void responseWithoutContent() throws Exception {
Assert.assertEquals(cr2.vendorExtensions.get("x-java-is-response-void"), Boolean.TRUE);
}


}
27 changes: 20 additions & 7 deletions src/test/java/io/swagger/codegen/v3/generators/java/JavaClientCodegenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,10 @@
import io.swagger.codegen.v3.CodegenModelType;
import io.swagger.codegen.v3.CodegenParameter;
import io.swagger.codegen.v3.CodegenProperty;
import io.swagger.codegen.v3.CodegenSchema;
import io.swagger.codegen.v3.ISchemaHandler;
import io.swagger.codegen.v3.generators.AbstractCodegenTest;
import io.swagger.codegen.v3.generators.CodegenWrapper;
import io.swagger.codegen.v3.generators.DefaultCodegenConfig;
import io.swagger.codegen.v3.generators.SchemaHandler;
import io.swagger.util.Json;
import io.swagger.util.Yaml;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.ComposedSchema;
Expand All @@ -25,9 +21,6 @@
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.media.StringSchema;
import io.swagger.v3.oas.models.parameters.RequestBody;
import io.swagger.v3.parser.OpenAPIV3Parser;
import io.swagger.v3.parser.core.models.ParseOptions;
import io.swagger.v3.parser.core.models.SwaggerParseResult;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.testng.Assert;
import org.testng.annotations.Test;
Expand All @@ -42,6 +35,26 @@

public class JavaClientCodegenTest extends AbstractCodegenTest {

@Test
public void testIsJsonMimeType() {
Assert.assertTrue(JavaClientCodegen.isJsonMimeType("application/json"));
Assert.assertTrue(JavaClientCodegen.isJsonMimeType("application/json; charset=UTF8"));
Assert.assertTrue(JavaClientCodegen.isJsonMimeType("APPLICATION/JSON"));
Assert.assertFalse(JavaClientCodegen.isJsonMimeType("text/plain"));
Assert.assertFalse(JavaClientCodegen.isJsonMimeType(null));
Assert.assertFalse(JavaClientCodegen.isJsonMimeType("application/vnd.mycompany+json"));
}

@Test
public void testIsJsonVendorMimeType() {
Assert.assertTrue(JavaClientCodegen.isJsonVendorMimeType("application/vnd.mycompany+json"));
Assert.assertTrue(JavaClientCodegen.isJsonVendorMimeType("application/vnd.mycompany.resourceA.version1+json"));
Assert.assertTrue(JavaClientCodegen.isJsonVendorMimeType("application/vnd.test+json; charset=UTF8"));
Assert.assertFalse(JavaClientCodegen.isJsonVendorMimeType("application/json"));
Assert.assertFalse(JavaClientCodegen.isJsonVendorMimeType("text/plain"));
Assert.assertFalse(JavaClientCodegen.isJsonVendorMimeType(null));
}

@Test
public void modelInheritanceSupportInGson() throws Exception {
List allModels = new ArrayList();
Expand Down