From 58bcfb8a93e60f7a6acb819133fd00a5efa5e5fa Mon Sep 17 00:00:00 2001
From: Massimiliano Adamo <maxadamo@gmail.com>
Date: Tue, 24 Nov 2020 18:48:33 +0100
Subject: [PATCH] add error check on URLs
---
main.go | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/main.go b/main.go
index e7acf48..69ad001 100644
--- a/main.go
+++ b/main.go
@@ -42,11 +42,10 @@ func appExit(status int) {
// check certificates
func checkCerificates(dnsname string, certificate string, fullchain string, ca string, key string, days int, fail bool) bool {
- Seconds := days * 86400
+ Seconds := days * 86400
daysNumber := time.Now().Local().Add(time.Second * time.Duration(Seconds))
- //fmt.Printf(daysNumber)
certPEM, err := ioutil.ReadFile(certificate)
if err != nil {
if fail == true {
@@ -156,9 +155,17 @@ func checkCerificates(dnsname string, certificate string, fullchain string, ca s
func GetRedisKey(redisurl string, redistoken string) string {
client := &http.Client{}
req, err := http.NewRequest("GET", redisurl, nil)
+ if err != nil {
+ fmt.Printf("[ERROR] Fail to read %v: %v\n", redisurl, err)
+ appExit(255)
+ }
req.SetBasicAuth("redis", redistoken)
resp, err := client.Do(req)
body, err := ioutil.ReadAll(resp.Body)
+ if resp.StatusCode < 200 || resp.StatusCode > 299 {
+ fmt.Printf("[ERROR] Fail to fetch %v\n", redisurl)
+ appExit(255)
+ }
defer resp.Body.Close()
if err != nil {
fmt.Printf("[ERROR] Fail to read %v: %v\n", redisurl, err)
@@ -171,9 +178,17 @@ func GetRedisKey(redisurl string, redistoken string) string {
func GetVaultKey(vaulturl string, vaulttoken string) string {
vaultClient := &http.Client{}
req, err := http.NewRequest("GET", vaulturl, nil)
+ if err != nil {
+ fmt.Printf("[ERROR] Fail to read %v: %v\n", vaulturl, err)
+ appExit(255)
+ }
req.Header.Add("X-vault-token", vaulttoken)
resp, err := vaultClient.Do(req)
body, err := ioutil.ReadAll(resp.Body)
+ if resp.StatusCode < 200 || resp.StatusCode > 299 {
+ fmt.Printf("[ERROR] Fail to fetch %v\n", vaulturl)
+ appExit(255)
+ }
defer resp.Body.Close()
if err != nil {
fmt.Printf("[ERROR] Fail to read %v: %v\n", vaulturl, err)
--
GitLab