Merge remote-tracking branch 'origin/master' into #2286_chat_improvem…

…ents
aberenguel · Oct 21, 2024 · 176664a · 176664a
2 parents 0a81f7d + 518a15d
commit 176664a
Show file tree

Hide file tree

Showing 31 changed files with 560 additions and 237 deletions.
diff --git a/iped-app/resources/config/conf/CategoriesConfig.json b/iped-app/resources/config/conf/CategoriesConfig.json
@@ -174,7 +174,7 @@
     {"name": "SIM Data", "mimes": ["application/x-ufed-html-simdata", "application/x-ufed-simdata"]},
     {"name": "Calendar", "mimes": ["application/x-ufed-html-calendar", "application/x-ufed-calendarentry", "application/x-ios-calendar-db"]},
     {"name": "Logs", "mimes": ["application/x-ufed-html-logs", "application/x-ufed-logentry"]},
-    {"name": "User Accounts", "mimes": ["application/x-ufed-html-users", "application/x-ufed-useraccount", "application/x-ufed-user", "contact/x-skype-account", "application/x-whatsapp-account", "application/x-telegram-account", "application/x-gdrive-account-info"]},
+    {"name": "User Accounts", "mimes": ["application/x-ufed-html-users", "application/x-ufed-useraccount", "application/x-ufed-user", "contact/x-skype-account", "application/x-whatsapp-account", "application/x-telegram-account", "application/x-gdrive-account-info", "application/x-whatsapp-user-xml"]},
     {"name": "Searches", "mimes": ["application/x-ufed-html-searches", "application/x-ufed-searcheditem"]},
     {"name": "Notes", "mimes": ["application/x-ufed-html-notes", "application/x-ufed-note", "application/x-ios-oldnotes-db", "application/x-ios-notes-db"]},
     {"name": "Wireless Networks", "mimes": ["application/x-ufed-html-wifi", "application/x-ufed-wirelessnetwork"]},

diff --git a/iped-app/resources/config/conf/CustomSignatures.xml b/iped-app/resources/config/conf/CustomSignatures.xml
@@ -1416,6 +1416,8 @@
         <glob pattern="com.whatsapp_preferences_light.xml"/>
         <glob pattern="com.whatsapp.w4b_preferences.xml"/>
         <glob pattern="com.whatsapp.w4b_preferences_light.xml"/>
+        <glob pattern="registration.RegisterPhone.xml"/>
+        <glob pattern="startup_prefs.xml"/>
     </mime-type>
 
     <mime-type type="application/x-whatsapp-user-plist">

diff --git a/iped-app/resources/localization/iped-parsers-messages.properties b/iped-app/resources/localization/iped-parsers-messages.properties
@@ -333,6 +333,10 @@ WhatsAppReport.PinnedMessage=pinned a message
 WhatsAppReport.AIThirdParty=This AI is from a third-party developer. Meta receives your AI chats to improve AI quality.
 WhatsAppReport.Over256MembersOnlyAdminsCanEdit=This group has over 256 members so now only admins can edit the groups settings.
 WhatsAppReport.SecurityNotificationsNoLongerAvailable=Security code notifications are no longer available for this chat.
+UFEDChatParser.Broadcast=Broadcast
+UFEDChatParser.Group=Group
+UFEDChatParser.Status=Status
+UFEDChatParser.Unknown=Unknown
 VCardParser.FormattedName=Formatted Name
 VCardParser.Name=Name
 VCardParser.Nickname=Nickname

diff --git a/iped-app/resources/localization/iped-parsers-messages_de_DE.properties b/iped-app/resources/localization/iped-parsers-messages_de_DE.properties
@@ -333,6 +333,10 @@ WhatsAppReport.PinnedMessage=pinned a message[TBT]
 WhatsAppReport.AIThirdParty=This AI is from a third-party developer. Meta receives your AI chats to improve AI quality.[TBT]
 WhatsAppReport.Over256MembersOnlyAdminsCanEdit=Diese Gruppe hat mehr als 256 Mitglieder. Daher können jetzt nur noch Admins die Gruppeneinstellungen bearbeiten.
 WhatsAppReport.SecurityNotificationsNoLongerAvailable=Benachrichtigungen zur Sicherheitsnummer sind für diesen Chat nicht länger verfügbar.
+UFEDChatParser.Broadcast=Broadcast[TBT]
+UFEDChatParser.Group=Group[TBT]
+UFEDChatParser.Status=Status[TBT]
+UFEDChatParser.Unknown=Unknown[TBT]
 VCardParser.FormattedName=Name formatiert
 VCardParser.Name=Name
 VCardParser.Nickname=Nickname

