upman-daemon 0.0.8.4 → 0.0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5c7ac163d0dd1ba6132fb4a7c3c77a9e5131b20bd158d473de4f576ad858583
-  data.tar.gz: 88631e841be85e59c2f8a00e13028771d4eaf03ff4142e4d199852275390d2c8
+  metadata.gz: b51d88026c608d0d4eb752780f0d44c611789e8cbf177fc818800a1447121249
+  data.tar.gz: b9d3627a649d7e69f4b012ebd0a3328d63957e59c115396e2c4d06832d260645
 SHA512:
-  metadata.gz: a2768d6f096fac1b3a43cd5fe159afa2a1c906a0b08ae61ebc6855d6475433f2d9d3c98815ceafe6ab32413ef75af64bf66b6f0800034596b918024aa05ac3ac
-  data.tar.gz: 9a14dc77f12af966feb76523faf26ef2fdd114d0fa8daafcce3bc0c0055f7c7974152bb542c0be96d1f302406302c72c93887f231f7ac5b5688f1f6a5382eb4a
+  metadata.gz: eeb4c315bbc741bd15dbe860f4546255f774b5263a93fcc864e2d04cdbb330346b96bee953dbbf4fdee7bea18821a74abb27746eff68a7bac3a2e55197affef3
+  data.tar.gz: 3ae68734a94fb756a63a0cc2cf6576a8593401e63d67b3ef0382798e7ee25b017b7bd67b897ba9bc871060edb462bc4264f181f0ada64c24bdfbc0d1712bc551

data/lib/upman.rb

@@ -15,10 +15,15 @@ require_relative 'upman/core/config'
 require_relative 'upman/core/extension_base'
 require_relative 'upman/core/worker'
 
+require_relative 'upman/services/node'
+require_relative 'upman/services/install_history'
+require_relative 'upman/services/installed_packages'
 
 require_relative 'upman/server/socket'
 require_relative 'upman/server/base_servlet'
 
+require_relative 'upman/worker/base_worker'
+
 module Upman
   def self.run!(options)
     config_file = nil

data/lib/upman/core/register.rb

@@ -1,50 +1,17 @@
-module Upman
-  module Core
-    class Register
-      include ::Upman::Utils::Helper
-      using SymbolizeHelper
-      require 'securerandom'
-
-      require 'facter'
-      attr_accessor :hostdata_file
-
-      def initialize
-        @hostdata_file = 'hostdata.yml'
-      end
-
-      def perform
-        data = generate_host_data
-        info "Register Daemon running on #{data[:hostname]} with foreman_upman"
-
-        api = ::Upman::Utils::Api.new
-        api.post("upman/node/register", data.to_json)
-      end
-
-      def generate_host_data
-        unless File.exist? @hostdata_file
-          data = {
-              :hostname => Socket.gethostbyname(Socket.gethostname).first,
-              :uuid => SecureRandom.uuid,
-          }
-          File.write(@hostdata_file, data.to_yaml)
-        end
-        update_node_data
-      end
-
-      def update_node_data
-        if File.exist? @hostdata_file
-          data = YAML::load_file(@hostdata_file).deep_symbolize_keys
-          data.merge!({
-                          :operatingsystem => Facter['operatingsystem'].value,
-                          :rubyversion => Facter['rubyversion'].value,
-                          :operatingsystemrelease => Facter['operatingsystemrelease'].value,
-                          :last_sync => DateTime.now
-                      })
-          File.write(@hostdata_file, data.to_yaml)
-        end
-        data
-      end
-
-    end
-  end
+module Upman
+  module Core
+    class Register
+      include ::Upman::Utils::Helper
+
+      def perform
+        node_service = Upman::Service::Node.new
+        data = node_service.generate_node_data
+        info "Register Daemon running on #{data[:hostname]} with foreman_upman"
+
+        api = ::Upman::Utils::Api.new
+        api.post("upman/node/register", data.to_json)
+      end
+
+    end
+  end
 end

data/lib/upman/core/worker.rb

@@ -3,33 +3,50 @@ module Upman
     class Worker
 
       include Upman::Utils::Helper
+      include Upman::Utils::Dynload
+
+      attr_accessor :workers, :worker_threads
 
       def initialize
         @stop_signal = true
+        @config = ::Upman::Core::Config.daemon
+        @workers = []
+        @worker_threads = []
+
+        register_worker
       end
 
       def run!
