import fence-agents-4.2.1-53.el8_3.2

SOURCES/bz1905595-fence_aws-add-imdsv2-support.patch

@@ -0,0 +1,40 @@
+From c9f8890264e0257197b31124dbb26c1046475314 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Fri, 13 Nov 2020 14:30:43 +0100
+Subject: [PATCH] fence_aws: add support for IMDSv2
+
+---
+ agents/aws/fence_aws.py | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/agents/aws/fence_aws.py b/agents/aws/fence_aws.py
+index 483a2991..e2a2391f 100644
+--- a/agents/aws/fence_aws.py
++++ b/agents/aws/fence_aws.py
+@@ -3,12 +3,13 @@
+ import sys, re
+ import logging
+ import atexit
+-import requests
+ sys.path.append("@FENCEAGENTSLIBDIR@")
+ from fencing import *
+ from fencing import fail, fail_usage, run_delay, EC_STATUS, SyslogLibHandler
+ 
++import requests
+ import boto3
++from requests import HTTPError
+ from botocore.exceptions import ConnectionError, ClientError, EndpointConnectionError, NoRegionError
+ 
+ logger = logging.getLogger("fence_aws")
+@@ -19,8 +20,9 @@
+ 
+ def get_instance_id():
+ 	try:
+-		r = requests.get('http://169.254.169.254/latest/meta-data/instance-id')
+-		return r.content.decode("UTF-8")
++		token = requests.put('http://169.254.169.254/latest/api/token', headers={"X-aws-ec2-metadata-token-ttl-seconds" : "21600"}).content.decode("UTF-8")
++		r = requests.get('http://169.254.169.254/latest/meta-data/instance-id', headers={"X-aws-ec2-metadata-token" : token}).content.decode("UTF-8")
++		return r
+ 	except HTTPError as http_err:
+ 		logger.error('HTTP error occurred while trying to access EC2 metadata server: %s', http_err)
+ 	except Exception as err:

SPECS/fence-agents.spec

@@ -29,7 +29,7 @@
 Name: fence-agents
 Summary: Set of unified programs capable of host isolation ("fencing")
 Version: 4.2.1
-Release: 53%{?alphatag:.%{alphatag}}%{?dist}.1
+Release: 53%{?alphatag:.%{alphatag}}%{?dist}.2
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: https://github.com/ClusterLabs/fence-agents
@@ -110,6 +110,7 @@ Patch68: bz1796654-fence_vmware_soap-log-exception-message-for-SSLError.patch
 Patch69: bz1793739-fence_vmware_rest-3-fix-encode-issue.patch
 Patch70: bz1860544-fence_lpar-fix-long-user-host-issue.patch
 Patch71: bz1859932-fence_evacuate-support-private-flavors.patch
+Patch72: bz1905595-fence_aws-add-imdsv2-support.patch
 
 %if 0%{?fedora} || 0%{?rhel} > 7
 %global supportedagents amt_ws apc apc_snmp bladecenter brocade cisco_mds cisco_ucs compute drac5 eaton_snmp emerson eps evacuate hpblade ibmblade ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan kdump lpar mpath redfish rhevm rsa rsb sbd scsi vmware_rest vmware_soap wti
@@ -259,6 +260,7 @@ BuildRequires: python3-google-api-client
 %patch69 -p1
 %patch70 -p1
 %patch71 -p1
+%patch72 -p1
 
 # prevent compilation of something that won't get used anyway
 sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac
@@ -1128,6 +1130,10 @@ Fence agent for IBM z/VM over IP.
 %endif
 
 %changelog
+* Wed Dec  9 2020 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.2.1-53.2
+- fence_aws: add support for IMDSv2
+  Resolves: rhbz#1905595
+
 * Tue Sep 29 2020 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.2.1-53.1
 - all agents: make telnet a weak dependency
   Resolves: rhbz#1883420