diff --git a/iped-app/resources/localization/iped-parsers-messages_es_AR.properties b/iped-app/resources/localization/iped-parsers-messages_es_AR.properties
@@ -333,6 +333,10 @@ WhatsAppReport.PinnedMessage=pinned a message[TBT]
 WhatsAppReport.AIThirdParty=This AI is from a third-party developer. Meta receives your AI chats to improve AI quality.[TBT]
 WhatsAppReport.Over256MembersOnlyAdminsCanEdit=This group has over 256 members so now only admins can edit the groups settings.[TBT]
 WhatsAppReport.SecurityNotificationsNoLongerAvailable=Security code notifications are no longer available for this chat.[TBT]
+UFEDChatParser.Broadcast=Broadcast[TBT]
+UFEDChatParser.Group=Group[TBT]
+UFEDChatParser.Status=Status[TBT]
+UFEDChatParser.Unknown=Unknown[TBT]
 VCardParser.FormattedName=Nombre con formato
 VCardParser.Name=Nombre
 VCardParser.Nickname=Sobrenombre

diff --git a/iped-app/resources/localization/iped-parsers-messages_fr_FR.properties b/iped-app/resources/localization/iped-parsers-messages_fr_FR.properties
@@ -333,6 +333,10 @@ WhatsAppReport.PinnedMessage=a epinglé un message
 WhatsAppReport.AIThirdParty=Cette IA provient d'un développeur tiers. Meta reçoit vos discussions IA pour améliorer la qualité de l'IA.
 WhatsAppReport.Over256MembersOnlyAdminsCanEdit=Comme ce groupe inclut plus de 256 membres, désormais, seulement les admins peuvent modifier les paramètres du groupe.
 WhatsAppReport.SecurityNotificationsNoLongerAvailable=Les notifications relatives aux codes de sécurité ne sont plus disponibles pour cette discoussion.
+UFEDChatParser.Broadcast=Broadcast[TBT]
+UFEDChatParser.Group=Group[TBT]
+UFEDChatParser.Status=Status[TBT]
+UFEDChatParser.Unknown=Unknown[TBT]
 VCardParser.FormattedName=Nom formaté
 VCardParser.Name=Nom
 VCardParser.Nickname=Surnom

diff --git a/iped-app/resources/localization/iped-parsers-messages_it_IT.properties b/iped-app/resources/localization/iped-parsers-messages_it_IT.properties
@@ -333,6 +333,10 @@ WhatsAppReport.PinnedMessage=pinned a message[TBT]
 WhatsAppReport.AIThirdParty=This AI is from a third-party developer. Meta receives your AI chats to improve AI quality.[TBT]
 WhatsAppReport.Over256MembersOnlyAdminsCanEdit=Dato che questo gruppo ha più di 256 membri, solo gli amministratori potranno modificarne le impostazioni.
 WhatsAppReport.SecurityNotificationsNoLongerAvailable=Le notifiche sul codice di sicurezza non sono più disponibili per questa chat.
+UFEDChatParser.Broadcast=Broadcast[TBT]
+UFEDChatParser.Group=Group[TBT]
+UFEDChatParser.Status=Status[TBT]
+UFEDChatParser.Unknown=Unknown[TBT]
 VCardParser.FormattedName=Nome formattato
 VCardParser.Name=Nome
 VCardParser.Nickname=Nickname

diff --git a/iped-app/resources/localization/iped-parsers-messages_pt_BR.properties b/iped-app/resources/localization/iped-parsers-messages_pt_BR.properties
@@ -333,6 +333,10 @@ WhatsAppReport.PinnedMessage=fixou uma mensagem
 WhatsAppReport.AIThirdParty=Esta IA pertence a um desenvolvedor terceirizado. A Meta recebe suas conversas com IA para melhorar a qualidade desse recurso.
 WhatsAppReport.Over256MembersOnlyAdminsCanEdit=Agora somente admins podem editar as configurações porque o grupo tem mais de 256 membros.
 WhatsAppReport.SecurityNotificationsNoLongerAvailable=As notificações sobre o código de segurança não estão mais disponíveis para esta conversa.
+UFEDChatParser.Broadcast=Broadcast
+UFEDChatParser.Group=Grupo
+UFEDChatParser.Status=Status
+UFEDChatParser.Unknown=Desconhecido
 VCardParser.FormattedName=Nome Formatado
 VCardParser.Name=Nome
 VCardParser.Nickname=Apelido

