Backport endpoint '/adversary/assets/restart/{assetId}'.

computablefacts · Sep 6, 2024 · 935e6ab · 935e6ab
1 parent 65e09a1
commit 935e6ab
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/app/Modules/AdversaryMeter/Http/Controllers/AssetController.php b/app/Modules/AdversaryMeter/Http/Controllers/AssetController.php
@@ -2,6 +2,7 @@
 
 namespace App\Modules\AdversaryMeter\Http\Controllers;
 
+use App\Modules\AdversaryMeter\Events\BeginPortsScan;
 use App\Modules\AdversaryMeter\Helpers\ApiUtils;
 use App\Modules\AdversaryMeter\Listeners\CreateAssetListener;
 use App\Modules\AdversaryMeter\Models\Alert;
@@ -333,4 +334,25 @@ public function infosFromAsset(string $assetBase64): array
             'hiddenAlerts' => $alerts->filter(fn(Alert $alert) => $alert->is_hidden)->toArray(),
         ];
     }
+
+    public function deleteAsset(Asset $asset): void
+    {
+        if ($asset->is_monitored) {
+            abort(500, 'Deletion not allowed, asset is monitored.');
+        }
+        $asset->delete();
+    }
+
+    public function restartScan(Asset $asset): array
+    {
+        if (!$asset->is_monitored) {
+            abort(500, 'Restart scan not allowed, asset is not monitored.');
+        }
+        if (!$asset->scanInProgress()) {
+            event(new BeginPortsScan($asset));
+        }
+        return [
+            'asset' => $this->convertAsset($asset),
+        ];
+    }
 }
diff --git a/app/Modules/AdversaryMeter/Http/Controllers/HoneypotController.php b/app/Modules/AdversaryMeter/Http/Controllers/HoneypotController.php
@@ -447,12 +447,4 @@ public function deleteHiddenAlert(HiddenAlert $hiddenAlert): void
     {
         $hiddenAlert->delete();
     }
-
-    public function deleteAsset(Asset $asset)
-    {
-        if ($asset->is_monitored) {
-            abort(500, 'Deletion not allowed, asset is monitored.');
-        }
-        $asset->delete();
-    }
 }
diff --git a/app/Modules/AdversaryMeter/api.php b/app/Modules/AdversaryMeter/api.php
@@ -34,6 +34,8 @@
 Route::group([
     'prefix' => 'adversary',
 ], function () {
+    Route::delete('assets/{assetId}', 'AssetController@deleteAsset');
+    Route::post('assets/restart/{assetId}', 'AssetController@restartScan');
     Route::get('infos-from-asset/{asset}', 'AssetController@infosFromAsset');
     Route::get('attacker-index', 'HoneypotController@attackerIndex');
     Route::get('recent-events', 'HoneypotController@recentEvents');
@@ -58,5 +60,4 @@
     Route::delete('hidden-alerts/{hiddenAlertId}', 'HoneypotController@deleteHiddenAlert');
     Route::post('honeypots', 'HoneypotController@postHoneypots');
     Route::post('honeypots/set-next-step', 'HoneypotController@moveHoneypotsConfigurationToNextStep');
-    Route::delete('assets/{assetId}', 'HoneypotController@deleteAsset');
 });