From 0b3583b5e9cca314a80fb2f0312c676558469446 Mon Sep 17 00:00:00 2001 From: Kristen Newbury Date: Tue, 10 Nov 2026 14:14:47 -0500 Subject: [PATCH 1/3] Add reactor.core.publisher.model.json for java --- .../lib/ext/reactor.core.publisher.model.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 java/ql/lib/ext/reactor.core.publisher.model.json diff --git a/java/ql/lib/ext/reactor.core.publisher.model.json b/java/ql/lib/ext/reactor.core.publisher.model.json new file mode 100644 index 000000000000..c0c83999dd1c --- /dev/null +++ b/java/ql/lib/ext/reactor.core.publisher.model.json @@ -0,0 +1,17 @@ +{ + "extensions": [ + { + "addsTo": { + "pack": "codeql/java-all", + "extensible": "summaryModel" + }, + "data": [ + ["reactor.core.publisher", "Mono", true, "justOrEmpty", "", "", "Argument[0]", "Argument[this]", "taint", "manual"], + ["reactor.core.publisher", "Mono", true, "just", "", "", "Argument[0]", "Argument[this]", "taint", "manual"], + ["reactor.core.publisher", "Mono", true, "flatMap", "", "", "Argument[this].Element", "Argument[0].Parameter[0]", "taint", "manual"], + ["reactor.core.publisher", "Mono", true, "map", "", "", "Argument[this].Element", "Argument[0].Parameter[0]", "taint", "manual"], + ["reactor.core.publisher", "Mono", true, "mapNotNull", "", "", "Argument[this].Element", "Argument[0].Parameter[0]", "taint", "manual"] + ] + } + ] +} \ No newline at end of file From 0eb81a591a3787c7fd117dbb9f9a6abd8d39921b Mon Sep 17 00:00:00 2001 From: Kristen Newbury Date: Tue, 10 Nov 2026 14:49:50 -0500 Subject: [PATCH 2/3] Add tests and stubs for java reactor-core --- .../frameworks/reactor-core/Test.java | 67 ++++++ .../frameworks/reactor-core/options | 1 + .../frameworks/reactor-core/test.expected | 0 .../frameworks/reactor-core/test.ql | 18 ++ java/ql/test/stubs/reactor-core/LICENSE.txt | 201 ++++++++++++++++++ .../reactor/core/publisher/Mono.java | 30 +++ 6 files changed, 317 insertions(+) create mode 100644 java/ql/test/library-tests/frameworks/reactor-core/Test.java create mode 100644 java/ql/test/library-tests/frameworks/reactor-core/options create mode 100644 java/ql/test/library-tests/frameworks/reactor-core/test.expected create mode 100644 java/ql/test/library-tests/frameworks/reactor-core/test.ql create mode 100644 java/ql/test/stubs/reactor-core/LICENSE.txt create mode 100644 java/ql/test/stubs/reactor-core/reactor/core/publisher/Mono.java diff --git a/java/ql/test/library-tests/frameworks/reactor-core/Test.java b/java/ql/test/library-tests/frameworks/reactor-core/Test.java new file mode 100644 index 000000000000..fd11871d1a0e --- /dev/null +++ b/java/ql/test/library-tests/frameworks/reactor-core/Test.java @@ -0,0 +1,67 @@ +import java.util.Optional; +import reactor.core.publisher.Mono; + +public class Test { + + void sink(Object o) {} + + String taint() { + return null; + } + + void testJust() { + Mono unsafe = Mono.just(taint()); + sink(unsafe); // $ hasTaintFlow + Mono safe = Mono.just("safe"); + sink(safe); // no taint flow + } + + void testJustOrEmpty() { + Mono unsafe = Mono.justOrEmpty(taint()); + sink(unsafe); // $ hasTaintFlow + Mono safe = Mono.justOrEmpty("safe"); + sink(safe); // no taint flow + } + + void testJustOrEmptyOptional() { + Mono unsafe = Mono.justOrEmpty(Optional.of(taint())); + sink(unsafe); // $ hasTaintFlow + Mono safe = Mono.justOrEmpty(Optional.of("safe")); + sink(safe); // no taint flow + Mono empty = Mono.justOrEmpty(Optional.empty()); + sink(empty); // no taint flow + } + + void testFlatMap() { + Mono.just(taint()).flatMap(value -> { + sink(value); // $ hasTaintFlow + return Mono.just("safe"); + }); + Mono.just("safe").flatMap(value -> { + sink(value); // no taint flow + return Mono.just("safe"); + }); + } + + void testMap() { + Mono.just(taint()).map(value -> { + sink(value); // $ hasTaintFlow + return "safe"; + }); + Mono.just("safe").map(value -> { + sink(value); // no taint flow + return "safe"; + }); + } + + void testMapNotNull() { + Mono.just(taint()).mapNotNull(value -> { + sink(value); // $ hasTaintFlow + return "safe"; + }); + Mono.just("safe").mapNotNull(value -> { + sink(value); // no taint flow + return "safe"; + }); + } +} \ No newline at end of file diff --git a/java/ql/test/library-tests/frameworks/reactor-core/options b/java/ql/test/library-tests/frameworks/reactor-core/options new file mode 100644 index 000000000000..b5399283a6d2 --- /dev/null +++ b/java/ql/test/library-tests/frameworks/reactor-core/options @@ -0,0 +1 @@ +//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/reactor-core diff --git a/java/ql/test/library-tests/frameworks/reactor-core/test.expected b/java/ql/test/library-tests/frameworks/reactor-core/test.expected new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/java/ql/test/library-tests/frameworks/reactor-core/test.ql b/java/ql/test/library-tests/frameworks/reactor-core/test.ql new file mode 100644 index 000000000000..948332b33da9 --- /dev/null +++ b/java/ql/test/library-tests/frameworks/reactor-core/test.ql @@ -0,0 +1,18 @@ +import java +import semmle.code.java.dataflow.TaintTracking +import semmle.code.java.dataflow.FlowSources +import utils.test.InlineFlowTest + +module Config implements DataFlow::ConfigSig { + predicate isSource(DataFlow::Node n) { + n.asExpr().(MethodCall).getMethod().hasName("taint") + or + n instanceof ActiveThreatModelSource + } + + predicate isSink(DataFlow::Node n) { + exists(MethodCall ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument()) + } +} + +import TaintFlowTest diff --git a/java/ql/test/stubs/reactor-core/LICENSE.txt b/java/ql/test/stubs/reactor-core/LICENSE.txt new file mode 100644 index 000000000000..bfad273e3d9f --- /dev/null +++ b/java/ql/test/stubs/reactor-core/LICENSE.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + https://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + 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 + + https://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. \ No newline at end of file diff --git a/java/ql/test/stubs/reactor-core/reactor/core/publisher/Mono.java b/java/ql/test/stubs/reactor-core/reactor/core/publisher/Mono.java new file mode 100644 index 000000000000..dfd4890221e6 --- /dev/null +++ b/java/ql/test/stubs/reactor-core/reactor/core/publisher/Mono.java @@ -0,0 +1,30 @@ +package reactor.core.publisher; + +import java.util.Optional; +import java.util.function.Function; + +public abstract class Mono { + public static Mono just(T value) { + return null; + } + + public static Mono justOrEmpty(T value) { + return null; + } + + public static Mono justOrEmpty(Optional value) { + return null; + } + + public final Mono flatMap(Function> mapper) { + return null; + } + + public final Mono map(Function mapper) { + return null; + } + + public final Mono mapNotNull(Function mapper) { + return null; + } +} From d5f0a052d27fd0499e58a9819c2aed657bf65f74 Mon Sep 17 00:00:00 2001 From: Owen Mansel-Chan <62447351+owen-mc@users.noreply.github.com> Date: Wed, 11 Nov 2026 12:05:52 +0000 Subject: [PATCH 3/3] Apply batched suggestions from code review Co-authored-by: Owen Mansel-Chan <62447351+owen-mc@users.noreply.github.com> --- .../lib/ext/reactor.core.publisher.model.json | 14 +++-- .../frameworks/reactor-core/Test.java | 56 +++++++++++++++---- .../frameworks/reactor-core/test.ql | 18 +----- 3 files changed, 57 insertions(+), 31 deletions(-) diff --git a/java/ql/lib/ext/reactor.core.publisher.model.json b/java/ql/lib/ext/reactor.core.publisher.model.json index c0c83999dd1c..e5de0a105b20 100644 --- a/java/ql/lib/ext/reactor.core.publisher.model.json +++ b/java/ql/lib/ext/reactor.core.publisher.model.json @@ -6,11 +6,15 @@ "extensible": "summaryModel" }, "data": [ - ["reactor.core.publisher", "Mono", true, "justOrEmpty", "", "", "Argument[0]", "Argument[this]", "taint", "manual"], - ["reactor.core.publisher", "Mono", true, "just", "", "", "Argument[0]", "Argument[this]", "taint", "manual"], - ["reactor.core.publisher", "Mono", true, "flatMap", "", "", "Argument[this].Element", "Argument[0].Parameter[0]", "taint", "manual"], - ["reactor.core.publisher", "Mono", true, "map", "", "", "Argument[this].Element", "Argument[0].Parameter[0]", "taint", "manual"], - ["reactor.core.publisher", "Mono", true, "mapNotNull", "", "", "Argument[this].Element", "Argument[0].Parameter[0]", "taint", "manual"] + ["reactor.core.publisher", "Mono", true, "justOrEmpty", "(Object)", "", "Argument[0]", "ReturnValue.Element", "value", "manual"], + ["reactor.core.publisher", "Mono", true, "justOrEmpty", "(Optional)", "", "Argument[0].Element", "ReturnValue.Element", "value", "manual"], + ["reactor.core.publisher", "Mono", true, "just", "", "", "Argument[0]", "ReturnValue.Element", "value", "manual"], + ["reactor.core.publisher", "Mono", true, "flatMap", "", "", "Argument[this].Element", "Argument[0].Parameter[0]", "value", "manual"], + ["reactor.core.publisher", "Mono", true, "flatMap", "", "", "Argument[0].ReturnValue.Element", "ReturnValue.Element", "value", "manual"], + ["reactor.core.publisher", "Mono", true, "map", "", "", "Argument[this].Element", "Argument[0].Parameter[0]", "value", "manual"], + ["reactor.core.publisher", "Mono", true, "map", "", "", "Argument[0].ReturnValue", "ReturnValue.Element", "value", "manual"], + ["reactor.core.publisher", "Mono", true, "mapNotNull", "", "", "Argument[this].Element", "Argument[0].Parameter[0]", "value", "manual"], + ["reactor.core.publisher", "Mono", true, "mapNotNull", "", "", "Argument[0].ReturnValue", "ReturnValue.Element", "value", "manual"] ] } ] diff --git a/java/ql/test/library-tests/frameworks/reactor-core/Test.java b/java/ql/test/library-tests/frameworks/reactor-core/Test.java index fd11871d1a0e..630d6671d3e2 100644 --- a/java/ql/test/library-tests/frameworks/reactor-core/Test.java +++ b/java/ql/test/library-tests/frameworks/reactor-core/Test.java @@ -11,30 +11,51 @@ String taint() { void testJust() { Mono unsafe = Mono.just(taint()); - sink(unsafe); // $ hasTaintFlow + unsafe.map(value -> { + sink(value); // $ hasValueFlow + return value; + }); Mono safe = Mono.just("safe"); - sink(safe); // no taint flow + safe.map(value -> { + sink(value); // no taint flow + return value; + }); } void testJustOrEmpty() { Mono unsafe = Mono.justOrEmpty(taint()); - sink(unsafe); // $ hasTaintFlow + unsafe.map(value -> { + sink(value); // $ hasValueFlow + return value; + }); Mono safe = Mono.justOrEmpty("safe"); - sink(safe); // no taint flow + safe.map(value -> { + sink(value); // no taint flow + return value; + }); } void testJustOrEmptyOptional() { Mono unsafe = Mono.justOrEmpty(Optional.of(taint())); - sink(unsafe); // $ hasTaintFlow + unsafe.map(value -> { + sink(value); // $ hasValueFlow + return value; + }); Mono safe = Mono.justOrEmpty(Optional.of("safe")); - sink(safe); // no taint flow + safe.map(value -> { + sink(value); // no taint flow + return value; + }); Mono empty = Mono.justOrEmpty(Optional.empty()); - sink(empty); // no taint flow + empty.map(value -> { + sink(value); // no taint flow + return value; + }); } void testFlatMap() { Mono.just(taint()).flatMap(value -> { - sink(value); // $ hasTaintFlow + sink(value); // $ hasValueFlow return Mono.just("safe"); }); Mono.just("safe").flatMap(value -> { @@ -45,7 +66,7 @@ void testFlatMap() { void testMap() { Mono.just(taint()).map(value -> { - sink(value); // $ hasTaintFlow + sink(value); // $ hasValueFlow return "safe"; }); Mono.just("safe").map(value -> { @@ -56,7 +77,7 @@ void testMap() { void testMapNotNull() { Mono.just(taint()).mapNotNull(value -> { - sink(value); // $ hasTaintFlow + sink(value); // $ hasValueFlow return "safe"; }); Mono.just("safe").mapNotNull(value -> { @@ -64,4 +85,19 @@ void testMapNotNull() { return "safe"; }); } + + void testNestedValues() { + Mono.just(Optional.of(taint())).flatMap(value -> { + sink(value.get()); // $ hasValueFlow + return Mono.just("safe"); + }); + Mono.just(Optional.of(taint())).map(value -> { + sink(value.get()); // $ hasValueFlow + return "safe"; + }); + Mono.just(Optional.of(taint())).mapNotNull(value -> { + sink(value.get()); // $ hasValueFlow + return "safe"; + }); + } } \ No newline at end of file diff --git a/java/ql/test/library-tests/frameworks/reactor-core/test.ql b/java/ql/test/library-tests/frameworks/reactor-core/test.ql index 948332b33da9..de0d4722737b 100644 --- a/java/ql/test/library-tests/frameworks/reactor-core/test.ql +++ b/java/ql/test/library-tests/frameworks/reactor-core/test.ql @@ -1,18 +1,4 @@ import java -import semmle.code.java.dataflow.TaintTracking -import semmle.code.java.dataflow.FlowSources import utils.test.InlineFlowTest - -module Config implements DataFlow::ConfigSig { - predicate isSource(DataFlow::Node n) { - n.asExpr().(MethodCall).getMethod().hasName("taint") - or - n instanceof ActiveThreatModelSource - } - - predicate isSink(DataFlow::Node n) { - exists(MethodCall ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument()) - } -} - -import TaintFlowTest +import DefaultFlowTest +import TaintFlow::PathGraph