Normalize component names

Author: tushardalvi

modules/DetermineMinSDK.py

@@ -6,6 +6,7 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.'''
 
 from modules import common,intents,report
+import re
 
 def showAdbCommands(component,compType,packageName):
 	#Print ADB commands for exploitation
@@ -29,27 +30,39 @@ def showAdbCommands(component,compType,packageName):
 							extras_list+=intents.find_extras(str(c[1]),common.sourceDirectory)
 							if len(extras_list)>0:
 								for t in extras_list:
-									command = "adb shell am start -a \"" + c[0] + "\" -n \""+packageName+str(c[1])+"\""+" --es "+str(t)
+									if re.match(r'^\..*',str(c[1])):
+										command = "adb shell am start -a \"" + c[0] + "\" -n \""+packageName+"/"+packageName+str(c[1])+"\""+" --es "+str(t)+" \"EXTRA_VALUE_IN_QUOTES\""
+									else:
+										command = "adb shell am start -a \"" + c[0] + "\" -n \""+packageName+"/"+str(c[1])+"\""+" --es "+str(t)+" \"EXTRA_VALUE_IN_QUOTES\""
 									print command
 									report.write_adb_commands("adbcommands-issues-list", common.Severity.VULNERABILITY, command, None, "activity")
 							else:
-								command = "adb shell am start -a \"" + c[0] + "\" -n \""+packageName+"/"+packageName+str(c[1])+"\""
+								if re.match(r'^\..*',str(c[1])):
+									command = "adb shell am start -a \"" + c[0] + "\" -n \""+packageName+"/"+packageName+str(c[1])+"\""
+								else:
+									command = "adb shell am start -a \"" + c[0] + "\" -n \""+packageName+"/"+str(c[1])+"\""
 								print command
 								report.write_adb_commands("adbcommands-issues-list", common.Severity.VULNERABILITY, command, None, "activity")
 				else:
 					common.logger.debug("No intent filter on:  " + str(component))
 					extras_list=[]
 					extras_list+=intents.find_extras(str(component),common.sourceDirectory)
 					if len(extras_list)>0:
-						command =  "adb shell am start -n \""+packageName+"/"+packageName+component+"\""
+						if re.match(r'^\..*',str(component)):
+							command =  "adb shell am start -n \""+packageName+"/"+packageName+component+"\""
+						else:
+							command =  "adb shell am start -n \""+packageName+"/"+component+"\""
 						print command
 						extras = []
 						for e in extras_list:
 							extras.append("Possible extras to send: " + str(e))
 							print "Possible extras to send: " + str(e)
 						report.write_adb_commands("adbcommands-issues-list", common.Severity.VULNERABILITY, command, extras, "activity")
 					else:
-						command =  "adb shell am start -n \""+packageName+"/"+packageName+component+"\""
+						if re.match(r'^\..*',str(component)):
+							command =  "adb shell am start -n \""+packageName+"/"+packageName+component+"\""
+						else:
+							command =  "adb shell am start -n \""+packageName+"/"+component+"\""
 						print command
 						report.write_adb_commands("adbcommands-issues-list", common.Severity.VULNERABILITY, command, None, "activity")
 	elif str(compType)=='service':
@@ -67,11 +80,17 @@ def showAdbCommands(component,compType,packageName):
 							extras_list+=intents.find_extras(str(c[1]),common.sourceDirectory)
 							if len(extras_list)>0:
 								for t in extras_list:
-									command =  "adb shell am startservice " +packageName+"/"+str(c[1])+" --es "+str(t)
+									if re.match(r'^\..*',str(c[1])):
+										command =  "adb shell am startservice " +packageName+"/"+packageName+str(c[1])+" --es "+str(t)
+									else:
+										command =  "adb shell am startservice " +packageName+"/"+str(c[1])+" --es "+str(t)
 									print command
 									report.write_adb_commands("adbcommands-issues-list", common.Severity.VULNERABILITY, command, None, "service")
 							else:
-								command =  "adb shell am startservice " +packageName+"/"+str(c[1])
+								if re.match(r'^\..*',str(c[1])):
+									command =  "adb shell am startservice " +packageName+"/"+packageName+str(c[1])
+								else:	
+									command =  "adb shell am startservice " +packageName+"/"+str(c[1])
 								print command
 								report.write_adb_commands("adbcommands-issues-list", common.Severity.VULNERABILITY, command, None, "service")
 	elif str(compType)=='receiver':

modules/GeneralIssues.py

@@ -430,8 +430,9 @@ def tree(l):
 
 def normalizeActivityNames(activityList,package_name):
 	for d in range(0,len(activityList)):
-		if not re.match(r''+str(package_name),str(activityList[d])):
+		if re.match(r'\..*',str(activityList[d])):
 			activityList[d]=str(package_name)+str(activityList[d])
+	return activityList
 
 def check_export(tag,output):
 	"""

modules/IssueType.py

@@ -8,7 +8,7 @@
 
 class ExploitType:
     """
-    Enum type for exploitatin category
+    Enum type for exploitation category
     """
     MANIFEST, ACTIVITY, INTENT, PERMISSION, SERVICE, RECEIVER, BROADCAST_INTENT, CERTIFICATE, WEBVIEW, CRYPTO = range(10)