mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-26 23:12:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #100 from owncloud/remove-account-cache

Browse Source
This commit is contained in:
Alex Unger
2020-09-07 12:49:02 +02:00
committed by GitHub
parent fcceec602f fb0ecd7e50
commit 1ea79c8984
2 changed files with 29 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
changelog/unreleased/remove-account-caching.md Normal file
View File

@@ -0,0 +1,5 @@
Change: Remove accounts caching
We removed the accounts cache in order to avoid problems with accounts that have been updated in the accounts service.
https://github.com/owncloud/ocis-proxy/pull/100

69
pkg/middleware/account_uuid.go
View File

@@ -4,7 +4,6 @@ import (
"context"
"encoding/json"
"fmt"
settings "github.com/owncloud/ocis-settings/pkg/proto/v0"
"net/http"
"strconv"
"strings"
@@ -14,55 +13,35 @@ import (
"github.com/cs3org/reva/pkg/token/manager/jwt"
acc "github.com/owncloud/ocis-accounts/pkg/proto/v0"
"github.com/owncloud/ocis-pkg/v2/log"
oidc "github.com/owncloud/ocis-pkg/v2/oidc"
"github.com/owncloud/ocis-pkg/v2/oidc"
settings "github.com/owncloud/ocis-settings/pkg/proto/v0"
)
func getAccount(l log.Logger, ac acc.AccountsService, query string) (account *acc.Account, status int) {
entry, err := svcCache.Get(AccountsKey, query)
resp, err := ac.ListAccounts(context.Background(), &acc.ListAccountsRequest{
Query: query,
PageSize: 2,
})
if err != nil {
l.Debug().Msgf("No cache entry for %s", query)
resp, err := ac.ListAccounts(context.Background(), &acc.ListAccountsRequest{
Query: query,
PageSize: 2,
})
if err != nil {
l.Error().Err(err).Str("query", query).Msgf("Error fetching from accounts-service")
status = http.StatusInternalServerError
return
}
if len(resp.Accounts) <= 0 {
l.Error().Str("query", query).Msgf("Account not found")
status = http.StatusNotFound
return
}
// TODO provision account
if len(resp.Accounts) > 1 {
l.Error().Str("query", query).Msgf("More than one account found. Not logging user in.")
status = http.StatusForbidden
return
}
err = svcCache.Set(AccountsKey, query, *resp.Accounts[0])
if err != nil {
l.Err(err).Str("query", query).Msgf("Could not cache user")
status = http.StatusInternalServerError
return
}
account = resp.Accounts[0]
} else {
l.Debug().Msgf("using cache entry for %s", query)
a, ok := entry.V.(acc.Account) // TODO how can we directly point to the cached account?
if !ok {
status = http.StatusInternalServerError
return
}
account = &a
l.Error().Err(err).Str("query", query).Msgf("Error fetching from accounts-service")
status = http.StatusInternalServerError
return
}
if len(resp.Accounts) <= 0 {
l.Error().Str("query", query).Msgf("Account not found")
status = http.StatusNotFound
return
}
if len(resp.Accounts) > 1 {
l.Error().Str("query", query).Msgf("More than one account found. Not logging user in.")
status = http.StatusForbidden
return
}
account = resp.Accounts[0]
return
}