Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
matrix-media-repo
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
matrix-media-repo
Commits
fc8a5fcb
Commit
fc8a5fcb
authored
3 years ago
by
mattc
Browse files
Options
Downloads
Patches
Plain Diff
Refactor - Extract auth-related ("api" package) function into a higher level
module. Prepare for function to be used by multiple modules.
parent
6ddbaecd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
api/auth.go
+12
-0
12 additions, 0 deletions
api/auth.go
api/custom/purge.go
+5
-17
5 additions, 17 deletions
api/custom/purge.go
with
17 additions
and
17 deletions
api/auth.go
+
12
−
0
View file @
fc8a5fcb
...
...
@@ -113,3 +113,15 @@ func RepoAdminRoute(next func(r *http.Request, rctx rcontext.RequestContext, use
return
regularFunc
(
r
,
rctx
)
}
}
func
GetRequestUserAdminStatus
(
r
*
http
.
Request
,
rctx
rcontext
.
RequestContext
,
user
UserInfo
)
(
bool
,
bool
)
{
isGlobalAdmin
:=
util
.
IsGlobalAdmin
(
user
.
UserId
)
||
user
.
IsShared
isLocalAdmin
,
err
:=
matrix
.
IsUserAdmin
(
rctx
,
r
.
Host
,
user
.
AccessToken
,
r
.
RemoteAddr
)
if
err
!=
nil
{
sentry
.
CaptureException
(
err
)
rctx
.
Log
.
Error
(
"Error verifying local admin: "
+
err
.
Error
())
return
isGlobalAdmin
,
false
}
return
isGlobalAdmin
,
isLocalAdmin
}
This diff is collapsed.
Click to expand it.
api/custom/purge.go
+
5
−
17
View file @
fc8a5fcb
...
...
@@ -48,7 +48,7 @@ func PurgeRemoteMedia(r *http.Request, rctx rcontext.RequestContext, user api.Us
}
func
PurgeIndividualRecord
(
r
*
http
.
Request
,
rctx
rcontext
.
RequestContext
,
user
api
.
UserInfo
)
interface
{}
{
isGlobalAdmin
,
isLocalAdmin
:=
getPurgeRequestInfo
(
r
,
rctx
,
user
)
isGlobalAdmin
,
isLocalAdmin
:=
api
.
GetRequestUserAdminStatus
(
r
,
rctx
,
user
)
localServerName
:=
r
.
Host
params
:=
mux
.
Vars
(
r
)
...
...
@@ -98,7 +98,7 @@ func PurgeIndividualRecord(r *http.Request, rctx rcontext.RequestContext, user a
}
func
PurgeQuarantined
(
r
*
http
.
Request
,
rctx
rcontext
.
RequestContext
,
user
api
.
UserInfo
)
interface
{}
{
isGlobalAdmin
,
isLocalAdmin
:=
getPurgeRequestInfo
(
r
,
rctx
,
user
)
isGlobalAdmin
,
isLocalAdmin
:=
api
.
GetRequestUserAdminStatus
(
r
,
rctx
,
user
)
localServerName
:=
r
.
Host
var
affected
[]
*
types
.
Media
...
...
@@ -168,7 +168,7 @@ func PurgeOldMedia(r *http.Request, rctx rcontext.RequestContext, user api.UserI
}
func
PurgeUserMedia
(
r
*
http
.
Request
,
rctx
rcontext
.
RequestContext
,
user
api
.
UserInfo
)
interface
{}
{
isGlobalAdmin
,
isLocalAdmin
:=
getPurgeRequestInfo
(
r
,
rctx
,
user
)
isGlobalAdmin
,
isLocalAdmin
:=
api
.
GetRequestUserAdminStatus
(
r
,
rctx
,
user
)
if
!
isGlobalAdmin
&&
!
isLocalAdmin
{
return
api
.
AuthFailed
()
}
...
...
@@ -220,7 +220,7 @@ func PurgeUserMedia(r *http.Request, rctx rcontext.RequestContext, user api.User
}
func
PurgeRoomMedia
(
r
*
http
.
Request
,
rctx
rcontext
.
RequestContext
,
user
api
.
UserInfo
)
interface
{}
{
isGlobalAdmin
,
isLocalAdmin
:=
getPurgeRequestInfo
(
r
,
rctx
,
user
)
isGlobalAdmin
,
isLocalAdmin
:=
api
.
GetRequestUserAdminStatus
(
r
,
rctx
,
user
)
if
!
isGlobalAdmin
&&
!
isLocalAdmin
{
return
api
.
AuthFailed
()
}
...
...
@@ -300,7 +300,7 @@ func PurgeRoomMedia(r *http.Request, rctx rcontext.RequestContext, user api.User
}
func
PurgeDomainMedia
(
r
*
http
.
Request
,
rctx
rcontext
.
RequestContext
,
user
api
.
UserInfo
)
interface
{}
{
isGlobalAdmin
,
isLocalAdmin
:=
getPurgeRequestInfo
(
r
,
rctx
,
user
)
isGlobalAdmin
,
isLocalAdmin
:=
api
.
GetRequestUserAdminStatus
(
r
,
rctx
,
user
)
if
!
isGlobalAdmin
&&
!
isLocalAdmin
{
return
api
.
AuthFailed
()
}
...
...
@@ -343,15 +343,3 @@ func PurgeDomainMedia(r *http.Request, rctx rcontext.RequestContext, user api.Us
return
&
api
.
DoNotCacheResponse
{
Payload
:
map
[
string
]
interface
{}{
"purged"
:
true
,
"affected"
:
mxcs
}}
}
func
getPurgeRequestInfo
(
r
*
http
.
Request
,
rctx
rcontext
.
RequestContext
,
user
api
.
UserInfo
)
(
bool
,
bool
)
{
isGlobalAdmin
:=
util
.
IsGlobalAdmin
(
user
.
UserId
)
||
user
.
IsShared
isLocalAdmin
,
err
:=
matrix
.
IsUserAdmin
(
rctx
,
r
.
Host
,
user
.
AccessToken
,
r
.
RemoteAddr
)
if
err
!=
nil
{
sentry
.
CaptureException
(
err
)
rctx
.
Log
.
Error
(
"Error verifying local admin: "
+
err
.
Error
())
return
isGlobalAdmin
,
false
}
return
isGlobalAdmin
,
isLocalAdmin
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment