smart_proxy_omaha 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4a6708a296e67836993cc8002728a630e3eb1aa3
-  data.tar.gz: 2d1a008d27a6500d01cf0f286d2de64c0a87ed47
+SHA256:
+  metadata.gz: de92f226437fa125e5902abdbaeb331847d8155397c2cf1808c353d04c3b0d6f
+  data.tar.gz: a270d730e518668d7239588599f99cf5d6c860c3ca0ca048ec4400fef1c3c8e8
 SHA512:
-  metadata.gz: 1242a70477fb372e90003aae5d9b1efdc0cb081da403e1ef95f03d58cbe447c0b494ca0eff0829d2ad6ac6a6906ff4e599a236f719cdf9caa7777f4440db382b
-  data.tar.gz: ccd486cf864f01b2ac4d76c72ea901de33399a03fd6aeb1a0b8fc6cff8125da562b4aa2c48d44f9c47caeb51ac0c17d615a2f33e030f79cd51d3d2eb20930022
+  metadata.gz: 4103c51a5cab4583fd5ac2310de72d7cd79510ce83996d899a8887f1c3cc196ee6334f2965d0b45355a9eb2d95f14039c10e8abe01bd11338dab9ba3c78045ad
+  data.tar.gz: c7bcc7867a4000af179765219cce24ac5e4d0cfed6882089ddd54171ccc2f026e00d5c89a08b1ba727d48a91dea806db9dec0a384cf09976d514e8e38d4a51a0

data/Gemfile

@@ -7,16 +7,28 @@ group :development do
 end
 
 group :test do
-  gem 'rack-test'
   gem 'single_test'
   gem 'test_xml'
 
-  if RUBY_VERSION < '1.9.3'
-    gem 'webmock', '< 2.0.0'
+  if RUBY_VERSION < '2.1'
+    gem 'public_suffix', '< 3'
+    gem 'nokogiri', '< 1.7'
   else
-    gem 'webmock'
+    gem 'public_suffix'
+    gem 'nokogiri'
+  end
+
+  if RUBY_VERSION < '2.2'
+    gem 'rack-test', '< 0.8'
+  else
+    gem 'rack-test'
   end
 end
 
-gem 'addressable', '< 2.2.0', :platforms => :ruby_18
-gem 'json', '~> 1.0', :platforms => [:ruby_18, :ruby_19]
+if RUBY_VERSION < '2.2'
+  gem 'sinatra', '< 2'
+  gem 'rack', '>= 1.1', '< 2.0.0'
+else
+  gem 'sinatra'
+  gem 'rack', '>= 1.1'
+end

data/lib/smart_proxy_omaha/omaha_protocol/handler.rb

@@ -86,7 +86,10 @@ module Proxy::Omaha::OmahaProtocol
         'host' => request.hostname,
         'status' => request.to_status.to_s,
         'omaha_version' => request.version,
-        'reported_at' => Time.now.getutc.to_s
+        'machineid' => request.machineid,
+        'omaha_group' => request.track,
+        'oem' => request.oem,
+        'reported_at' => report_timestamp
       }
       foreman_client.post_report({'omaha_report' => report}.to_json)
     end
@@ -109,5 +112,9 @@ module Proxy::Omaha::OmahaProtocol
         )
       end
     end
+
+    def report_timestamp
+      Time.now.getutc.to_s
+    end
   end
 end

data/lib/smart_proxy_omaha/omaha_protocol/request.rb

@@ -4,7 +4,7 @@ require 'ipaddr'
 module Proxy::Omaha::OmahaProtocol
   class Request
     attr_reader :appid, :version, :track, :updatecheck, :eventtype, :eventresult, :board,
-      :alephversion, :oemversion, :oem,
+      :alephversion, :oemversion, :oem, :machineid,
       :platform, :osmajor, :osminor, :hostname, :ipaddress, :ipaddress6,
       :body, :ip, :base_url, :ping
 
@@ -63,6 +63,7 @@ module Proxy::Omaha::OmahaProtocol
     def parse_request
       xml_request = Nokogiri::XML(body)
       @appid = xml_request.xpath('/request/app/@appid').to_s.tr('{}', '')
+      @machineid = xml_request.xpath('/request/app/@machineid').to_s
       @version = xml_request.xpath('/request/app/@version').to_s
       @osmajor = version.gsub(/^(\d+)\.\d\.\d$/, '\1')
       @osminor = version.gsub(/^\d+\.(\d\.\d)$/, '\1')
@@ -83,6 +84,7 @@ module Proxy::Omaha::OmahaProtocol
     def parse_ipaddress
       ipaddr = IPAddr.new(ip) rescue nil
       return if ipaddr.nil?
+      ipaddr = IPAddr.new(ipaddr.to_s.sub('::ffff:', '')) if ipaddr.ipv4_mapped?
       @ipaddress = ipaddr.to_s if ipaddr.ipv4?
       @ipaddress6 = ipaddr.to_s if ipaddr.ipv6?
       @hostname = lookup_hostname(ipaddr.to_s)
@@ -108,7 +110,8 @@ module Proxy::Omaha::OmahaProtocol
         :osminor => osminor,
         :ipaddress => ipaddress,
         :ipaddress6 => ipaddress6,
-        :hostname => hostname
+        :hostname => hostname,
+        :machineid => machineid
       }
     end
   end

data/lib/smart_proxy_omaha/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module Omaha
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

data/smart_proxy_omaha.gemspec

