github
/
filebrowser
mirror of https://github.com/filebrowser/filebrowser
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: recaptcha fixes, auth fixes and line endings 

* http: auth: remove unnecessary fields in recaptcha validation

* http: render: never expose ReCaptchaSecret to public

* build: dos2unix build.sh


Former-commit-id: 21908028289e4a5d30b5a2c1961abf163b1a93b6 [formerly b634e3e4da4a616119f6bc15ae92f15073f019fa] [formerly 55efca9d070539f346215090517abde1ec788be4 [formerly 9b8c2862e2]]
Former-commit-id: 70df1f0443977f6f2b101b946698dc3466aa6db9 [formerly 15195d4c28060aa1eca8f03ad0b77576ac8d9181]
Former-commit-id: e22d026e74a0cc800ad7281c35e4157037849e37
pull/726/head
Equim 2018-01-22 16:35:39 +08:00 committed by Henrique Dias
parent d50dc90a54
commit 6839c15a7b
3 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
build.sh
View File

@ -1,14 +1,14 @@
#!/bin/bash #!/bin/bash
set -e set -e
# Install rice tool if not present # Install rice tool if not present
if ! [ -x "$(command -v rice)" ]; then if ! [ -x "$(command -v rice)" ]; then
go get github.com/GeertJohan/go.rice/rice go get github.com/GeertJohan/go.rice/rice
fi fi
# Clean the dist folder and build the assets # Clean the dist folder and build the assets
rm -rf assets/dist rm -rf assets/dist
npm run build npm run build
# Embed the assets using rice # Embed the assets using rice
rice embed-go rice embed-go

5
http/auth.go
View File

@ -38,10 +38,7 @@ func reCaptcha(secret string, response string) (bool, error) {
} }
var data struct { var data struct {
Success bool `json:"success"` Success bool `json:"success"`
ChallengeTS time.Time `json:"challenge_ts"`
Hostname string `json:"hostname"`
ErrorCodes interface{} `json:"error-codes"`
} }
err = json.NewDecoder(resp.Body).Decode(&data) err = json.NewDecoder(resp.Body).Decode(&data)

13
http/http.go
View File

@ -223,13 +223,12 @@ func renderFile(c *fm.Context, w http.ResponseWriter, file string) (int, error)
w.Header().Set("Content-Type", contentType+"; charset=utf-8") w.Header().Set("Content-Type", contentType+"; charset=utf-8")
data := map[string]interface{}{ data := map[string]interface{}{
"BaseURL": c.RootURL(), "BaseURL": c.RootURL(),
"NoAuth": c.NoAuth, "NoAuth": c.NoAuth,
"Version": fm.Version, "Version": fm.Version,
"CSS": template.CSS(c.CSS), "CSS": template.CSS(c.CSS),
"ReCaptcha": c.ReCaptchaKey != "" && c.ReCaptchaSecret != "", "ReCaptcha": c.ReCaptchaKey != "" && c.ReCaptchaSecret != "",
"ReCaptchaKey": c.ReCaptchaKey, "ReCaptchaKey": c.ReCaptchaKey,
"ReCaptchaSecret": c.ReCaptchaSecret,
} }
if c.StaticGen != nil { if c.StaticGen != nil {