Merge branch 'master' into feature/update-cabonapi-to-c2229eabd094

.github/workflows/codeql-analysis.yml

@@ -5,8 +5,6 @@ on:
     branches: [ master ]
   pull_request:
     branches: [ master ]
-  schedule:
-    - cron: '33 20 * * 2'
 
 jobs:
   analyze:

api/controller/contact.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
+	"regexp"
 	"time"
 
 	"github.com/go-graphite/carbonapi/date"
@@ -53,6 +54,7 @@ func GetContactById(database moira.Database, contactID string) (*dto.Contact, *a
 func CreateContact(
 	dataBase moira.Database,
 	auth *api.Authorization,
+	contactsTemplate []api.WebContact,
 	contact *dto.Contact,
 	userLogin,
 	teamID string,
@@ -74,6 +76,7 @@ func CreateContact(
 		Type:  contact.Type,
 		Value: contact.Value,
 	}
+
 	if contactData.ID == "" {
 		uuid4, err := uuid.NewV4()
 		if err != nil {
@@ -90,19 +93,26 @@ func CreateContact(
 		}
 	}
 
+	if err := validateContact(contactsTemplate, contactData); err != nil {
+		return api.ErrorInvalidRequest(err)
+	}
+
 	if err := dataBase.SaveContact(&contactData); err != nil {
 		return api.ErrorInternalServer(err)
 	}
+
 	contact.User = contactData.User
 	contact.ID = contactData.ID
 	contact.TeamID = contactData.Team
+
 	return nil
 }
 
 // UpdateContact updates notification contact for current user.
 func UpdateContact(
 	dataBase moira.Database,
 	auth *api.Authorization,
+	contactsTemplate []api.WebContact,
 	contactDTO dto.Contact,
 	contactData moira.ContactData,
 ) (dto.Contact, *api.ErrorResponse) {
@@ -119,6 +129,10 @@ func UpdateContact(
 		contactData.Team = contactDTO.TeamID
 	}
 
+	if err := validateContact(contactsTemplate, contactData); err != nil {
+		return contactDTO, api.ErrorInvalidRequest(err)
+	}
+
 	if err := dataBase.SaveContact(&contactData); err != nil {
 		return contactDTO, api.ErrorInternalServer(err)
 	}
@@ -265,3 +279,19 @@ func isAllowedToUseContactType(auth *api.Authorization, userLogin string, contac
 
 	return isAllowedContactType || isAdmin || !isAuthEnabled
 }
+
+func validateContact(contactsTemplate []api.WebContact, contact moira.ContactData) error {
+	var validationPattern string
+	for _, contactTemplate := range contactsTemplate {
+		if contactTemplate.ContactType == contact.Type {
+			validationPattern = contactTemplate.ValidationRegex
+			break
+		}
+	}
+
+	if matched, err := regexp.MatchString(validationPattern, contact.Value); !matched || err != nil {
+		return fmt.Errorf("contact value doesn't match regex: '%s'", validationPattern)
+	}
+
+	return nil
+}