From 82b6f0349904155b70ef7e26cebf15223c18b658 Mon Sep 17 00:00:00 2001
From: Johnny Che <114401755+chej-hod@users.noreply.github.com>
Date: Fri, 12 Jan 2024 15:09:49 +0000
Subject: [PATCH] ACPENG-1385: Update kubecertmanager helper.go
 getRoute53HostedDomains() function (#98)

* ACPENG-1385: Update kubecertmanager helper.go getRoute53HostedDomains() function

* ACPENG-1385: Update alpine version

* ACPENG-1385: Update maintainer

* ACPENG-1385: Update drone pipeline to reflect mainline branch change

* ACPENG-1385: Update alpine packages & add non-root user

* ACPENG-1385: Implement trivy scan on drone pipeline

* ACPENG-1385: Update go binary version

* ACPENG-1385: Temporarily overide trivy exit code due to go modules

* ACPENG-1385: Add ca-certificates apk package
---
 .drone.yml                               | 22 +++++++--------
 Dockerfile                               | 28 +++++++++++++++----
 pkg/authorize/kubecertmanager/helpers.go | 34 ++++++++++++++++--------
 3 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index a360e05..c4198ac 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -12,7 +12,7 @@ workspace:
 
 steps:
 - name: tests
-  image: golang:1.17.3
+  image: golang:1.21
   commands:
   - make test
   - make static
@@ -35,14 +35,21 @@ steps:
     - pull_request
 
 - name: scan-image
-  image: 340268328991.dkr.ecr.eu-west-2.amazonaws.com/acp/anchore-submission:v0.0.5-1
+  pull: Always
+  image: 340268328991.dkr.ecr.eu-west-2.amazonaws.com/acp/trivy/client:latest
+  resources:
+    limits:
+      cpu: 1000
+      memory: 1024Mi
   environment:
     IMAGE_NAME: policy-admission:${DRONE_COMMIT_SHA}
+    IGNORE_UNFIXED: "true"
+    FAIL_ON_DETECTION: "false"
   when:
     event:
+    - pull_request
     - push
     - tag
-    - pull_request
 
 - name: latest
   image: 340268328991.dkr.ecr.eu-west-2.amazonaws.com/acp/dind
@@ -55,7 +62,7 @@ steps:
       from_secret: docker_password
   when:
     branch:
-    - master
+    - main
     event:
     - push
 
@@ -75,10 +82,3 @@ steps:
 services:
   - name: docker
     image: 340268328991.dkr.ecr.eu-west-2.amazonaws.com/acp/dind
-
-  - name: anchore-submission-server
-    image: 340268328991.dkr.ecr.eu-west-2.amazonaws.com/acp/anchore-submission:v0.0.5-1
-    commands:
-      - /run.sh server
-
-...
diff --git a/Dockerfile b/Dockerfile
index 3726880..24ebfe9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,28 @@
-FROM alpine:3.13
-MAINTAINER Rohith Jayawardene <gambol99@gmail.com>
+FROM alpine:3.19
 
-RUN apk -U add ca-certificates --no-cache
+# Non-Root Application User
+ARG USER=application
+ARG UID=1000
 
 COPY bin/policy-admission /policy-admission
 
-USER 1000
+RUN set -euxo pipefail ;\
+  # Create non-Root user
+  adduser \
+  -D \
+  -g "" \
+  -u "$UID" \
+  -H \
+  "$USER" ; \
+  #Update System Packages
+  apk update ;\
+  apk upgrade ;\
+  apk add --no-cache \
+    ca-certificates ;\
+  rm -rf /var/cache/apk/* ;\
+  update-ca-certificates ;\
+  # Update File Perms
+  chmod +x /policy-admission ;
 
-ENTRYPOINT [ "/policy-admission" ]
+USER $UID
+ENTRYPOINT ["/policy-admission"]
diff --git a/pkg/authorize/kubecertmanager/helpers.go b/pkg/authorize/kubecertmanager/helpers.go
index e43e111..217f72a 100644
--- a/pkg/authorize/kubecertmanager/helpers.go
+++ b/pkg/authorize/kubecertmanager/helpers.go
@@ -42,17 +42,29 @@ func isHosted(ingress *networkingv1.Ingress, domains []string) bool {
 
 // getRoute53HostedDomains returns a list of hosted domains or an error
 func getRoute53HostedDomains(client route53iface.Route53API) ([]string, error) {
-	resp, err := client.ListHostedZones(&route53.ListHostedZonesInput{})
-	if err != nil {
-		return []string{}, err
-	}
-
-	var list []string
-	for _, x := range resp.HostedZones {
-		list = append(list, strings.TrimSuffix(aws.StringValue(x.Name), "."))
-	}
-
-	return list, nil
+    var hostedZones []string
+    var marker *string
+    for {
+        input := &route53.ListHostedZonesInput{
+            MaxItems: aws.String("100"),
+        }
+        if marker != nil {
+            input.Marker = marker
+        }
+        output, err := client.ListHostedZones(input)
+        if err != nil {
+            return []string{}, err
+        }
+        for _, x := range output.HostedZones {
+            hostedZones = append(hostedZones, strings.TrimSuffix(aws.StringValue(x.Name), "."))
+        }
+        if output.IsTruncated != nil && *output.IsTruncated {
+            marker = output.NextMarker
+        } else {
+            break
+        }
+    }
+    return hostedZones, nil
 }
 
 // isIngressPointed is responisble for checking the dns hostname is pointed to the external ingress