crt0mega
/
mvt
mirror of https://github.com/mvt-project/mvt.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Renamed package to package_name for consistency

This commit is contained in:
Nex 2022-02-01 14:27:00 +01:00
parent 2d00dca5bd
commit 2ad175eae2
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mvt/android/modules/adb/dumpsys_accessibility.py
View File

@ -21,7 +21,7 @@ class DumpsysAccessibility(AndroidExtraction):
def check_indicators(self):
for result in self.results:
ioc = self.indicators.check_app_id(result["package"])
ioc = self.indicators.check_app_id(result["package_name"])
if ioc:
result["matched_indicator"] = ioc
self.detected.append(result)
@ -47,7 +47,7 @@ class DumpsysAccessibility(AndroidExtraction):
log.info("Found installed accessibility service \"%s\"", service)
results.append({
"package": service.split("/")[0],
"package_name": service.split("/")[0],
"service": service,
})

6
mvt/android/modules/adb/dumpsys_activities.py
View File

@ -24,7 +24,7 @@ class DumpsysActivities(AndroidExtraction):
def check_indicators(self):
for intent, activities in self.results.items():
for activity in activities:
ioc = self.indicators.check_app_id(activity["package"])
ioc = self.indicators.check_app_id(activity["package_name"])
if ioc:
activity["matched_indicator"] = ioc
self.detected.append({intent: activity})
@ -77,10 +77,10 @@ class DumpsysActivities(AndroidExtraction):
# If we got this far, we are processing receivers for the
# activities we are interested in.
activity = line.strip().split(" ")[1]
package = activity.split("/")[0]
package_name = activity.split("/")[0]
results[intent].append({
"package": package,
"package_name": package_name,
"activity": activity,
})

10
mvt/android/modules/adb/dumpsys_battery_daily.py
View File

@ -24,12 +24,12 @@ class DumpsysBatteryDaily(AndroidExtraction):
"timestamp": record["from"],
"module": self.__class__.__name__,
"event": "battery_daily",
"data": f"Recorded update of package {record['package']} with vers {record['vers']}"
"data": f"Recorded update of package {record['package_name']} with vers {record['vers']}"
}
def check_indicators(self):
for result in self.results:
ioc = self.indicators.check_app_id(result["package"])
ioc = self.indicators.check_app_id(result["package_name"])
if ioc:
result["matched_indicator"] = ioc
self.detected.append(result)
@ -59,12 +59,12 @@ class DumpsysBatteryDaily(AndroidExtraction):
continue
line = line.strip().replace("Update ", "")
package, vers = line.split(" ", 1)
package_name, vers = line.split(" ", 1)
vers_nr = vers.split("=", 1)[1]
already_seen = False
for update in daily_updates:
if package == update["package"] and vers_nr == update["vers"]:
if package_name == update["package_name"] and vers_nr == update["vers"]:
already_seen = True
break
@ -73,7 +73,7 @@ class DumpsysBatteryDaily(AndroidExtraction):
"action": "update",
"from": daily["from"],
"to": daily["to"],
"package": package,
"package_name": package_name,
"vers": vers_nr,
})

8
mvt/android/modules/adb/dumpsys_battery_history.py
View File

@ -21,7 +21,7 @@ class DumpsysBatteryHistory(AndroidExtraction):
def check_indicators(self):
for result in self.results:
ioc = self.indicators.check_app_id(result["package"])
ioc = self.indicators.check_app_id(result["package_name"])
if ioc:
result["matched_indicator"] = ioc
self.detected.append(result)
@ -56,14 +56,14 @@ class DumpsysBatteryHistory(AndroidExtraction):
if event in ["start_job", "end_job"]:
uid = line[line.find("=")+1:line.find(":")]
service = line[line.find(":")+1:].strip('"')
package = service.split("/")[0]
package_name = service.split("/")[0]
elif event == "wake":
uid = line[line.find("=")+1:line.find(":")]
service = line[line.find("*walarm*:")+9:].split(" ")[0].strip('"').strip()
if service == "" or "/" not in service:
continue
package = service.split("/")[0]
package_name = service.split("/")[0]
else:
continue
@ -71,7 +71,7 @@ class DumpsysBatteryHistory(AndroidExtraction):
"time_elapsed": time_elapsed,
"event": event,
"uid": uid,
"package": package,
"package_name": package_name,
"service": service,
})

6
mvt/android/modules/adb/dumpsys_receivers.py
View File

@ -46,7 +46,7 @@ class DumpsysReceivers(AndroidExtraction):
self.log.info("Found a receiver monitoring outgoing calls: \"%s\"",
receiver["receiver"])
ioc = self.indicators.check_app_id(receiver["package"])
ioc = self.indicators.check_app_id(receiver["package_name"])
if ioc:
receiver["matched_indicator"] = ioc
self.detected.append({intent: receiver})
@ -99,10 +99,10 @@ class DumpsysReceivers(AndroidExtraction):
# If we got this far, we are processing receivers for the
# activities we are interested in.
receiver = line.strip().split(" ")[1]
package = receiver.split("/")[0]
package_name = receiver.split("/")[0]
results[intent].append({
"package": package,
"package_name": package_name,
"receiver": receiver,
})