vh/rest-server
1
0
Fork 0
mirror of https://github.com/restic/rest-server.git synced 2025-12-07 09:36:13 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

htpasswd file relative to repo

Browse Source
This commit is contained in:
Chapuis Bertil
2015-09-07 15:32:38 +02:00
parent 738e78c439
commit ff5e60135c
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
auth.go
View File

@@ -3,11 +3,13 @@ package main
import ( import (
"errors" "errors"
"net/http" "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 { if err != nil {
return errors.New("internal server error") return errors.New("internal server error")
} }

2
router.go
View File

@@ -22,7 +22,7 @@ func (router Router) ServeHTTP(w http.ResponseWriter, r *http.Request) {
log.Printf("%s %s", m, u) 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 { if handler := RestAPI(m, u); handler != nil {
handler(w, r, &router.Context) handler(w, r, &router.Context)
} else { } else {