Skip to content

Commit 7ba5a03

Browse files
committed
Add tests and stubs for the new sources and flow steps
1 parent b678467 commit 7ba5a03

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1315
-1982
lines changed

java/ql/lib/semmle/code/java/frameworks/android/WebView.qll

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,17 @@ private class WebkitSourceModels extends SourceModelCsv {
8181
override predicate row(string row) {
8282
row =
8383
[
84-
"android.webkit;WebResourceRequest;true;doUpdateVisitedHistory;;;Parameter[1];remote",
85-
"android.webkit;WebResourceRequest;true;onLoadResource;;;Parameter[1];remote",
86-
"android.webkit;WebResourceRequest;true;onPageCommitVisible;;;Parameter[1];remote",
87-
"android.webkit;WebResourceRequest;true;onPageFinished;;;Parameter[1];remote",
88-
"android.webkit;WebResourceRequest;true;onPageStarted;;;Parameter[1];remote",
89-
"android.webkit;WebResourceRequest;true;onReceivedError;(WebView,int,String,String);;Parameter[3];remote",
90-
"android.webkit;WebResourceRequest;true;onReceivedError;(WebView,WebResourceRequest,WebResourceError);;Parameter[1];remote",
91-
"android.webkit;WebResourceRequest;true;onReceivedHttpError;;;Parameter[1];remote",
92-
"android.webkit;WebResourceRequest;true;onSafeBrowsingHit;;;Parameter[1];remote",
93-
"android.webkit;WebResourceRequest;true;shouldInterceptRequest;;;Parameter[1];remote",
94-
"android.webkit;WebResourceRequest;true;shouldOverrideUrlLoading;;;Parameter[1];remote"
84+
"android.webkit;WebViewClient;true;doUpdateVisitedHistory;;;Parameter[1];remote",
85+
"android.webkit;WebViewClient;true;onLoadResource;;;Parameter[1];remote",
86+
"android.webkit;WebViewClient;true;onPageCommitVisible;;;Parameter[1];remote",
87+
"android.webkit;WebViewClient;true;onPageFinished;;;Parameter[1];remote",
88+
"android.webkit;WebViewClient;true;onPageStarted;;;Parameter[1];remote",
89+
"android.webkit;WebViewClient;true;onReceivedError;(WebView,int,String,String);;Parameter[3];remote",
90+
"android.webkit;WebViewClient;true;onReceivedError;(WebView,WebResourceRequest,WebResourceError);;Parameter[1];remote",
91+
"android.webkit;WebViewClient;true;onReceivedHttpError;;;Parameter[1];remote",
92+
"android.webkit;WebViewClient;true;onSafeBrowsingHit;;;Parameter[1];remote",
93+
"android.webkit;WebViewClient;true;shouldInterceptRequest;;;Parameter[1];remote",
94+
"android.webkit;WebViewClient;true;shouldOverrideUrlLoading;;;Parameter[1];remote"
9595
]
9696
}
9797
}

java/ql/test/library-tests/frameworks/android/flow-steps/Test.java renamed to java/ql/test/library-tests/frameworks/android/flow-steps/ParcelTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.util.Map;
2020

2121
// Test case generated by GenerateFlowTestCase.ql
22-
public class Test {
22+
public class ParcelTest {
2323

2424
Object source() { return null; }
2525
void sink(Object o) { }
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package generatedtest;
2+
3+
import android.net.Uri;
4+
import android.webkit.WebResourceRequest;
5+
import java.util.Map;
6+
7+
// Test case generated by GenerateFlowTestCase.ql
8+
public class WebResourceRequestTest {
9+
10+
Object source() {
11+
return null;
12+
}
13+
14+
void sink(Object o) {}
15+
16+
public void test() throws Exception {
17+
18+
{
19+
// "android.webkit;WebResourceRequest;true;getRequestHeaders;;;Argument[-1];ReturnValue;taint"
20+
Map out = null;
21+
WebResourceRequest in = (WebResourceRequest) source();
22+
out = in.getRequestHeaders();
23+
sink(out); // $ hasTaintFlow
24+
}
25+
{
26+
// "android.webkit;WebResourceRequest;true;getUrl;;;Argument[-1];ReturnValue;taint"
27+
Uri out = null;
28+
WebResourceRequest in = (WebResourceRequest) source();
29+
out = in.getUrl();
30+
sink(out); // $ hasTaintFlow
31+
}
32+
33+
}
34+
35+
}

java/ql/test/library-tests/frameworks/android/sources/Test.java renamed to java/ql/test/library-tests/frameworks/android/sources/OnActivityResult.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import android.content.Intent;
55
import android.os.Bundle;
66

7-
public class Test extends Activity {
7+
public class OnActivityResult extends Activity {
88

99
void sink(Object o) {}
1010

java/ql/test/library-tests/frameworks/android/sources/TestActivityAndFragment.java renamed to java/ql/test/library-tests/frameworks/android/sources/OnActivityResultActivityAndFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import android.os.Bundle;
55
import androidx.fragment.app.FragmentTransaction;
66

7-
public class TestActivityAndFragment extends Activity {
7+
public class OnActivityResultActivityAndFragment extends Activity {
88

99
private TestFragment frag;
1010

java/ql/test/library-tests/frameworks/android/sources/TestFragment.java renamed to java/ql/test/library-tests/frameworks/android/sources/OnActivityResultFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import android.content.Intent;
55
import android.os.Bundle;
66

7-
public class TestFragment extends Fragment {
7+
public class OnActivityResultFragment extends Fragment {
88

99
void sink(Object o) {}
1010

java/ql/test/library-tests/frameworks/android/sources/TestMissing.java renamed to java/ql/test/library-tests/frameworks/android/sources/OnActivityResultMissing.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import android.content.Intent;
66
import android.os.Bundle;
77

8-
public class TestMissing extends Activity {
8+
public class OnActivityResultMissing extends Activity {
99

1010
void sink(Object o) {}
1111

java/ql/test/library-tests/frameworks/android/sources/Safe.java renamed to java/ql/test/library-tests/frameworks/android/sources/OnActivityResultSafe.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import android.content.Intent;
55
import android.os.Bundle;
66

7-
public class Safe extends Activity {
7+
public class OnActivityResultSafe extends Activity {
88

99
void sink(Object o) {}
1010

0 commit comments

Comments
 (0)