[incubator-kie-issues#1572] Fix CVE-2024-40094 (#2127)

apache · Oct 25, 2024 · a8825b4 · a8825b4
1 parent 7b582c8
commit a8825b4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/...data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLInstrumentation.java b/...data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLInstrumentation.java
@@ -20,6 +20,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 
+import graphql.execution.instrumentation.InstrumentationState;
 import graphql.execution.instrumentation.SimpleInstrumentation;
 import graphql.execution.instrumentation.parameters.InstrumentationExecutionParameters;
 import graphql.execution.instrumentation.parameters.InstrumentationFieldFetchParameters;
@@ -36,7 +37,7 @@ public class GraphQLInstrumentation extends SimpleInstrumentation {
     GraphQLSchemaManager manager;
 
     @Override
-    public DataFetcher<?> instrumentDataFetcher(DataFetcher<?> dataFetcher, InstrumentationFieldFetchParameters parameters) {
+    public DataFetcher<?> instrumentDataFetcher(DataFetcher<?> dataFetcher, InstrumentationFieldFetchParameters parameters, InstrumentationState instrumentationState) {
         if (parameters.getEnvironment().getSource() instanceof JsonNode && dataFetcher instanceof PropertyDataFetcher) {
             return new JsonPropertyDataFetcher();
         } else {
@@ -45,7 +46,7 @@ public DataFetcher<?> instrumentDataFetcher(DataFetcher<?> dataFetcher, Instrume
     }
 
     @Override
-    public GraphQLSchema instrumentSchema(GraphQLSchema schema, InstrumentationExecutionParameters parameters) {
+    public GraphQLSchema instrumentSchema(GraphQLSchema schema, InstrumentationExecutionParameters parameters, InstrumentationState instrumentationState) {
         return manager.getGraphQLSchema();
     }
 }
diff --git a/...xecutor/jitexecutor-common/src/main/java/org/kie/kogito/jitexecutor/common/Constants.java b/...xecutor/jitexecutor-common/src/main/java/org/kie/kogito/jitexecutor/common/Constants.java
@@ -6,9 +6,9 @@
  * to you 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
- * <p>
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
  * 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

diff --git a/kogito-apps-build-parent/pom.xml b/kogito-apps-build-parent/pom.xml
@@ -190,6 +190,11 @@
                 <artifactId>hibernate-ant</artifactId>
                 <version>${version.org.hibernate}</version>
             </dependency>
+            <dependency>
+                <groupId>com.graphql-java</groupId>
+                <artifactId>graphql-java</artifactId>
+                <version>${version.com.graphql-java-extended-scalars}</version>
+            </dependency>
             <dependency>
                 <groupId>com.graphql-java</groupId>
                 <artifactId>graphql-java-extended-scalars</artifactId>