Merge pull request #890 from traPtitech/fix/887

fix #887
traPtitech · May 5, 2020 · 716e99a · 716e99a
2 parents 87ab64e + 79b9ba8
commit 716e99a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/docs/v3-api.yaml b/docs/v3-api.yaml
@@ -1759,6 +1759,8 @@ paths:
                 $ref: '#/components/schemas/UserTag'
         '400':
           description: Bad Request
+        '403':
+          description: Forbidden
         '404':
           description: |-
             Not Found
@@ -1777,7 +1779,9 @@ paths:
             schema:
               $ref: '#/components/schemas/PostUserTagRequest'
         description: ''
-      description: 指定したユーザーに指定したタグを追加します。
+      description: |-
+        指定したユーザーに指定したタグを追加します。
+        Webhookユーザーにタグを追加することは出来ません。
   '/users/{userId}/tags/{tagId}':
     parameters:
       - $ref: '#/components/parameters/userIdInPath'

diff --git a/go.sum b/go.sum
@@ -671,8 +671,6 @@ google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/
 google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 google.golang.org/api v0.20.0 h1:jz2KixHX7EcCPiQrySzPdnYT7DbINAypCqKZ1Z7GM40=
 google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.22.0 h1:J1Pl9P2lnmYFSJvgs70DKELqHNh8CNWXPbud4njEE2s=
-google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 google.golang.org/api v0.23.0 h1:YlvGEOq2NA2my8cZ/9V8BcEO9okD48FlJcdqN0xJL3s=
 google.golang.org/api v0.23.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
 google.golang.org/appengine v1.1.0 h1:igQkv0AAhEIvTEpD5LIpAfav2eeVO9HBTjvKHVJPRSs=

diff --git a/router/v1/tags.go b/router/v1/tags.go
@@ -4,6 +4,7 @@ import (
 	vd "github.com/go-ozzo/ozzo-validation/v4"
 	"github.com/gofrs/uuid"
 	"github.com/labstack/echo/v4"
+	"github.com/traPtitech/traQ/model"
 	"github.com/traPtitech/traQ/repository"
 	"github.com/traPtitech/traQ/router/consts"
 	"github.com/traPtitech/traQ/router/extension/herror"
@@ -35,7 +36,10 @@ func (r PostUserTagRequest) Validate() error {
 
 // PostUserTag POST /users/:userID/tags
 func (h *Handlers) PostUserTag(c echo.Context) error {
-	userID := getRequestParamAsUUID(c, consts.ParamUserID)
+	user := getUserFromContext(c)
+	if user.GetUserType() == model.UserTypeWebhook {
+		return herror.Forbidden("tags cannot be added to webhook user")
+	}
 
 	// リクエスト検証
 	var req PostUserTagRequest
@@ -50,7 +54,7 @@ func (h *Handlers) PostUserTag(c echo.Context) error {
 	}
 
 	// ユーザーにタグを付与
-	if err := h.Repo.AddUserTag(userID, t.ID); err != nil {
+	if err := h.Repo.AddUserTag(user.GetID(), t.ID); err != nil {
 		switch err {
 		case repository.ErrAlreadyExists:
 			return c.NoContent(http.StatusNoContent)

diff --git a/router/v3/tags.go b/router/v3/tags.go
@@ -5,6 +5,7 @@ import (
 	vd "github.com/go-ozzo/ozzo-validation/v4"
 	"github.com/gofrs/uuid"
 	"github.com/labstack/echo/v4"
+	"github.com/traPtitech/traQ/model"
 	"github.com/traPtitech/traQ/repository"
 	"github.com/traPtitech/traQ/router/consts"
 	"github.com/traPtitech/traQ/router/extension/herror"
@@ -43,6 +44,9 @@ func (r PostUserTagRequest) Validate() error {
 
 // AddUserTag POST /users/:userID/tags
 func (h *Handlers) AddUserTag(c echo.Context) error {
+	if getParamUser(c).GetUserType() == model.UserTypeWebhook {
+		return herror.Forbidden("tags cannot be added to webhook user")
+	}
 	return addUserTags(c, h.Repo, getParamAsUUID(c, consts.ParamUserID))
 }