luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Sharing: Fix link redirect on shared domains #1617

Browse source
This commit is contained in:
Michael Mayer 2021-12-14 18:36:36 +01:00
parent 4e94919030
commit cce371d35a
2 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
internal/api/parse.go
View file

@ -1,13 +0,0 @@
package api
import "strconv"
func ParseUint(s string) uint {
result, err := strconv.ParseUint(s, 10, 32)
if err != nil {
log.Warnf("api: %s", err)
}
return uint(result)
}

12
internal/api/share.go
View file

@ -5,9 +5,11 @@ import (
"net/http"
"github.com/gin-gonic/gin"
"github.com/photoprism/photoprism/internal/entity"
"github.com/photoprism/photoprism/internal/query"
"github.com/photoprism/photoprism/internal/service"
"github.com/photoprism/photoprism/pkg/sanitize"
)
// GET /s/:token/...
@ -15,7 +17,7 @@ func Shares(router *gin.RouterGroup) {
router.GET("/:token", func(c *gin.Context) {
conf := service.Config()
token := c.Param("token")
token := sanitize.Token(c.Param("token"))
links := entity.FindValidLinks(token, "")
@ -34,8 +36,8 @@ func Shares(router *gin.RouterGroup) {
router.GET("/:token/:share", func(c *gin.Context) {
conf := service.Config()
token := c.Param("token")
share := c.Param("share")
token := sanitize.Token(c.Param("token"))
share := sanitize.Token(c.Param("share"))
links := entity.FindValidLinks(token, share)
@ -46,13 +48,13 @@ func Shares(router *gin.RouterGroup) {
}
uid := links[0].ShareUID
clientConfig := conf.GuestConfig()
if uid != share {
c.Redirect(http.StatusPermanentRedirect, fmt.Sprintf("/s/%s/%s", token, uid))
c.Redirect(http.StatusPermanentRedirect, fmt.Sprintf("%ss/%s/%s", clientConfig.SiteUrl, token, uid))
return
}
clientConfig := conf.GuestConfig()
clientConfig.SiteUrl = fmt.Sprintf("%ss/%s/%s", clientConfig.SiteUrl, token, uid)
clientConfig.SitePreview = fmt.Sprintf("%s/preview", clientConfig.SiteUrl)