(fix) show screenshots if stored in the db

fixes #246
sensepost · Oct 10, 2024 · a40f82a · a40f82a
1 parent 83b61c3
commit a40f82a
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 25 deletions.
diff --git a/web/api/gallery.go b/web/api/gallery.go
@@ -25,6 +25,7 @@ type galleryContent struct {
 	ResponseCode int       `json:"response_code"`
 	Title        string    `json:"title"`
 	Filename     string    `json:"file_name"`
+	Screenshot   string    `json:"screenshot"`
 	Failed       bool      `json:"failed"`
 	Technologies []string  `json:"technologies"`
 }
@@ -141,6 +142,7 @@ func (h *ApiHandler) GalleryHandler(w http.ResponseWriter, r *http.Request) {
 			ResponseCode: result.ResponseCode,
 			Title:        result.Title,
 			Filename:     result.Filename,
+			Screenshot:   result.Screenshot,
 			Failed:       result.Failed,
 			Technologies: technologies,
 		})

diff --git a/web/api/search.go b/web/api/search.go
@@ -28,6 +28,7 @@ type searchResult struct {
 	Failed         bool     `json:"failed"`
 	FailedReason   string   `json:"failed_reason"`
 	Filename       string   `json:"file_name"`
+	Screenshot     string   `json:"screenshot"`
 	MatchedFields  []string `json:"matched_fields"`
 }
 
@@ -254,6 +255,7 @@ func appendResults(searchResults []searchResult, resultIDs map[uint]bool, newRes
 				Failed:         res.Failed,
 				FailedReason:   res.FailedReason,
 				Filename:       res.Filename,
+				Screenshot:     res.Screenshot,
 				MatchedFields:  []string{matchedField},
 			})
 

diff --git a/web/ui/src/lib/api/types.ts b/web/ui/src/lib/api/types.ts
@@ -33,6 +33,7 @@ type galleryResult = {
   title: string;
   response_code: number;
   file_name: string;
+  screenshot: string;
   failed: boolean;
   technologies: string[];
 };
@@ -106,27 +107,6 @@ interface consolelog {
   value: string;
 }
 
-/*
-type Cookie struct {
-  ID       uint `json:"id" gorm:"primarykey"`
-  ResultID uint `json:"result_id"`
-
-  Name         string  `json:"name"`
-  Value        string  `json:"value"`
-  Domain       string  `json:"domain"`
-  Path         string  `json:"path"`
-  Expires      float64 `json:"expires"`
-  Size         int64   `json:"size"`
-  HTTPOnly     bool    `json:"http_only"`
-  Secure       bool    `json:"secure"`
-  Session      bool    `json:"session"`
-  Priority     string  `json:"priority"`
-  SourceScheme string  `json:"source_scheme"`
-  SourcePort   int64   `json:"source_port"`
-}
-
-*/
-
 interface cookie {
   id: number;
   result_id: number;
@@ -178,13 +158,13 @@ interface searchresult {
   title: string;
   matched_fields: string[];
   file_name: string;
+  screenshot: string;
 }
 
 interface technologylist {
   technologies: string[];
 }
 
-
 export type {
   statistics,
   wappalyzer,

diff --git a/web/ui/src/pages/detail/Detail.tsx b/web/ui/src/pages/detail/Detail.tsx
@@ -182,7 +182,11 @@ const ScreenshotDetailPage = () => {
             <DialogTrigger asChild>
               <button className="w-full relative">
                 <img
-                  src={api.endpoints.screenshot.path + "/" + detail.file_name}
+                  src={
+                    detail.screenshot
+                      ? `data:image/png;base64,${detail.screenshot}`
+                      : api.endpoints.screenshot.path + "/" + detail.file_name
+                  }
                   alt={detail.title}
                   className="w-full h-auto object-cover transition-all duration-300 filter group-hover:brightness-75 rounded-lg"
                 />

diff --git a/web/ui/src/pages/gallery/Gallery.tsx b/web/ui/src/pages/gallery/Gallery.tsx
@@ -159,7 +159,9 @@ const GalleryPage = () => {
               </div>
             ) : (
               <img
-                src={api.endpoints.screenshot.path + "/" + screenshot.file_name}
+                src={screenshot.screenshot
+                  ? `data:image/png;base64,${screenshot.screenshot}`
+                  : api.endpoints.screenshot.path + "/" + screenshot.file_name}
                 alt={screenshot.url}
                 loading="lazy"
                 className="w-full h-48 object-cover transition-all duration-300 filter group-hover:scale-105"

diff --git a/web/ui/src/pages/search/Search.tsx b/web/ui/src/pages/search/Search.tsx
@@ -28,7 +28,10 @@ export default function SearchResultsPage() {
             <Card className="flex flex-col h-full transition-shadow hover:shadow-lg">
               <CardHeader className="relative p-0">
                 <img
-                  src={api.endpoints.screenshot.path + "/" + result.file_name}
+                  src={
+                    result.screenshot
+                      ? `data:image/png;base64,${result.screenshot}`
+                      : api.endpoints.screenshot.path + "/" + result.file_name}
                   alt={result.url}
                   loading="lazy"
                   className="w-full h-48 object-cover transition-all duration-300 filter group-hover:scale-105"