Merge pull request #246 from davepgreene/add-expiration-to-credential…

…s-file
rapid7 · Jul 8, 2024 · 838ed95 · 838ed95
2 parents d15caec + 54c1260
commit 838ed95
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 16 deletions.
diff --git a/src/main/api/aws-credentials.js b/src/main/api/aws-credentials.js
@@ -68,6 +68,11 @@ class AwsCredentials {
       aws_security_token: credentials.SessionToken,
     };
 
+    // Include expiration if it is available
+    if (credentials.Expiration) {
+      config[profile].expiration = credentials.Expiration;
+    }
+
     if (region.includes('gov')) {
       config[profile].region = region;
     }

diff --git a/test/aws-credentials.js b/test/aws-credentials.js
@@ -159,6 +159,33 @@ describe('AwsCredentials#saveAsIniFile', () => {
     },
   );
 
+  it('saves the expiration in the credentials file if it exists', (done) => {
+    const aws = new AwsCredentials();
+    const credentials = {
+      AccessKeyId: 'AccessKeyId',
+      SecretAccessKey: 'SecretAccessKey',
+      SessionToken: 'SessionToken',
+      Expiration: new Date().toISOString(),
+    };
+
+    process.env.HOME = __dirname;
+
+    aws.saveAsIniFile(credentials, 'profile', () => {
+      const data = FS.readFileSync(awsCredentials, 'utf-8');
+      const config = ini.parse(data);
+
+      expect(config.profile).toEqual({
+        aws_access_key_id: credentials.AccessKeyId,
+        aws_secret_access_key: credentials.SecretAccessKey,
+        aws_security_token: credentials.SessionToken,
+        aws_session_token: credentials.SessionToken,
+        expiration: credentials.Expiration,
+      });
+
+      done();
+    });
+  });
+
   it('keeps existing profiles', (done) => {
     const aws = new AwsCredentials();
     const credentials1 = {
@@ -171,28 +198,44 @@ describe('AwsCredentials#saveAsIniFile', () => {
       SecretAccessKey: 'SecretAccessKey2',
       SessionToken: 'SessionToken2',
     };
+    const credentials3 = {
+      AccessKeyId: 'AccessKeyId3',
+      SecretAccessKey: 'SecretAccessKey3',
+      SessionToken: 'SessionToken3',
+      Expiration: new Date().toISOString(),
+    };
 
     process.env.HOME = __dirname;
 
     aws.saveAsIniFile(credentials1, 'profile1', () => {
       aws.saveAsIniFile(credentials2, 'profile2', () => {
-        const data = FS.readFileSync(awsCredentials, 'utf-8');
-        const config = ini.parse(data);
-
-        expect(config.profile1).toEqual({
-          aws_access_key_id: credentials1.AccessKeyId,
-          aws_secret_access_key: credentials1.SecretAccessKey,
-          aws_security_token: credentials1.SessionToken,
-          aws_session_token: credentials1.SessionToken,
+        aws.saveAsIniFile(credentials3, 'profile3', () => {
+          const data = FS.readFileSync(awsCredentials, 'utf-8');
+          const config = ini.parse(data);
+
+          expect(config.profile1).toEqual({
+            aws_access_key_id: credentials1.AccessKeyId,
+            aws_secret_access_key: credentials1.SecretAccessKey,
+            aws_security_token: credentials1.SessionToken,
+            aws_session_token: credentials1.SessionToken,
+          });
+          expect(config.profile2).toEqual({
+            aws_access_key_id: credentials2.AccessKeyId,
+            aws_secret_access_key: credentials2.SecretAccessKey,
+            aws_security_token: credentials2.SessionToken,
+            aws_session_token: credentials2.SessionToken,
+          });
+
+          expect(config.profile3).toEqual({
+            aws_access_key_id: credentials3.AccessKeyId,
+            aws_secret_access_key: credentials3.SecretAccessKey,
+            aws_security_token: credentials3.SessionToken,
+            aws_session_token: credentials3.SessionToken,
+            expiration: credentials3.Expiration,
+          });
+
+          done();
         });
-        expect(config.profile2).toEqual({
-          aws_access_key_id: credentials2.AccessKeyId,
-          aws_secret_access_key: credentials2.SecretAccessKey,
-          aws_security_token: credentials2.SessionToken,
-          aws_session_token: credentials2.SessionToken,
-        });
-
-        done();
       });
     });
   });