From 1a81daaa3777f96d76e89bb18e0abd131a5b5595 Mon Sep 17 00:00:00 2001 From: Miguel Alatzar Date: Wed, 8 May 2019 13:16:03 -0700 Subject: [PATCH] [MM-15379] Avoid possible reading of .name on undefined (#2778) * Avoid possible reading of property on undefined * Add unit test for handleSelectChannelByName * Update mattermost-redux hash --- app/actions/views/channel.js | 2 +- app/actions/views/channel.test.js | 96 +++++++++++++++++++++++++++++++ package-lock.json | 52 +++++------------ package.json | 2 +- 4 files changed, 113 insertions(+), 39 deletions(-) create mode 100644 app/actions/views/channel.test.js diff --git a/app/actions/views/channel.js b/app/actions/views/channel.js index c6f68032a..b374723bf 100644 --- a/app/actions/views/channel.js +++ b/app/actions/views/channel.js @@ -408,7 +408,7 @@ export function handleSelectChannelByName(channelName, teamName) { return async (dispatch, getState) => { const state = getState(); const {teams: currentTeams, currentTeamId} = state.entities.teams; - const currentTeamName = currentTeams[currentTeamId].name; + const currentTeamName = currentTeams[currentTeamId]?.name; const {data: channel} = await dispatch(getChannelByNameAndTeamName(teamName || currentTeamName, channelName)); const currentChannelId = getCurrentChannelId(state); if (channel && currentChannelId !== channel.id) { diff --git a/app/actions/views/channel.test.js b/app/actions/views/channel.test.js new file mode 100644 index 000000000..2b06a97d4 --- /dev/null +++ b/app/actions/views/channel.test.js @@ -0,0 +1,96 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +import configureStore from 'redux-mock-store'; +import thunk from 'redux-thunk'; + +import {handleSelectChannelByName} from 'app/actions/views/channel'; + +jest.mock('mattermost-redux/selectors/entities/channels', () => ({ + getChannel: () => ({data: 'received-channel-id'}), + getCurrentChannelId: () => 'current-channel-id', + getMyChannelMember: () => ({data: {member: {}}}), +})); + +const mockStore = configureStore([thunk]); + +describe('Actions.Views.Channel', () => { + let store; + + const MOCK_SELECT_CHANNEL_TYPE = 'MOCK_SELECT_CHANNEL_TYPE'; + const MOCK_RECEIVE_CHANNEL_TYPE = 'MOCK_RECEIVE_CHANNEL_TYPE'; + + const actions = require('mattermost-redux/actions/channels'); + actions.getChannelByNameAndTeamName = jest.fn((teamName) => { + if (teamName) { + return { + type: MOCK_RECEIVE_CHANNEL_TYPE, + data: 'received-channel-id', + }; + } + + return { + type: 'MOCK_ERROR', + error: 'error', + }; + }); + actions.selectChannel = jest.fn().mockReturnValue({ + type: MOCK_SELECT_CHANNEL_TYPE, + data: 'selected-channel-id', + }); + + const currentUserId = 'current-user-id'; + const currentChannelId = 'channel-id'; + const currentChannelName = 'channel-name'; + const currentTeamId = 'current-team-id'; + const currentTeamName = 'current-team-name'; + const storeObj = { + entities: { + users: { + currentUserId, + }, + channels: { + currentChannelId, + }, + teams: { + teams: { + currentTeamId, + currentTeams: { + [currentTeamId]: { + name: currentTeamName, + }, + }, + }, + }, + }, + }; + + test('handleSelectChannelByName success', async () => { + store = mockStore(storeObj); + + await store.dispatch(handleSelectChannelByName(currentChannelName, currentTeamName)); + + const storeActions = store.getActions(); + const receivedChannel = storeActions.some((action) => action.type === MOCK_RECEIVE_CHANNEL_TYPE); + expect(receivedChannel).toBe(true); + + const storeBatchActions = storeActions.filter(({type}) => type === 'BATCHING_REDUCER.BATCH'); + const selectedChannel = storeBatchActions[0].payload.some((action) => action.type === MOCK_SELECT_CHANNEL_TYPE); + expect(selectedChannel).toBe(true); + }); + + test('handleSelectChannelByName failure from null currentTeamName', async () => { + const failStoreObj = {...storeObj}; + failStoreObj.entities.teams.teams.currentTeamId = 'not-in-current-teams'; + store = mockStore(storeObj); + + await store.dispatch(handleSelectChannelByName(currentChannelName, null)); + + const storeActions = store.getActions(); + const receivedChannel = storeActions.some((action) => action.type === MOCK_RECEIVE_CHANNEL_TYPE); + expect(receivedChannel).toBe(false); + + const storeBatchActions = storeActions.some(({type}) => type === 'BATCHING_REDUCER.BATCH'); + expect(storeBatchActions).toBe(false); + }); +}); diff --git a/package-lock.json b/package-lock.json index afe0bd0a8..ca73430e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2684,7 +2684,6 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, - "optional": true, "requires": { "is-extendable": "^0.1.0" } @@ -2729,8 +2728,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true, - "optional": true + "dev": true }, "is-glob": { "version": "4.0.0", @@ -4807,8 +4805,7 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true, - "optional": true + "bundled": true }, "aproba": { "version": "1.2.0", @@ -4826,13 +4823,11 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4845,18 +4840,15 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "concat-map": { "version": "0.0.1", - "bundled": true, - "optional": true + "bundled": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "core-util-is": { "version": "1.0.2", @@ -4959,8 +4951,7 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, - "optional": true + "bundled": true }, "ini": { "version": "1.3.5", @@ -4970,7 +4961,6 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4983,20 +4973,17 @@ "minimatch": { "version": "3.0.4", "bundled": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true, - "optional": true + "bundled": true }, "minipass": { "version": "2.3.5", "bundled": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5013,7 +5000,6 @@ "mkdirp": { "version": "0.5.1", "bundled": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -5086,8 +5072,7 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, - "optional": true + "bundled": true }, "object-assign": { "version": "4.1.1", @@ -5097,7 +5082,6 @@ "once": { "version": "1.4.0", "bundled": true, - "optional": true, "requires": { "wrappy": "1" } @@ -5173,8 +5157,7 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true, - "optional": true + "bundled": true }, "safer-buffer": { "version": "2.1.2", @@ -5204,7 +5187,6 @@ "string-width": { "version": "1.0.2", "bundled": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5222,7 +5204,6 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5261,13 +5242,11 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, - "optional": true + "bundled": true }, "yallist": { "version": "3.0.3", - "bundled": true, - "optional": true + "bundled": true } } }, @@ -9844,8 +9823,8 @@ "integrity": "sha1-XdaUPJOFSCZwFtTjTwV1gwgMUUw=" }, "mattermost-redux": { - "version": "github:mattermost/mattermost-redux#eeaf49df2660577a1491d472858f7f01ea76660f", - "from": "github:mattermost/mattermost-redux#eeaf49df2660577a1491d472858f7f01ea76660f", + "version": "github:mattermost/mattermost-redux#a6b5a325126821c8e6fe22a3dbef747a4d325c5e", + "from": "github:mattermost/mattermost-redux#a6b5a325126821c8e6fe22a3dbef747a4d325c5e", "requires": { "deep-equal": "1.0.1", "eslint-plugin-header": "3.0.0", @@ -13127,8 +13106,7 @@ "version": "0.3.2", "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true, - "optional": true + "dev": true }, "braces": { "version": "2.3.2", diff --git a/package.json b/package.json index 2f10f781a..2a2ddf294 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "intl": "1.2.5", "jail-monkey": "2.0.0", "jsc-android": "236355.1.1", - "mattermost-redux": "github:mattermost/mattermost-redux#eeaf49df2660577a1491d472858f7f01ea76660f", + "mattermost-redux": "github:mattermost/mattermost-redux#a6b5a325126821c8e6fe22a3dbef747a4d325c5e", "mime-db": "1.40.0", "moment-timezone": "0.5.23", "prop-types": "15.7.2",