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

Added validation for command triggers (#3068)

Просмотр исходного кода
Этот коммит содержится в:
David Lu
2016-05-20 14:47:10 -04:00
коммит произвёл Christopher Speller
родитель 4f265522e1
Коммит e81fa3220d
8 изменённых файлов: 70 добавлений и 18 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
model/command.go
Просмотреть файл

@@ -6,11 +6,14 @@ package model
import (
"encoding/json"
"io"
"strings"
)
const (
COMMAND_METHOD_POST = "P"
COMMAND_METHOD_GET = "G"
MIN_TRIGGER_LENGTH = 1
MAX_TRIGGER_LENGTH = 128
)
type Command struct {
@@ -99,7 +102,7 @@ func (o *Command) IsValid() *AppError {
return NewLocAppError("Command.IsValid", "model.command.is_valid.team_id.app_error", nil, "")
}
if len(o.Trigger) == 0 || len(o.Trigger) > 128 {
if len(o.Trigger) < MIN_TRIGGER_LENGTH || len(o.Trigger) > MAX_TRIGGER_LENGTH || strings.Index(o.Trigger, "/") == 0 || strings.Contains(o.Trigger, " ") {
return NewLocAppError("Command.IsValid", "model.command.is_valid.trigger.app_error", nil, "")
}

48
webapp/components/backstage/add_command.jsx
Просмотреть файл

@@ -11,6 +11,7 @@ import {FormattedMessage} from 'react-intl';
import FormError from 'components/form_error.jsx';
import {browserHistory, Link} from 'react-router';
import SpinnerButton from 'components/spinner_button.jsx';
import Constants from 'utils/constants.jsx';
const REQUEST_POST = 'P';
const REQUEST_GET = 'G';
@@ -92,6 +93,51 @@ export default class AddCommand extends React.Component {
return;
}
if (command.trigger.indexOf('/') === 0) {
this.setState({
saving: false,
clientError: (
<FormattedMessage
id='add_command.triggerInvalidSlash'
defaultMessage='A trigger word cannot begin with a /'
/>
)
});
return;
}
if (command.trigger.indexOf(' ') !== -1) {
this.setState({
saving: false,
clientError: (
<FormattedMessage
id='add_command.triggerInvalidSpace'
defaultMessage='A trigger word must not contain spaces'
/>
)
});
return;
}
if (command.trigger.length < Constants.MIN_TRIGGER_LENGTH || command.trigger.length > Constants.MAX_TRIGGER_LENGTH) {
this.setState({
saving: false,
clientError: (
<FormattedMessage
id='add_command.triggerInvalidLength'
defaultMessage='A trigger word must contain between {min} and {max} characters'
values={{
min: Constants.MIN_TRIGGER_LENGTH,
max: Constants.MAX_TRIGGER_LENGTH
}}
/>
)
});
return;
}
if (!command.url) {
this.setState({
saving: false,
@@ -323,7 +369,7 @@ export default class AddCommand extends React.Component {
<input
id='trigger'
type='text'
maxLength='128'
maxLength={Constants.MAX_TRIGGER_LENGTH}
className='form-control'
value={this.state.trigger}
onChange={this.updateTrigger}

9
webapp/i18n/en.json
Просмотреть файл

@@ -47,10 +47,13 @@
"add_command.method.help": "The type of command request issued to the Request URL.",
"add_command.method.post": "POST",
"add_command.trigger": "Command Trigger Word",
"add_command.trigger.help1": "Examples: /patient, /client, /employee",
"add_command.trigger.help2": "Reserved: /echo, /join, /logout, /me, /shrug",
"add_command.trigger.placeholder": "Command trigger e.g. \"hello\" not including the slash",
"add_command.trigger.help1": "Examples: patient, client, employee",
"add_command.trigger.help2": "Reserved: echo, join, logout, me, shrug",
"add_command.trigger.placeholder": "Command trigger e.g. \"hello\"",
"add_command.triggerRequired": "A trigger word is required",
"add_command.triggerInvalidSlash": "A trigger word cannot begin with a /",
"add_command.triggerInvalidSpace": "A trigger word must not contain spaces",
"add_command.triggerInvalidLength": "A trigger word must contain between {min} and {max} characters",
"add_command.url": "Request URL",
"add_command.url.help": "The callback URL to receive the HTTP POST or GET event request when the slash command is run.",
"add_command.url.placeholder": "Must start with http:// or https://",

6
webapp/i18n/es.json
Просмотреть файл

@@ -46,9 +46,9 @@
"add_command.method.help": "El tipo de comando que se utiliza al hacer una solicitud al URL.",
"add_command.method.post": "POST",
"add_command.trigger": "Palabra Gatilladora del Comando",
"add_command.trigger.help1": "Ejemplos: /paciente, /cliente, /empleado",
"add_command.trigger.help2": "Reservadas: /echo, /join, /logout, /me, /shrug",
"add_command.trigger.placeholder": "Gatillador del Comando ej. \"hola\" no se debe incluir la barra",
"add_command.trigger.help1": "Ejemplos: paciente, cliente, empleado",
"add_command.trigger.help2": "Reservadas: echo, join, logout, me, shrug",
"add_command.trigger.placeholder": "Gatillador del Comando ej. \"hola\"",
"add_command.triggerRequired": "Se requiere una palabra gatilladora",
"add_command.url": "URL de Solicitud",
"add_command.url.help": "El URL para recibir el evento de la solicitud HTTP POST o GET cuando se ejecuta el comando de barra.",

7
webapp/i18n/fr.json
Просмотреть файл

@@ -46,10 +46,9 @@
"add_command.method.help": "Le type de méthode de requête HTTP envoyé à cette URL.",
"add_command.method.post": "POST",
"add_command.trigger": "Mot-clé de déclenchement",
"add_command.trigger.help1": "Exemples: /patient, /client, /employé",
"add_command.trigger.help2": "Mots réservés : /echo, /join, /logout, /me, /shrug",
"add_command.trigger.placeholder": "Command trigger e.g. \"hello\" not including the slash",
"add_command.triggerRequired": "A trigger word is required",
"add_command.trigger.help1": "Exemples: patient, client, employé",
"add_command.trigger.help2": "Mots réservés : echo, join, logout, me, shrug",
"add_command.trigger.placeholder": "Command trigger e.g. \"hello\"",
"add_command.url": "URL de requête",
"add_command.url.help": "L'URL de callback qui recevra la requête POST ou GET quand cette commande slash est exécutée.",
"add_command.url.placeholder": "Doit commencer par http:// ou https://",

5
webapp/i18n/ja.json
Просмотреть файл

@@ -46,9 +46,8 @@
"add_command.method.help": "リクエストURLに発行するコマンドリクエストの種類です。",
"add_command.method.post": "POST",
"add_command.trigger": "コマンドトリガーワード",
"add_command.trigger.help1": "例: /patient, /client, /employee",
"add_command.trigger.help2": "予約語: /echo, /join, /logout, /me, /shrug",
"add_command.trigger.placeholder": "コマンドトリガー 例: スラッシュコマンドに含まれていない\"hello\"",
"add_command.trigger.help1": "例: patient, client, employee",
"add_command.trigger.help2": "予約語: echo, join, logout, me, shrug",
"add_command.triggerRequired": "トリガーワードが必要です。",
"add_command.url": "リクエストURL",
"add_command.url.help": "スラッシュコマンドを実行した時に、HTTP POSTまたはGETイベントリクエストを受信するコールバックURLです。",

6
webapp/i18n/pt.json
Просмотреть файл

@@ -46,9 +46,9 @@
"add_command.method.help": "O tipo de solicitação do comando emitido para a URL requisitada.",
"add_command.method.post": "POST",
"add_command.trigger": "Comando Palavra Gatilho",
"add_command.trigger.help1": "Exemplos: /paciente, /cliente, /funcionario",
"add_command.trigger.help2": "Reservados: /echo, /join, /logout, /me, /shrug",
"add_command.trigger.placeholder": "Comando de gatilho ex. \"hello\", não incluí a barra",
"add_command.trigger.help1": "Exemplos: paciente, cliente, funcionario",
"add_command.trigger.help2": "Reservados: echo, join, logout, me, shrug",
"add_command.trigger.placeholder": "Comando de gatilho ex. \"hello\"",
"add_command.triggerRequired": "Uma palavra gatilho é necessária",
"add_command.url": "URL da solicitação",
"add_command.url.help": "A URL callback para receber o evento HTTP POST ou GET quando o comando slash for executado.",

2
webapp/utils/constants.jsx
Просмотреть файл

@@ -644,6 +644,8 @@ export default {
MAX_USERNAME_LENGTH: 22,
MIN_PASSWORD_LENGTH: 5,
MAX_PASSWORD_LENGTH: 50,
MIN_TRIGGER_LENGTH: 1,
MAX_TRIGGER_LENGTH: 128,
TIME_SINCE_UPDATE_INTERVAL: 30000,
MIN_HASHTAG_LINK_LENGTH: 3,
EMOJI_PATH: '/static/emoji',