fence-agents/SOURCES/bz1896827-fence_aws-add-imdsv2-support.patch

41 lines
1.5 KiB
Diff
Raw Normal View History

2021-05-14 04:12:18 +00:00
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: