fix json deserialization issues

projectdiscovery · Feb 27, 2023 · 27fefe5 · 27fefe5
1 parent 9949883
commit 27fefe5
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 10 deletions.
diff --git a/v2/pkg/model/types/userAgent/user_agent.go b/v2/pkg/model/types/userAgent/user_agent.go
@@ -87,7 +87,11 @@ func (userAgentHolder *UserAgentHolder) UnmarshalYAML(unmarshal func(interface{}
 }
 
 func (userAgentHolder *UserAgentHolder) UnmarshalJSON(data []byte) error {
-	computedUserAgent, err := toUserAgent(strings.Trim(string(data), `"`))
+	s := strings.Trim(string(data), `"`)
+	if s == "" {
+		return nil
+	}
+	computedUserAgent, err := toUserAgent(s)
 	if err != nil {
 		return err
 	}

diff --git a/v2/pkg/operators/extractors/extractor_types.go b/v2/pkg/operators/extractors/extractor_types.go
@@ -100,7 +100,11 @@ func (holder *ExtractorTypeHolder) UnmarshalYAML(unmarshal func(interface{}) err
 }
 
 func (holder *ExtractorTypeHolder) UnmarshalJSON(data []byte) error {
-	computedType, err := toExtractorTypes(strings.Trim(string(data), "\""))
+	s := strings.Trim(string(data), `"`)
+	if s == "" {
+		return nil
+	}
+	computedType, err := toExtractorTypes(s)
 	if err != nil {
 		return err
 	}

diff --git a/v2/pkg/operators/matchers/matchers_types.go b/v2/pkg/operators/matchers/matchers_types.go
@@ -107,7 +107,11 @@ func (holder *MatcherTypeHolder) UnmarshalYAML(unmarshal func(interface{}) error
 }
 
 func (holder *MatcherTypeHolder) UnmarshalJSON(data []byte) error {
-	computedType, err := toMatcherTypes(strings.Trim(string(data), "\""))
+	s := strings.Trim(string(data), `"`)
+	if s == "" {
+		return nil
+	}
+	computedType, err := toMatcherTypes(s)
 	if err != nil {
 		return err
 	}

diff --git a/v2/pkg/protocols/common/generators/attack_types.go b/v2/pkg/protocols/common/generators/attack_types.go
@@ -89,7 +89,11 @@ func (holder *AttackTypeHolder) UnmarshalYAML(unmarshal func(interface{}) error)
 }
 
 func (holder *AttackTypeHolder) UnmarshalJSON(data []byte) error {
-	computedType, err := toAttackType(strings.Trim(string(data), "\""))
+	s := strings.Trim(string(data), `"`)
+	if s == "" {
+		return nil
+	}
+	computedType, err := toAttackType(s)
 	if err != nil {
 		return err
 	}

diff --git a/v2/pkg/protocols/dns/dns_types.go b/v2/pkg/protocols/dns/dns_types.go
@@ -117,7 +117,11 @@ func (holder *DNSRequestTypeHolder) UnmarshalYAML(unmarshal func(interface{}) er
 }
 
 func (holder *DNSRequestTypeHolder) UnmarshalJSON(data []byte) error {
-	computedType, err := toDNSRequestTypes(strings.Trim(string(data), "\""))
+	s := strings.Trim(string(data), `"`)
+	if s == "" {
+		return nil
+	}
+	computedType, err := toDNSRequestTypes(s)
 	if err != nil {
 		return err
 	}

diff --git a/v2/pkg/protocols/headless/engine/action_types.go b/v2/pkg/protocols/headless/engine/action_types.go
@@ -199,7 +199,11 @@ func (holder *ActionTypeHolder) UnmarshalYAML(unmarshal func(interface{}) error)
 }
 
 func (holder *ActionTypeHolder) UnmarshalJSON(data []byte) error {
-	computedType, err := toActionTypes(strings.Trim(string(data), `"`))
+	s := strings.Trim(string(data), `"`)
+	if s == "" {
+		return nil
+	}
+	computedType, err := toActionTypes(s)
 	if err != nil {
 		return err
 	}

diff --git a/v2/pkg/protocols/http/http_method_types.go b/v2/pkg/protocols/http/http_method_types.go
@@ -117,7 +117,11 @@ func (holder *HTTPMethodTypeHolder) UnmarshalYAML(unmarshal func(interface{}) er
 }
 
 func (holder *HTTPMethodTypeHolder) UnmarshalJSON(data []byte) error {
-	computedType, err := toHTTPMethodTypes(strings.Trim(string(data), "\""))
+	s := strings.Trim(string(data), `"`)
+	if s == "" {
+		return nil
+	}
+	computedType, err := toHTTPMethodTypes(s)
 	if err != nil {
 		return err
 	}

diff --git a/v2/pkg/protocols/http/signature.go b/v2/pkg/protocols/http/signature.go
@@ -79,7 +79,11 @@ func (holder *SignatureTypeHolder) UnmarshalYAML(unmarshal func(interface{}) err
 }
 
 func (holder *SignatureTypeHolder) UnmarshalJSON(data []byte) error {
-	computedType, err := toSignatureType(strings.Trim(string(data), "\""))
+	s := strings.Trim(string(data), `"`)
+	if s == "" {
+		return nil
+	}
+	computedType, err := toSignatureType(s)
 	if err != nil {
 		return err
 	}
@@ -88,7 +92,7 @@ func (holder *SignatureTypeHolder) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
-func (holder *SignatureTypeHolder) MarshalJSON() ([]byte, error) {
+func (holder SignatureTypeHolder) MarshalJSON() ([]byte, error) {
 	return json.Marshal(holder.Value.String())
 }
 

diff --git a/v2/pkg/protocols/network/network_input_types.go b/v2/pkg/protocols/network/network_input_types.go
@@ -94,7 +94,11 @@ func (holder *NetworkInputTypeHolder) UnmarshalYAML(unmarshal func(interface{})
 }
 
 func (holder *NetworkInputTypeHolder) UnmarshalJSON(data []byte) error {
-	computedType, err := toNetworkInputTypes(strings.Trim(string(data), `"`))
+	s := strings.Trim(string(data), `"`)
+	if s == "" {
+		return nil
+	}
+	computedType, err := toNetworkInputTypes(s)
 	if err != nil {
 		return err
 	}