Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc fixes #560

Open
wants to merge 22 commits into
base: main
Choose a base branch
from
Open

Misc fixes #560

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
9498f39
remove util.ArrayContains
mpldr Feb 26, 2024
8b0a8e6
use format strings for string building
mpldr Feb 26, 2024
6dd81b1
fix send on closed channel
mpldr Feb 27, 2024
3e03f07
fix panic being used as a way to communicate errors
mpldr Feb 27, 2024
ef35ac7
get rid of some unnecessary panics
mpldr Feb 27, 2024
9518366
improve variable naming
mpldr Feb 27, 2024
87964bb
introduce the concept of time into the codebase
mpldr Mar 2, 2024
186f1c9
rename thumbnailing/i to thumbnailing/preview
mpldr Mar 2, 2024
c518070
drop model package
mpldr Mar 2, 2024
cc20a34
minor preview metadata backend refactoring
mpldr Mar 2, 2024
f81662d
inline GetID3Tags
mpldr Mar 2, 2024
682b41f
move thumbnailing/u to thumbnailing/preview/metadata
mpldr Mar 2, 2024
edd19b2
move pipelines/_steps to pipelines/steps
mpldr Mar 3, 2024
ca68585
move cmd/utilities/_common to cmd/utilities/common
mpldr Mar 3, 2024
fadeb9a
move api/_apimeta to api/apimeta
mpldr Mar 3, 2024
8515e0b
move api/_responses to api/responses
mpldr Mar 3, 2024
a6b6598
move api/_routers to api/routers
mpldr Mar 3, 2024
6fc49c2
move api/_auth_cache to api/auth_cache
mpldr Mar 3, 2024
dc277e9
move api/_debug to api/debug
mpldr Mar 3, 2024
1f3380e
move cmd/homeserver_live_importers/_common to cmd/homeserver_live_imp…
mpldr Mar 3, 2024
a31465b
move cmd/homeserver_offline_importers/_common to cmd/homeserver_offli…
mpldr Mar 3, 2024
0c957d8
move cmd/homeserver_offline_exporters/_common to cmd/homeserver_offli…
mpldr Mar 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/_auth_cache/auth_cache.go → api/auth_cache/auth_cache.go
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please revert 6fc49c2 - the package naming is deliberate

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package _auth_cache
package auth_cache

import (
"errors"
Expand Down
6 changes: 3 additions & 3 deletions api/r0/logout.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
"github.com/t2bot/matrix-media-repo/api/apimeta"
"github.com/t2bot/matrix-media-repo/api/responses"

"github.com/t2bot/matrix-media-repo/api/_auth_cache"
"github.com/t2bot/matrix-media-repo/api/auth_cache"
"github.com/t2bot/matrix-media-repo/common/rcontext"
)

func Logout(r *http.Request, rctx rcontext.RequestContext, user apimeta.UserInfo) interface{} {
err := _auth_cache.InvalidateToken(rctx, user.AccessToken, user.UserId)
err := auth_cache.InvalidateToken(rctx, user.AccessToken, user.UserId)
if err != nil {
rctx.Log.Error(err)
sentry.CaptureException(err)
Expand All @@ -23,7 +23,7 @@ func Logout(r *http.Request, rctx rcontext.RequestContext, user apimeta.UserInfo
}

func LogoutAll(r *http.Request, rctx rcontext.RequestContext, user apimeta.UserInfo) interface{} {
err := _auth_cache.InvalidateAllTokens(rctx, user.AccessToken, user.UserId)
err := auth_cache.InvalidateAllTokens(rctx, user.AccessToken, user.UserId)
if err != nil {
rctx.Log.Error(err)
sentry.CaptureException(err)
Expand Down
4 changes: 2 additions & 2 deletions api/routers/97-optional-access-token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/getsentry/sentry-go"
"github.com/sirupsen/logrus"
"github.com/t2bot/matrix-media-repo/api/_auth_cache"
"github.com/t2bot/matrix-media-repo/api/apimeta"
"github.com/t2bot/matrix-media-repo/api/auth_cache"
"github.com/t2bot/matrix-media-repo/api/responses"
"github.com/t2bot/matrix-media-repo/common/config"
"github.com/t2bot/matrix-media-repo/common/rcontext"
Expand All @@ -34,7 +34,7 @@ func OptionalAccessToken(generator GeneratorWithUserFn) GeneratorFn {
})
}
appserviceUserId := util.GetAppserviceUserIdFromRequest(r)
userId, err := _auth_cache.GetUserId(ctx, accessToken, appserviceUserId)
userId, err := auth_cache.GetUserId(ctx, accessToken, appserviceUserId)
if err != nil {
if !errors.Is(err, matrix.ErrInvalidToken) {
sentry.CaptureException(err)
Expand Down
4 changes: 2 additions & 2 deletions api/routers/97-require-access-token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/getsentry/sentry-go"
"github.com/sirupsen/logrus"
"github.com/t2bot/matrix-media-repo/api/_auth_cache"
"github.com/t2bot/matrix-media-repo/api/apimeta"
"github.com/t2bot/matrix-media-repo/api/auth_cache"
"github.com/t2bot/matrix-media-repo/api/responses"
"github.com/t2bot/matrix-media-repo/common"
"github.com/t2bot/matrix-media-repo/common/config"
Expand Down Expand Up @@ -37,7 +37,7 @@ func RequireAccessToken(generator GeneratorWithUserFn) GeneratorFn {
})
}
appserviceUserId := util.GetAppserviceUserIdFromRequest(r)
userId, err := _auth_cache.GetUserId(ctx, accessToken, appserviceUserId)
userId, err := auth_cache.GetUserId(ctx, accessToken, appserviceUserId)
if err != nil || userId == "" {
if errors.Is(err, matrix.ErrGuestToken) {
return responses.GuestAuthFailed()
Expand Down
4 changes: 2 additions & 2 deletions cmd/workers/media_repo/reloads.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"github.com/sirupsen/logrus"
"github.com/t2bot/matrix-media-repo/api"
"github.com/t2bot/matrix-media-repo/api/_auth_cache"
"github.com/t2bot/matrix-media-repo/api/auth_cache"
"github.com/t2bot/matrix-media-repo/common/config"
"github.com/t2bot/matrix-media-repo/common/globals"
"github.com/t2bot/matrix-media-repo/common/runtime"
Expand Down Expand Up @@ -136,7 +136,7 @@ func reloadAccessTokensOnChan(reloadChan chan bool) {
for {
shouldReload := <-reloadChan
if shouldReload {
_auth_cache.FlushCache()
auth_cache.FlushCache()
} else {
return // received stop
}
Expand Down