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

Update Intent model tests, and fix models where required

Browse Source
This commit is contained in:
Chris Smowton
2021-10-06 17:09:47 +01:00
parent 4be2347a30
commit b33daa3d3a
2 changed files with 107 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/ql/lib/semmle/code/java/frameworks/android/Intent.qll
View File

@@ -145,8 +145,8 @@ private class IntentBundleFlowSteps extends SummaryModelCsv {
// currently only the Extras part of the intent and the data field are fully modelled
"android.content;Intent;false;Intent;(Intent);;MapKey of SyntheticField[android.content.Intent.extras] of Argument[0];MapKey of SyntheticField[android.content.Intent.extras] of Argument[-1];value",
"android.content;Intent;false;Intent;(Intent);;MapValue of SyntheticField[android.content.Intent.extras] of Argument[0];MapValue of SyntheticField[android.content.Intent.extras] of Argument[-1];value",
"android.content;Intent;false;Intent;(String,Uri);;Argument[1];MapValue of SyntheticField[android.content.Intent.data] of Argument[-1];value",
"android.content;Intent;false;Intent;(String,Uri,Context,Class);;Argument[1];MapValue of SyntheticField[android.content.Intent.data] of Argument[-1];value",
"android.content;Intent;false;Intent;(String,Uri);;Argument[1];SyntheticField[android.content.Intent.data] of Argument[-1];value",
"android.content;Intent;false;Intent;(String,Uri,Context,Class);;Argument[1];SyntheticField[android.content.Intent.data] of Argument[-1];value",
"android.content;Intent;true;addCategory;;;Argument[-1];ReturnValue;value",
"android.content;Intent;true;addFlags;;;Argument[-1];ReturnValue;value",
"android.content;Intent;false;createChooser;;;Argument[0..2];MapValue of SyntheticField[android.content.Intent.extras] of ReturnValue;value",
@@ -159,8 +159,8 @@ private class IntentBundleFlowSteps extends SummaryModelCsv {
"android.content;Intent;true;getData;;;SyntheticField[android.content.Intent.data] of Argument[-1];ReturnValue;value",
"android.content;Intent;true;getDataString;;;SyntheticField[android.content.Intent.data] of Argument[-1];ReturnValue;taint",
"android.content;Intent;true;getExtras;();;SyntheticField[android.content.Intent.extras] of Argument[-1];ReturnValue;value",
"android.content;Intent;false;getIntent;();;Argument[0];SyntheticField[android.content.Intent.data] of Argument[-1];taint",
"android.content;Intent;false;getIntentOld;();;Argument[0];SyntheticField[android.content.Intent.data] of Argument[-1];taint",
"android.content;Intent;false;getIntent;;;Argument[0];SyntheticField[android.content.Intent.data] of ReturnValue;taint",
"android.content;Intent;false;getIntentOld;;;Argument[0];SyntheticField[android.content.Intent.data] of ReturnValue;taint",
"android.content;Intent;true;getParcelableArrayExtra;(String);;MapValue of SyntheticField[android.content.Intent.extras] of Argument[-1];ReturnValue;value",
"android.content;Intent;true;getParcelableArrayListExtra;(String);;MapValue of SyntheticField[android.content.Intent.extras] of Argument[-1];ReturnValue;value",
"android.content;Intent;true;getParcelableExtra;(String);;MapValue of SyntheticField[android.content.Intent.extras] of Argument[-1];ReturnValue;value",
@@ -168,7 +168,7 @@ private class IntentBundleFlowSteps extends SummaryModelCsv {
"android.content;Intent;true;getStringArrayExtra;(String);;MapValue of SyntheticField[android.content.Intent.extras] of Argument[-1];ReturnValue;value",
"android.content;Intent;true;getStringArrayListExtra;(String);;MapValue of SyntheticField[android.content.Intent.extras] of Argument[-1];ReturnValue;value",
"android.content;Intent;true;getStringExtra;(String);;MapValue of SyntheticField[android.content.Intent.extras] of Argument[-1];ReturnValue;value",
"android.content;Intent;false;parseUri;();;Argument[0];SyntheticField[android.content.Intent.data] of Argument[-1];taint",
"android.content;Intent;false;parseUri;;;Argument[0];SyntheticField[android.content.Intent.data] of ReturnValue;taint",
"android.content;Intent;true;putCharSequenceArrayListExtra;;;Argument[0];MapKey of SyntheticField[android.content.Intent.extras] of Argument[-1];value",
"android.content;Intent;true;putCharSequenceArrayListExtra;;;Argument[1];MapValue of SyntheticField[android.content.Intent.extras] of Argument[-1];value",
"android.content;Intent;true;putCharSequenceArrayListExtra;;;Argument[-1];ReturnValue;value",

102
java/ql/test/library-tests/frameworks/android/intent/Test.java
View File

@@ -2,6 +2,8 @@ package generatedtest;
import android.content.Context;
import android.content.Intent;
import android.content.IntentSender;
import android.net.Uri;
import android.os.BaseBundle;
import android.os.Bundle;
import android.os.IBinder;
@@ -21,10 +23,12 @@ public class Test {
String getMapKey(BaseBundle b) { return b.keySet().iterator().next(); }
Object getMapValue(BaseBundle b) { return null; }
Intent newWithIntent_extras(Bundle b) { return null; }
Intent newWithIntent_data(Uri data) { return new Intent("title", data); }
Bundle newBundleWithMapKey(String k) { Bundle b = new Bundle(); b.putInt(k, 0); return b; }
PersistableBundle newPersistableBundleWithMapKey(String k) { PersistableBundle b = new PersistableBundle(); b.putInt(k, 0); return b; }
Bundle newBundleWithMapValue(Object element) { return null; }
PersistableBundle newPersistableBundleWithMapValue(Object element) { return null; }
Uri getData(Intent intent) { return intent.getData(); }
<T> T source() { return null; }
void sink(Object o) { }
@@ -44,6 +48,20 @@ public class Test {
out = new Intent(in);
sink(getMapValue(getIntent_extras(out))); // $ hasValueFlow
}
{
// "android.content;Intent;false;Intent;(String,Uri);;Argument[1];SyntheticField[android.content.Intent.data] of Argument[-1];value"
Intent out = null;
Uri in = (Uri)source();
out = new Intent(null, in);
sink(getData(out)); // $ hasValueFlow
}
{
// "android.content;Intent;false;Intent;(String,Uri,Context,Class);;Argument[1];SyntheticField[android.content.Intent.data] of Argument[-1];value"
Intent out = null;
Uri in = (Uri)source();
out = new Intent(null, in, null, null);
sink(getData(out)); // $ hasValueFlow
}
{
// "android.content;Intent;true;addCategory;;;Argument[-1];ReturnValue;value"
Intent out = null;
@@ -58,6 +76,27 @@ public class Test {
out = in.addFlags(0);
sink(out); // $ hasValueFlow
}
{
// "android.content;Intent;false;createChooser;;;Argument[0..2];MapValue of SyntheticField[android.content.Intent.extras] of ReturnValue;value"
Intent out = null;
CharSequence in = (CharSequence)source();
out = Intent.createChooser(null, in, null);
sink(getMapValue(getIntent_extras(out))); // $ hasValueFlow
}
{
// "android.content;Intent;false;createChooser;;;Argument[0..2];MapValue of SyntheticField[android.content.Intent.extras] of ReturnValue;value"
Intent out = null;
IntentSender in = (IntentSender)source();
out = Intent.createChooser(null, null, in);
sink(getMapValue(getIntent_extras(out))); // $ hasValueFlow
}
{
// "android.content;Intent;false;createChooser;;;Argument[0..2];MapValue of SyntheticField[android.content.Intent.extras] of ReturnValue;value"
Intent out = null;
Intent in = (Intent)source();
out = Intent.createChooser(in, null, null);
sink(getMapValue(getIntent_extras(out))); // $ hasValueFlow
}
{
// "android.content;Intent;true;getBundleExtra;(String);;MapValue of SyntheticField[android.content.Intent.extras] of Argument[-1];ReturnValue;value"
Bundle out = null;
@@ -100,6 +139,20 @@ public class Test {
out = in.getCharSequenceExtra(null);
sink(out); // $ hasValueFlow
}
{
// "android.content;Intent;true;getData;;;SyntheticField[android.content.Intent.data] of Argument[-1];ReturnValue;value"
Uri out = null;
Intent in = (Intent)newWithIntent_data(source());
out = in.getData();
sink(out); // $ hasValueFlow
}
{
// "android.content;Intent;true;getDataString;;;SyntheticField[android.content.Intent.data] of Argument[-1];ReturnValue;taint"
String out = null;
Intent in = (Intent)newWithIntent_data(source());
out = in.getDataString();
sink(out); // $ hasTaintFlow
}
{
// "android.content;Intent;true;getExtras;();;SyntheticField[android.content.Intent.extras] of Argument[-1];ReturnValue;value"
Bundle out = null;
@@ -107,6 +160,20 @@ public class Test {
out = in.getExtras();
sink(out); // $ hasValueFlow
}
{
// "android.content;Intent;false;getIntent;;;Argument[0];SyntheticField[android.content.Intent.data] of Argument[-1];taint"
Intent out = null;
String in = (String)source();
out = Intent.getIntent(in);
sink(out.getData()); // $ hasTaintFlow
}
{
// "android.content;Intent;false;getIntentOld;;;Argument[0];SyntheticField[android.content.Intent.data] of Argument[-1];taint"
Intent out = null;
String in = (String)source();
out = Intent.getIntentOld(in);
sink(out.getData()); // $ hasTaintFlow
}
{
// "android.content;Intent;true;getParcelableArrayExtra;(String);;MapValue of SyntheticField[android.content.Intent.extras] of Argument[-1];ReturnValue;value"
Parcelable[] out = null;
@@ -156,6 +223,13 @@ public class Test {
out = in.getStringExtra(null);
sink(out); // $ hasValueFlow
}
{
// "android.content;Intent;false;parseUri;;;Argument[0];SyntheticField[android.content.Intent.data] of Argument[-1];taint"
Intent out = null;
String in = (String)source();
out = Intent.parseUri(in, 0);
sink(out.getData()); // $ hasTaintFlow
}
{
// "android.content;Intent;true;putCharSequenceArrayListExtra;;;Argument[-1];ReturnValue;value"
Intent out = null;
@@ -863,6 +937,34 @@ public class Test {
out = in.setData(null);
sink(out); // $ hasValueFlow
}
{
// "android.content;Intent;true;setData;;;Argument[0];SyntheticField[android.content.Intent.data] of Argument[-1];value",
Uri in = (Uri)source();
Intent instance = new Intent();
instance.setData(in);
sink(instance.getData()); // $ hasValueFlow
}
{
// "android.content;Intent;true;setDataAndNormalize;;;Argument[0];SyntheticField[android.content.Intent.data] of Argument[-1];value",
Uri in = (Uri)source();
Intent instance = new Intent();
instance.setDataAndNormalize(in);
sink(instance.getData()); // $ hasValueFlow
}
{
// "android.content;Intent;true;setDataAndType;;;Argument[0];SyntheticField[android.content.Intent.data] of Argument[-1];value",
Uri in = (Uri)source();
Intent instance = new Intent();
instance.setDataAndType(in, null);
sink(instance.getData()); // $ hasValueFlow
}
{
// "android.content;Intent;true;setDataAndTypeAndNormalize;;;Argument[0];SyntheticField[android.content.Intent.data] of Argument[-1];value",
Uri in = (Uri)source();
Intent instance = new Intent();
instance.setDataAndTypeAndNormalize(in, null);
sink(instance.getData()); // $ hasValueFlow
}
{
// "android.content;Intent;true;setDataAndNormalize;;;Argument[-1];ReturnValue;value"
Intent out = null;