Move file reading into own helper func.

helpers.go

@@ -5,13 +5,30 @@
 package main
 
 import (
+	"bytes"
 	"crypto/rand"
 	"fmt"
 	"log"
 	mrand "math/rand"
+	"os"
 	"time"
 )
 
+func readFile(path string) (*bytes.Buffer, error) {
+	file, err := os.Open(path)
+	if err != nil {
+		return nil, err
+	}
+	defer file.Close()
+	buffer := new(bytes.Buffer)
+	_, err = buffer.ReadFrom(file)
+	if err != nil {
+		return nil, err
+	}
+
+	return buffer, nil
+}
+
 func getRpad() string {
 	var letters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.,;?!+-_§$%&/()=")
 

httpupload.go

@@ -32,22 +32,14 @@ func httpUpload(client *xmpp.Client, jserver string, filePath string) string {
 	}
 	fileSize := fileInfo.Size()
 
-	// Open File
-	f, err := os.Open(filePath)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer f.Close()
-
 	// Read file
-	buffer := make([]byte, fileSize)
-	_, err = f.Read(buffer)
+	buffer, err := readFile(filePath)
 	if err != nil {
 		log.Fatal(err)
 	}
 
 	// Get mime type
-	mimeType := mimetype.Detect(buffer).String()
+	mimeType := mimetype.Detect(buffer.Bytes()).String()
 	var mimeTypeEscaped bytes.Buffer
 	xml.Escape(&mimeTypeEscaped, []byte(mimeType))
 
@@ -141,7 +133,7 @@ func httpUpload(client *xmpp.Client, jserver string, filePath string) string {
 
 	// Upload file
 	httpClient := &http.Client{}
-	req, err := http.NewRequest(http.MethodPut, iqHttpUploadSlotXML.Put.URL, bytes.NewBuffer(buffer))
+	req, err := http.NewRequest(http.MethodPut, iqHttpUploadSlotXML.Put.URL, buffer)
 	if err != nil {
 		log.Fatal(err)
 	}

ox.go

@@ -5,7 +5,6 @@
 package main
 
 import (
-	"bytes"
 	"encoding/base64"
 	"encoding/xml"
 	"errors"
@@ -58,15 +57,9 @@ func oxGetPrivKey(jid string, passphrase string) (*crypto.Key, error) {
 	if err != nil {
 		log.Fatal(err)
 	}
-	file, err := os.OpenFile(dataFile, os.O_RDWR, 0600)
+	keyBuffer, err := readFile(dataFile)
 	if err != nil {
-		log.Fatal("Error: can't open private key file:", err)
-	}
-	defer file.Close()
-	keyBuffer := new(bytes.Buffer)
-	_, err = keyBuffer.ReadFrom(file)
-	if err != nil {
-		return nil, err
+		log.Fatal(err)
 	}
 	keyString := keyBuffer.String()
 	decodedPrivKey, err := base64.StdEncoding.DecodeString(keyString)