Merge branch 'url-validate' into 'master'

Better URL validation

See merge request joinimpact/api!85

Author: oatmilkcat

internal/organizations/format.go

@@ -0,0 +1,19 @@
+package organizations
+
+import (
+	"fmt"
+	"strings"
+)
+
+// formatURL takes a string with a user-inputted URL and returns a standardized, formatted URL which contains a protocol if one does not already exist.
+func formatURL(url string) string {
+	if len(url) < 1 {
+		return ""
+	}
+
+	if strings.HasPrefix(url, "http://") || strings.HasPrefix(url, "https://") {
+		return url
+	}
+
+	return fmt.Sprintf("http://%s", url)
+}

internal/organizations/service.go

@@ -195,7 +195,7 @@ func (s *service) UpdateOrganizationProfile(organizationID int64, profile Organi
 		},
 		Name:        profile.Name,
 		Description: profile.Description,
-		WebsiteURL:  profile.WebsiteURL,
+		WebsiteURL:  formatURL(profile.WebsiteURL),
 	})
 }
 

pkg/parse/parse.go

@@ -60,6 +60,7 @@ func POST(w http.ResponseWriter, r *http.Request, s interface{}) error {
 	validate := validator.New()
 	validate.RegisterValidation("minAge", validators.MinAge)
 	validate.RegisterValidation("maxAge", validators.MaxAge)
+	validate.RegisterValidation("url", validators.URL)
 
 	err := validate.Struct(s)
 	if err == nil {

pkg/validators/url.go

@@ -0,0 +1,18 @@
+package validators
+
+import (
+	"regexp"
+
+	"github.com/go-playground/validator/v10"
+)
+
+const urlRegex = `^(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$`
+
+// URL validates a web URL.
+func URL(fl validator.FieldLevel) bool {
+	if match, err := regexp.MatchString(urlRegex, fl.Field().Interface().(string)); !match || err != nil {
+		return false
+	}
+
+	return true
+}