mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-06 04:09:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

add changelog

Browse Source 
remove unused mux
cleanup k6 test
This commit is contained in:
Florian Schade
2020-11-26 14:46:44 +01:00
parent 11ba46eb88
commit cb2e2a3896
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
proxy/pkg/middleware/basic_auth.go
View File

@@ -2,13 +2,11 @@ package middleware
import (
"fmt"
"net/http"
"strings"
"sync"
accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/oidc"
"net/http"
"strings"
)
const publicFilesEndpoint = "/remote.php/dav/public-files/"
@@ -59,22 +57,21 @@ type basicAuth struct {
logger log.Logger
enabled bool
accountsClient accounts.AccountsService
m sync.Mutex
}
func (m *basicAuth) isPublicLink(req *http.Request) bool {
func (m basicAuth) isPublicLink(req *http.Request) bool {
login, _, ok := req.BasicAuth()
return ok && login == "public" && strings.HasPrefix(req.URL.Path, publicFilesEndpoint)
}
func (m *basicAuth) isBasicAuth(req *http.Request) bool {
func (m basicAuth) isBasicAuth(req *http.Request) bool {
login, password, ok := req.BasicAuth()
return m.enabled && ok && login != "" && password != ""
}
func (m *basicAuth) getAccount(req *http.Request) (*accounts.Account, bool) {
func (m basicAuth) getAccount(req *http.Request) (*accounts.Account, bool) {
login, password, _ := req.BasicAuth()
account, status := getAccount(