Gurkengewuerz/go-autoresponder
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed stdin check and recipient/sender

Browse Source
This commit is contained in:
Niklas 2019-12-08 15:14:01 +01:00
parent 51887828f3
commit 601d1d326b
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
autoresponder.go
View File

@ -1,7 +1,6 @@
package main package main
import ( import (
"bufio"
"database/sql" "database/sql"
"flag" "flag"
"fmt" "fmt"
@ -9,6 +8,7 @@ import (
"github.com/jedisct1/dlog" "github.com/jedisct1/dlog"
"gopkg.in/ini.v1" "gopkg.in/ini.v1"
"io/ioutil" "io/ioutil"
"log"
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
@ -138,7 +138,7 @@ Subject: %v
X-Version: %v X-Version: %v
X-Service: %v X-Service: %v
%v`, *recipient, config.Section("").Key("query").String(), config.Section("").Key("version").String(), config.Section("").Key("service_name").String(), key.response), nil %v`, *recipient, config.Section("").Key("subject").String(), config.Section("").Key("version").String(), config.Section("").Key("service_name").String(), key.response), nil
} }
// Forward email using supplied arguments and stdin (email body) // Forward email using supplied arguments and stdin (email body)
@ -146,7 +146,7 @@ func forwardEmailAndAutoresponse(recipient string, sender string, responseRate u
recipientRateLog := filepath.Join(RESPONSE_DIR, recipient) recipientRateLog := filepath.Join(RESPONSE_DIR, recipient)
recipientSenderRateLog := filepath.Join(RESPONSE_DIR, recipient, sender) recipientSenderRateLog := filepath.Join(RESPONSE_DIR, recipient, sender)
response, err := getResponseMYSQL(&sender) response, err := getResponseMYSQL(&recipient)
if err == nil { if err == nil {
// Check rate log // Check rate log
sendResponse := true sendResponse := true
@ -168,7 +168,7 @@ func forwardEmailAndAutoresponse(recipient string, sender string, responseRate u
// If sendResponse is true and sender and recipiend differ, then send response and touch rate log file // If sendResponse is true and sender and recipiend differ, then send response and touch rate log file
if sendResponse && strings.ToLower(recipient) != strings.ToLower(sender) { if sendResponse && strings.ToLower(recipient) != strings.ToLower(sender) {
dlog.Info("Sending Response") dlog.Info("Sending Response")
response = strings.Replace(response, "To: THIS GETS REPLACED", fmt.Sprintf("To: %v", recipient), -1) response = strings.Replace(response, "To: THIS GETS REPLACED", fmt.Sprintf("To: %v", sender), -1)
DebugFmtPrintf(response) DebugFmtPrintf(response)
@ -190,21 +190,20 @@ func forwardEmailAndAutoresponse(recipient string, sender string, responseRate u
} }
// Now resend original mail // Now resend original mail
fi, err := os.Stdin.Stat()
file := os.Stdin
fi, err := file.Stat()
if err != nil { if err != nil {
return fmt.Errorf("file.Stat() error") log.Fatal(err)
}
size := fi.Size()
if size <= 0 {
fmt.Println("Stdin is empty")
return fmt.Errorf("Stdin is empty")
} }
reader := bufio.NewReader(file) if fi.Mode()&os.ModeNamedPipe == 0 {
text, _ := reader.ReadString('\n') if fi.Size() == 0 {
err = sendMail(sender, recipient, text) fmt.Println("Stdin is empty")
return fmt.Errorf("Stdin is empty")
}
}
text, err := ioutil.ReadAll(os.Stdin)
err = sendMail(sender, recipient, string(text))
return nil return nil
} }