Fix asset discovery.

computablefacts · Sep 8, 2024 · 66b98e1 · 66b98e1
1 parent 744e509
commit 66b98e1
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 13 deletions.
diff --git a/app/Modules/AdversaryMeter/Http/Controllers/AssetController.php b/app/Modules/AdversaryMeter/Http/Controllers/AssetController.php
@@ -3,7 +3,7 @@
 namespace App\Modules\AdversaryMeter\Http\Controllers;
 
 use App\Modules\AdversaryMeter\Events\BeginPortsScan;
-use App\Modules\AdversaryMeter\Helpers\ApiUtils;
+use App\Modules\AdversaryMeter\Helpers\ApiUtilsFacade as ApiUtils;
 use App\Modules\AdversaryMeter\Listeners\CreateAssetListener;
 use App\Modules\AdversaryMeter\Listeners\DeleteAssetListener;
 use App\Modules\AdversaryMeter\Models\Alert;
@@ -48,7 +48,7 @@ public function discover(Request $request): array
         if (!IsValidDomain::test($domain)) {
             return [];
         }
-        if (!in_array($domain, self::BLACKLIST)) {
+        if (in_array($domain, self::BLACKLIST)) {
             abort(500, "The domain is blacklisted : {$domain}");
         }
         return ApiUtils::discover_public($domain);
@@ -361,7 +361,7 @@ public function deleteAsset(Asset $asset): void
 
         /** @var User $user */
         $user = Auth::user();
-        DeleteAssetListener::execute($user, $asset);
+        DeleteAssetListener::execute($user, $asset->asset);
     }
 
     public function restartScan(Asset $asset): array

diff --git a/app/Modules/AdversaryMeter/Jobs/TriggerDiscoveryShallow.php b/app/Modules/AdversaryMeter/Jobs/TriggerDiscoveryShallow.php
@@ -43,7 +43,7 @@ public function handle()
                             Asset::where('tld', $tld)
                                 ->get()
                                 ->each(function (Asset $asset) use ($domain) {
-                                    event(new CreateAsset($domain));
+                                    event(new CreateAsset($asset->createdBy(), $domain));
                                 });
                         });
                 }

diff --git a/app/Modules/AdversaryMeter/Listeners/CreateAssetListener.php b/app/Modules/AdversaryMeter/Listeners/CreateAssetListener.php
@@ -10,7 +10,6 @@
 use App\Modules\AdversaryMeter\Rules\IsValidDomain;
 use App\Modules\AdversaryMeter\Rules\IsValidIpAddress;
 use App\User;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
 
 class CreateAssetListener extends AbstractListener
@@ -28,14 +27,15 @@ public static function execute(User $user, string $asset): ?Asset
         } else {
             $assetType = AssetTypesEnum::RANGE;
         }
-        Auth::login($user); // otherwise the tenant will not be properly set
         return Asset::updateOrCreate(
             [
                 'asset' => $asset,
+                'created_by' => $user->id,
             ],
             [
                 'asset' => $asset,
                 'type' => $assetType,
+                'created_by' => $user->id,
             ]
         );
     }

diff --git a/app/Modules/AdversaryMeter/Listeners/DeleteAssetListener.php b/app/Modules/AdversaryMeter/Listeners/DeleteAssetListener.php
@@ -10,7 +10,6 @@
 use App\Modules\AdversaryMeter\Rules\IsValidDomain;
 use App\Modules\AdversaryMeter\Rules\IsValidIpAddress;
 use App\User;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
 
 class DeleteAssetListener extends AbstractListener
@@ -29,8 +28,11 @@ public static function execute(User $user, string $asset): bool
             $assetType = AssetTypesEnum::RANGE;
         }
 
-        Auth::login($user); // otherwise the tenant will not be properly set
-        Asset::where('asset', $asset)->where('type', $assetType)->delete();
+        Asset::where('asset', $asset)
+            ->where('type', $assetType)
+            ->where('created_by', $user->id)
+            ->delete();
+
         return true;
     }
 

diff --git a/app/Modules/AdversaryMeter/Listeners/EndDiscoveryListener.php b/app/Modules/AdversaryMeter/Listeners/EndDiscoveryListener.php
@@ -71,7 +71,7 @@ protected function handle2($event)
                 Asset::where('tld', $tld)
                     ->get()
                     ->each(function (Asset $asset) use ($domain) {
-                        event(new CreateAsset($domain));
+                        event($asset->createdBy(), new CreateAsset($domain));
                     });
             });
 

diff --git a/public/adversary_meter/src/js/_assets/tab-assets-importer.js b/public/adversary_meter/src/js/_assets/tab-assets-importer.js
@@ -211,7 +211,7 @@ export class TabAssetsImporter extends com.computablefacts.widgets.Widget {
             const tags = data.tags.map(tag => `<span class="badge me-2 mb-1">${tag}</span>`).join('');
             return createNode('div', tags)
           },
-          (data) => document.createTextNode(data.inDatabase ? i18next.t('Déjà importé') : '-'),
+          (data) => document.createTextNode(data.inDatabase ? i18next.t('importé') : ''),
           (data) => {
             const checkbox = document.createElement('input');
             checkbox.type = 'checkbox';
@@ -222,7 +222,7 @@ export class TabAssetsImporter extends com.computablefacts.widgets.Widget {
           }
         ] : [
           (data) => document.createTextNode(data.asset ? data.asset : '-'),
-          (data) => document.createTextNode(data.inDatabase ? i18next.t('Déjà importé') : '-'),
+          (data) => document.createTextNode(data.inDatabase ? i18next.t('importé') : ''),
           (data) => {
             const checkbox = document.createElement('input');
             checkbox.classList.add('me-2')

diff --git a/public/adversary_meter/src/lang/en.json b/public/adversary_meter/src/lang/en.json
@@ -64,7 +64,7 @@
   "Ce n'est pas un nom de domaine ou une adresse ip valide.": "This is not a valid domain name or IP address.",
   "Étiquettes": "Tags",
   "Status": "Status",
-  "Déjà importé": "Already imported",
+  "importé": "imported",
   "Une erreur s'est produite, veuillez réessayer plus tard.": "An error occurred, please try again later.",
   "Aucun fichier sélectionné.": "No file selected.",
   "Erreur lors de la lecture du fichier CSV.": "Error reading the CSV file.",