-        _banner
-        while @stop_signal
-          self.perform
-          sleep(::Upman::Core::Config.daemon[:interval])
-        end
+        show_banner
 
+        @workers.each do |worker|
+          @worker_threads << Thread.new do
+            worker.run!
+          end
+        end
+        @worker_threads.each { |t| t.join }
       end
 
       def shutdown
-        info "Stopping working thread"
+        info "Stopping Worker Threads"
         @stop_signal = false
       end
 
 
-      def perform
-        info "Doing some work"
+      def register_worker
+        @config[:workers].each do |worker|
+          require_relative "../../upman/worker/#{worker}"
+          ext_obj  = dynload("Upman::Worker::#{worker.split('_').map(&:capitalize).join('')}")
+          info "Register Worker Thread Upman::Worker::#{worker.split('_').map(&:capitalize).join('')}"
+          ext_class = ext_obj .new
+          @workers.append ext_class.register
+        end
       end
 
+
       private
 
-      def _banner
+      def show_banner
         info "Running UpMan #{::Upman::Version::VERSION}"
       end
 

data/lib/upman/extensions/get_install_history.rb

@@ -23,6 +23,11 @@ module Upman
 
           super(request, response)
 
+          unless is_authenticated(request)
+            response = not_authorized(response, "Request declined")
+            return response
+          end
+
           unless (@param_since = get_param('since', 'date', false))
             return nil
           end
@@ -33,56 +38,10 @@ module Upman
         end
 
         def perform_action
-          result = []
-          i = 0
-          hist_lines = fetch_history.split("\n")
-          hist_lines.each do |history|
-            fill_up(result, i, hist_lines, history) if i.even?
-            i += 1
-          end
-          result.to_json
-        end
-
-        private
-
-        def fetch_history
-          command = '(zcat $(ls -tr /var/log/apt/history.log*.gz); '\
-                    'cat /var/log/apt/history.log) ' \
-                    '2>/dev/null | egrep \'^(Start-Date:|Commandline:)\' | '\
-                    'grep -v aptdaemon'
-          `#{command}`
+          install_history_service = ::Upman::Service::InstallHistory.new
+          install_history_service.get(@param_since).to_json
         end
 
-        def fill_up(result, line_index, hist_lines, history)
-          line = hist_lines[line_index + 1].sub('Commandline: ', '')
-          command = parse_command(line)
-          return nil if command.empty?
-
-          command[:start_date] = DateTime.parse(history.sub('Start-Date: ', ''))
-
-          if @param_since.instance_of?(Date)
-            if command[:start_date] >= @param_since
-              result.append command
-            end
-          else
-            result.append command
-          end
-        end
-
-        def parse_command(command_line)
-          package = {}
-          regexp = /(apt(-get)?)(( [\-\w]*)*) (install|upgrade|purge)(.*)?/
-          if (matches = command_line.match(regexp))
-            package[:action] = matches[5].strip
-
-            package[:options] = []
-            matches[3].split(' ').each { |name| package[:options].append name }
-
-            package[:packages] = []
-            matches[6].split(' ').each { |name| package[:packages].append name }
-          end
-          package
-        end
       end
     end
   end

data/lib/upman/extensions/get_installed_packages.rb

@@ -11,14 +11,17 @@ module Upman
 
         attr_accessor :requested
 
-        include ::Upman::Utils::Parser
-
         # rubocop:disable Naming/MethodName
         def do_GET(request, response)
           # rubocop:enable Naming/MethodName
 
           super(request, response)
 
+          unless is_authenticated(request)
+            response = not_authorized(response, "Request declined")
+            return response
+          end
+
           @requested = get_param('requested', 'int')
 
           if (body = perform_action)
@@ -27,20 +30,8 @@ module Upman
         end
 
         def perform_action
-          result = []
-          extended_states = File.open('/var/lib/apt/extended_states', 'rb', &:read)
-          extended_states.split("\n\n").each do |chunk|
-            installed_packages = _get_hashed_values(chunk)
-            unless @requested.empty?
-              if installed_packages['auto_installed'] == @requested
-                result.append installed_packages
-              end
-            else
-              result.append installed_packages
-            end
-
-          end
-          result.to_json
+          installed_package_service = Upman::Service::InstalledPackages.new
+          installed_package_service.get(@requested).to_json
         end
 
       end

data/lib/upman/extensions/install_package.rb

