Fix #7

cmd/flags.go

@@ -57,8 +57,7 @@ See also: --tls-cert ; -T, --ss-tls`,
 
 	RootCmd.Flags().StringVarP(&username, "username", "U", "", `Username for basic authentication.
 If an empty username ("") is set then a random, easy to remember username will be used.
-If a password is not also provided using either the -P, --password flag , then the client may enter any password;
--W, --hidden-password; or -w, --password-file flags then the client may enter any password.`,
+If a password is not also provided using either the -P, --password flag ; -W, --hidden-password; or -w, --password-file flags then the client may enter any password.`,
 	)
 
 	RootCmd.Flags().StringVarP(&password, "password", "P", "", `Password for basic authentication.

internal/handlers/download.go

@@ -5,9 +5,11 @@ import (
 	"io"
 	"log"
 	"net/http"
+	"strings"
 	"time"
 
 	"github.com/raphaelreyna/oneshot/internal/file"
+	"github.com/raphaelreyna/oneshot/pkg/server"
 )
 
 func HandleDownload(file *file.FileReader, download bool, header http.Header,
@@ -85,6 +87,22 @@ func HandleDownload(file *file.FileReader, download bool, header http.Header,
 	}
 
 	return func(w http.ResponseWriter, r *http.Request) error {
+		// Filter out requests from bots, iMessage, etc.
+		if headers, exists := r.Header["User-Agent"]; exists {
+			for _, header := range headers {
+				isBot := strings.Contains(header, "bot")
+				if !isBot {
+					isBot = strings.Contains(header, "Bot")
+				}
+				if !isBot {
+					isBot = strings.Contains(header, "facebookexternalhit")
+				}
+				if isBot {
+					w.WriteHeader(http.StatusOK)
+					return server.OKNotDoneErr
+				}
+			}
+		}
 		iLog("connected: %s", r.RemoteAddr)
 		err := file.Open()
 		defer func() {

pkg/server/server.go

@@ -50,7 +50,6 @@ func NewServer() *Server {
 		finishedRoutes: make(map[*Route]error),
 	}
 	s.server = &http.Server{Handler: s}
-
 	return s
 }