IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-11287] Add support for plus sign and period/dot in custom URL schemes (#9155) (#10852)

Browse Source
This commit is contained in:
Tsilavina Razafinirina
2019-05-25 22:47:06 +03:00
committed by Hanzei
parent 2d97f01781
commit c05cf5b033
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
model/config.go
View File

@@ -2871,7 +2871,7 @@ func (mes *MessageExportSettings) isValid(fs FileSettings) *AppError {
func (ds *DisplaySettings) isValid() *AppError {
if len(ds.CustomUrlSchemes) != 0 {
validProtocolPattern := regexp.MustCompile(`(?i)^\s*[a-z][a-z0-9-]*\s*$`)
validProtocolPattern := regexp.MustCompile(`(?i)^\s*[A-Za-z][A-Za-z0-9.+-]*\s*$`)
for _, scheme := range ds.CustomUrlSchemes {
if !validProtocolPattern.MatchString(scheme) {

4
model/config_test.go
View File

@@ -509,7 +509,7 @@ func TestDisplaySettingsIsValidCustomUrlSchemes(t *testing.T) {
{
name: "containing period",
value: []string{"iris.beep"},
valid: false, // should technically be true, but client doesn't support it
valid: true,
},
{
name: "containing hyphen",
@@ -519,7 +519,7 @@ func TestDisplaySettingsIsValidCustomUrlSchemes(t *testing.T) {
{
name: "containing plus",
value: []string{"coap+tcp", "coap+ws"},
valid: false, // should technically be true, but client doesn't support it
valid: true,
},
{
name: "starting with number",