@@ -8,17 +8,33 @@ module Upman
         return Servlet
       end
 
-      class Servlet < WEBrick::HTTPServlet::AbstractServlet
-        def do_GET request, response
-          response.status = 200
-          response['Content-Type'] = 'application/json'
-          response.body = self.perform_action
-        end
+      # Servlet action for WEBrick
+      class Servlet < ::Upman::Server::BaseServlet
+
+        attr_accessor :payload
+
+        # rubocop:disable Naming/MethodName
+        def do_GET(request, response)
+          # rubocop:enable Naming/MethodName
+
+          super(request, response)
 
+          unless is_authenticated(request)
+            response = not_authorized(response, "Request declined")
+            return response
+          end
+
+          @payload = get_param('payload', 'json', false)
+
+          if (body = perform_action)
+            response = ok(response, body)
+          end
+        end
 
         def perform_action
-          "installPackage"
+          "{\"autentication\": \"failed - no valid certifacte was given\"}"
         end
+
       end
 
     end

data/lib/upman/extensions/ping.rb

@@ -15,6 +15,11 @@ module Upman
 
          super(request, response)
 
+         unless is_authenticated(request)
+           response = not_authorized(response, "Request declined")
+           return response
+         end
+
          response = ok(response, perform_action)
        end
 

data/lib/upman/server/base_servlet.rb

@@ -1,65 +1,84 @@
-module Upman
-  module Server
-    class BaseServlet < WEBrick::HTTPServlet::AbstractServlet
-
-      include ::Upman::Utils::Helper
-
-      attr_accessor :query, :response, :error_msg
-
-      def initialize(server, *options)
-        super(server, *options)
-      end
-
-      # rubocop:disable Naming/MethodName
-      def do_GET(_request, response)
-        # rubocop:enable Naming/MethodName
-
-        info "Process API request #{_request.path}"
-
-        @response = response
-        @query = _request.query
-      end
-
-      def ok(response, body)
-        response.status = 200
-        response['Content-Type'] = 'application/json'
-        response.body = body
-        response
-      end
-
-      def bad_request(response, body)
-        response.status = 400
-        response['Content-Type'] = 'application/json'
-        response.body = "{\"status\": \"bad_request\", \"message\": \"#{body}\"}"
-        response
-      end
-
-      def get_param(key, validate, require = false)
-        if @query.nil?
-          return ''
-        end
-
-        unless @query.include? key
-          unless require
-            return ''
-          else
-            return nil
-          end
-        end
-        unless validate.nil?
-          if validate == 'date'
-            begin
-              @query[key] = DateTime.parse(@query[key])
-            rescue
-              msg = "Invalid content for param #{key}, expected type: date - found #{@query[key]}"
-              bad_request(@response, msg)
-              fail msg
-              return false
-            end
-          end
-        end
-        @query[key]
-      end
-    end
-  end
+module Upman
+  module Server
+    class BaseServlet < WEBrick::HTTPServlet::AbstractServlet
+
+      include ::Upman::Utils::Helper
+
+      attr_accessor :query, :response, :error_msg
+
+      def initialize(server, *options)
+        super(server, *options)
+      end
+
+      # rubocop:disable Naming/MethodName
+      def do_GET(_request, response)
+        # rubocop:enable Naming/MethodName
+
+        info "Process API request #{_request.path}"
+
+        @response = response
+        @query = _request.query
+      end
+
+      def is_authenticated(request)
+        node_service = Upman::Service::Node.new
+        node_uuid = node_service.get_node_uuuid
+
+        info "Checking Authentication"
+        return true if request["x-upman-token"] == node_uuid
+
+        fail "Access denied"
+
+        false
+      end
+
+      def ok(response, body)
+        response.status = 200
+        response['Content-Type'] = 'application/json'
+        response.body = body
+        response
+      end
+
+      def not_authorized(response, body)
+        response.status = 401
+        response['Content-Type'] = 'application/json'
+        response.body = "{\"status\": \"not_authorized\", \"message\": \"#{body}\"}"
+        response
+      end
+
+      def bad_request(response, body)
+        response.status = 400
+        response['Content-Type'] = 'application/json'
+        response.body = "{\"status\": \"bad_request\", \"message\": \"#{body}\"}"
+        response
+      end
+
+      def get_param(key, validate, require = false)
+        if @query.nil?
+          return ''
+        end
+
+        unless @query.include? key
+          unless require
+            return ''
+          else
+            return nil
+          end
+        end
+        unless validate.nil?
+          if validate == 'date'
+            begin
+              @query[key] = DateTime.parse(@query[key])
+            rescue
+              msg = "Invalid content for param #{key}, expected type: date - found #{@query[key]}"
+              bad_request(@response, msg)
+              fail msg
+              return false
+            end
+          end
+        end
+        @query[key]
+      end
+    end
+  end
 end

