Skip to content

Feature basic auth single option #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ehsandeep merged 3 commits into from
Feb 23, 2021
Merged

Feature basic auth single option #11

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
526bfd9
refactoring basic auth option
Mzack9999 Feb 19, 2021
1593493
fixing split amount
Mzack9999 Feb 23, 2021
260a0d7
Merge branch 'dev' into feature-basic-auth-single-option
Mzack9999 Feb 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions simplehttpserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,17 @@ import (
"net/http"
"net/http/httputil"
"path"
"strings"

"github.com/projectdiscovery/gologger"
)

type options struct {
ListenAddress string
Folder string
Username string
Password string
BasicAuth string
username string
password string
Realm string
Certificate string
Key string
Expand All @@ -36,8 +38,7 @@ func main() {
flag.StringVar(&opts.Certificate, "cert", "", "Certificate")
flag.StringVar(&opts.Key, "key", "", "Key")
flag.BoolVar(&opts.Verbose, "v", false, "Verbose")
flag.StringVar(&opts.Username, "username", "", "Basic auth username")
flag.StringVar(&opts.Password, "password", "", "Basic auth password")
flag.StringVar(&opts.BasicAuth, "basic-auth", "", "Basic auth (username:password)")
flag.StringVar(&opts.Realm, "realm", "Please enter username and password", "Realm")

flag.Parse()
Expand All @@ -48,7 +49,14 @@ func main() {

gologger.Print().Msgf("Serving %s on http://%s/...", opts.Folder, opts.ListenAddress)
layers := loglayer(http.FileServer(http.Dir(opts.Folder)))
if opts.Username != "" || opts.Password != "" {
if opts.BasicAuth != "" {
baTokens := strings.SplitN(opts.BasicAuth, ":", 2)
if len(baTokens) > 0 {
opts.username = baTokens[0]
}
if len(baTokens) > 1 {
opts.password = baTokens[1]
}
layers = loglayer(basicauthlayer(http.FileServer(http.Dir(opts.Folder))))
}

Expand Down Expand Up @@ -96,7 +104,7 @@ func loglayer(handler http.Handler) http.Handler {
func basicauthlayer(handler http.Handler) http.HandlerFunc {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
user, pass, ok := r.BasicAuth()
if !ok || user != opts.Username || pass != opts.Password {
if !ok || user != opts.username || pass != opts.password {
w.Header().Set("WWW-Authenticate", fmt.Sprintf("Basic realm=\"%s\"", opts.Realm))
w.WriteHeader(http.StatusUnauthorized)
w.Write([]byte("Unauthorized.\n")) //nolint
Expand Down