From ff5e60135cdb07076ea6339212d3ec9ba2e1fa81 Mon Sep 17 00:00:00 2001 From: Chapuis Bertil Date: Mon, 7 Sep 2015 15:32:38 +0200 Subject: [PATCH] htpasswd file relative to repo --- auth.go | 6 ++++-- router.go | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/auth.go b/auth.go index 2ef234c..37cbea2 100644 --- a/auth.go +++ b/auth.go @@ -3,11 +3,13 @@ package main import ( "errors" "net/http" + "path/filepath" ) -func Authorize(r *http.Request) error { +func Authorize(r *http.Request, c *Context) error { - htpasswd, err := NewHtpasswdFromFile("/tmp/restic/.htpasswd") + file := filepath.Join(c.path, ".htpasswd") + htpasswd, err := NewHtpasswdFromFile(file) if err != nil { return errors.New("internal server error") } diff --git a/router.go b/router.go index 4a90365..2dc79bf 100644 --- a/router.go +++ b/router.go @@ -22,7 +22,7 @@ func (router Router) ServeHTTP(w http.ResponseWriter, r *http.Request) { log.Printf("%s %s", m, u) - if err := Authorize(r); err == nil { + if err := Authorize(r, &router.Context); err == nil { if handler := RestAPI(m, u); handler != nil { handler(w, r, &router.Context) } else {