Merge branch 'master' into bleepbop/virts-4695/resolve-manx-bugs

README.md

@@ -128,4 +128,4 @@ To discuss licensing opportunities, please reach out to [email protected] or dir
 
 ## Caldera Benefactor Program
 
-If you are interested in partnering to support, sustain, and evolve Caldera™'s open source capabilities, please contact us at [email protected].
+If you are interested in partnering to support, sustain, and evolve MITRE Caldera™'s open source capabilities, please contact us at [email protected].

templates/operations.html

@@ -1608,7 +1608,7 @@ <h2>Operations</h2>
                 this.setPotentialLinksToAdd();
                 if (!this.selectedPotentialLink.ability_id) return;
 
-                const executor = link.executors.find((e) => this.potentialLink.executor === e.name);
+                const executor = link.executors.find((ex) => ex.platform === this.potentialLink.agent.platform && this.potentialLink.executor === ex.name);
                 const fields = [...new Set([...executor.command.matchAll(/#{(.*?)}/gm)].map((field) => field[1]))];
                 const opSource = this.SOURCES.find((s) => s.id === this.selectedOperation.source.id);
                 const opSourceCollected = this.SOURCES.find((source) => source.name === this.selectedOperation.name);
@@ -1654,7 +1654,7 @@ <h2>Operations</h2>
 
                 let executor;
                 if (this.selectedPotentialLink.executors) {
-                    executor = this.selectedPotentialLink.executors.find((e) => this.potentialLink.executor === e.name);
+                    executor = this.selectedPotentialLink.executors.find((ex) => ex.platform === this.potentialLink.agent.platform && this.potentialLink.executor === ex.name);
                 }
 
                 if (!combinations.length) {
@@ -2144,4 +2144,4 @@ <h2>Operations</h2>
     #operationsPage span.status-timeout::after {
         box-shadow: 0 0 0 0.2em cornflowerblue;
     }
-</style>
+</style>