From 5a090eef218f33567edc24b66a7fbcb45be4bdd8 Mon Sep 17 00:00:00 2001
From: Devon Colmer <935806+d3vco@users.noreply.github.com>
Date: Fri, 19 Jan 2024 17:02:14 -0500
Subject: [PATCH 1/2] Match potential link on platform and name (#2843)

* Match potential link on platform and name

* Restore original formatting
---
 templates/operations.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/operations.html b/templates/operations.html
index 95e6c9204..5a9747597 100644
--- a/templates/operations.html
+++ b/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>
\ No newline at end of file

From 94567f8d8fa1a07c99216c84088f76c1c56d4714 Mon Sep 17 00:00:00 2001
From: Michael Kouremetis <mkouremetis16@gmail.com>
Date: Tue, 23 Jan 2024 14:12:09 -0500
Subject: [PATCH 2/2] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2be0916ba..9e57963bf 100644
--- a/README.md
+++ b/README.md
@@ -128,4 +128,4 @@ To discuss licensing opportunities, please reach out to caldera@mitre.org or dir
 
 ## Caldera Benefactor Program
 
-If you are interested in partnering to support, sustain, and evolve Caldera&trade;'s open source capabilities, please contact us at caldera@mitre.org.
+If you are interested in partnering to support, sustain, and evolve MITRE Caldera&trade;'s open source capabilities, please contact us at caldera@mitre.org.