fix configs

.gitignore

@@ -26,3 +26,5 @@ go.work.sum
 
 .idea/
 mailsherpa
+*.csv
+*.txt

Justfile

@@ -0,0 +1,24 @@
+# Justfile for MailSherpa CLI
+
+version := `git describe --tags --always`
+ldflags := "-X github.com/customeros/mailsherpa/internal/cmd.version=" + version 
+
+build-macos:
+	@echo "Building MailSherpa CLI for MacOS..."
+	GOOS=darwin go build -ldflags "{{ldflags}}" -o mailsherpa-macos
+
+build-linux-amd64:
+	@echo "Building MailSherpa CLI for Linux AMD64..."
+	GOOS=linux GOARCH=amd64 go build -ldflags "{{ldflags}}" -o mailsherpa-linux-amd64
+
+build-linux-arm64:
+    @echo "Building MailSherpa CLI for Linux ARM64..."
+    GOOS=linux GOARCH=arm64 go build -ldflags "{{ldflags}}" -o mailsherpa-linux-arm64
+
+build: build-macos build-linux-amd64 build-linux-arm64
+
+clean:
+    rm -f mailsherpa-linux-arm64 mailsherpa-linux-amd64 mailsherpa-macos
+
+test:
+    go test ./...

README.md

@@ -12,4 +12,34 @@ This is open-source, but we also offer a hosted API that's simple to use. If you
 
 <br />
 
-## Get Started
+## Quickstart 
+
+1. Download the appropriate CLI tarball for your OS:
+
+```
+wget mailsherpa.sh/mailsherpa-linux-arm64.tar.gz
+wget mailsherpa.sh/mailsherpa-linux-amd64.tar.gz
+wget mailsherpa.sh/mailsherpa-macos.tar.gz
+```
+
+2. Extract the binary:
+
+```
+tar -xzf filename.tar.gz
+```
+
+3. Set the `MAIL_SERVER_DOMAIN` environment variable.  See the `Mail Server setup guide` section below for more details:
+
+```
+export MAIL_SERVER_DOMAIN=example.com
+```
+
+4. Test to make sure everything is working
+
+```
+./mailsherpa version
+```
+
+## Mail Server setup guide
+
+You might be asking why you need to setup a mail server...

internal/cmd/cmd.go

@@ -9,6 +9,8 @@ import (
 	"github.com/customeros/mailsherpa/mailvalidate"
 )
 