data/lib/upman/services/install_history.rb

@@ -0,0 +1,54 @@
+module Upman
+  module Service
+    class InstallHistory
+
+      attr_accessor :since
+
+      def get(since)
+        @since = since
+
+        result = []
+
+        lines = fetch_history.split("\n")
+        lines.each do |line|
+          fill_up(result, line)
+        end
+        result.reverse!
+      end
+
+      private
+
+      def fetch_history
+        command = 'for x in $(ls -1t /var/log/dpkg.log*); do zcat -f $x |tac |grep -e " install " -e " upgrade " -e " remove "; done |awk -F ":a" \'{print $1 " :a" $2}\' |column -t'
+        `#{command}`
+      end
+
+      def fill_up(result, line)
+        command = parse_command(line)
+        return nil if command.empty?
+
+        if @since.instance_of?(DateTime)
+          if DateTime.parse(command[:datetime]) >= @since
+            result.append command
+          end
+        else
+          result.append command
+        end
+      end
+
+      def parse_command(command_line)
+        package = {}
+        regexp = /([0-9]{4}-[0-9]{2}-[0-9]{2})\s+([0-9]{2}:[0-9]{2}:[0-9]{2})\s+(upgrade|install|remove)\s+([\w\-+\.]+)\s+\:([a-z0-9]+)\s+([\w+:\.\-~<>]+)\s+([\w+:\.\-~<>]+)/
+        unless !(matches = command_line.match(regexp))
+          package[:datetime] = "#{matches[1]} #{matches[2]}"
+          package[:action] = matches[3]
+          package[:package] = matches[4]
+          package[:architecture] = matches[5]
+          package[:old_version] =  (%w[<keine> <none>].include? matches[6]) ? nil : matches[6]
+          package[:target_version] =  (%w[<keine> <none>].include? matches[7]) ? nil : matches[7]
+        end
+        package
+      end
+    end
+  end
+end

data/lib/upman/services/installed_packages.rb

@@ -0,0 +1,24 @@
+module Upman
+  module Service
+    class InstalledPackages
+
+      include ::Upman::Utils::Parser
+
+      def get(auto_installed)
+        result = []
+        extended_states = File.open('/var/lib/apt/extended_states', 'rb', &:read)
+        extended_states.split("\n\n").each do |chunk|
+          installed_packages = _get_hashed_values(chunk)
+          if auto_installed.empty?
+            result.append installed_packages
+          else
+            if installed_packages['auto_installed'] == auto_installed
+              result.append installed_packages
+            end
+          end
+        end
+        result
+      end
+    end
+  end
+end

data/lib/upman/services/node.rb

@@ -0,0 +1,49 @@
+module Upman
+  module Service
+    class Node
+
+      require 'securerandom'
+      require 'facter'
+      using SymbolizeHelper
+
+      attr_accessor :node_config
+
+      def initialize
+        @node_config = 'node.yml'
+      end
+
+
+      def get_node_uuuid
+        data = YAML::load_file(@node_config).deep_symbolize_keys
+        data[:uuid]
+      end
+
+      def generate_node_data
+        unless File.exist? @node_config
+          data = {
+              hostname: Socket.gethostbyname(Socket.gethostname).first,
+              uuid: SecureRandom.uuid,
+          }
+          File.write(@node_config, data.to_yaml)
+        end
+        update_node_data
+      end
+
+      def update_node_data
+        unless File.exist? @node_config
+          generate_node_data
+        end
+
+        data = YAML::load_file(@node_config).deep_symbolize_keys
+        data.merge!(
+            operatingsystem: Facter['operatingsystem'].value,
+            rubyversion: Facter['rubyversion'].value,
+            operatingsystemrelease: Facter['operatingsystemrelease'].value,
+            last_sync: DateTime.now
+        )
+        File.write(@node_config, data.to_yaml)
+        data
+      end
+    end
+  end
+end

