johanels/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2025-12-12 00:34:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Auth: Session and ACL enhancements #98 #1746

Browse Source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer
2022-09-28 09:01:17 +02:00
parent 8be80aec49
commit f5a8c5a45d
386 changed files with 10403 additions and 5316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/api/import.go
View File

@@ -17,7 +17,6 @@ import (
"github.com/photoprism/photoprism/internal/photoprism"
"github.com/photoprism/photoprism/internal/query"
"github.com/photoprism/photoprism/internal/service"
"github.com/photoprism/photoprism/pkg/clean"
"github.com/photoprism/photoprism/pkg/fs"
)
@@ -27,10 +26,9 @@ import (
// POST /api/v1/import*
func StartImport(router *gin.RouterGroup) {
router.POST("/import/*path", func(c *gin.Context) {
s := Auth(SessionID(c), acl.ResourcePhotos, acl.ActionImport)
s := Auth(c, acl.ResourceFiles, acl.ActionManage)
if s.Invalid() {
AbortUnauthorized(c)
if s.Abort(c) {
return
}
@@ -126,10 +124,9 @@ func StartImport(router *gin.RouterGroup) {
// DELETE /api/v1/import
func CancelImport(router *gin.RouterGroup) {
router.DELETE("/import", func(c *gin.Context) {
s := Auth(SessionID(c), acl.ResourcePhotos, acl.ActionImport)
s := Auth(c, acl.ResourceFiles, acl.ActionManage)
if s.Invalid() {
AbortUnauthorized(c)
if s.Abort(c) {
return
}