hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-02 04:05:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Java: Rename MaD to summary.

Browse Source
This commit is contained in:
Michael Nebel
2024-05-06 13:03:38 +02:00
parent a33393d452
commit 51e7f3be1a
18 changed files with 369 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/ql/test/utils/modelgenerator/dataflow/p/Factory.java
View File

@@ -6,12 +6,12 @@ public final class Factory {
private int intValue;
// MaD=p;Factory;false;create;(String,int);;Argument[0];ReturnValue;taint;df-generated
// summary=p;Factory;false;create;(String,int);;Argument[0];ReturnValue;taint;df-generated
public static Factory create(String value, int foo) {
return new Factory(value, foo);
}
// MaD=p;Factory;false;create;(String);;Argument[0];ReturnValue;taint;df-generated
// summary=p;Factory;false;create;(String);;Argument[0];ReturnValue;taint;df-generated
public static Factory create(String value) {
return new Factory(value, 0);
}
@@ -21,7 +21,7 @@ public final class Factory {
this.intValue = intValue;
}
// MaD=p;Factory;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
// summary=p;Factory;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
public String getValue() {
return value;
}

2
java/ql/test/utils/modelgenerator/dataflow/p/FinalClass.java
View File

@@ -4,7 +4,7 @@ public final class FinalClass {
private static final String C = "constant";
// MaD=p;FinalClass;false;returnsInput;(String);;Argument[0];ReturnValue;taint;df-generated
// summary=p;FinalClass;false;returnsInput;(String);;Argument[0];ReturnValue;taint;df-generated
public String returnsInput(String input) {
return input;
}

2
java/ql/test/utils/modelgenerator/dataflow/p/FluentAPI.java
View File

@@ -2,7 +2,7 @@ package p;
public final class FluentAPI {
// MaD=p;FluentAPI;false;returnsThis;(String);;Argument[this];ReturnValue;value;df-generated
// summary=p;FluentAPI;false;returnsThis;(String);;Argument[this];ReturnValue;value;df-generated
public FluentAPI returnsThis(String input) {
return this;
}

8
java/ql/test/utils/modelgenerator/dataflow/p/ImmutablePojo.java
View File

@@ -6,13 +6,13 @@ public final class ImmutablePojo {
private final long x;
// MaD=p;ImmutablePojo;false;ImmutablePojo;(String,int);;Argument[0];Argument[this];taint;df-generated
// summary=p;ImmutablePojo;false;ImmutablePojo;(String,int);;Argument[0];Argument[this];taint;df-generated
public ImmutablePojo(String value, int x) {
this.value = value;
this.x = x;
}
// MaD=p;ImmutablePojo;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
// summary=p;ImmutablePojo;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
public String getValue() {
return value;
}
@@ -21,8 +21,8 @@ public final class ImmutablePojo {
return x;
}
// MaD=p;ImmutablePojo;false;or;(String);;Argument[0];ReturnValue;taint;df-generated
// MaD=p;ImmutablePojo;false;or;(String);;Argument[this];ReturnValue;taint;df-generated
// summary=p;ImmutablePojo;false;or;(String);;Argument[0];ReturnValue;taint;df-generated
// summary=p;ImmutablePojo;false;or;(String);;Argument[this];ReturnValue;taint;df-generated
public String or(String defaultValue) {
return value != null ? value : defaultValue;
}

4
java/ql/test/utils/modelgenerator/dataflow/p/InnerClasses.java
View File

@@ -9,13 +9,13 @@ public class InnerClasses {
}
public class CaptureMe {
// MaD=p;InnerClasses$CaptureMe;true;yesCm;(String);;Argument[0];ReturnValue;taint;df-generated
// summary=p;InnerClasses$CaptureMe;true;yesCm;(String);;Argument[0];ReturnValue;taint;df-generated
public String yesCm(String input) {
return input;
}
}
// MaD=p;InnerClasses;true;yes;(String);;Argument[0];ReturnValue;taint;df-generated
// summary=p;InnerClasses;true;yes;(String);;Argument[0];ReturnValue;taint;df-generated
public String yes(String input) {
return input;
}

8
java/ql/test/utils/modelgenerator/dataflow/p/InnerHolder.java
View File

@@ -18,22 +18,22 @@ public final class InnerHolder {
private StringBuilder sb = new StringBuilder();
// MaD=p;InnerHolder;false;setContext;(String);;Argument[0];Argument[this];taint;df-generated
// summary=p;InnerHolder;false;setContext;(String);;Argument[0];Argument[this];taint;df-generated
public void setContext(String value) {
context = new Context(value);
}
// MaD=p;InnerHolder;false;explicitSetContext;(String);;Argument[0];Argument[this];taint;df-generated
// summary=p;InnerHolder;false;explicitSetContext;(String);;Argument[0];Argument[this];taint;df-generated
public void explicitSetContext(String value) {
this.context = new Context(value);
}
// MaD=p;InnerHolder;false;append;(String);;Argument[0];Argument[this];taint;df-generated
// summary=p;InnerHolder;false;append;(String);;Argument[0];Argument[this];taint;df-generated
public void append(String value) {
sb.append(value);
}
// MaD=p;InnerHolder;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
// summary=p;InnerHolder;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
public String getValue() {
return context.getValue();
}

16
java/ql/test/utils/modelgenerator/dataflow/p/Joiner.java
View File

@@ -12,14 +12,14 @@ public final class Joiner {
private int len;
private String emptyValue;
// MaD=p;Joiner;false;Joiner;(CharSequence);;Argument[0];Argument[this];taint;df-generated
// summary=p;Joiner;false;Joiner;(CharSequence);;Argument[0];Argument[this];taint;df-generated
public Joiner(CharSequence delimiter) {
this(delimiter, "", "");
}
// MaD=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[0];Argument[this];taint;df-generated
// MaD=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[1];Argument[this];taint;df-generated
// MaD=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[2];Argument[this];taint;df-generated
// summary=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[0];Argument[this];taint;df-generated
// summary=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[1];Argument[this];taint;df-generated
// summary=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[2];Argument[this];taint;df-generated
public Joiner(CharSequence delimiter, CharSequence prefix, CharSequence suffix) {
Objects.requireNonNull(prefix, "The prefix must not be null");
Objects.requireNonNull(delimiter, "The delimiter must not be null");
@@ -30,8 +30,8 @@ public final class Joiner {
checkAddLength(0, 0);
}
// MaD=p;Joiner;false;setEmptyValue;(CharSequence);;Argument[0];Argument[this];taint;df-generated
// MaD=p;Joiner;false;setEmptyValue;(CharSequence);;Argument[this];ReturnValue;value;df-generated
// summary=p;Joiner;false;setEmptyValue;(CharSequence);;Argument[0];Argument[this];taint;df-generated
// summary=p;Joiner;false;setEmptyValue;(CharSequence);;Argument[this];ReturnValue;value;df-generated
public Joiner setEmptyValue(CharSequence emptyValue) {
this.emptyValue =
Objects.requireNonNull(emptyValue, "The empty value must not be null").toString();
@@ -70,7 +70,7 @@ public final class Joiner {
return new String(chars);
}
// MaD=p;Joiner;false;add;(CharSequence);;Argument[this];ReturnValue;value;df-generated
// summary=p;Joiner;false;add;(CharSequence);;Argument[this];ReturnValue;value;df-generated
public Joiner add(CharSequence newElement) {
final String elt = String.valueOf(newElement);
if (elts == null) {
@@ -93,7 +93,7 @@ public final class Joiner {
return (int) newLen;
}
// MaD=p;Joiner;false;merge;(Joiner);;Argument[this];ReturnValue;value;df-generated
// summary=p;Joiner;false;merge;(Joiner);;Argument[this];ReturnValue;value;df-generated
public Joiner merge(Joiner other) {
Objects.requireNonNull(other);
if (other.elts == null) {

2
java/ql/test/utils/modelgenerator/dataflow/p/MultipleImpl2.java
View File

@@ -6,7 +6,7 @@ class MultipleImpl2 {
// This is used to test that we only generate a summary model and
// not neutral summary model for `IInterface.m`.
public interface IInterface {
// MaD=p;MultipleImpl2$IInterface;true;m;(Object);;Argument[0];ReturnValue;taint;df-generated
// summary=p;MultipleImpl2$IInterface;true;m;(Object);;Argument[0];ReturnValue;taint;df-generated
Object m(Object value);
}

6
java/ql/test/utils/modelgenerator/dataflow/p/MultipleImpls.java
View File

@@ -5,8 +5,8 @@ import java.util.concurrent.Callable;
public class MultipleImpls {
public static interface Strategy {
// MaD=p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];Argument[this];taint;df-generated
// MaD=p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];ReturnValue;taint;df-generated
// summary=p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];Argument[this];taint;df-generated
// summary=p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];ReturnValue;taint;df-generated
String doSomething(String value);
}
@@ -33,7 +33,7 @@ public class MultipleImpls {
return "none";
}
// MaD=p;MultipleImpls$Strat2;true;getValue;();;Argument[this];ReturnValue;taint;df-generated
// summary=p;MultipleImpls$Strat2;true;getValue;();;Argument[this];ReturnValue;taint;df-generated
public String getValue() {
return this.foo;
}

22
java/ql/test/utils/modelgenerator/dataflow/p/ParamFlow.java
View File

@@ -7,7 +7,7 @@ import java.util.List;
public class ParamFlow {
// MaD=p;ParamFlow;true;returnsInput;(String);;Argument[0];ReturnValue;taint;df-generated
// summary=p;ParamFlow;true;returnsInput;(String);;Argument[0];ReturnValue;taint;df-generated
public String returnsInput(String input) {
return input;
}
@@ -16,8 +16,8 @@ public class ParamFlow {
return input.length();
}
// MaD=p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[0];ReturnValue;taint;df-generated
// MaD=p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[1];ReturnValue;taint;df-generated
// summary=p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[0];ReturnValue;taint;df-generated
// summary=p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[1];ReturnValue;taint;df-generated
public String returnMultipleParameters(String one, String two) {
if (System.currentTimeMillis() > 100) {
return two;
@@ -25,27 +25,27 @@ public class ParamFlow {
return one;
}
// MaD=p;ParamFlow;true;returnArrayElement;(String[]);;Argument[0].ArrayElement;ReturnValue;taint;df-generated
// summary=p;ParamFlow;true;returnArrayElement;(String[]);;Argument[0].ArrayElement;ReturnValue;taint;df-generated
public String returnArrayElement(String[] input) {
return input[0];
}
// MaD=p;ParamFlow;true;returnVarArgElement;(String[]);;Argument[0].ArrayElement;ReturnValue;taint;df-generated
// summary=p;ParamFlow;true;returnVarArgElement;(String[]);;Argument[0].ArrayElement;ReturnValue;taint;df-generated
public String returnVarArgElement(String... input) {
return input[0];
}
// MaD=p;ParamFlow;true;returnCollectionElement;(List);;Argument[0].Element;ReturnValue;taint;df-generated
// summary=p;ParamFlow;true;returnCollectionElement;(List);;Argument[0].Element;ReturnValue;taint;df-generated
public String returnCollectionElement(List<String> input) {
return input.get(0);
}
// MaD=p;ParamFlow;true;returnIteratorElement;(Iterator);;Argument[0].Element;ReturnValue;taint;df-generated
// summary=p;ParamFlow;true;returnIteratorElement;(Iterator);;Argument[0].Element;ReturnValue;taint;df-generated
public String returnIteratorElement(Iterator<String> input) {
return input.next();
}
// MaD=p;ParamFlow;true;returnIterableElement;(Iterable);;Argument[0].Element;ReturnValue;taint;df-generated
// summary=p;ParamFlow;true;returnIterableElement;(Iterable);;Argument[0].Element;ReturnValue;taint;df-generated
public String returnIterableElement(Iterable<String> input) {
return input.iterator().next();
}
@@ -54,17 +54,17 @@ public class ParamFlow {
return input;
}
// MaD=p;ParamFlow;true;writeChunked;(byte[],OutputStream);;Argument[0];Argument[1];taint;df-generated
// summary=p;ParamFlow;true;writeChunked;(byte[],OutputStream);;Argument[0];Argument[1];taint;df-generated
public void writeChunked(byte[] data, OutputStream output) throws IOException {
output.write(data, 0, data.length);
}
// MaD=p;ParamFlow;true;writeChunked;(char[],OutputStream);;Argument[0];Argument[1];taint;df-generated
// summary=p;ParamFlow;true;writeChunked;(char[],OutputStream);;Argument[0];Argument[1];taint;df-generated
public void writeChunked(char[] data, OutputStream output) throws IOException {
output.write(String.valueOf(data).getBytes(), 0, data.length);
}
// MaD=p;ParamFlow;true;addTo;(String,List);;Argument[0];Argument[1].Element;taint;df-generated
// summary=p;ParamFlow;true;addTo;(String,List);;Argument[0];Argument[1].Element;taint;df-generated
public void addTo(String data, List<String> target) {
target.add(data);
}

14
java/ql/test/utils/modelgenerator/dataflow/p/Pojo.java
View File

@@ -30,12 +30,12 @@ public final class Pojo {
private List<Character> charList = Arrays.asList('a', 'b', 'c');
private Byte[] byteObjectArray = new Byte[] {1, 2, 3};
// MaD=p;Pojo;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
// summary=p;Pojo;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
public String getValue() {
return value;
}
// MaD=p;Pojo;false;setValue;(String);;Argument[0];Argument[this];taint;df-generated
// summary=p;Pojo;false;setValue;(String);;Argument[0];Argument[this];taint;df-generated
public void setValue(String value) {
this.value = value;
}
@@ -57,12 +57,12 @@ public final class Pojo {
return new int[] {intValue};
}
// MaD=p;Pojo;false;getCharArray;();;Argument[this];ReturnValue;taint;df-generated
// summary=p;Pojo;false;getCharArray;();;Argument[this];ReturnValue;taint;df-generated
public char[] getCharArray() {
return charArray;
}
// MaD=p;Pojo;false;getByteArray;();;Argument[this];ReturnValue;taint;df-generated
// summary=p;Pojo;false;getByteArray;();;Argument[this];ReturnValue;taint;df-generated
public byte[] getByteArray() {
return byteArray;
}
@@ -79,12 +79,12 @@ public final class Pojo {
return List.of(Integer.valueOf(intValue));
}
// MaD=p;Pojo;false;getBoxedChars;();;Argument[this];ReturnValue;taint;df-generated
// summary=p;Pojo;false;getBoxedChars;();;Argument[this];ReturnValue;taint;df-generated
public List<Character> getBoxedChars() {
return charList;
}
// MaD=p;Pojo;false;getBoxedBytes;();;Argument[this];ReturnValue;taint;df-generated
// summary=p;Pojo;false;getBoxedBytes;();;Argument[this];ReturnValue;taint;df-generated
public Byte[] getBoxedBytes() {
return byteObjectArray;
}
@@ -97,7 +97,7 @@ public final class Pojo {
return new BigDecimal(value);
}
// MaD=p;Pojo;false;fillIn;(List);;Argument[this];Argument[0].Element;taint;df-generated
// summary=p;Pojo;false;fillIn;(List);;Argument[this];Argument[0].Element;taint;df-generated
public void fillIn(List<String> target) {
target.add(value);
}

4
java/ql/test/utils/modelgenerator/dataflow/p/PrivateFlowViaPublicInterface.java
View File

@@ -12,7 +12,7 @@ public class PrivateFlowViaPublicInterface {
}
public static interface SPI {
// MaD=p;PrivateFlowViaPublicInterface$SPI;true;openStream;();;Argument[this];ReturnValue;taint;df-generated
// summary=p;PrivateFlowViaPublicInterface$SPI;true;openStream;();;Argument[this];ReturnValue;taint;df-generated
OutputStream openStream() throws IOException;
default OutputStream openStreamNone() throws IOException {
@@ -50,7 +50,7 @@ public class PrivateFlowViaPublicInterface {
}
}
// MaD=p;PrivateFlowViaPublicInterface;true;createAnSPI;(File);;Argument[0];ReturnValue;taint;df-generated
// summary=p;PrivateFlowViaPublicInterface;true;createAnSPI;(File);;Argument[0];ReturnValue;taint;df-generated
public static SPI createAnSPI(File file) {
return new PrivateImplWithSink(file);
}