Skip to content

Minor crash fix #33

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
merged 4 commits into from
Apr 18, 2021
Merged

Minor crash fix #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0712f0b
fixing crash in #27
Mzack9999 Apr 17, 2021
b18ada6
Merge pull request #29 from projectdiscovery/bugfix-app-crash
ehsandeep Apr 18, 2021
435e88c
version update
ehsandeep Apr 18, 2021
4db054d
Update Dockerfile
ehsandeep Apr 18, 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
8 changes: 3 additions & 5 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
FROM golang:1.16-alpine AS builder
RUN apk add --no-cache git
FROM golang:1.16-alpine as build-env
RUN GO111MODULE=on go get -v github.com/projectdiscovery/simplehttpserver/cmd/simplehttpserver

FROM alpine:latest
RUN apk add --no-cache bind-tools ca-certificates
COPY --from=builder /go/bin/simplehttpserver /usr/local/bin/

ENTRYPOINT ["simplehttpserver"]
COPY --from=build-env /go/bin/simplehttpserver /usr/local/bin/simplehttpserver
ENTRYPOINT ["simplehttpserver"]
4 changes: 2 additions & 2 deletions internal/runner/banner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ const banner = `
\__ \/ / __ -__ \/ __ \/ / _ \/ /_/ / / / / / / /_/ / ___/ _ \/ ___/ | / / _ \/ ___/
___/ / / / / / / / /_/ / / __/ __ / / / / / / ____(__ ) __/ / | |/ / __/ /
/____/_/_/ /_/ /_/ .___/_/\___/_/ /_/ /_/ /_/ /_/ /____/\___/_/ |___/\___/_/
/_/ - v0.0.2
/_/ - v0.0.3
`

// Version is the current version
const Version = `0.0.2`
const Version = `0.0.3`

// showBanner is used to show the banner to the user
func showBanner() {
Expand Down
7 changes: 4 additions & 3 deletions pkg/httpserver/httpserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,13 @@ func New(options *Options) (*HTTPServer, error) {
var h HTTPServer
EnableUpload = options.EnableUpload
EnableVerbose = options.Verbose
layers := h.loglayer(http.FileServer(http.Dir(options.Folder)))
h.layers = h.loglayer(http.FileServer(http.Dir(options.Folder)))
if options.BasicAuthUsername != "" || options.BasicAuthPassword != "" {
layers = h.loglayer(h.basicauthlayer(http.FileServer(http.Dir(options.Folder))))
h.layers = h.loglayer(h.basicauthlayer(http.FileServer(http.Dir(options.Folder))))
}
h.options = options

return &HTTPServer{options: options, layers: layers}, nil
return &h, nil
}

// ListenAndServe requests over http
Expand Down