Hass/message-pusher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

fix: ignore auth when using webhook

Browse Source
This commit is contained in:
JustSong
2024-11-10 17:50:14 +08:00
parent 431c0d6e15
commit 981539b8e9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/message.go
+3 -3
View File
@@ -116,7 +116,7 @@ func pushMessageHelper(c *gin.Context, message *model.Message) {
if message.Token == "" { if message.Token == "" {
message.Token = strings.TrimPrefix(c.Request.Header.Get("Authorization"), "Bearer ") message.Token = strings.TrimPrefix(c.Request.Header.Get("Authorization"), "Bearer ")
} }
processMessage(c, message, &user) processMessage(c, message, &user, true)
} }
func authMessage(messageToken string, userToken string, channelToken *string) bool { func authMessage(messageToken string, userToken string, channelToken *string) bool {
@@ -133,7 +133,7 @@ func authMessage(messageToken string, userToken string, channelToken *string) bo
return true return true
} }
func processMessage(c *gin.Context, message *model.Message, user *model.User) { func processMessage(c *gin.Context, message *model.Message, user *model.User, needAuth bool) {
if message.Title == "" { if message.Title == "" {
message.Title = common.SystemName message.Title = common.SystemName
} }
@@ -151,7 +151,7 @@ func processMessage(c *gin.Context, message *model.Message, user *model.User) {
}) })
return return
} }
if !authMessage(message.Token, user.Token, channel_.Token) { if needAuth && !authMessage(message.Token, user.Token, channel_.Token) {
if message.Token == "" { if message.Token == "" {
c.JSON(http.StatusUnauthorized, gin.H{ c.JSON(http.StatusUnauthorized, gin.H{
"success": false, "success": false,
controller/webhook.go
+1 -1
View File
@@ -258,5 +258,5 @@ func TriggerWebhook(c *gin.Context) {
Content: constructRule.Content, Content: constructRule.Content,
URL: constructRule.URL, URL: constructRule.URL,
} }
processMessage(c, message, user) processMessage(c, message, user, false)
} }