'Version 1.6.3 of the AWS CloudTrail Processing Library'

Author: keithwo

META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: AWS CloudTrail Processing Library for Java
 Bundle-SymbolicName: com.amazonaws.awscloudtrailprocessinglibrary;singleton:=true
-Bundle-Version: 1.6.2
+Bundle-Version: 1.6.3
 Bundle-Vendor: Amazon Technologies, Inc
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.amazonaws.sdk;bundle-version="1.12.261"

README.rst

@@ -65,6 +65,11 @@ build, use this command::
 Release Notes
 -------------
 
+Release 1.6.3 (Oct 25, 2024)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Added support for modeling InScopeOf
+* Added support for modeling VpcEndpointAccountId
+
 Release 1.6.2 (Nov 30, 2023)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 * Added support for modeling EdgeDeviceDetails

pom.xml

@@ -1,3 +1,4 @@
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -96,3 +97,4 @@
         </pluginManagement>
     </build>
 </project>
+

src/main/java/com/amazonaws/services/cloudtrail/processinglibrary/manager/BasicS3Manager.java

@@ -26,6 +26,7 @@
 import com.amazonaws.services.cloudtrail.processinglibrary.progress.ProgressStatus;
 import com.amazonaws.services.cloudtrail.processinglibrary.utils.LibraryUtils;
 import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.model.GetObjectRequest;
 import com.amazonaws.services.s3.model.S3Object;
 import com.amazonaws.services.s3.model.S3ObjectInputStream;
 import org.apache.commons.logging.Log;
@@ -36,7 +37,7 @@
 /**
  * Manages Amazon S3 service-related operations.
  */
