Blame SOURCES/bz1905737-aws-add-imdsv2-support.patch

d07311
From 8f10d0eb1e33d38ab6e89015a903620c54edd7c1 Mon Sep 17 00:00:00 2001
d07311
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
d07311
Date: Fri, 13 Nov 2020 16:36:20 +0100
d07311
Subject: [PATCH] AWS agents: add support for IMDSv2
d07311
d07311
---
d07311
 heartbeat/aws-vpc-move-ip    | 5 +++--
d07311
 heartbeat/aws-vpc-route53.in | 3 ++-
d07311
 heartbeat/awseip             | 9 +++++----
d07311
 heartbeat/awsvip             | 7 ++++---
d07311
 4 files changed, 14 insertions(+), 10 deletions(-)
d07311
d07311
diff --git a/heartbeat/aws-vpc-move-ip b/heartbeat/aws-vpc-move-ip
d07311
index 72a89ecb1..cbb629b00 100755
d07311
--- a/heartbeat/aws-vpc-move-ip
d07311
+++ b/heartbeat/aws-vpc-move-ip
d07311
@@ -215,7 +215,8 @@ ec2ip_validate() {
d07311
 		return $OCF_ERR_CONFIGURED
d07311
 	fi
d07311
 
d07311
-	EC2_INSTANCE_ID="$(curl -s http://169.254.169.254/latest/meta-data/instance-id)"
d07311
+	TOKEN=$(curl -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600")
d07311
+	EC2_INSTANCE_ID=$(curl -s http://169.254.169.254/latest/meta-data/instance-id -H "X-aws-ec2-metadata-token: $TOKEN")
d07311
 
d07311
 	if [ -z "${EC2_INSTANCE_ID}" ]; then
d07311
 		ocf_exit_reason "Instance ID not found. Is this a EC2 instance?"
d07311
@@ -329,7 +330,7 @@ ec2ip_get_instance_eni() {
d07311
 	fi
d07311
 	ocf_log debug "MAC address associated with interface ${OCF_RESKEY_interface}: ${MAC_ADDR}"
d07311
 
d07311
-	cmd="curl -s http://169.254.169.254/latest/meta-data/network/interfaces/macs/${MAC_ADDR}/interface-id"
d07311
+	cmd="curl -s http://169.254.169.254/latest/meta-data/network/interfaces/macs/${MAC_ADDR}/interface-id -H \"X-aws-ec2-metadata-token: $TOKEN\""
d07311
 	ocf_log debug "executing command: $cmd"
d07311
 	EC2_NETWORK_INTERFACE_ID="$(eval $cmd)"
d07311
 	rc=$?
d07311
diff --git a/heartbeat/aws-vpc-route53.in b/heartbeat/aws-vpc-route53.in
d07311
index b06b93726..4fb17019b 100644
d07311
--- a/heartbeat/aws-vpc-route53.in
d07311
+++ b/heartbeat/aws-vpc-route53.in
d07311
@@ -347,7 +347,8 @@ r53_monitor() {
d07311
 _get_ip() {
d07311
 	case $OCF_RESKEY_ip in
d07311
 		local|public)
d07311
-			IPADDRESS="$(curl -s http://169.254.169.254/latest/meta-data/${OCF_RESKEY_ip}-ipv4)";;
d07311
+			TOKEN=$(curl -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600")
d07311
+			IPADDRESS=$(curl -s http://169.254.169.254/latest/meta-data/${OCF_RESKEY_ip}-ipv4 -H "X-aws-ec2-metadata-token: $TOKEN");;
d07311
 		*.*.*.*)
d07311
 			IPADDRESS="${OCF_RESKEY_ip}";;
d07311
 	esac
d07311
diff --git a/heartbeat/awseip b/heartbeat/awseip
d07311
index 445a03666..de1967774 100755
d07311
--- a/heartbeat/awseip
d07311
+++ b/heartbeat/awseip
d07311
@@ -149,12 +149,12 @@ awseip_start() {
d07311
     awseip_monitor && return $OCF_SUCCESS
d07311
 
d07311
     if [ -n "${PRIVATE_IP_ADDRESS}" ]; then
d07311
-        NETWORK_INTERFACES_MACS="$(curl -s http://169.254.169.254/latest/meta-data/network/interfaces/macs/)"
d07311
+        NETWORK_INTERFACES_MACS=$(curl -s http://169.254.169.254/latest/meta-data/network/interfaces/macs/ -H "X-aws-ec2-metadata-token: $TOKEN")
d07311
         for MAC in ${NETWORK_INTERFACES_MACS}; do
d07311
-            curl -s http://169.254.169.254/latest/meta-data/network/interfaces/macs/${MAC}/local-ipv4s |
d07311
+            curl -s http://169.254.169.254/latest/meta-data/network/interfaces/macs/${MAC}/local-ipv4s -H "X-aws-ec2-metadata-token: $TOKEN" |
d07311
                 grep -q "^${PRIVATE_IP_ADDRESS}$"
d07311
             if [ $? -eq 0 ]; then
d07311
-                NETWORK_ID="$(curl -s http://169.254.169.254/latest/meta-data/network/interfaces/macs/${MAC}/interface-id)"
d07311
+                NETWORK_ID=$(curl -s http://169.254.169.254/latest/meta-data/network/interfaces/macs/${MAC}/interface-id -H "X-aws-ec2-metadata-token: $TOKEN")
d07311
             fi
d07311
         done
d07311
         $AWSCLI --profile $OCF_RESKEY_profile ec2 associate-address  \
d07311
@@ -244,7 +244,8 @@ AWSCLI="${OCF_RESKEY_awscli}"
d07311
 ELASTIC_IP="${OCF_RESKEY_elastic_ip}"
d07311
 ALLOCATION_ID="${OCF_RESKEY_allocation_id}"
d07311
 PRIVATE_IP_ADDRESS="${OCF_RESKEY_private_ip_address}"
d07311
-INSTANCE_ID="$(curl -s http://169.254.169.254/latest/meta-data/instance-id)"
d07311
+TOKEN=$(curl -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600")
d07311
+INSTANCE_ID=$(curl -s http://169.254.169.254/latest/meta-data/instance-id -H "X-aws-ec2-metadata-token: $TOKEN")
d07311
 
d07311
 case $__OCF_ACTION in
d07311
     start)
d07311
diff --git a/heartbeat/awsvip b/heartbeat/awsvip
d07311
index 3eb31e6ae..8050107e8 100755
d07311
--- a/heartbeat/awsvip
d07311
+++ b/heartbeat/awsvip
d07311
@@ -206,9 +206,10 @@ esac
d07311
 
d07311
 AWSCLI="${OCF_RESKEY_awscli}"
d07311
 SECONDARY_PRIVATE_IP="${OCF_RESKEY_secondary_private_ip}"
d07311
-INSTANCE_ID="$(curl -s http://169.254.169.254/latest/meta-data/instance-id)"
d07311
-MAC_ADDRESS="$(curl -s http://169.254.169.254/latest/meta-data/mac)"
d07311
-NETWORK_ID="$(curl -s http://169.254.169.254/latest/meta-data/network/interfaces/macs/${MAC_ADDRESS}/interface-id)"
d07311
+TOKEN=$(curl -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600")
d07311
+INSTANCE_ID=$(curl -s http://169.254.169.254/latest/meta-data/instance-id -H "X-aws-ec2-metadata-token: $TOKEN")
d07311
+MAC_ADDRESS=$(curl -s http://169.254.169.254/latest/meta-data/mac -H "X-aws-ec2-metadata-token: $TOKEN")
d07311
+NETWORK_ID=$(curl -s http://169.254.169.254/latest/meta-data/network/interfaces/macs/${MAC_ADDRESS}/interface-id -H "X-aws-ec2-metadata-token: $TOKEN")
d07311
 
d07311
 case $__OCF_ACTION in
d07311
     start)