Merge pull request #75 from redBorder/development

Release 4.1.3

Author: nilsver

CHANGELOG.md

@@ -1,6 +1,13 @@
 cookbook-rb-proxy CHANGELOG
 ===============
 
+## 4.1.3
+
+  - Juan Soto
+    - [133047f] Get flow sensors
+    - [70a85d7] Send flow sensors to firewall cookbook
+    - [6372c75] Define flow sensors in the proxies
+
 ## 4.1.2
 
   - Pablo Pérez

resources/libraries/get_flow_sensors_info.rb

@@ -0,0 +1,16 @@
+module RbProxy
+  module Helpers
+    def get_flow_sensors_info(sensor_type)
+      sensors_info = []
+      begin
+        sensors = search(:role, 'run_list:role\[proxy-sensor\]')
+                  .map { |role| role.override_attributes['redborder']['sensors_mapping'][sensor_type.to_s] }
+                  .reject { |s_type| s_type.nil? || s_type.empty? }
+        sensors_info.concat(sensors) unless sensors.empty?
+      rescue NoMethodError
+        sensors_info = []
+      end
+      sensors_info
+    end
+  end
+end

resources/metadata.rb

@@ -3,7 +3,7 @@
 maintainer_email '[email protected]'
 license          'AGPL-3.0'
 description      'Installs/Configures redborder proxy'
-version          '4.1.2'
+version          '4.1.3'
 
 depends 'rb-common'
 depends 'rb-selinux'

resources/recipes/configure.rb

@@ -28,6 +28,7 @@
 end
 
 rb_firewall_config 'Configure Firewall' do
+  flow_sensor_in_proxy_nodes node.run_state['sensors_info_all']['flow-sensor']
   vault_sensor_in_proxy_nodes node.run_state['sensors_info_all']['vault-sensor']
   if proxy_services['firewall']
     action :add

resources/recipes/prepare_system.rb

@@ -59,6 +59,9 @@
 # get sensors info full info
 node.run_state['sensors_info_all'] = get_sensors_all_info()
 
+# get flow sensors in proxy info
+node.run_state['sensors_info_all']['flow-sensor'] = get_flow_sensors_info('flow')
+
 # get namespaces
 node.run_state['namespaces'] = get_namespaces