From 6170ec190affcf267adf6d3a9f4627326c50c9c8 Mon Sep 17 00:00:00 2001
From: Nils Lagerkvist <nils.lagerkvist@viaplay.com>
Date: Thu, 20 Oct 2016 14:46:17 +0200
Subject: [PATCH] Fixed: Writing to buffer

---
 main.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/main.go b/main.go
index 9c95bda..c4d1a3a 100644
--- a/main.go
+++ b/main.go
@@ -181,6 +181,7 @@ func readAuthorizedKey(bucket, key string, authorizedKeys chan io.Reader) {
 	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		info.Printf("Unable to convert authorized key to byte array: %v", err)
+		authorizedKeys <- bytes.NewReader([]byte{})
 	}
 	if !bytes.HasSuffix(body, []byte("\n")) {
 		body = append(body, []byte("\n")...)
@@ -188,7 +189,11 @@ func readAuthorizedKey(bucket, key string, authorizedKeys chan io.Reader) {
 
 	if *authlog != "" {
 		outbuf := bytes.NewBufferString(fmt.Sprintf(logheader, *authlog, path.Base(key), bucket, key))
-		outbuf.Read(body)
+		_, err := outbuf.Write(body)
+		if err != nil {
+			info.Printf("Unable to write author key to buffer: %v", err)
+			authorizedKeys <- bytes.NewReader([]byte{})
+		}
 		authorizedKeys <- outbuf
 		return
 	}
@@ -212,7 +217,7 @@ func printAuthorizedKeys(bucket, authorizedKeysPath, user string) {
 	err := svc.ListObjectsPages(params, func(resp *s3.ListObjectsOutput, lastPage bool) (shouldContinue bool) {
 		for _, content := range resp.Contents {
 			// If it's a root key skip reading it
-			if *content.Key == authorizedKeysPath {
+			if *content.Key == authorizedKeysPath+"/" {
 				authorizedKeys <- bytes.NewReader([]byte{})
 				continue
 			}