hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-21 19:26:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source 
Co-authored-by: Anders Schack-Mulligen <aschackmull@users.noreply.github.com>
This commit is contained in:
Tony Torralba
2021-11-04 10:08:53 +01:00
committed by GitHub
parent a5749a5eb1
commit fd92c4e435
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/ql/lib/semmle/code/java/security/AndroidIntentRedirection.qll
View File

@@ -71,11 +71,12 @@ private class DefaultIntentRedirectionSink extends IntentRedirectionSink {
*/ */
private class DefaultIntentRedirectionSanitizer extends IntentRedirectionSanitizer { private class DefaultIntentRedirectionSanitizer extends IntentRedirectionSanitizer {
DefaultIntentRedirectionSanitizer() { DefaultIntentRedirectionSanitizer() {
exists(MethodAccess ma, Method m | exists(MethodAccess ma, Method m, Guard g, boolean branch |
ma.getMethod() = m and ma.getMethod() = m and
m.getDeclaringType() instanceof TypeComponentName and m.getDeclaringType() instanceof TypeComponentName and
m.hasName(["getPackageName", "getClassName"]) and m.hasName(["getPackageName", "getClassName"]) and
ma.getBasicBlock().(ConditionBlock).controls(this.asExpr().getBasicBlock(), true) g.isEquality(ma, _, branch) and
g.controls(this.asExpr().getBasicBlock(), branch)
) )
} }
} }

2
java/ql/src/Security/CWE/CWE-940/AndroidIntentRedirectionSample.java
View File

@@ -13,6 +13,6 @@ if (destinationComponent.getPackageName().equals("safe.package") &&
// GOOD: The component that sent the Intent is checked before launching the destination component // GOOD: The component that sent the Intent is checked before launching the destination component
Intent forwardIntent = (Intent) getIntent().getParcelableExtra("forward_intent"); Intent forwardIntent = (Intent) getIntent().getParcelableExtra("forward_intent");
ComponentName originComponent = getCallingActivity(); ComponentName originComponent = getCallingActivity();
if (originComponent.getPackageName().equals("trusted.package") && originComponent.getClassName("TrustedClass")) { if (originComponent.getPackageName().equals("trusted.package") && originComponent.getClassName().equals("TrustedClass")) {
startActivity(forwardIntent); startActivity(forwardIntent);
} }