+var version = "dev"
+
 func PrintUsage() {
 	fmt.Println("Usage: mailsherpa <command> [arguments]")
 	fmt.Println("Commands:")
@@ -59,7 +61,7 @@ func VerifyEmail(email string) {
 }
 
 func Version() {
-	fmt.Println("MailSherpa", run.Version)
+	fmt.Printf("MailSherpa %s\n", version)
 }
 
 func printOutput(response interface{}) {

internal/mailserver/mailserver.go

@@ -9,8 +9,6 @@ import (
 	"strings"
 	"time"
 
-	"golang.org/x/net/proxy"
-
 	"github.com/customeros/mailsherpa/internal/dns"
 )
 
@@ -30,7 +28,7 @@ type ProxySetup struct {
 	Password string
 }
 
-func VerifyEmailAddress(email, fromDomain, fromEmail string, proxy ProxySetup) (bool, SMPTValidation, error) {
+func VerifyEmailAddress(email, fromDomain, fromEmail string) (bool, SMPTValidation, error) {
 	results := SMPTValidation{}
 	var isVerified bool
 
@@ -46,12 +44,7 @@ func VerifyEmailAddress(email, fromDomain, fromEmail string, proxy ProxySetup) (
 	var conn net.Conn
 	var client *bufio.Reader
 
-	if proxy.Enable {
-		fmt.Println("Enabling proxy...")
-		conn, client, err = connectToSMTPviaProxy(mxServers[0], proxy.Address, proxy.Username, proxy.Password)
-	} else {
-		conn, client, err = connectToSMTP(mxServers[0])
-	}
+	conn, client, err = connectToSMTP(mxServers[0])
 	if err != nil {
 		return false, results, err
 	}
@@ -88,32 +81,6 @@ func connectToSMTP(mxServer string) (net.Conn, *bufio.Reader, error) {
 	return conn, client, nil
 }
 
-func connectToSMTPviaProxy(mxServer, proxyAddress, proxyUsername, proxyPassword string) (net.Conn, *bufio.Reader, error) {
-	auth := &proxy.Auth{
-		User:     proxyUsername,
-		Password: proxyPassword,
-	}
-
-	dialer, err := proxy.SOCKS5("tcp", proxyAddress, auth, proxy.Direct)
-	if err != nil {
-		return nil, nil, fmt.Errorf("Failed to connect proxy dialer: %w", err)
-	}
-
-	conn, err := dialer.Dial("tcp", mxServer+":25")
-	if err != nil {
-		return nil, nil, fmt.Errorf("Failed to connect to SMTP server via proxy: %w", err)
-	}
-
-	err = conn.SetDeadline(time.Now().Add(30 * time.Second))
-	if err != nil {
-		conn.Close()
-		return nil, nil, fmt.Errorf("Failed to set connection deadline: %w", err)
-	}
-
-	client := bufio.NewReader(conn)
-	return conn, client, nil
-}
-
 func readSMTPgreeting(smtpClient *bufio.Reader) error {
 	for {
 		line, err := smtpClient.ReadString('\n')

internal/run/run.go

@@ -2,17 +2,11 @@ package run
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/customeros/mailsherpa/mailvalidate"
 )
 
-const (
-	fromDomain            = "gmail.com"
-	validateFreeAccounts  = true
-	validateRoleMailboxes = true
-	Version               = "0.0.10"
-)
-
 type VerifyEmailResponse struct {
 	Email         string
 	IsDeliverable bool
@@ -43,14 +37,17 @@ type Smtp struct {
 
 func BuildRequest(email string) mailvalidate.EmailValidationRequest {
 	firstname, lastname := mailvalidate.GenerateNames()
+	fromDomain, exists := os.LookupEnv("MAIL_SERVER_DOMAIN")
+	if !exists {
+		fmt.Println("MAIL_SERVER_DOMAIN environment variable not set")
+		os.Exit(1)
+	}
 
 	request := mailvalidate.EmailValidationRequest{
-		Email:                email,
-		FromDomain:           fromDomain,
-		FromEmail:            fmt.Sprintf("%s.%s@%s", firstname, lastname, fromDomain),
-		CatchAllTestUser:     mailvalidate.GenerateCatchAllUsername(),
-		ValidateFreeAccounts: validateFreeAccounts,
-		ValidateRoleAccounts: validateRoleMailboxes,
+		Email:            email,
+		FromDomain:       fromDomain,
+		FromEmail:        fmt.Sprintf("%s.%s@%s", firstname, lastname, fromDomain),
+		CatchAllTestUser: mailvalidate.GenerateCatchAllUsername(),
 	}
 	return request
 }

mailvalidate/validation.go

@@ -13,13 +13,10 @@ import (
 )
 
 type EmailValidationRequest struct {
-	Email                string
-	FromDomain           string
-	FromEmail            string
-	CatchAllTestUser     string
-	ValidateFreeAccounts bool
-	ValidateRoleAccounts bool
-	Proxy                mailserver.ProxySetup
+	Email            string
+	FromDomain       string
+	FromEmail        string
+	CatchAllTestUser string
 }
 
 type DomainValidation struct {
@@ -144,15 +141,10 @@ func ValidateEmail(validationRequest EmailValidationRequest) (EmailValidation, e
 	}
 	results.IsRoleAccount = isRoleAccount
 
-	if isRoleAccount && !validationRequest.ValidateRoleAccounts {
-		return results, nil
-	}
-
 	isVerified, smtpValidation, err := mailserver.VerifyEmailAddress(
 		validationRequest.Email,
 		validationRequest.FromDomain,
 		validationRequest.FromEmail,
-		validationRequest.Proxy,
 	)
 	if err != nil {
 		return results, errors.Wrap(err, "Error validating email via SMTP")
@@ -243,7 +235,6 @@ func catchAllTest(validationRequest EmailValidationRequest) (bool, mailserver.SM
 		catchAllEmail,
 		validationRequest.FromDomain,
 		validationRequest.FromEmail,
-		validationRequest.Proxy,
 	)
 	if err != nil {
 		log.Printf("Error validating email via SMTP: %v", err)