Skip to content

Automated cherry pick of #219 #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
avasconcelos114 merged 1 commit into from
Jul 23, 2026
Merged

Automated cherry pick of #219 #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions server/app/helper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,3 +103,11 @@ func (th *TestHelper) expectBoardEditor(userID, boardID, teamID string) {
}, nil)
th.API.EXPECT().HasPermissionToTeam(userID, teamID, model.PermissionManageTeam).Return(false)
}

func (th *TestHelper) expectBoardImportPermissions(userID, teamID string, boardType model.BoardType) {
if boardType == model.BoardTypeOpen {
th.API.EXPECT().HasPermissionToTeam(userID, teamID, model.PermissionCreatePublicChannel).Return(true)
return
}
th.API.EXPECT().HasPermissionToTeam(userID, teamID, model.PermissionCreatePrivateChannel).Return(true)
}
5 changes: 4 additions & 1 deletion server/app/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,9 @@ func (a *App) ImportBoardJSONL(r io.Reader, opt model.ImportArchiveOptions) (*mo
board.ModifiedBy = userID
board.UpdateAt = now
board.TeamID = opt.TeamID
if err := a.validateBoardForImport(userID, opt.TeamID, &board); err != nil {
return nil, err
}
boardsAndBlocks.Boards = append(boardsAndBlocks.Boards, &board)
boardID = board.ID
case "board_block":
Expand All @@ -220,7 +223,7 @@ func (a *App) ImportBoardJSONL(r io.Reader, opt model.ImportArchiveOptions) (*mo
if err != nil {
return nil, fmt.Errorf("cannot convert archive line %d to block: %w", lineNum, err)
}
if err := board.IsValidForImport(); err != nil {
if err := a.validateBoardForImport(userID, opt.TeamID, board); err != nil {
return nil, err
}
boardsAndBlocks.Boards = append(boardsAndBlocks.Boards, board)
Expand Down
104 changes: 93 additions & 11 deletions server/app/import_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@ import (
"github.com/stretchr/testify/require"
)

const importTestTeamID = "y5tuzz9yb3y99gmobyc4hg5wnr"

func TestApp_ImportArchive(t *testing.T) {
th, tearDown := SetupTestHelper(t)
defer tearDown()

board := &model.Board{
ID: "d14b9df9-1f31-4732-8a64-92bc7162cd28",
TeamID: "test-team",
TeamID: importTestTeamID,
Title: "Cross-Functional Project Plan",
IsTemplate: false,
}
Expand Down Expand Up @@ -49,11 +51,13 @@ func TestApp_ImportArchive(t *testing.T) {
ModifiedBy: "user",
}

th.expectBoardImportPermissions("user", opts.TeamID, model.BoardTypePrivate)

th.Store.EXPECT().CreateBoardsAndBlocks(gomock.AssignableToTypeOf(&model.BoardsAndBlocks{}), "user").Return(babs, nil)
th.Store.EXPECT().GetMembersForBoard(board.ID).AnyTimes().Return([]*model.BoardMember{boardMember}, nil)
th.Store.EXPECT().GetBoard(board.ID).Return(board, nil)
th.Store.EXPECT().GetMemberForBoard(board.ID, "user").Return(boardMember, nil)
th.Store.EXPECT().GetUserCategoryBoards("user", "test-team").Return([]model.CategoryBoards{
th.Store.EXPECT().GetUserCategoryBoards("user", opts.TeamID).Return([]model.CategoryBoards{
{
Category: model.Category{
Type: "default",
Expand All @@ -62,13 +66,13 @@ func TestApp_ImportArchive(t *testing.T) {
},
},
}, nil)
th.Store.EXPECT().GetUserCategoryBoards("user", "test-team")
th.Store.EXPECT().GetUserCategoryBoards("user", opts.TeamID)
th.Store.EXPECT().CreateCategory(utils.Anything).Return(nil)
th.Store.EXPECT().GetCategory(utils.Anything).Return(&model.Category{
ID: "boards_category_id",
Name: "Boards",
}, nil)
th.Store.EXPECT().GetBoardsForUserAndTeam("user", "test-team", false).Return([]*model.Board{}, nil)
th.Store.EXPECT().GetBoardsForUserAndTeam("user", opts.TeamID, false).Return([]*model.Board{}, nil)
th.Store.EXPECT().GetMembersForUser("user").Return([]*model.BoardMember{}, nil)
th.Store.EXPECT().AddUpdateCategoryBoard("user", utils.Anything, utils.Anything).Return(nil)

Expand All @@ -79,10 +83,12 @@ func TestApp_ImportArchive(t *testing.T) {
t.Run("import board archive", func(t *testing.T) {
r := bytes.NewReader([]byte(boardArchive))
opts := model.ImportArchiveOptions{
TeamID: "test-team",
TeamID: importTestTeamID,
ModifiedBy: "f1tydgc697fcbp8ampr6881jea",
}

th.expectBoardImportPermissions(opts.ModifiedBy, opts.TeamID, model.BoardTypePrivate)

bm1 := &model.BoardMember{
BoardID: board.ID,
UserID: "f1tydgc697fcbp8ampr6881jea",
Expand Down Expand Up @@ -112,8 +118,8 @@ func TestApp_ImportArchive(t *testing.T) {

th.Store.EXPECT().CreateBoardsAndBlocks(gomock.AssignableToTypeOf(&model.BoardsAndBlocks{}), "f1tydgc697fcbp8ampr6881jea").Return(babs, nil)
th.Store.EXPECT().GetMembersForBoard(board.ID).AnyTimes().Return([]*model.BoardMember{bm1, bm2, bm3}, nil)
th.Store.EXPECT().GetUserCategoryBoards("f1tydgc697fcbp8ampr6881jea", "test-team").Return([]model.CategoryBoards{}, nil)
th.Store.EXPECT().GetUserCategoryBoards("f1tydgc697fcbp8ampr6881jea", "test-team").Return([]model.CategoryBoards{
th.Store.EXPECT().GetUserCategoryBoards("f1tydgc697fcbp8ampr6881jea", importTestTeamID).Return([]model.CategoryBoards{}, nil)
th.Store.EXPECT().GetUserCategoryBoards("f1tydgc697fcbp8ampr6881jea", importTestTeamID).Return([]model.CategoryBoards{
{
Category: model.Category{
ID: "boards_category_id",
Expand All @@ -128,7 +134,7 @@ func TestApp_ImportArchive(t *testing.T) {
Name: "Boards",
}, nil)
th.Store.EXPECT().GetMembersForUser("f1tydgc697fcbp8ampr6881jea").Return([]*model.BoardMember{}, nil)
th.Store.EXPECT().GetBoardsForUserAndTeam("f1tydgc697fcbp8ampr6881jea", "test-team", false).Return([]*model.Board{}, nil)
th.Store.EXPECT().GetBoardsForUserAndTeam("f1tydgc697fcbp8ampr6881jea", importTestTeamID, false).Return([]*model.Board{}, nil)
th.Store.EXPECT().AddUpdateCategoryBoard("f1tydgc697fcbp8ampr6881jea", utils.Anything, utils.Anything).Return(nil)
th.Store.EXPECT().GetBoard(board.ID).AnyTimes().Return(board, nil)
th.Store.EXPECT().GetMemberForBoard(board.ID, "f1tydgc697fcbp8ampr6881jea").AnyTimes().Return(bm1, nil)
Expand All @@ -149,13 +155,15 @@ func TestApp_ImportArchive(t *testing.T) {

r := bytes.NewReader([]byte(boardArchive))
opts := model.ImportArchiveOptions{
TeamID: "test-team",
TeamID: importTestTeamID,
ModifiedBy: importerID,
}

th.expectBoardImportPermissions(importerID, opts.TeamID, model.BoardTypePrivate)

th.Store.EXPECT().CreateBoardsAndBlocks(gomock.AssignableToTypeOf(&model.BoardsAndBlocks{}), importerID).Return(babs, nil)
th.Store.EXPECT().GetMembersForBoard(board.ID).AnyTimes().Return([]*model.BoardMember{}, nil)
th.Store.EXPECT().GetUserCategoryBoards(importerID, "test-team").AnyTimes().Return([]model.CategoryBoards{
th.Store.EXPECT().GetUserCategoryBoards(importerID, importTestTeamID).AnyTimes().Return([]model.CategoryBoards{
{
Category: model.Category{
ID: "boards_category_id",
Expand All @@ -165,7 +173,7 @@ func TestApp_ImportArchive(t *testing.T) {
},
}, nil)
th.Store.EXPECT().GetMembersForUser(importerID).AnyTimes().Return([]*model.BoardMember{}, nil)
th.Store.EXPECT().GetBoardsForUserAndTeam(importerID, "test-team", false).AnyTimes().Return([]*model.Board{}, nil)
th.Store.EXPECT().GetBoardsForUserAndTeam(importerID, importTestTeamID, false).AnyTimes().Return([]*model.Board{}, nil)
th.Store.EXPECT().AddUpdateCategoryBoard(importerID, utils.Anything, utils.Anything).AnyTimes().Return(nil)
th.Store.EXPECT().GetBoard(board.ID).AnyTimes().Return(board, nil)
th.Store.EXPECT().GetMemberForBoard(board.ID, gomock.Any()).AnyTimes().Return(nil, nil)
Expand Down Expand Up @@ -245,8 +253,82 @@ func TestApp_ImportArchive(t *testing.T) {
th.Store.EXPECT().PatchBlocks(gomock.Any(), "my-userid").Return(nil)
th.App.fixImagesAttachments(boardMap, fileMap, "test-team", "my-userid")
})

t.Run("import private board archive requires create private channel permission", func(t *testing.T) {
const importerID = "f1tydgc697fcbp8ampr6881jea"

r := bytes.NewReader([]byte(boardArchive))
opts := model.ImportArchiveOptions{
TeamID: importTestTeamID,
ModifiedBy: importerID,
}

th.API.EXPECT().HasPermissionToTeam(importerID, opts.TeamID, model.PermissionCreatePrivateChannel).Return(false)

_, err := th.App.ImportBoardJSONL(r, opts)
require.Error(t, err)
var permErr *model.ErrPermission
require.ErrorAs(t, err, &permErr)
})

t.Run("import open board archive requires create public channel permission", func(t *testing.T) {
const importerID = "f1tydgc697fcbp8ampr6881jea"

r := bytes.NewReader([]byte(openBoardArchive))
opts := model.ImportArchiveOptions{
TeamID: importTestTeamID,
ModifiedBy: importerID,
}

th.API.EXPECT().HasPermissionToTeam(importerID, opts.TeamID, model.PermissionCreatePublicChannel).Return(false)

_, err := th.App.ImportBoardJSONL(r, opts)
require.Error(t, err)
var permErr *model.ErrPermission
require.ErrorAs(t, err, &permErr)
})

t.Run("import open board archive succeeds with create public channel permission", func(t *testing.T) {
const importerID = "f1tydgc697fcbp8ampr6881jea"

r := bytes.NewReader([]byte(openBoardArchive))
opts := model.ImportArchiveOptions{
TeamID: importTestTeamID,
ModifiedBy: importerID,
}

th.expectBoardImportPermissions(importerID, opts.TeamID, model.BoardTypeOpen)
th.Store.EXPECT().CreateBoardsAndBlocks(gomock.AssignableToTypeOf(&model.BoardsAndBlocks{}), importerID).Return(babs, nil)
th.Store.EXPECT().GetMembersForBoard(board.ID).AnyTimes().Return([]*model.BoardMember{}, nil)
th.Store.EXPECT().GetUserCategoryBoards(importerID, importTestTeamID).AnyTimes().Return([]model.CategoryBoards{
{
Category: model.Category{
ID: "boards_category_id",
Name: "Boards",
Type: model.CategoryTypeSystem,
},
},
}, nil)
th.Store.EXPECT().GetMembersForUser(importerID).AnyTimes().Return([]*model.BoardMember{}, nil)
th.Store.EXPECT().GetBoardsForUserAndTeam(importerID, importTestTeamID, false).AnyTimes().Return([]*model.Board{}, nil)
th.Store.EXPECT().AddUpdateCategoryBoard(importerID, utils.Anything, utils.Anything).AnyTimes().Return(nil)
th.Store.EXPECT().GetBoard(board.ID).AnyTimes().Return(board, nil)
th.Store.EXPECT().GetMemberForBoard(board.ID, gomock.Any()).AnyTimes().Return(nil, nil)
th.Store.EXPECT().GetUserByID(gomock.Any()).AnyTimes().DoAndReturn(func(id string) (*model.User, error) {
return &model.User{ID: id, IsGuest: false}, nil
})

newBoard, err := th.App.ImportBoardJSONL(r, opts)
require.NoError(t, err)
require.Equal(t, board.ID, newBoard.ID)
})
}

//nolint:lll
const openBoardArchive = `{"type":"board","data":{"id":"bfoi6yy6pa3yzika53spj7pq9ee","teamId":"wsmqbtwb5jb35jb3mtp85c8a9h","createdBy":"f1tydgc697fcbp8ampr6881jea","modifiedBy":"f1tydgc697fcbp8ampr6881jea","type":"O","minimumRole":"","title":"Open Import Test","createAt":1672750481591,"updateAt":1672750481591}}
{"type":"block","data":{"id":"ckpc3b1dp3pbw7bqntfryy9jbzo","parentId":"bjaqxtbyqz3bu7pgyddpgpms74a","createdBy":"f1tydgc697fcbp8ampr6881jea","modifiedBy":"f1tydgc697fcbp8ampr6881jea","schema":1,"type":"card","title":"Test","fields":{"contentOrder":[],"icon":"","isTemplate":false,"properties":{}},"createAt":1672750481612,"updateAt":1672845003530,"deleteAt":0,"boardId":"bfoi6yy6pa3yzika53spj7pq9ee"}}
`

//nolint:lll
const asana = `{"version":1,"date":1614714686842}
{"type":"block","data":{"id":"d14b9df9-1f31-4732-8a64-92bc7162cd28","fields":{"icon":"","description":"","cardProperties":[{"id":"3bdcbaeb-bc78-4884-8531-a0323b74676a","name":"Section","type":"select","options":[{"id":"d8d94ef1-5e74-40bb-8be5-fc0eb3f47732","value":"Planning","color":"propColorGray"},{"id":"454559bb-b788-4ff6-873e-04def8491d2c","value":"Milestones","color":"propColorBrown"},{"id":"deaab476-c690-48df-828f-725b064dc476","value":"Next steps","color":"propColorOrange"},{"id":"2138305a-3157-461c-8bbe-f19ebb55846d","value":"Comms Plan","color":"propColorYellow"}]}]},"createAt":1614714686836,"updateAt":1614714686836,"deleteAt":0,"schema":1,"parentId":"","rootId":"d14b9df9-1f31-4732-8a64-92bc7162cd28","modifiedBy":"","type":"board","title":"Cross-Functional Project Plan"}}
Expand Down
24 changes: 24 additions & 0 deletions server/app/permissions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,33 @@
package app

import (
"github.com/mattermost/mattermost-plugin-boards/server/model"

mm_model "github.com/mattermost/mattermost/server/public/model"
)

func (a *App) HasPermissionToBoard(userID, boardID string, permission *mm_model.Permission) bool {
return a.permissions.HasPermissionToBoard(userID, boardID, permission)
}

func (a *App) checkBoardCreationPermission(userID, teamID string, boardType model.BoardType) error {
if userID == model.SystemUserID {
return nil
}

if boardType == model.BoardTypeOpen {
if !a.permissions.HasPermissionToTeam(userID, teamID, model.PermissionCreatePublicChannel) {
return model.NewErrPermission("access denied to create public boards")
}
} else if !a.permissions.HasPermissionToTeam(userID, teamID, model.PermissionCreatePrivateChannel) {
return model.NewErrPermission("access denied to create private boards")
}
return nil
}

func (a *App) validateBoardForImport(userID, teamID string, board *model.Board) error {
if err := board.IsValidForImport(); err != nil {
return err
}
return a.checkBoardCreationPermission(userID, teamID, board.Type)
}
Loading