forbid ieq for boolean

infobloxopen · May 4, 2019 · a3e2c33 · a3e2c33
1 parent 79a3be6
commit a3e2c33
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/example/example_test.go b/example/example_test.go
@@ -42,6 +42,7 @@ func TestValidateFiltering(t *testing.T) {
 		{`boolean_field in ["tRuE"]`, true},
 		{`boolean_field=="True"`, false},
 		{`boolean_field=="Blah"`, true},
+		{`boolean_field:="True"`, true},
 	}
 
 	for _, test := range tests {

diff --git a/options/validate.go b/options/validate.go
@@ -59,6 +59,11 @@ func ValidateFiltering(f *query.Filtering, messageInfo map[string]FilteringOptio
 			}
 
 			if fieldInfo.ValueType == QueryValidate_BOOL {
+
+				if x.Type != query.StringCondition_EQ {
+					return fmt.Errorf("Operation %s is not allowed for %q", query.StringCondition_Type_name[int32(x.Type)], fieldTag)
+				}
+
 				if _, err := strconv.ParseBool(x.Value); err != nil {
 					return fmt.Errorf("Got invalid literal for field %q of type %s, expect 'true' or 'false'", fieldTag, fieldInfo.ValueType)
 				}

diff --git a/plugin/plugin.go b/plugin/plugin.go
@@ -38,6 +38,7 @@ const (
 	protoTypeInt64Value  = ".google.protobuf.Int64Value"
 	protoTypeUInt32Value = ".google.protobuf.UInt32Value"
 	protoTypeUInt64Value = ".google.protobuf.UInt64Value"
+	protoTypeBoolValue   = ".google.protobuf.BoolValue"
 )
 
 // QueryValidatePlugin implements the plugin interface and creates validations for collection operation parameters code from .protos
@@ -409,6 +410,8 @@ func (p *QueryValidatePlugin) getValueType(field *descriptor.FieldDescriptorProt
 			protoTypeUInt32Value,
 			protoTypeUInt64Value:
 			return options.QueryValidate_NUMBER
+		case protoTypeBoolValue:
+			return options.QueryValidate_BOOL
 		default:
 			return options.QueryValidate_DEFAULT
 		}
@@ -526,6 +529,7 @@ func (p *QueryValidatePlugin) getFieldSelectionDataAux(msg *generator.Descriptor
 					protoTypeUUIDValue,
 					protoTypeInet,
 					protoTypeStringValue:
+				case protoTypeBoolValue:
 				case protoTypeDoubleValue,
 					protoTypeFloatValue,
 					protoTypeInt32Value,
@@ -589,7 +593,6 @@ func (p *QueryValidatePlugin) getDenyRules(fieldName string, opts *options.Query
 		supportedOps = []options.QueryValidate_FilterOperator{
 			options.QueryValidate_EQ,
 			options.QueryValidate_IN,
-			options.QueryValidate_IEQ,
 		}
 	}