Get Delphi working with Labrinth

aecsocket · aecsocket · commit 2b49a7c1d3c1 · 2025-11-15T23:09:48.000Z
diff --git a/apps/labrinth/migrations/20250810155316_delphi-reports.sql b/apps/labrinth/migrations/20250810155316_delphi-reports.sql
@@ -39,7 +39,8 @@ CREATE TABLE delphi_report_issue_details (
 	issue_id BIGINT NOT NULL REFERENCES delphi_report_issues (id)
 		ON DELETE CASCADE
 		ON UPDATE CASCADE,
-	internal_class_name TEXT NOT NULL,
+	key TEXT NOT NULL,
+	file_path TEXT NOT NULL,
 	decompiled_source TEXT,
 	data JSONB NOT NULL,
 	severity DELPHI_SEVERITY NOT NULL
diff --git a/apps/labrinth/src/database/models/delphi_report_item.rs b/apps/labrinth/src/database/models/delphi_report_item.rs
@@ -249,8 +249,9 @@ impl DBDelphiReportIssue {
 #[derive(Debug, Deserialize, Serialize)]
 pub struct DBDelphiReportIssueDetails {
     pub id: DelphiReportIssueDetailsId,
+    pub key: String,
     pub issue_id: DelphiReportIssueId,
-    pub internal_class_name: InternalJavaClassName,
+    pub file_path: String,
     pub decompiled_source: Option<DecompiledJavaClassSource>,
     pub data: Json<HashMap<String, serde_json::Value>>,
     pub severity: DelphiSeverity,
@@ -263,12 +264,13 @@ impl DBDelphiReportIssueDetails {
     ) -> Result<DelphiReportIssueDetailsId, DatabaseError> {
         Ok(DelphiReportIssueDetailsId(sqlx::query_scalar!(
             "
-            INSERT INTO delphi_report_issue_details (issue_id, internal_class_name, decompiled_source, data, severity)
-            VALUES ($1, $2, $3, $4, $5)
+            INSERT INTO delphi_report_issue_details (issue_id, key, file_path, decompiled_source, data, severity)
+            VALUES ($1, $2, $3, $4, $5, $6)
             RETURNING id
             ",
             self.issue_id as DelphiReportIssueId,
-            self.internal_class_name.0,
+            self.key,
+            self.file_path,
             self.decompiled_source.as_ref().map(|decompiled_source| &decompiled_source.0),
             &self.data as &Json<HashMap<String, serde_json::Value>>,
             self.severity as DelphiSeverity,
diff --git a/apps/labrinth/src/routes/internal/delphi.rs b/apps/labrinth/src/routes/internal/delphi.rs
@@ -6,7 +6,7 @@ use reqwest::header::{HeaderMap, HeaderValue, USER_AGENT};
 use serde::Deserialize;
 use sqlx::PgPool;
 use tokio::sync::Mutex;
-use tracing::info;
+use tracing::{info, warn};
 
 use crate::{
     auth::check_is_moderator_from_headers,
@@ -18,7 +18,6 @@ use crate::{
                 DBDelphiReport, DBDelphiReportIssue,
                 DBDelphiReportIssueDetails, DecompiledJavaClassSource,
                 DelphiReportIssueStatus, DelphiReportListOrder, DelphiSeverity,
-                InternalJavaClassName,
             },
         },
         redis::RedisPool,
@@ -61,7 +60,8 @@ static DELPHI_CLIENT: LazyLock<reqwest::Client> = LazyLock::new(|| {
 
 #[derive(Deserialize)]
 struct DelphiReportIssueDetails {
-    pub internal_class_name: InternalJavaClassName,
+    pub file: String,
+    pub key: String,
     pub decompiled_source: Option<DecompiledJavaClassSource>,
     pub data: HashMap<String, serde_json::Value>,
     pub severity: DelphiSeverity,
@@ -94,14 +94,14 @@ impl DelphiReport {
 
         for (issue, trace) in &self.issues {
             for DelphiReportIssueDetails {
-                internal_class_name,
+                file,
                 decompiled_source,
                 ..
             } in trace
             {
                 write!(
                     &mut message_header,
-                    "\n issue {issue} found at class `{internal_class_name}`:\n```\n{}\n```",
+                    "\n issue {issue} found at class `{file}`:\n```\n{}\n```",
                     decompiled_source.as_ref().map_or(
                         "No decompiled source available",
                         |decompiled_source| &**decompiled_source
@@ -131,13 +131,21 @@ pub struct DelphiRunParameters {
 async fn ingest_report(
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
-    web::Json(report): web::Json<DelphiReport>,
-) -> Result<HttpResponse, ApiError> {
-    tracing::error!("!! INGEST !!");
+    report: web::Bytes,
+    // web::Json(report): web::Json<DelphiReport>,
+) -> Result<(), ApiError> {
+    info!(
+        "Json: {}",
+        serde_json::to_string_pretty(
+            &serde_json::from_slice::<serde_json::Value>(&report).unwrap()
+        )
+        .unwrap()
+    );
+    let report = serde_json::from_slice::<DelphiReport>(&report).unwrap();
 
     if report.issues.is_empty() {
         info!("No issues found for file {}", report.url);
-        return Ok(HttpResponse::NoContent().finish());
+        return Ok(());
     }
 
     report.send_to_slack(&pool, &redis).await.ok();
@@ -155,6 +163,12 @@ async fn ingest_report(
     .upsert(&mut transaction)
     .await?;
 
+    warn!(
+        "Delphi found {} issues in file {}",
+        report.issues.len(),
+        report.url
+    );
+
     for (issue_type, issue_details) in report.issues {
         let issue_id = DBDelphiReportIssue {
             id: DelphiReportIssueId(0), // This will be set by the database
@@ -176,7 +190,8 @@ async fn ingest_report(
             DBDelphiReportIssueDetails {
                 id: DelphiReportIssueDetailsId(0), // This will be set by the database
                 issue_id,
-                internal_class_name: issue_detail.internal_class_name,
+                key: issue_detail.key,
+                file_path: issue_detail.file,
                 decompiled_source: issue_detail.decompiled_source,
                 data: issue_detail.data.into(),
                 severity: issue_detail.severity,
@@ -188,7 +203,7 @@ async fn ingest_report(
 
     transaction.commit().await?;
 
-    Ok(HttpResponse::NoContent().finish())
+    Ok(())
 }
 
 pub async fn run(
@@ -216,10 +231,18 @@ pub async fn run(
         run_parameters.file_id.0
     );
 
+    // fix for local file paths
+    // TODO: should we fix this upstream in whatever inserts the files row?
+    let url = if file_data.url.starts_with("/") {
+        format!("file://{}", file_data.url)
+    } else {
+        file_data.url
+    };
+
     DELPHI_CLIENT
         .post(dotenvy::var("DELPHI_URL")?)
         .json(&serde_json::json!({
-            "url": file_data.url,
+            "url": url,
             "project_id": ProjectId(file_data.project_id.0 as u64),
             "version_id": VersionId(file_data.version_id.0 as u64),
             "file_id": run_parameters.file_id,
diff --git a/apps/labrinth/src/routes/internal/moderation/tech_review.rs b/apps/labrinth/src/routes/internal/moderation/tech_review.rs
@@ -67,6 +67,7 @@ pub struct SearchProjectsFilter {
     Deserialize,
     utoipa::ToSchema,
 )]
+#[serde(rename_all = "snake_case")]
 pub enum SearchProjectsSort {
     CreatedAsc,
     CreatedDesc,
@@ -153,8 +154,8 @@ pub struct FileIssue {
 /// Occurrence of a [`FileIssue`] in a specific class in a scanned JAR file.
 #[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct FileIssueDetail {
-    /// Name of the Java class in which this issue was found.
-    pub class_name: String,
+    /// Name of the Java class path in which this issue was found.
+    pub file_path: String,
     /// Decompiled, pretty-printed source of the Java class.
     pub decompiled_source: String,
     /// How important is this issue, as flagged by Delphi?
@@ -236,7 +237,7 @@ async fn search_projects(
             dri.status AS "issue_status!: DelphiReportIssueStatus",
             -- maybe null
             drid.id AS "issue_detail_id?: DelphiReportIssueDetailsId",
-            drid.internal_class_name AS "issue_detail_class_name?",
+            drid.file_path AS "issue_detail_file_path?",
             drid.decompiled_source AS "issue_detail_decompiled_source?",
             drid.severity AS "issue_detail_severity?: DelphiSeverity"
         FROM delphi_reports dr
@@ -322,12 +323,12 @@ async fn search_projects(
 
         let (
             Some(issue_detail_id),
-            Some(class_name),
+            Some(file_path),
             Some(decompiled_source),
             Some(severity),
         ) = (
             row.issue_detail_id,
-            row.issue_detail_class_name,
+            row.issue_detail_file_path,
             row.issue_detail_decompiled_source,
             row.issue_detail_severity,
         )
@@ -336,7 +337,7 @@ async fn search_projects(
         };
         issue.details.entry(issue_detail_id).or_insert_with(|| {
             FileIssueDetail {
-                class_name,
+                file_path,
                 decompiled_source,
                 severity,
             }
@@ -414,8 +415,7 @@ async fn search_projects(
                                             .into_iter()
                                             .map(|(_, detail)| {
                                                 FileIssueDetail {
-                                                    class_name: detail
-                                                        .class_name,
+                                                    file_path: detail.file_path,
                                                     decompiled_source: detail
                                                         .decompiled_source,
                                                     severity: detail.severity,
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -117,7 +117,7 @@ services:
   delphi:
     profiles:
       - with-delphi
-    image: ghcr.io/modrinth/delphi:main
+    image: ghcr.io/modrinth/delphi:feature-schema-rework
     container_name: labrinth-delphi
     ports:
       - '59999:59999'
@@ -130,6 +130,10 @@ services:
       interval: 3s
       timeout: 5s
       retries: 3
+    volumes:
+      # Labrinth deposits version files here;
+      # Delphi reads them from here
+      - /tmp/modrinth:/tmp/modrinth:ro
     extra_hosts:
       # Delphi must send a message on a webhook to our backend,
       # so it must have access to our local network
