feat: update urls for dashboard (#105)

Author: tjmblake

reai_toolkit/app/components/tabs/similarity_tab.py

@@ -76,6 +76,8 @@ def __init__(self, parent=None) -> None:
         super().__init__(parent)
         self._data: list[MatchedFunction] = []
         self._func_id: int | None = None
+        self._analysis_id: int | None = None
+        self._portal_url: str = "https://portal.reveng.ai"
 
     def rowCount(self, parent=QtCore.QModelIndex()) -> int:
         return len(self._data)
@@ -107,7 +109,7 @@ def data(
                 return None  # Button column - handled by delegate
 
         elif role == QtCore.Qt.ItemDataRole.UserRole:
-            return f"https://portal.reveng.ai/function/{self._func_id}/compare?id={match.function_id}"
+            return f"{self._portal_url}/analyses/{self._analysis_id}?fn={self._func_id}&view=matching&matchingMode=single&alt={match.function_id}"
 
         elif role == QtCore.Qt.ItemDataRole.TextAlignmentRole:
             if col == SimilarityTableColumns.SIMILARITY:
@@ -149,10 +151,12 @@ def headerData(
             return self.COLUMNS[section]
         return None
 
-    def set_data(self, func_id: int, data: list[MatchedFunction]) -> None:
+    def set_data(self, func_id: int, data: list[MatchedFunction], analysis_id: int, portal_url: str) -> None:
         self.beginResetModel()
         self._func_id = func_id
         self._data = data
+        self._analysis_id = analysis_id
+        self._portal_url = portal_url
         self.endResetModel()
 
     def clear(self) -> None:
@@ -266,15 +270,15 @@ def _on_button_clicked(self, index: QtCore.QModelIndex) -> None:
             QtGui.QDesktopServices.openUrl(QtCore.QUrl(url))
 
     def _on_fetch_finished(
-        self, func_id: int, func_addr: int, data: list[MatchedFunction]
+        self, func_id: int, func_addr: int, data: list[MatchedFunction], analysis_id: int, portal_url: str
     ) -> None:
         """Handle successful API response (called on main thread)."""
         # Ignore results if user has moved to a different function
         if func_addr != self._current_func_addr:
             return
 
         if self._model:
-            self._model.set_data(func_id, data)
+            self._model.set_data(func_id, data, analysis_id, portal_url)
 
         func_name = idaapi.get_func_name(func_addr) or f"sub_{func_addr:X}"
 
@@ -295,6 +299,8 @@ def update_for_function(
         func_id: int,
         func_addr: int,
         data: list[MatchedFunction],
+        analysis_id: int,
+        portal_url: str,
         force: bool = False,
     ) -> None:
         if not force and func_addr == self._current_func_addr:
@@ -313,4 +319,4 @@ def update_for_function(
         if self._model:
             self._model.clear()
 
-        self._on_fetch_finished(func_id, func_addr, data)
+        self._on_fetch_finished(func_id, func_addr, data, analysis_id, portal_url)

reai_toolkit/app/coordinator.py

@@ -107,18 +107,21 @@ def run_dialog(self):
         pass
 
     def redirect_analysis_portal(self) -> None:
-        binary_id: int | None = self.app.netstore_service.get_binary_id()
-        if binary_id is not None:
-            portal_url: str = self.app.config_service.portal_url + f"/analyses/{binary_id}"
+        analysis_id: int | None = self.app.netstore_service.get_analysis_id()
+        if analysis_id is not None:
+            portal_url: str = self.app.config_service.portal_url + f"/analyses/{analysis_id}"
             QtGui.QDesktopServices.openUrl(QtCore.QUrl(portal_url))
 
     def redirect_function_portal(self) -> None:
         func_map: FunctionMapping | None = self.app.analysis_sync_service.netstore_service.get_function_mapping()
         current_ea: int = ida_kernwin.get_screen_ea()
         current_func: ida_funcs.func_t | None = ida_funcs.get_func(current_ea)
-        if func_map and current_func:
+        analysis_id: int | None = self.app.netstore_service.get_analysis_id()
+        if func_map and current_func and analysis_id:
             function_id: int | None = func_map.inverse_function_map.get(
                 str(current_func.start_ea), None
             )
-            portal_url: str = self.app.config_service.portal_url + f"/function/{function_id}"
+            portal_url: str = (
+                self.app.config_service.portal_url + f"/analyses/{analysis_id}?fn={function_id}"
+            )
             QtGui.QDesktopServices.openUrl(QtCore.QUrl(portal_url))

reai_toolkit/app/coordinators/similarity_coordinator.py

@@ -70,26 +70,26 @@ def disable_function_tracking(self) -> None:
             self._hook = None
 
     def _launch_similarity_tab(
-        self, local_func_id: int, local_vaddr: int, functions: list[MatchedFunction]
+        self, local_func_id: int, local_vaddr: int, functions: list[MatchedFunction], analysis_id: int
     ) -> None:
         def _show_tab() -> None:
             self._similarity_tab = SimilarityTab(self._on_pane_closed)  # type: ignore
             self._similarity_tab.Create()
             self._similarity_tab.update_for_function(
-                local_func_id, local_vaddr, functions
+                local_func_id, local_vaddr, functions, analysis_id, self.app.config_service.portal_url
             )
 
         kw.execute_ui_requests([_show_tab])
 
     def _update_similarity_tab(
-        self, local_func_id: int, local_vaddr: int, functions: list[MatchedFunction]
+        self, local_func_id: int, local_vaddr: int, functions: list[MatchedFunction], analysis_id: int
     ) -> None:
         def _update_tab() -> None:
             if self._similarity_tab is None:
                 return
 
             self._similarity_tab.update_for_function(
-                local_func_id, local_vaddr, functions
+                local_func_id, local_vaddr, functions, analysis_id, self.app.config_service.portal_url
             )
 
         kw.execute_ui_requests([_update_tab])

reai_toolkit/app/services/matching/similarity_service.py

@@ -27,7 +27,7 @@ def fetch_similar_functions(
         self,
         func_id: int,
         vaddr: int,
-        callback: Callable[[int, int, list[MatchedFunction]], None],
+        callback: Callable[[int, int, list[MatchedFunction], int], None],
     ) -> None:
         self.start_worker(
             target=self._perform_function_similarity_request,
@@ -39,7 +39,7 @@ def _perform_function_similarity_request(
         stop_event: threading.Event,
         func_id: int,
         vaddr: int,
-        callback: Callable[[int, int, list[MatchedFunction]], None],
+        callback: Callable[[int, int, list[MatchedFunction], int], None],
     ) -> None:
         with self.yield_api_client(sdk_config=self.sdk_config) as api_client:
             analyses_client = AnalysesCoreApi(api_client)
@@ -92,7 +92,7 @@ def _perform_function_similarity_request(
                     if response.matches:
                         matches = response.matches[0].matched_functions
 
-                    return callback(func_id, vaddr, matches)
+                    return callback(func_id, vaddr, matches, analysis_id)
 
                 time.sleep(sleep_interval)
                 elapsed += sleep_interval