data/lib/upman/utils/api.rb

@@ -10,12 +10,12 @@ module Upman
       def check_connection
         response = self.get "status"
         if response.nil?
-          false
+          return false
         end
 
         unless response.code == 200
           fail "Could not connect to API endpoint"
-          false
+          return false
         end
         success "API Endpoint connected to Forman #{JSON.parse(response.body)["version"]} using API v#{JSON.parse(response.body)["api_version"]}."
         true
@@ -36,6 +36,8 @@ module Upman
           fail "Could not establish a secure connection to our API Endpoint"
         rescue RestClient::NotFound
           fail "API Endpoint route could not found"
+        rescue RestClient::InternalServerError
+          fail "API Endpoint reports error, ignore request"
         rescue Errno::ECONNREFUSED
           fail "Can not connect to Foreman instance on #{_url}"
         end
@@ -52,6 +54,8 @@ module Upman
           fail "Could not establish a secure connection to our API Endpoint"
         rescue RestClient::NotFound
           fail "API Endpoint route could not found"
+        rescue RestClient::InternalServerError
+          fail "API Endpoint reports error, ignore request"
         rescue Errno::ECONNREFUSED
           fail "Can not connect to your Foreman instance on #{_url}"
         end

data/lib/upman/worker/base_worker.rb

@@ -0,0 +1,17 @@
+module Upman
+  module Worker
+    class BaseWorker
+
+      include ::Upman::Utils::Helper
+
+      def run!
+        raise "No run! method defined"
+      end
+
+      def register
+        raise "No register method defined"
+      end
+
+    end
+  end
+end

data/lib/upman/worker/report_install_history.rb

@@ -0,0 +1,28 @@
+module Upman
+  module Worker
+    class ReportInstallHistory < BaseWorker
+
+      def register
+        return self
+      end
+
+      def run!
+        while true
+          install_history_service = ::Upman::Service::InstallHistory.new
+          data = install_history_service.get("")
+
+          info "Report install history to API"
+
+
+          node_service = Upman::Service::Node.new
+          node_uuid = node_service.get_node_uuuid
+
+          api = ::Upman::Utils::Api.new
+          api.post("upman/node/install_history?uuid=#{node_uuid}", "{\"data\": #{data.to_json}}")
+
+          sleep(::Upman::Core::Config.daemon[:interval])
+        end
+      end
+    end
+  end
+end

data/lib/upman/worker/report_installed_packages.rb

@@ -0,0 +1,28 @@
+module Upman
+  module Worker
+    class ReportInstalledPackages < BaseWorker
+
+      def register
+        return self
+      end
+
+      def run!
+        while true
+          installed_package_service = ::Upman::Service::InstalledPackages.new
+          data = installed_package_service.get("1")
+          info "Report installed packages to API"
+
+
+          node_service = Upman::Service::Node.new
+          node_uuid = node_service.get_node_uuuid
+
+          #api = ::Upman::Utils::Api.new
+          #api.post("upman/node/installed_packages?uuid=#{node_uuid}","{\"data\": #{data.to_json}}")
+
+          sleep(::Upman::Core::Config.daemon[:interval])
+        end
+      end
+
+    end
+  end
+end

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Upman
   class Version
-    VERSION = '0.0.8.4'
+    VERSION = '0.0.8.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upman-daemon
 version: !ruby/object:Gem::Version
-  version: 0.0.8.4
+  version: 0.0.8.5
 platform: ruby
 authors:
 - Tobias Ehrig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-21 00:00:00.000000000 Z
+date: 2019-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
@@ -97,12 +97,18 @@ files:
 - lib/upman/extensions/ping.rb
 - lib/upman/server/base_servlet.rb
 - lib/upman/server/socket.rb
+- lib/upman/services/install_history.rb
+- lib/upman/services/installed_packages.rb
+- lib/upman/services/node.rb
 - lib/upman/utils/api.rb
 - lib/upman/utils/dynload.rb
 - lib/upman/utils/files.rb
 - lib/upman/utils/helper.rb
 - lib/upman/utils/parser.rb
 - lib/upman/utils/symbolize_helper.rb
+- lib/upman/worker/base_worker.rb
+- lib/upman/worker/report_install_history.rb
+- lib/upman/worker/report_installed_packages.rb
 - lib/version.rb
 - upman.gemspec
 homepage: https://github.com/liKe2k1/upman