redirect support, tls fault tolerance

README.md

@@ -1,5 +1,5 @@
 <p  align="center">
-    <img  src="https://i.imgur.com/3SrxBbK.png"  width="300"  title="yeah im looking at you">
+    <img  src="https://i.imgur.com/3SrxBbK.png"  width="420"  title="yeah im looking at you">
 </p>
 
 # maraudir

common/args.go

@@ -16,8 +16,8 @@ type Params struct {
 var (
 	list    = flag.String("l", "", "")
 	cidr    = flag.String("r", "", "")
-	threads = flag.Int("t", 50, "")
-	tmout   = flag.Int("timeout", 500, "")
+	threads = flag.Int("t", 100, "")
+	tmout   = flag.Int("timeout", 1000, "")
 	delay   = flag.Int("delay", 200, "")
 	silent  = flag.Bool("s", false, "")
 	Conf    Params

common/exec.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log/slog"
 	"os"
+	"strings"
 )
 
 func thread(l *slog.Logger, dests <-chan string, tab chan<- interface{}) {
@@ -12,21 +13,28 @@ func thread(l *slog.Logger, dests <-chan string, tab chan<- interface{}) {
 	uriloop:
 		for _, uri := range Paths {
 			url := fmt.Sprintf("https://%s%s", dest, uri)
-			fallback := true
+			fallback, redirect := true, true
 			for {
-				if doc, err := Hit(c, url); err == nil {
+				if doc, redir, err := Hit(c, url); err == nil {
 					if doc != nil {
 						if Checktitle(doc) {
 							entries := Entries(doc)
 							l.Info("opendir", "url", url, "entries", entries)
 						}
+					} else if redir != "" && redirect {
+						url = redir
+						if !strings.HasPrefix(url, "https") {
+							fallback = false
+						}
+						redirect = false
+						continue
 					}
 					break
 				} else {
 					if !fallback {
 						break uriloop
 					}
-					url = fmt.Sprintf("http://%s%s", dest, uri)
+					url = "http://" + url[8:]
 					fallback = false
 				}
 			}

common/io.go

@@ -24,5 +24,5 @@ results are written to stdout and can be piped accordingly,
 verbosity is directed to stderr when silent is not set
 
 `)
-	os.Exit(-1)
+	os.Exit(1)
 }

common/net.go

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"crypto/tls"
 	"net"
 	"strings"
 	"time"
@@ -11,7 +12,7 @@ import (
 
 var (
 	// constants
-	Paths     = []string{"/", "/files/", "/ftp/", "/backup/", "/backups/", "/config/", "/logs/", "/data/", "/uploads/", "/temp/", "/tmp/", "/static/"}
+	Paths     = []string{"/", "/files", "/ftp", "/backup", "/backups", "/config", "/logs", "/data", "/uploads", "/temp", "/tmp", "/static"}
 	Patterns  = []string{"index of", "directory listing for"}
 	Ignore    = []string{"..", ".", "../", "./", "parent directory", "last modified", "name", "size", "description"}
 	UserAgent = "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"
@@ -65,19 +66,20 @@ func MkClient() *fasthttp.Client {
 	return &fasthttp.Client{
 		MaxResponseBodySize:           10 * 1024 * 1024, // 10mb
 		ReadTimeout:                   5 * time.Second,
-		WriteTimeout:                  tmout,
+		WriteTimeout:                  5 * time.Second,
 		MaxIdleConnDuration:           5 * time.Second,
 		MaxConnsPerHost:               Conf.Threads,
 		NoDefaultUserAgentHeader:      true,
 		DisableHeaderNamesNormalizing: true,
 		DisablePathNormalizing:        true,
+		TLSConfig:                     &tls.Config{InsecureSkipVerify: true},
 		DialTimeout: func(addr string, timeout time.Duration) (net.Conn, error) {
 			return dialer.DialTimeout(addr, tmout)
 		},
 	}
 }
 
-func Hit(c *fasthttp.Client, url string) (*goquery.Document, error) {
+func Hit(c *fasthttp.Client, url string) (*goquery.Document, string, error) {
 	req := fasthttp.AcquireRequest()
 	req.SetRequestURI(url)
 	req.Header.SetMethod(fasthttp.MethodGet)
@@ -94,15 +96,21 @@ func Hit(c *fasthttp.Client, url string) (*goquery.Document, error) {
 
 	var err error
 	if err = c.DoTimeout(req, resp, time.Duration(Conf.Tmout)*time.Millisecond); err == nil {
+		// check for redirect
+		if resp.StatusCode() >= 300 && resp.StatusCode() < 400 {
+			if location := resp.Header.Peek("Location"); len(location) > 0 {
+				redir := string(location)
+				if strings.HasPrefix(redir, "http") {
+					return nil, redir, nil
+				}
+			}
+		}
+
 		if body := strings.ToLower(string(resp.Body())); len(body) > 0 {
 			doc, err := goquery.NewDocumentFromReader(strings.NewReader(body))
-			if err != nil {
-				return nil, nil
-			}
-
-			return doc, nil
+			return doc, "", err
 		}
 	}
 
-	return nil, err
+	return nil, "", err
 }