steplib 0.9.0.6 → 0.9.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac2ab879cd2d14f65be39f5e31dfb1a9f50c83eb
-  data.tar.gz: 550f989699a6e3575479ed61ce32a8e0fb692340
+  metadata.gz: c487d428b66291bc8c2661014d48a7a0ee3f2222
+  data.tar.gz: 695069371c9936d4b657076e1c88045201558ef3
 SHA512:
-  metadata.gz: ecb3c5e44bde0e8124d1e55d3e6e0a5199310e6c92afd6492d3903947aa26c208127c773be7aded7aec2d428286e7e8aa85b2c7f8873af026baf100d38fe5651
-  data.tar.gz: b0bfb6e6419be8939f9e77761705b865443ab1125ceb1278e33c55c82510c7e59a7f61348361a456e33123d648c8ec051eb10e2a9fe172f5f3b23d260d5c9c5c
+  metadata.gz: 32c5e41dc32538d47033947b4c88ee0b9a50b54e19ddbe67343635baa8f73667230f8dd9054287ebecec6ef507e41fed32239da2ba4235fc8a92e2a94a18d000
+  data.tar.gz: e33072831220441ab59f487b35383558fd7ef86c8139051a57ed5d99299becc788fc54608dc68c16dc0a3bf0e7dd3afa49ce4c093b7e5e74d2a87cbc8af01ca6

data/lib/steplib/hash_utils.rb

@@ -13,6 +13,15 @@ module Steplib
 				return Marshal.load(Marshal.dump(hsh))
 			end
 
+			def whitelist(hsh, whitelist)
+				return nil if hsh.nil?
+				res_hash = {}
+				whitelist.each do |whiteitm|
+					res_hash[whiteitm] = hsh[whiteitm]
+				end
+				return res_hash
+			end
+
 			def check_required_attributes_and_types!(hash_to_check, attribute_type_array)
 				attribute_type_array.each do |a_attribute_type_itm|
 					attribute_key = a_attribute_type_itm[0]

data/lib/steplib/steplib_validator.rb

@@ -41,8 +41,33 @@ module Steplib
 				validate_step_version!(step_data['latest'])
 			end
 
-			def validate_step_version!(step_version_data)
-				HashUtils.check_required_attributes_and_types!(step_version_data, [
+			def whitelist_step_version(step_version_data)
+				raise "Input step_version_data hash is nil" if step_version_data.nil?
+
+				base_prop_whitelist = required_step_version_properties_with_types().map { |e| e.first }
+				base_prop_whitelist = base_prop_whitelist.concat( optional_step_version_properties() )
+				step_version_data = HashUtils.whitelist(step_version_data, base_prop_whitelist)
+				# source
+				step_version_data['source'] = HashUtils.whitelist(
+					step_version_data['source'],
+					required_step_version_source_properties_with_types().map { |e| e.first })
+				# inputs
+				step_version_data['inputs'] = step_version_data['inputs'].map do |a_step_input|
+					HashUtils.whitelist(
+						a_step_input,
+						required_step_version_inputs_properties_with_types().map { |e| e.first })
+				end
+				# outputs
+				step_version_data['outputs'] = step_version_data['outputs'].map do |a_step_output|
+					HashUtils.whitelist(
+						a_step_output,
+						required_step_version_outputs_properties_with_types().map { |e| e.first })
+				end
+				return step_version_data
+			end
+
+			def required_step_version_properties_with_types
+				return [
 					# auto generated
 					['id', String],
 					['steplib_source', String],
@@ -59,16 +84,56 @@ module Steplib
 					['is_requires_admin_user', ABooleanValue],
 					['inputs', Array],
 					['outputs', Array],
-					])
+					]
+			end
+
+			def optional_step_version_properties
+				return ['icon_url_256']
+			end
+
+			def required_step_version_source_properties_with_types
+				return [ ['git', String] ]
+			end
+
+			def required_step_version_inputs_properties_with_types
+				return [
+					['title', String],
+					['description', String],
+					['mapped_to', String],
+					['is_expand', ABooleanValue],
+					['is_required', ABooleanValue],
+					['value_options', Array],
+					['value', String],
+					['is_dont_change_value', ABooleanValue]
+					]
+			end
+
+			def required_step_version_outputs_properties_with_types
+				return [
+					['title', String],
+					['description', String],
+					['mapped_to', String]
+					]
+			end
+
+			def validate_step_version!(step_version_data)
+				# whitelist
+				step_version_data = whitelist_step_version(step_version_data)
+				# check/validate
+				HashUtils.check_required_attributes_and_types!(
+					step_version_data,
+					required_step_version_properties_with_types()
+					)
 
 				# optional - can be nil
 				step_version_data = HashUtils.set_missing_defaults(
 					step_version_data,
 					[{key: 'icon_url_256', value: nil}])
 
-				HashUtils.check_required_attributes_and_types!(step_version_data['source'], [
-					['git', String]
-					])
+				HashUtils.check_required_attributes_and_types!(
+					step_version_data['source'],
+					required_step_version_source_properties_with_types()
+					)
 
 				a_host_os_tags = step_version_data['host_os_tags']
 				a_host_os_tags.each { |a_tag|
@@ -87,16 +152,10 @@ module Steplib
 
 				a_inputs = step_version_data['inputs']
 				a_inputs.each do |a_input_itm|
-					HashUtils.check_required_attributes_and_types!(a_input_itm, [
-					['title', String],
-					['description', String],
-					['mapped_to', String],
-					['is_expand', ABooleanValue],
-					['is_required', ABooleanValue],
-					['value_options', Array],
-					['value', String],
-					['is_dont_change_value', ABooleanValue]
-					])
+					HashUtils.check_required_attributes_and_types!(
+						a_input_itm,
+						required_step_version_inputs_properties_with_types()
+						)
 
 					a_value_options = a_input_itm['value_options']
 					a_value_options.each { |a_value_option|
@@ -106,11 +165,10 @@ module Steplib
 
 				a_outputs = step_version_data['outputs']
 				a_outputs.each do |a_output_itm|
-					HashUtils.check_required_attributes_and_types!(a_output_itm, [
-					['title', String],
-					['description', String],
-					['mapped_to', String]
-					])
+					HashUtils.check_required_attributes_and_types!(
+						a_output_itm,
+						required_step_version_outputs_properties_with_types()
+						)
 				end
 			end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: steplib
 version: !ruby/object:Gem::Version
-  version: 0.9.0.6
+  version: 0.9.0.7
 platform: ruby
 authors:
 - Bitrise