-public class BasicS3Manager implements S3Manager{
+public class BasicS3Manager implements S3Manager {
     private static final Log logger = LogFactory.getLog(S3Manager.class);
 
     private AmazonS3 s3Client;
@@ -109,7 +110,8 @@ public byte[] downloadLog(CloudTrailLog ctLog, CloudTrailSource source) {
      */
     public S3Object getObject(String bucketName, String objectKey) {
         try {
-            return s3Client.getObject(bucketName, objectKey);
+            GetObjectRequest request = new GetObjectRequest(bucketName, objectKey).withRequesterPays(true);
+            return s3Client.getObject(request);
         } catch (AmazonServiceException e) {
             logger.error("Failed to get object " + objectKey + " from s3 bucket " + bucketName);
             throw e;

src/main/java/com/amazonaws/services/cloudtrail/processinglibrary/model/CloudTrailEventData.java

@@ -18,6 +18,7 @@
 import com.amazonaws.services.cloudtrail.processinglibrary.model.internal.Addendum;
 import com.amazonaws.services.cloudtrail.processinglibrary.model.internal.CloudTrailDataStore;
 import com.amazonaws.services.cloudtrail.processinglibrary.model.internal.CloudTrailEventField;
+import com.amazonaws.services.cloudtrail.processinglibrary.model.internal.InScopeOf;
 import com.amazonaws.services.cloudtrail.processinglibrary.model.internal.InsightDetails;
 import com.amazonaws.services.cloudtrail.processinglibrary.model.internal.Resource;
 import com.amazonaws.services.cloudtrail.processinglibrary.model.internal.TlsDetails;
@@ -367,4 +368,12 @@ public TlsDetails getTlsDetails() {
     public String getSessionCredentialFromConsole() {
         return (String) get(CloudTrailEventField.sessionCredentialFromConsole.name());
     }
+
+    public InScopeOf getInScopeOf() {
+        return (InScopeOf) get(CloudTrailEventField.inScopeOf.name());
+    }
+
+    public String getVpcEndpointAccountId() {
+        return (String) get(CloudTrailEventField.vpcEndpointAccountId.name());
+    }
 }

src/main/java/com/amazonaws/services/cloudtrail/processinglibrary/model/internal/CloudTrailEventField.java

@@ -39,6 +39,7 @@ public enum CloudTrailEventField {
     cipherSuite,
     clientProvidedHostHeader,
     credentialId,
+    credentialsIssuedTo,
     deviceFamily,
     deviceId,
     edgeDeviceDetails,
@@ -53,6 +54,8 @@ public enum CloudTrailEventField {
     eventVersion,
     federatedProvider,
     identityProvider,
+    issuerType,
+    inScopeOf,
     insight,
     insightContext,
     insightDetails,
@@ -80,6 +83,8 @@ public enum CloudTrailEventField {
     sharedEventID,
     snowJobId,
     sourceIPAddress,
+    sourceAccount,
+    sourceArn,
     state,
     statistics,
     tlsDetails,
@@ -90,6 +95,7 @@ public enum CloudTrailEventField {
     userIdentity,
     userName,
     value,
+    vpcEndpointAccountId,
     vpcEndpointId,
     webIdFederationData
 }

src/main/java/com/amazonaws/services/cloudtrail/processinglibrary/model/internal/InScopeOf.java

@@ -0,0 +1,19 @@
+package com.amazonaws.services.cloudtrail.processinglibrary.model.internal;
+
+public class InScopeOf extends CloudTrailDataStore {
+    public String getSourceAccount() {
+        return (String) this.get(CloudTrailEventField.sourceAccount.name());
+    }
+
+    public String getSourceArn() {
+        return (String) this.get(CloudTrailEventField.sourceArn.name());
+    }
+
+    public String getIssuerType() {
+        return (String) this.get(CloudTrailEventField.issuerType.name());
+    }
+
+    public String getCredentialsIssuedTo() {
+        return (String) this.get(CloudTrailEventField.credentialsIssuedTo.name());
+    }
+}

src/main/java/com/amazonaws/services/cloudtrail/processinglibrary/serializer/AbstractEventSerializer.java

@@ -171,6 +171,9 @@ public CloudTrailEvent getNextEvent() throws IOException {
                 case "edgeDeviceDetails":
                     this.parseEdgeDeviceDetails(eventData);
                     break;
+                case "inScopeOf":
+                    this.parseInScopeOf(eventData);
+                    break;
                 default:
                     eventData.add(key, parseDefaultValue(key));
                     break;
@@ -855,6 +858,43 @@ private void parseEdgeDeviceDetails(CloudTrailEventData eventData) throws IOExce
         eventData.add(CloudTrailEventField.edgeDeviceDetails.name(), edgeDeviceDetails);
     }
 
+    private void parseInScopeOf(CloudTrailEventData eventData) throws IOException {
+        JsonToken nextToken = jsonParser.nextToken();
+        if (nextToken == JsonToken.VALUE_NULL) {
+            eventData.add(CloudTrailEventField.inScopeOf.name(), null);
+            return;
+        }
+
+        if (nextToken != JsonToken.START_OBJECT) {
+            throw new JsonParseException("Not an inScopeOf object", jsonParser.getCurrentLocation());
+        }
+
+        InScopeOf inScopeOf = new InScopeOf();
+
+        while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+            String key = jsonParser.getCurrentName();
+
+            switch (key) {
+                case "sourceAccount":
+                    inScopeOf.add(CloudTrailEventField.sourceAccount.name(), jsonParser.nextTextValue());
+                    break;
+                case "sourceArn":
+                    inScopeOf.add(CloudTrailEventField.sourceArn.name(), jsonParser.nextTextValue());
+                    break;
+                case "issuerType":
+                    inScopeOf.add(CloudTrailEventField.issuerType.name(), jsonParser.nextTextValue());
+                    break;
+                case "credentialsIssuedTo":
+                    inScopeOf.add(CloudTrailEventField.credentialsIssuedTo.name(), jsonParser.nextTextValue());
+                    break;
+                default:
+                    inScopeOf.add(key, parseDefaultValue(key));
+                    break;
+            }
+        }
+        eventData.add(CloudTrailEventField.inScopeOf.name(), inScopeOf);
+    }
+
     /**
      * Parses the event with key as default value.
      *