* Posts * Add missing translation * Fix internal store marshaling * [MM-22051] Remove To/From JSON (Channels) (#18116) * Channels * Channel members * ChannelSearch * Channel categories, list, sidebar, stats, view * Fix conversions * [MM-22051] Remove To/From JSON (Users) (#18121) * User related structs * Fix return * Team related structures (#18127) * [MM-22051] Remove To/From JSON (Status, Bot, Reaction, Thread, FileInfo) (#18130) * Status * Bot * Reaction * Thread * FileInfo * Some fixes * Translations update from Weblate (#18143) * Translated using Weblate (German) Currently translated at 100.0% (2309 of 2309 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/de/ * Translated using Weblate (Turkish) Currently translated at 100.0% (2309 of 2309 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (2309 of 2309 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/hu/ * 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/ 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/ 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/ 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/ * Translated using Weblate (German) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/de/ * Translated using Weblate (Turkish) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/hu/ * Translated using Weblate (English (Australia)) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/en_AU/ * Translated using Weblate (Bulgarian) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/bg/ * Translated using Weblate (Japanese) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ja/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/zh_Hans/ Co-authored-by: JtheBAB <srast@bioc.uzh.ch> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: Tóth Csaba // Online ERP Hungary Kft <csaba.toth@online-erp.hu> Co-authored-by: Matthew Williams <Matthew.Williams@outlook.com.au> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: kaakaa <stooner.hoe@gmail.com> Co-authored-by: aeomin <lin@aeomin.net> Co-authored-by: Weblate (bot) <hosted@weblate.org> Co-authored-by: JtheBAB <srast@bioc.uzh.ch> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: Tóth Csaba // Online ERP Hungary Kft <csaba.toth@online-erp.hu> Co-authored-by: Matthew Williams <Matthew.Williams@outlook.com.au> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: kaakaa <stooner.hoe@gmail.com> Co-authored-by: aeomin <lin@aeomin.net> * [MM-22051] Remove To/From JSON methods from model (#18138) * Scheme * Role * Session * Config * Status * Fix logic * Emoji * GuestsInvite * Group * Command * ClusterInfo * License * Job * System * Plugin * Command2 * IncomingWebhook * OutgoingWebhook * Fix tests * Update traslation * Some fixes * Add missing return * Simplify * Make Config.ToJSONFiltered() return []byte * Make Busy.ToJSON() return []byte * Include error in log * Split logic * [MM-22051] Remove To/From JSON (final) (#18150) * SwitchRequest * PluginEventData * Permalink * PushNotification * SuggestCommand * PluginsResponse * WebSocketMessage * RemoteCluster * SharedChannel * PluginStatuses * InitialLoad * ClusterDiscovery * ClusterStats * MfaSecret * GroupSyncable * SAML * WebSocketRequest * TypingRequest * SecurityBulletin * OAuthApp * IntegrationAction * DataRetention * Preference * FileInfoList * Compliance * Preferences * FileInfoSearchResults * TermsOfService * InstallMarketplacePluginRequest * GitLabUser * UploadSessions * Remove unused helpers * Fix tests * [MM-23280] Fix linting for ToJSON/FromJSON (#18153) * SwitchRequest * PluginEventData * Permalink * PushNotification * SuggestCommand * PluginsResponse * WebSocketMessage * RemoteCluster * SharedChannel * PluginStatuses * InitialLoad * ClusterDiscovery * ClusterStats * MfaSecret * GroupSyncable * SAML * WebSocketRequest * TypingRequest * SecurityBulletin * OAuthApp * IntegrationAction * DataRetention * Preference * FileInfoList * Compliance * Preferences * FileInfoSearchResults * TermsOfService * InstallMarketplacePluginRequest * GitLabUser * UploadSessions * Remove unused helpers * Fix tests * Fix linting for ToJSON/FromJSON * Fix conversions Co-authored-by: Weblate (bot) <hosted@weblate.org> Co-authored-by: JtheBAB <srast@bioc.uzh.ch> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: Tóth Csaba // Online ERP Hungary Kft <csaba.toth@online-erp.hu> Co-authored-by: Matthew Williams <Matthew.Williams@outlook.com.au> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: kaakaa <stooner.hoe@gmail.com> Co-authored-by: aeomin <lin@aeomin.net> Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
189 строки
4.2 KiB
Go
189 строки
4.2 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package remotecluster
|
|
|
|
import (
|
|
"bytes"
|
|
"image"
|
|
"image/color"
|
|
"image/png"
|
|
"io"
|
|
"io/ioutil"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"sync"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/mattermost/mattermost-server/v6/model"
|
|
)
|
|
|
|
const (
|
|
imageWidth = 128
|
|
imageHeight = 128
|
|
)
|
|
|
|
func TestService_sendProfileImageToRemote(t *testing.T) {
|
|
hadPing := disablePing
|
|
disablePing = true
|
|
defer func() { disablePing = hadPing }()
|
|
|
|
shouldError := &flag{}
|
|
|
|
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
defer io.Copy(ioutil.Discard, r.Body)
|
|
|
|
if shouldError.get() {
|
|
w.WriteHeader(http.StatusInternalServerError)
|
|
resp := make(map[string]string)
|
|
resp[model.STATUS] = model.StatusFail
|
|
w.Write([]byte(model.MapToJSON(resp)))
|
|
return
|
|
}
|
|
|
|
status := model.StatusOk
|
|
defer func(s *string) {
|
|
if *s != model.StatusOk {
|
|
w.WriteHeader(http.StatusInternalServerError)
|
|
}
|
|
resp := make(map[string]string)
|
|
resp[model.STATUS] = *s
|
|
w.Write([]byte(model.MapToJSON(resp)))
|
|
}(&status)
|
|
|
|
if err := r.ParseMultipartForm(1024 * 1024); err != nil {
|
|
status = model.StatusFail
|
|
assert.Fail(t, "connect parse multipart form", err)
|
|
return
|
|
}
|
|
m := r.MultipartForm
|
|
if m == nil {
|
|
status = model.StatusFail
|
|
assert.Fail(t, "multipart form missing")
|
|
return
|
|
}
|
|
|
|
imageArray, ok := m.File["image"]
|
|
if !ok || len(imageArray) != 1 {
|
|
status = model.StatusFail
|
|
assert.Fail(t, "image missing")
|
|
return
|
|
}
|
|
|
|
imageData := imageArray[0]
|
|
file, err := imageData.Open()
|
|
if err != nil {
|
|
status = model.StatusFail
|
|
assert.Fail(t, "cannot open multipart form file")
|
|
return
|
|
}
|
|
defer file.Close()
|
|
|
|
img, err := png.Decode(file)
|
|
if err != nil || imageWidth != img.Bounds().Max.X || imageHeight != img.Bounds().Max.Y {
|
|
status = model.StatusFail
|
|
assert.Fail(t, "cannot decode png", err)
|
|
return
|
|
}
|
|
}))
|
|
defer ts.Close()
|
|
|
|
rc := makeRemoteCluster("remote_test_profile_image", ts.URL, TestTopics)
|
|
|
|
user := &model.User{
|
|
Id: model.NewId(),
|
|
RemoteId: model.NewString(rc.RemoteId),
|
|
}
|
|
|
|
provider := testImageProvider{}
|
|
|
|
mockServer := newMockServer(makeRemoteClusters(NumRemotes, ts.URL))
|
|
defer mockServer.Shutdown()
|
|
mockServer.SetUser(user)
|
|
service, err := NewRemoteClusterService(mockServer)
|
|
require.NoError(t, err)
|
|
|
|
err = service.Start()
|
|
require.NoError(t, err)
|
|
defer service.Shutdown()
|
|
|
|
t.Run("Server response 200", func(t *testing.T) {
|
|
shouldError.set(false)
|
|
|
|
resultFunc := func(userId string, rc *model.RemoteCluster, resp *Response, err error) {
|
|
assert.Equal(t, user.Id, userId, "user ids should match")
|
|
assert.NoError(t, err)
|
|
assert.True(t, resp.IsSuccess())
|
|
}
|
|
|
|
task := sendProfileImageTask{
|
|
rc: rc,
|
|
userID: user.Id,
|
|
provider: provider,
|
|
f: resultFunc,
|
|
}
|
|
|
|
err := service.sendProfileImageToRemote(time.Second*15, task)
|
|
assert.NoError(t, err, "request should not error")
|
|
})
|
|
|
|
t.Run("Server response 500", func(t *testing.T) {
|
|
shouldError.set(true)
|
|
|
|
resultFunc := func(userId string, rc *model.RemoteCluster, resp *Response, err error) {
|
|
assert.Equal(t, user.Id, userId, "user ids should match")
|
|
assert.False(t, resp.IsSuccess())
|
|
}
|
|
|
|
task := sendProfileImageTask{
|
|
rc: rc,
|
|
userID: user.Id,
|
|
provider: provider,
|
|
f: resultFunc,
|
|
}
|
|
|
|
err := service.sendProfileImageToRemote(time.Second*15, task)
|
|
assert.Error(t, err, "request should error")
|
|
})
|
|
}
|
|
|
|
type testImageProvider struct {
|
|
}
|
|
|
|
func (tip testImageProvider) GetProfileImage(user *model.User) ([]byte, bool, *model.AppError) {
|
|
img := image.NewRGBA(image.Rectangle{image.Point{0, 0}, image.Point{imageWidth, imageHeight}})
|
|
red := color.RGBA{255, 50, 50, 0xff}
|
|
|
|
for x := 0; x < imageWidth; x++ {
|
|
for y := 0; y < imageHeight; y++ {
|
|
img.Set(x, y, red)
|
|
}
|
|
}
|
|
|
|
buf := &bytes.Buffer{}
|
|
png.Encode(buf, img)
|
|
|
|
return buf.Bytes(), true, nil
|
|
}
|
|
|
|
type flag struct {
|
|
mux sync.RWMutex
|
|
b bool
|
|
}
|
|
|
|
func (f *flag) get() bool {
|
|
f.mux.RLock()
|
|
defer f.mux.RUnlock()
|
|
return f.b
|
|
}
|
|
|
|
func (f *flag) set(b bool) {
|
|
f.mux.Lock()
|
|
defer f.mux.Unlock()
|
|
f.b = b
|
|
}
|