@@ -16,14 +16,16 @@ Gem::Specification.new do |s|
 
   if RUBY_VERSION < '1.9'
     s.add_dependency('nokogiri', '<= 1.5.11')
+  elsif RUBY_VERSION < '2.1'
+    s.add_dependency('nokogiri', '>= 1.5.11')
   else
-    s.add_dependency('nokogiri', '>= 1.5.10')
+    s.add_dependency('nokogiri', '>= 1.8.1')
   end
   s.add_dependency('json')
 
   s.add_development_dependency('test-unit', '~> 2')
   s.add_development_dependency('mocha', '~> 1')
   s.add_development_dependency('webmock', '~> 1')
-  s.add_development_dependency('rack-test', '~> 0')
+  s.add_development_dependency('rack-test')
   s.add_development_dependency('rake', '~> 10')
 end

data/test/fixtures/request_update_complete_noupdate.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <request protocol="3.0" version="CoreOSUpdateEngine-0.1.0.0" updaterversion="CoreOSUpdateEngine-0.1.0.0" installsource="ondemandupdate" ismachine="1">
   <os version="Chateau" platform="CoreOS" sp="1122.2.0_x86_64"></os>
-  <app appid="{e96281a6-d1af-4bde-9a0a-97b76e56dc57}" version="1122.2.0" track="stable" bootid="{5c43ee37-70da-48b7-9328-636618c2807c}" oem="" oemversion="" alephversion="1010.5.0" machineid="8e9450f47a4c47adbfe48b946e201c84" lang="en-US" board="amd64-usr" hardware_class="" delta_okay="false" >
+  <app appid="{e96281a6-d1af-4bde-9a0a-97b76e56dc57}" version="1122.2.0" track="stable" bootid="{5c43ee37-70da-48b7-9328-636618c2807c}" oem="vmware" oemversion="10.1.10" alephversion="1010.5.0" machineid="8e9450f47a4c47adbfe48b946e201c84" lang="en-US" board="amd64-usr" hardware_class="" delta_okay="false" >
     <ping active="1"></ping>
     <updatecheck></updatecheck>
     <event eventtype="3" eventresult="2" previousversion=""></event>

data/test/omaha/omaha_api_test.rb

@@ -5,8 +5,25 @@ require 'smart_proxy_omaha/omaha_plugin'
 ENV['RACK_ENV'] = 'test'
 
 class TestForemanClient
-  def post_facts(factsdata); end
-  def post_report(report); end
+  @@requests = {}
+
+  def self.requests
+    @@requests
+  end
+
+  def self.clear_requests
+    @@requests = {}
+  end
+
+  def post_facts(factsdata)
+    @@requests[:facts] ||= []
+    @@requests[:facts] << JSON.parse(factsdata)
+  end
+
+  def post_report(report)
+    @@requests[:reports] ||= []
+    @@requests[:reports] << JSON.parse(report)
+  end
 end
 
 class TestReleaseRepository
@@ -70,10 +87,28 @@ class OmahaApiTest < Test::Unit::TestCase
     Proxy::Omaha::Api.new
   end
 
+  def setup
+    TestForemanClient.clear_requests
+  end
+
   def test_processes_update_complete_noupdate
+    Proxy::Omaha::OmahaProtocol::Handler.any_instance.stubs(:report_timestamp).returns('fake_timestamp')
     post "/v1/update", xml_fixture('request_update_complete_noupdate')
     assert last_response.ok?, "Last response was not ok: #{last_response.status} #{last_response.body}"
     assert_xml_equal xml_fixture('response_update_complete_noupdate'), last_response.body
+    assert_equal [
+      {
+        'omaha_report' => {
+          'host' => 'localhost',
+          'status' => 'complete',
+          'omaha_version' => '1122.2.0',
+          'machineid' => '8e9450f47a4c47adbfe48b946e201c84',
+          'omaha_group' => 'stable',
+          'oem' => 'vmware',
+          'reported_at' => 'fake_timestamp'
+        }
+      }
+    ], TestForemanClient.requests[:reports]
   end
 
   def test_processes_update_complete_update

data/test/omaha/omaha_protocol/request_test.rb

@@ -22,6 +22,7 @@ class RequestTest < Test::Unit::TestCase
     assert_equal '', @request.oemversion
     assert_equal '', @request.oem
     assert_equal 'CoreOS', @request.platform
+    assert_equal '8e9450f47a4c47adbfe48b946e201c84', @request.machineid
     assert_equal 3, @request.eventtype
     assert_equal 2, @request.eventresult
     assert @request.updatecheck
@@ -46,6 +47,7 @@ class RequestTest < Test::Unit::TestCase
         :hostname => 'omaha.example.com',
         :ipaddress => '1.1.1.1',
         :ipaddress6 => nil,
+        :machineid => '8e9450f47a4c47adbfe48b946e201c84',
         :oem => '',
         :oemversion => '',
         :osmajor => '1068',
@@ -77,5 +79,14 @@ class RequestTest < Test::Unit::TestCase
 
     assert_nil request6.ipaddress
     assert_equal '2001:db8::1', request6.ipaddress6
+
+    request64 = Proxy::Omaha::OmahaProtocol::Request.new(
+      xml_fixture('request_update_complete_update'),
+      :ip => '::ffff:1.1.1.1',
+      :base_url => 'http://www.example.org/'
+    )
+
+    assert_equal '1.1.1.1', request64.ipaddress
+    assert_nil request64.ipaddress6
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_omaha
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Timo Goebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-23 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.10
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.10
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -84,14 +84,14 @@ dependencies:
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Omaha protocol support for smart-proxy