fix some name issues and dregister2

fgwei · fgwei · commit 898cfadf4a26 · 2015-04-26T15:11:31.000-07:00
diff --git a/eclipse-projects/IccHandling/ICC_Explicit_NoSrc_NoSink/src/com/ksu/explicit_nosrc_nosink/MainActivity.java b/eclipse-projects/IccHandling/ICC_Explicit_NoSrc_NoSink/src/com/ksu/explicit_nosrc_nosink/MainActivity.java
@@ -7,7 +7,7 @@
 import android.content.Intent;
 
 /**
- * @testcase_name ICC_Explicit1_NoSrc_NoSink
+ * @testcase_name ICC_Explicit_NoSrc_NoSink
  * @author Fengguo Wei & Sankardas Roy
  * @author_mail fgwei@ksu.edu & sroy@ksu.edu
  * 
diff --git a/eclipse-projects/IccHandling/ICC_Explicit_NoSrc_Sink/src/com/ksu/explicit_nosrc_sink/MainActivity.java b/eclipse-projects/IccHandling/ICC_Explicit_NoSrc_Sink/src/com/ksu/explicit_nosrc_sink/MainActivity.java
@@ -7,7 +7,7 @@
 import android.content.Intent;
 
 /**
- * @testcase_name InterComponentCommunication_Explicit1
+ * @testcase_name ICC_Explicit_NoSrc_Sink
  * @author Fengguo Wei & Sankardas Roy
  * @author_mail fgwei@ksu.edu & sroy@ksu.edu
  * 
diff --git a/eclipse-projects/IccHandling/ICC_Explicit_Src_NoSink/src/com/ksu/explicit_src_nosink/MainActivity.java b/eclipse-projects/IccHandling/ICC_Explicit_Src_NoSink/src/com/ksu/explicit_src_nosink/MainActivity.java
@@ -8,7 +8,7 @@
 import android.content.Intent;
 
 /**
- * @testcase_name InterComponentCommunication_Explicit1
+ * @testcase_name ICC_Explicit_Src_NoSink
  * @author Fengguo Wei & Sankardas Roy
  * @author_mail fgwei@ksu.edu & sroy@ksu.edu
  * 
diff --git a/eclipse-projects/IccHandling/ICC_Explicit_Src_Sink/src/com/ksu/explicit_src_sink/MainActivity.java b/eclipse-projects/IccHandling/ICC_Explicit_Src_Sink/src/com/ksu/explicit_src_sink/MainActivity.java
@@ -8,7 +8,7 @@
 import android.content.Intent;
 
 /**
- * @testcase_name InterComponentCommunication_Explicit1
+ * @testcase_name ICC_Explicit_Src_Sink
  * @author Fengguo Wei & Sankardas Roy
  * @author_mail fgwei@ksu.edu & sroy@ksu.edu
  * 
diff --git a/eclipse-projects/IccHandling/ICC_Implicit_NoSrc_NoSink/src/com/ksu/implicit_nosrc_nosink/MainActivity.java b/eclipse-projects/IccHandling/ICC_Implicit_NoSrc_NoSink/src/com/ksu/implicit_nosrc_nosink/MainActivity.java
@@ -8,7 +8,7 @@
 import android.view.Menu;
 
 /**
- * @testcase_name InterComponentCommunication_Implicit1
+ * @testcase_name ICC_Implicit_NoSrc_NoSink
  * @author Fengguo Wei & Sankardas Roy
  * @author_mail fgwei@ksu.edu & sroy@ksu.edu
  * 
diff --git a/eclipse-projects/IccHandling/ICC_Implicit_NoSrc_Sink/src/com/ksu/implicit_nosrc_sink/MainActivity.java b/eclipse-projects/IccHandling/ICC_Implicit_NoSrc_Sink/src/com/ksu/implicit_nosrc_sink/MainActivity.java
@@ -8,14 +8,13 @@
 import android.view.Menu;
 
 /**
- * @testcase_name InterComponentCommunication_Implicit1
+ * @testcase_name ICC_Implicit_NoSrc_Sink
  * @author Fengguo Wei & Sankardas Roy
  * @author_mail fgwei@ksu.edu & sroy@ksu.edu
  * 
  * @description Insensitive value v is sent to component FooActivity via implicit ICC. 
  * 				In FooActivity, it will retrieve value v and leak it. 
- * @dataflow source -> imei -> MainActivity's intent -> sink (implicit ICC)
- * 			 source -> imei -> MainActivity's intent -> FooActivity's intent -> imei -> sink
+ * @dataflow v -> MainActivity's intent -> _
  * @number_of_leaks 0
  * @challenges The analysis must be able to resolve implicit (Action) ICC calls and handle data flow 
  * 				via different components.
diff --git a/eclipse-projects/IccHandling/ICC_Implicit_Src_NoSink/src/com/ksu/implicit_src_nosink/MainActivity.java b/eclipse-projects/IccHandling/ICC_Implicit_Src_NoSink/src/com/ksu/implicit_src_nosink/MainActivity.java
@@ -9,14 +9,13 @@
 import android.view.Menu;
 
 /**
- * @testcase_name InterComponentCommunication_Implicit1
+ * @testcase_name ICC_Implicit_Src_NoSink
  * @author Fengguo Wei & Sankardas Roy
  * @author_mail fgwei@ksu.edu & sroy@ksu.edu
  * 
  * @description The value v of a source is sent to component FooActivity via implicit ICC. 
  * 				In FooActivity, it will retrieve value v but not leak it. 
  * @dataflow source -> imei -> MainActivity's intent -> sink (implicit ICC)
- * 			 source -> imei -> MainActivity's intent -> FooActivity's intent -> imei -> sink
  * @number_of_leaks 1
  * @challenges The analysis must be able to resolve implicit (Action) ICC calls and handle data flow 
  * 				via different components.
diff --git a/eclipse-projects/IccHandling/ICC_Implicit_Src_Sink/src/com/ksu/implicit_src_sink/MainActivity.java b/eclipse-projects/IccHandling/ICC_Implicit_Src_Sink/src/com/ksu/implicit_src_sink/MainActivity.java
@@ -9,7 +9,7 @@
 import android.view.Menu;
 
 /**
- * @testcase_name InterComponentCommunication_Implicit1
+ * @testcase_name ICC_Implicit_Src_Sink
  * @author Fengguo Wei & Sankardas Roy
  * @author_mail fgwei@ksu.edu & sroy@ksu.edu
  * 
diff --git a/eclipse-projects/IccTargetFinding/InterComponentCommunication_DynRegister2/src/com/ksu/dynamicregister2/MainActivity.java b/eclipse-projects/IccTargetFinding/InterComponentCommunication_DynRegister2/src/com/ksu/dynamicregister2/MainActivity.java
@@ -9,7 +9,7 @@
 import android.view.Menu;
 
 /**
- * @testcase_name InterComponentCommunication_DynRegister1
+ * @testcase_name InterComponentCommunication_DynRegister2
  * @author Fengguo Wei & Sankardas Roy
  * @author_mail fgwei@ksu.edu & sroy@ksu.edu
  * 
@@ -27,14 +27,15 @@ public class MainActivity extends Activity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_main);	
+		setContentView(R.layout.activity_main);
+		registerReceiver(new MyReceiver(), new IntentFilter("com.ksu"));
+		registerReceiver(new MyReceiver2(), new IntentFilter("com.ksu2"));
+		TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
+		String id = tm.getDeviceId(); //source
 		StringBuilder sb = new StringBuilder();
 		sb.append("com.");
 		sb.append("ksu");
-		registerReceiver(new MyReceiver(), new IntentFilter(sb.toString()));
-		TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
-		String id = tm.getDeviceId(); //source
-		Intent i = new Intent("com.ksu");
+		Intent i = new Intent(sb.toString());
 		i.putExtra("id", id);
 		sendBroadcast(i); //leak
 	}
diff --git a/eclipse-projects/IccTargetFinding/InterComponentCommunication_DynRegister2/src/com/ksu/dynamicregister2/MyReceiver.java b/eclipse-projects/IccTargetFinding/InterComponentCommunication_DynRegister2/src/com/ksu/dynamicregister2/MyReceiver.java
@@ -10,7 +10,7 @@ public class MyReceiver extends BroadcastReceiver
 
 	@Override
 	public void onReceive(Context arg0, Intent arg1) {
-		Log.d("Id", arg1.getStringExtra("id")); //sink
+		Log.d("leak", arg1.getStringExtra("id")); //sink
 	}
 
 }
diff --git a/eclipse-projects/IccTargetFinding/InterComponentCommunication_DynRegister2/src/com/ksu/dynamicregister2/MyReceiver2.java b/eclipse-projects/IccTargetFinding/InterComponentCommunication_DynRegister2/src/com/ksu/dynamicregister2/MyReceiver2.java
@@ -0,0 +1,22 @@
+package com.ksu.dynamicregister2;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+public class MyReceiver2 extends BroadcastReceiver 
+{
+
+	@Override
+	public void onReceive(Context arg0, Intent arg1) {
+		String id = arg1.getStringExtra("id");
+		process(id);
+	}
+	
+	private void process(String id) {
+		Log.d("leak2", id); //sink
+	}
+
+}
+
diff --git a/eclipse-projects/IccTargetFinding/InterComponentCommunication_Implicit6/src/com/ksu/implicit6/MainActivity.java b/eclipse-projects/IccTargetFinding/InterComponentCommunication_Implicit6/src/com/ksu/implicit6/MainActivity.java
@@ -10,7 +10,7 @@
 import android.view.Menu;
 
 /**
- * @testcase_name InterComponentCommunication_Implicit5
+ * @testcase_name InterComponentCommunication_Implicit6
  * @author Fengguo Wei & Sankardas Roy
  * @author_mail fgwei@ksu.edu & sroy@ksu.edu
  * 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`import android.content.Intent;`
`8`	`8`
`9`	`9`	`/**`
`10`		`- * @testcase_name ICC_Explicit1_NoSrc_NoSink`
	`10`	`+ * @testcase_name ICC_Explicit_NoSrc_NoSink`
`11`	`11`	`* @author Fengguo Wei & Sankardas Roy`
`12`	`12`	`* @author_mail fgwei@ksu.edu & sroy@ksu.edu`
`13`	`13`	`*`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`import android.content.Intent;`
`9`	`9`
`10`	`10`	`/**`
`11`		`- * @testcase_name InterComponentCommunication_Explicit1`
	`11`	`+ * @testcase_name ICC_Explicit_Src_NoSink`
`12`	`12`	`* @author Fengguo Wei & Sankardas Roy`
`13`	`13`	`* @author_mail fgwei@ksu.edu & sroy@ksu.edu`
`14`	`14`	`*`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`import android.view.Menu;`
`9`	`9`
`10`	`10`	`/**`
`11`		`- * @testcase_name InterComponentCommunication_Implicit1`
	`11`	`+ * @testcase_name ICC_Implicit_NoSrc_NoSink`
`12`	`12`	`* @author Fengguo Wei & Sankardas Roy`
`13`	`13`	`* @author_mail fgwei@ksu.edu & sroy@ksu.edu`
`14`	`14`	`*`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`import android.view.Menu;`
`10`	`10`
`11`	`11`	`/**`
`12`		`- * @testcase_name InterComponentCommunication_Implicit1`
	`12`	`+ * @testcase_name ICC_Implicit_Src_Sink`
`13`	`13`	`* @author Fengguo Wei & Sankardas Roy`
`14`	`14`	`* @author_mail fgwei@ksu.edu & sroy@ksu.edu`
`15`	`15`	`*`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public class MyReceiver extends BroadcastReceiver`
`10`	`10`
`11`	`11`	`@Override`
`12`	`12`	`public void onReceive(Context arg0, Intent arg1) {`
`13`		`- Log.d("Id", arg1.getStringExtra("id")); //sink`
	`13`	`+ Log.d("leak", arg1.getStringExtra("id")); //sink`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`}`