[trafficcontrol] 01/02: Fix delivery service validation

[de...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dewrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git

commit 1ad2f1627aaa50a1fdeffecece96de9e9b0d33f3
Author: Rawlin Peters <ra...@comcast.com>
AuthorDate: Thu Jun 21 15:37:16 2018 -0600

    Fix delivery service validation
    
    Add the rest of the validation done by the Perl API that the Go API is
    missing.
    
    Fixes #2373
---
 lib/go-tc/deliveryservices.go | 34 +++++++++++++++++++++++++---------
 lib/go-tc/tovalidate/rules.go | 18 ++++++++++++++++++
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/lib/go-tc/deliveryservices.go b/lib/go-tc/deliveryservices.go
index 354b76d..9f8f56e 100644
--- a/lib/go-tc/deliveryservices.go
+++ b/lib/go-tc/deliveryservices.go
@@ -241,15 +241,21 @@ func (ds *DeliveryServiceNullableV12) Sanitize() {
 	}
 }
 
-func getTypeName(tx *sql.Tx, id int) (string, bool, error) {
+// getTypeData returns the type's name and use_in_table, true/false if the query returned data, and any error
+func getTypeData(tx *sql.Tx, id int) (string, string, bool, error) {
 	name := ""
-	if err := tx.QueryRow(`SELECT name from type where id=$1`, id).Scan(&name); err != nil {
+	var useInTablePtr *string
+	if err := tx.QueryRow(`SELECT name, use_in_table from type where id=$1`, id).Scan(&name, &useInTablePtr); err != nil {
 		if err == sql.ErrNoRows {
-			return "", false, nil
+			return "", "", false, nil
 		}
-		return "", false, errors.New("querying type name: " + err.Error())
+		return "", "", false, errors.New("querying type data: " + err.Error())
 	}
-	return name, true, nil
+	useInTable := ""
+	if useInTablePtr != nil {
+		useInTable = *useInTablePtr
+	}
+	return name, useInTable, true, nil
 }
 
 func requiredIfMatchesTypeName(patterns []string, typeName string) func(interface{}) error {
@@ -296,25 +302,35 @@ func (ds *DeliveryServiceNullableV12) validateTypeFields(tx *sql.Tx) error {
 	DNSRegexType := "^DNS.*$"
 	HTTPRegexType := "^HTTP.*$"
 	SteeringRegexType := "^STEERING.*$"
+	latitudeErr := "Must be a floating point number within the range +-90"
+	longitudeErr := "Must be a floating point number within the range +-180"
 	if ds.TypeID == nil {
 		return errors.New("missing type")
 	}
-	typeName, ok, err := getTypeName(tx, *ds.TypeID)
+	typeName, useInTable, ok, err := getTypeData(tx, *ds.TypeID)
 	if err != nil {
 		return errors.New("getting type name: " + err.Error())
 	}
 	if !ok {
 		return errors.New("type not found")
 	}
+	if useInTable != "deliveryservice" {
+		return errors.New("type is not a valid deliveryservice type")
+	}
 	errs := validation.Errors{
 		"initialDispersion": validation.Validate(ds.InitialDispersion,
-			validation.By(requiredIfMatchesTypeName([]string{HTTPRegexType}, typeName))),
+			validation.By(requiredIfMatchesTypeName([]string{HTTPRegexType}, typeName)),
+			validation.By(tovalidate.IsGreaterThanZero)),
 		"ipv6RoutingEnabled": validation.Validate(ds.IPV6RoutingEnabled,
 			validation.By(requiredIfMatchesTypeName([]string{SteeringRegexType, DNSRegexType, HTTPRegexType}, typeName))),
 		"missLat": validation.Validate(ds.MissLat,
-			validation.By(requiredIfMatchesTypeName([]string{DNSRegexType, HTTPRegexType}, typeName))),
+			validation.By(requiredIfMatchesTypeName([]string{DNSRegexType, HTTPRegexType}, typeName)),
+			validation.Min(-90.0).Error(latitudeErr),
+			validation.Max(90.0).Error(latitudeErr)),
 		"missLong": validation.Validate(ds.MissLong,
-			validation.By(requiredIfMatchesTypeName([]string{DNSRegexType, HTTPRegexType}, typeName))),
+			validation.By(requiredIfMatchesTypeName([]string{DNSRegexType, HTTPRegexType}, typeName)),
+			validation.Min(-180.0).Error(longitudeErr),
+			validation.Max(180.0).Error(longitudeErr)),
 		"multiSiteOrigin": validation.Validate(ds.MultiSiteOrigin,
 			validation.By(requiredIfMatchesTypeName([]string{DNSRegexType, HTTPRegexType}, typeName))),
 		"orgServerFqdn": validation.Validate(ds.OrgServerFQDN,
diff --git a/lib/go-tc/tovalidate/rules.go b/lib/go-tc/tovalidate/rules.go
index aeb1b9b..1e86407 100644
--- a/lib/go-tc/tovalidate/rules.go
+++ b/lib/go-tc/tovalidate/rules.go
@@ -13,6 +13,8 @@
 package tovalidate
 
 import (
+	"errors"
+	"fmt"
 	"strings"
 )
 
@@ -46,3 +48,19 @@ func IsOneOfStringICase(set ...string) func(string) bool {
 	}
 	return IsOneOfString(lowcased...)
 }
+
+func IsGreaterThanZero(value interface{}) error {
+	switch v := value.(type) {
+	case *int:
+		if v == nil || *v > 0 {
+			return nil
+		}
+	case *float64:
+		if v == nil || *v > 0 {
+			return nil
+		}
+	default:
+		return fmt.Errorf("IsGreaterThanZero validation failure: unknown type %T", value)
+	}
+	return errors.New("must be greater than zero")
+}