3pp-mirror/pushbits
1
0
Fork 0
mirror of https://github.com/pushbits/server.git synced 2025-05-04 12:46:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Sanitize notification before processing it

Browse source
This commit is contained in:
eikendev 2022-02-13 16:57:07 +01:00
parent 21afef0128
commit e676b723e9
No known key found for this signature in database
GPG key ID: A1BDB1B28C8EF694
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
internal/api/notification.go
View file

@ -4,7 +4,6 @@ import (
"log" "log"
"net/http" "net/http"
"net/url" "net/url"
"strings"
"time" "time"
"github.com/pushbits/server/internal/authentication" "github.com/pushbits/server/internal/authentication"
@ -45,23 +44,17 @@ type NotificationHandler struct {
// @Failure 500,404,403 "" // @Failure 500,404,403 ""
// @Router /message [post] // @Router /message [post]
func (h *NotificationHandler) CreateNotification(ctx *gin.Context) { func (h *NotificationHandler) CreateNotification(ctx *gin.Context) {
var notification model.Notification application := authentication.GetApplication(ctx)
log.Printf("Sending notification for application %s.", application.Name)
var notification model.Notification
if err := ctx.Bind(&notification); err != nil { if err := ctx.Bind(&notification); err != nil {
return return
} }
application := authentication.GetApplication(ctx) notification.Sanitize(application)
log.Printf("Sending notification for application %s.", application.Name)
notification.ApplicationID = application.ID
if strings.TrimSpace(notification.Title) == "" {
notification.Title = application.Name
}
notification.Date = time.Now()
messageID, err := h.DP.SendNotification(application, &notification) messageID, err := h.DP.SendNotification(application, &notification)
if success := successOrAbort(ctx, http.StatusInternalServerError, err); !success { if success := successOrAbort(ctx, http.StatusInternalServerError, err); !success {
return return
} }
@ -86,8 +79,9 @@ func (h *NotificationHandler) CreateNotification(ctx *gin.Context) {
// @Router /message/{message_id} [DELETE] // @Router /message/{message_id} [DELETE]
func (h *NotificationHandler) DeleteNotification(ctx *gin.Context) { func (h *NotificationHandler) DeleteNotification(ctx *gin.Context) {
application := authentication.GetApplication(ctx) application := authentication.GetApplication(ctx)
id, err := getMessageID(ctx) log.Printf("Deleting notification for application %s.", application.Name)
id, err := getMessageID(ctx)
if success := successOrAbort(ctx, http.StatusUnprocessableEntity, err); !success { if success := successOrAbort(ctx, http.StatusUnprocessableEntity, err); !success {
return return
} }

12
internal/model/notification.go
View file

@ -1,6 +1,7 @@
package model package model
import ( import (
"strings"
"time" "time"
) )
@ -16,6 +17,17 @@ type Notification struct {
Date time.Time `json:"date"` Date time.Time `json:"date"`
} }
// Sanitize sets explicit defaults for a notification.
func (n *Notification) Sanitize(application *Application) {
n.ID = ""
n.UrlEncodedID = ""
n.ApplicationID = application.ID
if strings.TrimSpace(n.Title) == "" {
n.Title = application.Name
}
n.Date = time.Now()
}
// DeleteNotification holds information like the message ID of a deletion notification. // DeleteNotification holds information like the message ID of a deletion notification.
type DeleteNotification struct { type DeleteNotification struct {
ID string `json:"id" form:"id"` ID string `json:"id" form:"id"`