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

Logs: Add package pkg/log/status to provide generic outcome constants

Browse Source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer
2025-10-21 14:42:05 +02:00
parent 91e4d72e1b
commit cd7fa6adca
57 changed files with 377 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/api/oauth_token.go
View File

@@ -4,7 +4,6 @@ import (
"errors"
"fmt"
"net/http"
"strings"
"github.com/dustin/go-humanize/english"
"github.com/gin-gonic/gin"
@@ -17,6 +16,7 @@ import (
"github.com/photoprism/photoprism/pkg/authn"
"github.com/photoprism/photoprism/pkg/clean"
"github.com/photoprism/photoprism/pkg/http/header"
"github.com/photoprism/photoprism/pkg/log/status"
)
// OAuthToken creates a new access token for clients using OAuth2 grant types.
@@ -65,14 +65,14 @@ func OAuthToken(router *gin.RouterGroup) {
frm.ClientID = clientId
frm.ClientSecret = clientSecret
} else if err = c.ShouldBind(&frm); err != nil {
event.AuditWarn([]string{clientIp, "oauth2", actor, action, "%s"}, err)
event.AuditWarn([]string{clientIp, "oauth2", actor, action, status.Error(err)})
AbortBadRequest(c, err)
return
}
// Check the credentials for completeness and the correct format.
if err = frm.Validate(); err != nil {
event.AuditWarn([]string{clientIp, "oauth2", actor, action, "%s"}, err)
event.AuditWarn([]string{clientIp, "oauth2", actor, action, status.Error(err)})
AbortInvalidCredentials(c)
return
}
@@ -151,13 +151,13 @@ func OAuthToken(router *gin.RouterGroup) {
authUser, authProvider, authMethod, authErr := entity.Auth(loginForm, nil, c)
if authProvider.IsClient() {
event.AuditErr([]string{clientIp, "oauth2", actor, action, authn.Denied})
event.AuditErr([]string{clientIp, "oauth2", actor, action, status.Denied})
AbortInvalidCredentials(c)
return
} else if authMethod.Is(authn.Method2FA) && errors.Is(authErr, authn.ErrPasscodeRequired) {
// Ok.
} else if authErr != nil {
event.AuditErr([]string{clientIp, "oauth2", actor, action, "%s"}, strings.ToLower(clean.Error(authErr)))
event.AuditErr([]string{clientIp, "oauth2", actor, action, status.Error(authErr)})
AbortInvalidCredentials(c)
return
} else if !authUser.Equal(s.GetUser()) {
@@ -183,7 +183,7 @@ func OAuthToken(router *gin.RouterGroup) {
// Save new session.
if sess, err = get.Session().Save(sess); err != nil {
event.AuditErr([]string{clientIp, "oauth2", actor, action, err.Error()})
event.AuditErr([]string{clientIp, "oauth2", actor, action, status.Error(err)})
AbortInvalidCredentials(c)
return
} else if sess == nil {
@@ -191,7 +191,7 @@ func OAuthToken(router *gin.RouterGroup) {
AbortUnexpectedError(c)
return
} else {
event.AuditInfo([]string{clientIp, "oauth2", actor, action, authn.Created})
event.AuditInfo([]string{clientIp, "oauth2", actor, action, status.Created})
}
// Delete any existing client sessions above the configured limit.