From 2dce2f5c55590cdb4a4ec775d8179443235768f5 Mon Sep 17 00:00:00 2001
From: Sergio Garcia <38561120+sergargar@users.noreply.github.com>
Date: Fri, 3 Feb 2023 12:28:23 +0100
Subject: [PATCH] fix(KeyError): handle service key errors (#1831)

---
 .../aws/services/opensearch/opensearch_service.py      | 10 ++++++----
 .../s3_bucket_public_access/s3_bucket_public_access.py |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/prowler/providers/aws/services/opensearch/opensearch_service.py b/prowler/providers/aws/services/opensearch/opensearch_service.py
index 49741b7621..0dd44d4fd7 100644
--- a/prowler/providers/aws/services/opensearch/opensearch_service.py
+++ b/prowler/providers/aws/services/opensearch/opensearch_service.py
@@ -89,10 +89,12 @@ class OpenSearchService:
                     DomainName=domain.name
                 )
                 domain.arn = describe_domain["DomainStatus"]["ARN"]
-                if "vpc" in describe_domain["DomainStatus"]["Endpoints"]:
-                    domain.endpoint_vpc = describe_domain["DomainStatus"]["Endpoints"][
-                        "vpc"
-                    ]
+                domain.endpoint_vpc = None
+                if "Endpoints" in describe_domain["DomainStatus"]:
+                    if "vpc" in describe_domain["DomainStatus"]["Endpoints"]:
+                        domain.endpoint_vpc = describe_domain["DomainStatus"][
+                            "Endpoints"
+                        ]["vpc"]
                 domain.vpc_id = describe_domain["DomainStatus"]["VPCOptions"]["VPCId"]
                 domain.cognito_options = describe_domain["DomainStatus"][
                     "CognitoOptions"
diff --git a/prowler/providers/aws/services/s3/s3_bucket_public_access/s3_bucket_public_access.py b/prowler/providers/aws/services/s3/s3_bucket_public_access/s3_bucket_public_access.py
index 4fbe1e4809..3888426be7 100644
--- a/prowler/providers/aws/services/s3/s3_bucket_public_access/s3_bucket_public_access.py
+++ b/prowler/providers/aws/services/s3/s3_bucket_public_access/s3_bucket_public_access.py
@@ -45,7 +45,8 @@ class s3_bucket_public_access(Check):
                     if bucket.policy:
                         for statement in bucket.policy["Statement"]:
                             if (
-                                "*" == statement["Principal"]
+                                "Principal" in statement
+                                and "*" == statement["Principal"]
                                 and statement["Effect"] == "Allow"
                             ):
                                 report.status = "FAIL"