Граф коммитов

12404 Коммитов

Автор SHA1 Сообщение Дата
catalintomai
6dc8eccc13 MM-23395: Add websockets support for update group (#14202)
* MM-23395: add websockets support for update group
2020-05-18 09:43:26 -07:00
Federico Martín Alconada Verzini
94dbb09906 [GH-13463] add unit tests to the ChannelCreateCmd mmctl command (#14177)
* add unit tests to the ChannelCreateCmd mmctl command

* fix showed variables

* remove extra whitespace

* add errors check to tests

Co-authored-by: Federico Martín Alconada Verzini <fedealconada@gmail.com>
Co-authored-by: mattermod <mattermod@users.noreply.github.com>
2020-05-18 09:43:24 +03:00
Agniva De Sarker
bb172aea71 MM-25007: Add staticcheck (#14522) 2020-05-15 17:57:15 +02:00
Agniva De Sarker
21af1f49f1 MM-25238: Fix system ping check to read from master (#14580)
The code was writing to master and immediately after that reading
from a replica causing it to fail intermittently.

Since this is not a very high-traffic table, it should be safe to read
from master always.
2020-05-15 14:19:46 +05:30
Doug Lauder
76ed77663a MM-23706 search executable dir before working dir when looking for i18n (#14241)
* MM-23706 search executable dir before working dir when looking for i18n
2020-05-14 20:11:22 -04:00
Scott Bishel
e6bbb4bd7a MM-24082: Add PictureAttribute to LDAP Settings in config (#14506)
* add new config setting for profile picture attribute

* update attribute names

Co-authored-by: mattermod <mattermod@users.noreply.github.com>
2020-05-14 13:25:23 -06:00
Agniva De Sarker
090743de86 MM-24132: Migrate AppError from SaveDirectChannel/channel_store.go (#14318)
* MM-24135: Migrate AppError from SaveChannel/channel_store.go

This is the first POC of migration of store app errors to plain error.

We create a few basic error types in the store package and use
them to return the errors from store methods. In the app layer,
we inspect the error and re-create the exact app errors. This lets
us preserve the same error content, but yet move to plain errors.

Since this is a gradual migration, this means that the error inspection
code will be duplicated across the app layer whenever a store method
is invoked. But all of that should go away once we start propagating
the errors higher up the hierarchy.

There have been a significant amount of changes in the storetest and searchtest
layer, primarily because we have to rename the err variable now that it is of
a different type.

* Addressed review comments

* MM-24132: Migrate AppError from SaveDirectChannel/channel_store.go

This PR migrates 2 new methods SaveDirectChannel and CreateDirectChannel
to return error instead of AppError.

We also need to handle the error internally in SaveMultipleMember for now
until that is migrated too.

* Fix layers

Co-authored-by: mattermod <mattermod@users.noreply.github.com>
2020-05-14 23:41:05 +05:30
Agniva De Sarker
624980ff54 MM-25005: Remove HttpRequestsDuration bucket (#14520)
* MM-25005: Remove HttpRequestsDuration bucket

The ApiTimesHistograms already captures what HttpRequestsDuration does.
And it's more granular than that. So there's no need to duplicate stuff.
Let's remove this one.

* Updating resource class to xlarge

Co-authored-by: mattermod <mattermod@users.noreply.github.com>
Co-authored-by: Jason Deland <jaydeland@gmail.com>
2020-05-14 10:53:55 +05:30
Jason Deland
5686268a5a Update to xLarge resource 2020-05-13 15:28:55 -04:00
Farhan Munshi
599bd93258 MM-25016 Send group Name to in out of channel group users message (#14537) 2020-05-13 13:41:28 -04:00
Doug Lauder
e27b86cae0 expose ServiceSettings.ExtendSessionLengthWithActivity config to clients (#14516) 2020-05-13 12:31:43 -04:00
Miguel de la Cruz
4fde004a5b [MM-23535] Add disable database search flag and return empty posts results if set (#14245)
* [MM-23535] Add disable database search flag and return empty posts results if set

* Add UpdateConfig function for the SearchStore and hook it into the app lifecycle

* Add the config listener in the server instance instead of using FakeApp

* Instantiate searchlayer as a pointer to avoid passing around copies of it
2020-05-13 14:00:57 +02:00
Sayantan Das
288ed40e8f Retry on failed download of plugins from marketplace. (#14176)
* Retry on failed download of plugins from marketplace.

* minor polishing.

* Handling http errors during downloading
Adding unit test for DownloadFromURL

* Adding suggested changes from the PR
Close response body before returning error during progressive retry
Remove separate struct for the downloadURL parameter in download_test
Adding comment to clarify the share retries variable
Changing to NoError and Error in the test assertion.

* Added license header to download_test.go

Co-authored-by: mattermod <mattermod@users.noreply.github.com>
2020-05-13 08:36:43 +05:30
Flavia Bastos
e03fca5032 Document sqlTeamStore GetAll methods (#14372)
Co-authored-by: mattermod <mattermod@users.noreply.github.com>
2020-05-12 20:47:10 +02:00
Agniva De Sarker
729a84a3e6 MM-24135: Migrate AppError from SaveChannel/channel_store.go (#14299)
* MM-24135: Migrate AppError from SaveChannel/channel_store.go

This is the first POC of migration of store app errors to plain error.

We create a few basic error types in the store package and use
them to return the errors from store methods. In the app layer,
we inspect the error and re-create the exact app errors. This lets
us preserve the same error content, but yet move to plain errors.

Since this is a gradual migration, this means that the error inspection
code will be duplicated across the app layer whenever a store method
is invoked. But all of that should go away once we start propagating
the errors higher up the hierarchy.

There have been a significant amount of changes in the storetest and searchtest
layer, primarily because we have to rename the err variable now that it is of
a different type.

* Addressed review comments

* Made all appError origins to be CreateChannel

* Remove typed internal error

* Fix translations

* fix layer generation

Co-authored-by: mattermod <mattermod@users.noreply.github.com>
2020-05-12 21:23:41 +05:30
catalintomai
41e58d9769 MM-23816: Group Mentions: Add ability to rename group names (#14338)
* MM-23816: Group Mentions: Add ability to rename group names
2020-05-12 08:35:03 -07:00
Agniva De Sarker
9dc64173dc MM-24817: Bump hashicorp/memberlist (#14467)
Automatic Merge
2020-05-12 08:32:16 -07:00
Doug Lauder
65733f4969 MM-24644 fix infinite loop splitting post attachments (#14542) 2020-05-12 09:58:19 -04:00
Agniva De Sarker
88481862f7 MM-24911: re-add the reactions table migration (#14487)
Adding the line to migrate it in 5.24

Co-authored-by: mattermod <mattermod@users.noreply.github.com>
2020-05-12 18:57:29 +05:30
Agniva De Sarker
4fe52d677c MM-24652: Bump golangci to 1.25.1 (#14409)
Co-authored-by: mattermod <mattermod@users.noreply.github.com>
2020-05-12 10:36:58 +05:30
Agniva De Sarker
c7f53cf02b MM-24759: fix order of calling SetstatusOnline (#14450)
We would call SetStatusOnline in a goroutine before actually calling HubRegister.
This could cause the message not to be sent after all, because there's no guarantee
that Register would actually happen before it.

To fix it, we just change the order of things.

Co-authored-by: mattermod <mattermod@users.noreply.github.com>
2020-05-12 00:16:24 +05:30
Martin Kraft
3f6c9ab40c Adds server awareness. (#14271)
Co-authored-by: mattermod <mattermod@users.noreply.github.com>
2020-05-11 11:45:54 -04:00
Eli Yukelzon
744ec281d2 Layer generators error return type fix (#14526) 2020-05-11 12:37:02 +03:00
Agniva De Sarker
2e1dc79a03 Remove concurrent write to websocket connection (#14527)
This test writes directly to a connection
which causes panics and more frustration in an already fragile CI.

Since this anyways checks an edge condition, and will anyways be
removed in v6, let's remove this for now and let CI be happy.
2020-05-11 13:19:00 +05:30
Agniva De Sarker
48256721c4 MM-24611: Fix flaky test TestDeletePreferencesWebsocket (#14399)
After registering the conn in the hub, we proceeded to send a
direct message to the user. We had changed it to send the direct message
in the same hub goroutine that handles the registration. This was the correct
behavior and fixes chances of having panics due to sending to closed channels.

However, often fixing something unearths some deeper underlying bug. This was
such a case :)

The issue was that register channel had a buffer size of 1. And we were sending
a direct message after registration. In the code to send direct message, we
were checking if the user has been registered or not, and if not, then skip it.

Therefore, since the register channel buffer was 1, it could very well be that
the select case would pick up the direct message send case first - in which
case it would not have been registered, and therefore no hello message would be sent.

The fix is to unbuffer the register and unregister channels. There does not seem
to be a valid reason to make these buffered channels. They are meant to be
synchronous operations, because the code following them assumes that the user
has been registered.

While here, we also remove all the time.Sleeps before waiting on the Response channel
because they are not required at all. Waiting on a channel is already blocking.

Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com>
2020-05-09 08:45:03 +05:30
Farhan Munshi
fff93cb73f [MM-24987] Dont call GetSchemeRolesForChannel and instead load the scheme from channel (#14514)
* MM-24987 Dont call a.GetSchemeRolesForChannel and instead load the scheme using the channel directly

* Trigger CI

* MM-24987 Add a test for concurrent patch to channel moderation

* MM-24987 Cleanup
2020-05-08 17:50:45 -04:00
Farhan Munshi
8fe003876d [MM-24828] Take into account group synced state of team and channel when sending notifications (#14477)
* MM-24828 Take into account group synced state of team and channel when getting groups for mentions

* Update app/notification_test.go

* i18n-extract

* Revert "i18n-extract"

This reverts commit dcb0426b98afa4646c26870c0e3a1236f99fda17.

* Trigger CI

Co-authored-by: mattermod <mattermod@users.noreply.github.com>
2020-05-08 16:32:48 -04:00
Farhan Munshi
0d1eb02341 [MM-24827] Disable group mentions on e10 or team edition (#14475)
* MM-24827 Disable group mentions when ldap groups not enabled

* Trigger CI

Co-authored-by: mattermod <mattermod@users.noreply.github.com>
2020-05-08 14:19:01 -04:00
Martin Kraft
4c2d34b097 Fix log message typo. (#14472) 2020-05-08 13:51:52 -04:00
Agniva De Sarker
82e27982d0 MM-24310: Recycle DB connections properly (#14378)
Automatic Merge
2020-05-07 22:03:54 -07:00
Scott Bishel
80c846412d MM-24692: Add a since parameter to getGroups api (#14444)
* add a since parameter to getGroups api

* update for lint error

* when using since, return deleted groups as well.

* update flaky test, groups have same create time

Co-authored-by: mattermod <mattermod@users.noreply.github.com>
2020-05-07 14:35:09 -06:00
Scott Bishel
1031e27fd8 MM-23038: Compliance Report Fixes (#14242)
* add warning count as return value

* add warning count as return value

* fix file name

* update mock

* add setting warning to db

* replace wrongly removed string

* add dummy function to see if it will build

* remove dummy function

Co-authored-by: mattermod <mattermod@users.noreply.github.com>
2020-05-07 14:12:47 -06:00
Scott Bishel
bdd0e9febb MM-24694: Add getGroupsByUserId to API layer (#14443)
* add getGroupsByUserId to API layer

* update for lint errors

* add check for contextId = userId or ManageSystem Permission

Co-authored-by: mattermod <mattermod@users.noreply.github.com>
2020-05-07 13:35:56 -06:00
Shibasis Patel
882b0324b5 MM_22682_Centralize_ID_Validation (#14237)
Co-authored-by: mattermod <mattermod@users.noreply.github.com>
2020-05-07 13:27:35 -04:00
Jesús Espino
ef5ac519d9 Disable read/search db replicas in TE/E0 (#14400)
* Disable read/search db replicas in TE/E0

* fixing tests

* Removing unnecesary text.

* Updating without-license read-replicas config before store initialization

* Reconnecting to database after remove read replicas
2020-05-07 14:11:05 +02:00
Juho Nurminen
37f43a7094 Move Dependency-Check configs to a separate repo (#14497) 2020-05-07 12:05:49 +02:00
dantepippi
539c8ba4bb [MM-24662] Refactor license_store to use squirrel Closes #14422 (#14451)
* Refactor license_store to use squirrel

* Fix query build error string
2020-05-07 14:42:51 +05:30
Federico Martín Alconada Verzini
d9a0f89446 [GH-13461] add unit tests to the RemoveChannelUsersCmd mmctl command (#14178)
* add unit tests to the RemoveChannelUsersCmd mmctl command

* add changes requested by @mgdelacroix

Co-authored-by: Federico Martín Alconada Verzini <fedealconada@gmail.com>
Co-authored-by: mattermod <mattermod@users.noreply.github.com>
2020-05-07 10:22:53 +02:00
Doug Lauder
41ccd0c755 MM-24484 allow base64 certs in config for TLS Syslog (#14445) 2020-05-06 19:45:03 -04:00
Doug Lauder
5e59b5f70c MM-23935 extend session expiry on user activity (#14275)
* MM-23935  extend session expiry on user activity

- if user types anything before a session expires the session will be extended to now + session length

- ensures new session expiries are not written to DB too frequently

- new session store func for updating session ExpiresAt

- session length defaults for mobile and web/ldap changed from 180 days to 30 days
2020-05-06 15:41:10 -04:00
catalintomai
58305b080f Check license expiration, disable license and notify administrator (#14420)
* Check license expiration and notify administrator
2020-05-06 10:28:49 -07:00
Carlos Tadeu Panato Junior
5ad3eaf7ee upgrade DB to 5.23 (#14469) 2020-05-06 10:47:58 +02:00
Siyuan Liu
10538b4813 cache v2 interface - store serialized cache (#14118)
Automatic Merge
2020-05-05 11:59:25 -07:00
Carlos Tadeu Panato Junior
4c16924832 bump base package for MM in dockerfile (#14468) 2020-05-05 18:43:12 +02:00
Gabe Jackson
22c949618c Fix API ping endpoint race condition (#14365)
This corrects an issue found when running multiple clustered
Mattermost servers and using the optional `get_server_status`
check on the ping API endpoint. This is done by allowing each
server to write and read from its own health check key in the
system table.
2020-05-05 22:44:18 +08:00
Hossein Ahmadian-Yazdi
40b20c3eaf [MM-24177] Adds props to post for front end to know if highlight or not (#14348)
* Add props to post

* Address PR comments

* address PR comments

* Fix styling problems

* Address PR comments

* address PR comments

* Add PR suggestion

* fix usage

* fix error

* remove err

* fix golang lint
2020-05-05 06:00:59 -04:00
George Goldberg
3dbb0201a4 MM-24780: Fix subpath CSP rewriting after Rudder addition. (#14459)
Co-authored-by: mattermod <mattermod@users.noreply.github.com>
2020-05-05 09:19:25 +01:00
Tomas
5dcd37d7e3 Convert tests in model/search_params_test.go into table testing (#14058)
* Convert tests in model/search_params_test.go into table testing

* remove the not needed definitions

* gofmt

* update msg strings

Co-authored-by: mattermod <mattermod@users.noreply.github.com>
2020-05-05 09:39:02 +02:00
Agniva De Sarker
462a21dcd1 MM-24547: Fix deadlock in pingTimeoutTimer (#14440)
Automatic Merge
2020-05-04 22:01:53 -07:00
Juho Nurminen
cf3ba6661d Fix dependency alerting (#14457)
Automatic Merge
2020-05-04 04:21:47 -07:00