diff --git a/iped-app/resources/scripts/tasks/RefineCategoryTask.js b/iped-app/resources/scripts/tasks/RefineCategoryTask.js
@@ -1,4 +1,4 @@
-/*
+/*
  * Script of Category Specialization based on item properties.
  * Uses javascript language to allow flexibility in definitions.
  */
@@ -102,14 +102,17 @@ function process(e){
 		}
 	}
 
-	if(mime.equals("application/dita+xml") && 
+	if(path.indexOf("whatsapp") != -1 && mime.equals("application/dita+xml") &&
 		(e.getName().equals("com.whatsapp_preferences.xml") || 
 		 e.getName().equals("com.whatsapp_preferences_light.xml") ||
 		 e.getName().equals("com.whatsapp.w4b_preferences.xml") || 
-		 e.getName().equals("com.whatsapp.w4b_preferences_light.xml"))) {
+		 e.getName().equals("com.whatsapp.w4b_preferences_light.xml") ||
+		 e.getName().equals("registration.RegisterPhone.xml") ||
+		 e.getName().equals("startup_prefs.xml"))) {
 		e.setMediaTypeStr("application/x-whatsapp-user-xml");
-		e.setCategory("Contacts");
+		e.setCategory("User Accounts");
 	}
+
 	if(mime.equals("application/dita+xml") && e.getName().equals("userconfing.xml")){
 		e.setMediaTypeStr("application/x-telegram-user-conf");
 		//e.setCategory("Contacts");

diff --git a/iped-app/src/main/java/iped/app/ui/TextParser.java b/iped-app/src/main/java/iped/app/ui/TextParser.java
@@ -20,6 +20,7 @@
 
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InterruptedIOException;
 import java.io.RandomAccessFile;
@@ -207,7 +208,7 @@ public CountInputStream(InputStream in) {
         }
 
         @Override
-        protected synchronized void afterRead(final int n) {
+        protected synchronized void afterRead(final int n) throws IOException {
             super.afterRead(n);
             progressMonitor.setProgress(this.getByteCount());
         }

diff --git a/iped-engine/pom.xml b/iped-engine/pom.xml
@@ -318,7 +318,7 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
             <!-- check https://github.com/sepinf-inc/IPED/issues/1068 when upgrading this -->
-            <version>1.25.0</version>
+            <version>1.27.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tika</groupId>

diff --git a/iped-engine/src/main/java/iped/engine/task/ParsingTask.java b/iped-engine/src/main/java/iped/engine/task/ParsingTask.java
@@ -286,7 +286,6 @@ private static boolean isToAlwaysExpand(CaseData caseData, IItem item) {
             return false;
         }
         return WhatsAppParser.WA_USER_PLIST.equals(item.getMediaType())
-                || WhatsAppParser.WA_USER_XML.equals(item.getMediaType()) 
                 || TelegramParser.TELEGRAM_USER_CONF.equals(item.getMediaType());
     }
 

diff --git a/iped-engine/src/main/java/iped/engine/task/similarity/ImageSimilarityTask.java b/iped-engine/src/main/java/iped/engine/task/similarity/ImageSimilarityTask.java
@@ -95,6 +95,11 @@ protected void process(IItem evidence) throws Exception {
             return;
         }
 
+        Object prev = evidence.getExtraAttribute(IMAGE_FEATURES);
+        if (prev != null && prev instanceof byte[]) {
+            return;
+        }
+
         try {
             byte[] thumb = evidence.getThumb();
             if (thumb == null) {

diff --git a/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/telegram/ReportGenerator.java b/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/telegram/ReportGenerator.java
@@ -444,8 +444,8 @@ private static void printMessageFileHeader(PrintWriter out, String title, byte[]
                 + "	<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n" //$NON-NLS-1$
                 + "	<meta name=\"viewport\" content=\"width=device-width\" />\n" //$NON-NLS-1$
                 + "     <meta charset=\"UTF-8\" />\n" //$NON-NLS-1$
-                + "	<link rel=\"shortcut icon\" href=\"" //$NON-NLS-1$
-                + iped.parsers.whatsapp.Util.getImageResourceAsEmbedded("img/favicon.ico") + "\" />\n" //$NON-NLS-1$ //$NON-NLS-2$
+                + "<link rel=\"icon\" href=\""
+                + iped.parsers.whatsapp.Util.getImageResourceAsEmbedded("img/telegram.png") + "\">\n"
                 + "<style>\n" + iped.parsers.whatsapp.Util.readResourceAsString("css/whatsapp.css") //$NON-NLS-2$
                 + Util.readResourceAsString("css/tooltip.css") + "\n</style>\n" + "<script>"
                 + iped.parsers.whatsapp.Util.readResourceAsString("js/whatsapp.js") + "</script>"