mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность
15 411 коммитов 3 Ветки 0 Теги
c5d7ac0876de7acbc2d5ed20955ba55587aa9edd
Граф коммитов

15411 Коммитов

This Branch
This Branch
Все ветки
Автор SHA1 Сообщение Дата
Agniva De Sarker
c5d7ac0876 MM-46604: Fix racy access to session props (#20996) 
The core mistake was that the webconn doesn't really go out of scope
once the connection disconnects. It is kept in the webhub connIndex
to be reconnected if the user connects again. This was the new
behavior as part of reliable websockets.

Therefore, it was a mistake to return the session to the pool
once the connection drops. Because the connection would still
recieve events from the web_hub.

And once you release the session, another login might acquire the
session and set some props, while the web_hub might still try
to send events to it, which will cause a read of the map prop.

The following test case illustrates such a race. It is very
hard to trigger it organically, hence I artificially wrote
the code.

The right fix is to release the session only when the connection
is stale and gets deleted from the conn index. The PR has been
load tested in `-race` mode just for extra sanity check.

```go
func TestHubSessionRace(t *testing.T) {
  th := Setup(t).InitBasic()
  defer th.TearDown()

  s := httptest.NewServer(dummyWebsocketHandler(t))
  defer s.Close()

  th.Server.HubStart()
  wc1 := registerDummyWebConn(t, th.App, s.Listener.Addr(), th.BasicUser.Id)
  defer wc1.Close()

  var wg sync.WaitGroup
  wg.Add(2)
  go func() {
    defer wg.Done()
    token := wc1.GetSessionToken()
    // Return to pool after *WebConn.Pump finishes
    wc1.App.Srv().userService.ReturnSessionToPool(wc1.GetSession())
    // A new HTTP requests acquires a session which gets it from the pool
    sess, _ := wc1.App.GetSession(token)
    // Login happens which sets some session properties
    sess.AddProp(model.SessionPropPlatform, "chrome")
  }()
  go func() {
    defer wg.Done()
    // Called from *WebConn.shouldSendEvent
    t.Log("session: ", wc1.GetSession().Props[model.SessionPropIsGuest] == "true")
  }()
  wg.Wait()
}
```

https://mattermost.atlassian.net/browse/MM-46604

```release-note
NONE
```
 2022-09-14 14:27:24 +05:30
Cass C
27cb087091 prepackage playbooks v1.32.3 (#21019) 2022-09-13 10:33:32 -04:00
Zef Hemel
fc867ea88c Merge pull request #21017 from mattermost/weblate_220913 
Weblate 220913
 2022-09-13 14:54:35 +02:00
MArtin Johnson
75259215a2 Translated using Weblate (Swedish) 
Currently translated at 100.0% (2381 of 2381 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/

Translated using Weblate (Swedish)

Currently translated at 98.4% (2341 of 2379 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/
 2022-09-13 13:48:27 +02:00
master7
5408ed084b Translated using Weblate (Polish) 
Currently translated at 100.0% (2381 of 2381 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/pl/

Translated using Weblate (Polish)

Currently translated at 100.0% (2379 of 2379 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/pl/
 2022-09-13 13:48:14 +02:00
Kaya Zeren
7b417ca26a Translated using Weblate (Turkish) 
Currently translated at 100.0% (2379 of 2379 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/
 2022-09-13 13:48:08 +02:00
Hosted Weblate
d515a96a07 Update translation files 
Updated by "Cleanup translation files" hook in Weblate.

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/
 2022-09-13 13:48:02 +02:00
jprusch
212efe18ca Translated using Weblate (German) 
Currently translated at 100.0% (2381 of 2381 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/de/

Translated using Weblate (German)

Currently translated at 100.0% (2379 of 2379 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/de/

Translated using Weblate (German)

Currently translated at 100.0% (2379 of 2379 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/de/
 2022-09-13 13:47:56 +02:00
Matthew Williams
afc372099b Translated using Weblate (English (Australia)) 
Currently translated at 100.0% (2379 of 2379 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/en_AU/
 2022-09-13 13:47:40 +02:00
Tom De Moor
f4123ef584 Translated using Weblate (Dutch) 
Currently translated at 99.2% (2364 of 2381 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/

Translated using Weblate (Dutch)

Currently translated at 99.4% (2366 of 2379 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/

Translated using Weblate (Dutch)

Currently translated at 99.0% (2356 of 2379 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/
 2022-09-13 13:47:01 +02:00
Zef Hemel
7fff071fee Merge pull request #21003 from weblate/weblate-mattermost-mattermost-server_master 
Translations update from Mattermost Weblate
 2022-09-13 10:38:50 +02:00
Harrison Healey
e0a5b3620d MM-46004 Add Focalboard webpack dev server to dev CSP policy (#20888) 
* MM-46004 Add Focalboard webpack dev server to dev CSP policy

* Fix tests and prevent duplicated CSP values
 2022-09-12 16:59:54 -04:00
Christopher Poile
393c46c2d8 calls v0.8.1 (#21006) 2022-09-12 16:42:22 -04:00
Christopher Poile
54df69e57a MM-46947 - Fix: Manifest parsing won't allow placeholders for custom pluginSettingType (#21004) 
* allow custom pluginSettingTypes to have a placeholder

* i18n

* lock it down with a test case

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2022-09-12 14:35:33 -04:00
MArtin Johnson
4d7a223397 Translated using Weblate (Swedish) 
Currently translated at 100.0% (2381 of 2381 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/

Translated using Weblate (Swedish)

Currently translated at 98.4% (2341 of 2379 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/sv/
 2022-09-12 18:03:36 +02:00
master7
eba83d5780 Translated using Weblate (Polish) 
Currently translated at 100.0% (2381 of 2381 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/pl/

Translated using Weblate (Polish)

Currently translated at 100.0% (2379 of 2379 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/pl/
 2022-09-12 18:03:36 +02:00
Kaya Zeren
177c7b5cd4 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2379 of 2379 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/
 2022-09-12 18:03:35 +02:00
Hosted Weblate
699f94c2ca Update translation files 
Updated by "Cleanup translation files" hook in Weblate.

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/
 2022-09-12 18:03:35 +02:00
jprusch
ab3f25c966 Translated using Weblate (German) 
Currently translated at 100.0% (2381 of 2381 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/de/

Translated using Weblate (German)

Currently translated at 100.0% (2379 of 2379 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/de/

Translated using Weblate (German)

Currently translated at 100.0% (2379 of 2379 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/de/
 2022-09-12 18:03:34 +02:00
Matthew Williams
0478377c36 Translated using Weblate (English (Australia)) 
Currently translated at 100.0% (2379 of 2379 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/en_AU/
 2022-09-12 18:03:34 +02:00
Tom De Moor
e6a42ceb70 Translated using Weblate (Dutch) 
Currently translated at 99.4% (2366 of 2379 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/

Translated using Weblate (Dutch)

Currently translated at 99.0% (2356 of 2379 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/
 2022-09-12 18:03:34 +02:00
Shivashis Padhi
098873b58f [MM-31745] Add translations for enterprise PR#1266 (#20872) 
* Add certificate_parse_error's translation from enterprise

* Change translation text

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2022-09-12 16:02:35 +05:30
Anurag Shivarathri
203c6a5013 Badge count fix for push notifications when CRT is enabled (#20898) 
* Fix

* Fixed other cases and tests

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2022-09-12 14:51:33 +05:30
Kyriakos Z
8edd351f27 Fixes kerberos version not found (#20998) 
* Fixes kerberos version not found

docker-build fails in CI because the following versions are not found.

- libkrb5support0=1.17-3+deb10u3
- libk5crypto3=1.17-3+deb10u3
- libkrb5-3=1.17-3+deb10u3
- libgssapi-krb5-2=1.17-3+deb10u3
 2022-09-12 11:30:02 +03:00
Kyriakos Z
93174fbe56 MM-46408: adds PostPriority feature flag and admin setting (#20875) 
* MM-46408: adds PostPriority feature flag

Adds the PostPriority feature flag. You can enable it by setting the
env variable `MM_FEATUREFLAGS_POSTPRIORITY=true`.

* Adds support for admin setting

* empty

* Uses post priority in telemetry

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2022-09-11 20:45:20 +03:00
Shivashis Padhi
38aaa9e3d3 [MM-46603] P1 - Improvements in handling '0 posts' channels (#20905) 
Automatic Merge
 2022-09-09 20:34:00 +03:00
Cass C
42e03e18b9 Prepackage Playbooks v1.32.2 (#20979) 2022-09-09 13:00:10 -04:00
Doug Lauder
1d7822d154 Revert "Allow inline JSON in config.json for advanced logging config (#20954)" (#20983) 
This reverts commit 5211d5de15.
 2022-09-09 12:56:05 -04:00
Agniva De Sarker
8797bfcde7 MM-46871: Add remining search parameters to be escaped (#20963) 
The first try wasn't exhaustive. I was planning to use
1f933263e7/store/sqlstore/post_store.go (L1738-L1748) for this
but it also contained `@` which we don't want.

In the end, I just used a separate slice for all
the characters to be escaped.

https://mattermost.atlassian.net/browse/MM-46871

```release-note
NONE
```

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2022-09-09 21:21:34 +05:30
Shivashis Padhi
8b328386c5 MM-46911: P1 - Fix MySQL query to filter bots out of TopDM (#20965) 
Automatic Merge
 2022-09-09 18:34:00 +03:00
Tim Scheuermann
78251a3ff1 Initialize the logger for imports (#20978) 2022-09-09 16:20:56 +02:00
Doug Lauder
5211d5de15 Allow inline JSON in config.json for advanced logging config (#20954) 
* Allow embedded JSON in config.json for AdvancedLoggingConfig

* fix escaped JSON case

* Add unit test cases for escaped JSON

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2022-09-09 07:51:17 -04:00
Agniva De Sarker
e14fd1d955 Bump splitio dependency (#20960) 
Split finally upgraded their dependency.
This means we can bump this and get rid of any hacks
in our dependency upgrade process!

```release-note
NONE
```
 2022-09-09 00:41:04 +05:30
Nick Misasi
8401a31c3a [MM-44729] Update payment failed email (#20925) 
* Update Payment Failed Email

* Actually add the mjml file:

* Fix mjml indentation

* Fix pipelines

* Fix translations

* Fix translations

* Clean up translations

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2022-09-08 11:01:50 -04:00
Cass C
d935443df4 Pre-package Playbooks v1.32.1 (#20910) 
* prepackage playbooks v1.32.0

* Update Makefile

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2022-09-08 10:15:16 -04:00
Vishal
4bc2cc4b0f Add Limit (#20762) 
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2022-09-08 19:29:13 +05:30
kshitij katiyar
5a718f3c63 MM-29123: Removed the hard coded gitlab.com in Terms of Service error (#20830) 
Automatic Merge
 2022-09-08 13:04:00 +03:00
Daniel Espino García
56bf9cec50 Add missing field "sortOrder" to graphQL schema (#20956) 
* Add missing field "sortOrder" to graphQL schema

* Add test

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2022-09-08 09:30:53 +02:00
Agniva De Sarker
1fc5fcd900 MM-46911: Skip flaky TestGetTopDMsForUserSince (#20962) 
https://mattermost.atlassian.net/browse/MM-46911

```release-note
NONE
```
 2022-09-08 11:43:49 +05:30
Shivashis Padhi
4ffdf6b859 [MM-46667] P1 Fix top DM insights pagination (#20896) 
Automatic Merge
 2022-09-07 23:34:01 +03:00
Mustafa Kara
57afc97f24 Optimize CircleCI pipelines (#20933) 
Signed-off-by: Mustafa Kara <mustafa.kara@mattermost.com>
 2022-09-07 09:36:40 +03:00
Agniva De Sarker
f67c7cbbdf MM-46902: Skip TestFileinfosForPost (#20955) 
https://mattermost.atlassian.net/browse/MM-46902

```release-note
NONE
```
 2022-09-07 09:31:20 +05:30
Agniva De Sarker
a0ab03a31e MM-46869: Fix channel props not appearing in GraphQL (#20944) 
The props map was being null, but the schema did not
allow nulls. Therefore, the whole response was being
set to null. There was no error which created more
confusion.

To avoid making the property nillable, which would
mean sending pointers to maps, we just create
empty maps if they are nil.

https://mattermost.atlassian.net/browse/MM-46869

```release-note
NONE
```
 2022-09-07 08:38:41 +05:30
Shivashis Padhi
8f743c37b6 [MM-46516] P1 - Fix total message counting for top DM (#20858) 
Automatic Merge
 2022-09-07 01:34:01 +03:00
Julien Tant
d23c7ed2a3 [MM-46663] Only enable marketplace command completion when config allows it (#20919) 2022-09-06 08:43:34 -07:00
Tóth Csaba // Online ERP Hungary Kft
1f933263e7 Translated using Weblate (Hungarian) 
Currently translated at 98.2% (2337 of 2379 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/hu/
 2022-09-06 16:24:00 +03:00
Kaya Zeren
b79444e332 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2379 of 2379 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/
 2022-09-06 16:24:00 +03:00
Tom De Moor
ba0b1e83ac Translated using Weblate (Dutch) 
Currently translated at 97.7% (2326 of 2379 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/nl/
 2022-09-06 16:24:00 +03:00
master7
cd04cc13fc Translated using Weblate (Polish) 
Currently translated at 100.0% (2379 of 2379 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/pl/
 2022-09-06 16:24:00 +03:00
jprusch
7b8ac02283 Translated using Weblate (German) 
Currently translated at 100.0% (2379 of 2379 strings)

Translation: mattermost-languages-shipped/mattermost-server
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/de/
 2022-09-06 16:24:00 +03:00