From 534fe608db497142f0c03c6ec46cfecd8a238d40 Mon Sep 17 00:00:00 2001
From: Knut Ahlers <knut@ahlers.me>
Date: Mon, 17 Sep 2018 11:45:26 +0200
Subject: [PATCH] Fix linter errors / warnings

Signed-off-by: Knut Ahlers <knut@ahlers.me>
---
 assets.go | 16 ++++++++++------
 main.go   | 15 ++++++++-------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/assets.go b/assets.go
index 049ba05..414e119 100644
--- a/assets.go
+++ b/assets.go
@@ -44,13 +44,15 @@ func buildAssetsZIP(uid uuid.UUID) (io.Reader, error) {
 		if err != nil {
 			return err
 		}
-		osFile, err := os.Open(p)
+		osFile, err := os.Open(p) // #nosec G304
 		if err != nil {
 			return err
 		}
 
-		io.Copy(zipFile, osFile)
-		osFile.Close()
+		if _, err := io.Copy(zipFile, osFile); err != nil {
+			return err
+		}
+		osFile.Close() // #nosec G104
 
 		return nil
 	})
@@ -85,13 +87,15 @@ func buildAssetsTAR(uid uuid.UUID) (io.Reader, error) {
 		if err != nil {
 			return err
 		}
-		osFile, err := os.Open(p)
+		osFile, err := os.Open(p) // #nosec G304
 		if err != nil {
 			return err
 		}
 
-		io.Copy(w, osFile)
-		osFile.Close()
+		if _, err := io.Copy(w, osFile); err != nil {
+			return err
+		}
+		osFile.Close() // #nosec G104
 
 		return nil
 	})
diff --git a/main.go b/main.go
index 3e34749..1661e1d 100644
--- a/main.go
+++ b/main.go
@@ -58,6 +58,7 @@ func loadStatusByUUID(uid uuid.UUID) (*jobStatus, error) {
 	statusFile := pathFromUUID(uid, filenameStatus)
 
 	status := jobStatus{}
+	// #nosec G304
 	if f, err := os.Open(statusFile); err == nil {
 		defer f.Close()
 		if err = json.NewDecoder(f).Decode(&status); err != nil {
@@ -76,7 +77,7 @@ func (s *jobStatus) UpdateStatus(st status) {
 }
 
 func (s jobStatus) Save() error {
-	uid, _ := uuid.FromString(s.UUID)
+	uid, _ := uuid.FromString(s.UUID) // #nosec G104
 	f, err := os.Create(pathFromUUID(uid, filenameStatus))
 	if err != nil {
 		return err
@@ -116,7 +117,7 @@ func main() {
 
 func serverErrorf(res http.ResponseWriter, tpl string, args ...interface{}) {
 	log.Errorf(tpl, args...)
-	http.Error(res, "An error ocurred. See details in log.", http.StatusInternalServerError)
+	http.Error(res, "An error occurred. See details in log.", http.StatusInternalServerError)
 }
 
 func pathFromUUID(uid uuid.UUID, filename string) string {
@@ -132,7 +133,7 @@ func startNewJob(res http.ResponseWriter, r *http.Request) {
 	inputFile := pathFromUUID(jobUUID, filenameInput)
 	statusFile := pathFromUUID(jobUUID, filenameStatus)
 
-	if err := os.Mkdir(path.Dir(inputFile), 0755); err != nil {
+	if err := os.Mkdir(path.Dir(inputFile), 0750); err != nil {
 		log.Errorf("Unable to create job dir %q: %s", path.Dir(inputFile), err)
 	}
 
@@ -142,7 +143,7 @@ func startNewJob(res http.ResponseWriter, r *http.Request) {
 			serverErrorf(res, "Unable to copy input file %q: %s", inputFile, copyErr)
 			return
 		}
-		f.Sync()
+		f.Sync() // #nosec G104
 	} else {
 		serverErrorf(res, "Unable to write input file %q: %s", inputFile, err)
 		return
@@ -243,7 +244,7 @@ func downloadAssets(res http.ResponseWriter, r *http.Request) {
 	)
 
 	switch r.Header.Get("Accept") {
-	case "application/tar", "application/x-tar", "applicaton/x-gtar", "multipart/x-tar", "application/x-compress", "application/x-compressed":
+	case "application/tar", "application/x-tar", "application/x-gtar", "multipart/x-tar", "application/x-compress", "application/x-compressed":
 		contentType = "application/tar"
 		content, err = buildAssetsTAR(uid)
 		filename = uid.String() + ".tar"
@@ -261,7 +262,7 @@ func downloadAssets(res http.ResponseWriter, r *http.Request) {
 	res.Header().Set("Content-Type", contentType)
 	res.WriteHeader(http.StatusOK)
 
-	io.Copy(res, content)
+	io.Copy(res, content) // #nosec G104
 }
 
 func jobProcessor(uid uuid.UUID) {
@@ -272,7 +273,7 @@ func jobProcessor(uid uuid.UUID) {
 		return
 	}
 
-	cmd := exec.Command("/bin/bash", cfg.ExecutionScript)
+	cmd := exec.Command("/bin/bash", cfg.ExecutionScript) // #nosec G204
 	cmd.Dir = processingDir
 	cmd.Stderr = log.StandardLogger().WriterLevel(log.ErrorLevel)