mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

[MM-37755] Idiomatic naming (SMTP, TLS, TCP, XML, CSS, HTML, HTTP) (#18103)

Просмотр исходного кода
Этот коммит содержится в:
Ben Schumacher
2021-08-12 11:49:16 +02:00
коммит произвёл GitHub
родитель bd65e8daf9
Коммит fd853e74a6
46 изменённых файлов: 223 добавлений и 223 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
api4/user_test.go
Просмотреть файл

@@ -3425,7 +3425,7 @@ func TestLoginCookies(t *testing.T) {
th := Setup(t).InitBasic()
defer th.TearDown()
th.Client.HttpHeader[model.HeaderRequestedWith] = model.HeaderRequestedWithXml
th.Client.HTTPHeader[model.HeaderRequestedWith] = model.HeaderRequestedWithXML
user, resp := th.Client.Login(th.BasicUser.Email, th.BasicUser.Password)
@@ -3463,7 +3463,7 @@ func TestLoginCookies(t *testing.T) {
th := Setup(t).InitBasic()
defer th.TearDown()
th.Client.HttpHeader[model.HeaderRequestedWith] = model.HeaderRequestedWithXml
th.Client.HTTPHeader[model.HeaderRequestedWith] = model.HeaderRequestedWithXML
testCases := []struct {
Description string
@@ -3514,20 +3514,20 @@ func TestCBALogin(t *testing.T) {
t.Run("missing cert subject", func(t *testing.T) {
th.Client.Logout()
th.Client.HttpHeader["X-SSL-Client-Cert"] = "valid_cert_fake"
th.Client.HTTPHeader["X-SSL-Client-Cert"] = "valid_cert_fake"
_, resp := th.Client.Login(th.BasicUser.Email, th.BasicUser.Password)
CheckBadRequestStatus(t, resp)
})
t.Run("emails mismatch", func(t *testing.T) {
th.Client.Logout()
th.Client.HttpHeader["X-SSL-Client-Cert-Subject-DN"] = "C=US, ST=Maryland, L=Pasadena, O=Brent Baccala, OU=FreeSoft, CN=www.freesoft.org/emailAddress=mis_match" + th.BasicUser.Email
th.Client.HTTPHeader["X-SSL-Client-Cert-Subject-DN"] = "C=US, ST=Maryland, L=Pasadena, O=Brent Baccala, OU=FreeSoft, CN=www.freesoft.org/emailAddress=mis_match" + th.BasicUser.Email
_, resp := th.Client.Login(th.BasicUser.Email, "")
CheckUnauthorizedStatus(t, resp)
})
t.Run("successful cba login", func(t *testing.T) {
th.Client.HttpHeader["X-SSL-Client-Cert-Subject-DN"] = "C=US, ST=Maryland, L=Pasadena, O=Brent Baccala, OU=FreeSoft, CN=www.freesoft.org/emailAddress=" + th.BasicUser.Email
th.Client.HTTPHeader["X-SSL-Client-Cert-Subject-DN"] = "C=US, ST=Maryland, L=Pasadena, O=Brent Baccala, OU=FreeSoft, CN=www.freesoft.org/emailAddress=" + th.BasicUser.Email
user, resp := th.Client.Login(th.BasicUser.Email, "")
CheckNoError(t, resp)
require.NotNil(t, user)
@@ -3543,7 +3543,7 @@ func TestCBALogin(t *testing.T) {
botUser, resp := th.SystemAdminClient.GetUser(bot.UserId, "")
CheckNoError(t, resp)
th.Client.HttpHeader["X-SSL-Client-Cert-Subject-DN"] = "C=US, ST=Maryland, L=Pasadena, O=Brent Baccala, OU=FreeSoft, CN=www.freesoft.org/emailAddress=" + botUser.Email
th.Client.HTTPHeader["X-SSL-Client-Cert-Subject-DN"] = "C=US, ST=Maryland, L=Pasadena, O=Brent Baccala, OU=FreeSoft, CN=www.freesoft.org/emailAddress=" + botUser.Email
_, resp = th.Client.Login(botUser.Email, "")
CheckErrorMessage(t, resp, "api.user.login.bot_login_forbidden.app_error")
@@ -3559,7 +3559,7 @@ func TestCBALogin(t *testing.T) {
*cfg.ServiceSettings.EnableBotAccountCreation = true
})
th.Client.HttpHeader["X-SSL-Client-Cert"] = "valid_cert_fake"
th.Client.HTTPHeader["X-SSL-Client-Cert"] = "valid_cert_fake"
th.App.UpdateConfig(func(cfg *model.Config) {
*cfg.ExperimentalSettings.ClientSideCertEnable = true
@@ -3567,13 +3567,13 @@ func TestCBALogin(t *testing.T) {
})
t.Run("password required", func(t *testing.T) {
th.Client.HttpHeader["X-SSL-Client-Cert-Subject-DN"] = "C=US, ST=Maryland, L=Pasadena, O=Brent Baccala, OU=FreeSoft, CN=www.freesoft.org/emailAddress=" + th.BasicUser.Email
th.Client.HTTPHeader["X-SSL-Client-Cert-Subject-DN"] = "C=US, ST=Maryland, L=Pasadena, O=Brent Baccala, OU=FreeSoft, CN=www.freesoft.org/emailAddress=" + th.BasicUser.Email
_, resp := th.Client.Login(th.BasicUser.Email, "")
CheckBadRequestStatus(t, resp)
})
t.Run("successful cba login with password", func(t *testing.T) {
th.Client.HttpHeader["X-SSL-Client-Cert-Subject-DN"] = "C=US, ST=Maryland, L=Pasadena, O=Brent Baccala, OU=FreeSoft, CN=www.freesoft.org/emailAddress=" + th.BasicUser.Email
th.Client.HTTPHeader["X-SSL-Client-Cert-Subject-DN"] = "C=US, ST=Maryland, L=Pasadena, O=Brent Baccala, OU=FreeSoft, CN=www.freesoft.org/emailAddress=" + th.BasicUser.Email
user, resp := th.Client.Login(th.BasicUser.Email, th.BasicUser.Password)
CheckNoError(t, resp)
require.NotNil(t, user)
@@ -3593,7 +3593,7 @@ func TestCBALogin(t *testing.T) {
CheckNoError(t, resp)
require.True(t, changed)
th.Client.HttpHeader["X-SSL-Client-Cert-Subject-DN"] = "C=US, ST=Maryland, L=Pasadena, O=Brent Baccala, OU=FreeSoft, CN=www.freesoft.org/emailAddress=" + botUser.Email
th.Client.HTTPHeader["X-SSL-Client-Cert-Subject-DN"] = "C=US, ST=Maryland, L=Pasadena, O=Brent Baccala, OU=FreeSoft, CN=www.freesoft.org/emailAddress=" + botUser.Email
_, resp = th.Client.Login(botUser.Email, "password")
CheckErrorMessage(t, resp, "api.user.login.bot_login_forbidden.app_error")