smart_proxy_omaha 0.0.5 → 0.1.0

data/test/omaha/omaha_api_test.rb

@@ -1,6 +1,7 @@
 require 'test_helper'
 require 'smart_proxy_omaha/configuration_loader'
 require 'smart_proxy_omaha/omaha_plugin'
+require 'smart_proxy_omaha/distribution'
 
 ENV['RACK_ENV'] = 'test'
 
@@ -30,6 +31,7 @@ class TestReleaseRepository
   def releases(track, architecture)
     ['1068.9.0', '1122.2.0'].map do |release|
       Proxy::Omaha::Release.new(
+        :distribution => ::Proxy::Omaha::Distribution::Coreos.new,
         :track => 'alpha',
         :architecture => 'amd64-usr',
         :version => release
@@ -73,6 +75,9 @@ module Proxy::Omaha
         c.singleton_dependency :foreman_client_impl, TestForemanClient
         c.singleton_dependency :release_repository_impl, TestReleaseRepository
         c.singleton_dependency :metadata_provider_impl, TestMetadataProvider
+        c.singleton_dependency :distribution_impl, (lambda do
+          ::Proxy::Omaha::Distribution::Coreos.new
+        end)
       end
     end
   end
@@ -151,4 +156,18 @@ class OmahaApiTest < Test::Unit::TestCase
     assert_kind_of Array, parsed
     assert_equal ['1068.9.0', '1122.2.0'], parsed.map { |track| track['name'] }
   end
+
+  def test_ca
+    Proxy::SETTINGS.stubs(:ssl_ca_file).returns(File.expand_path('../../fixtures/ca.crt', __FILE__))
+    get '/ca'
+    assert last_response.ok?, "Last response was not ok: #{last_response.status} #{last_response.body}"
+    body = last_response.body
+    assert_includes body, 'CERTIFICATE'
+  end
+
+  def test_ca_not_found
+    Proxy::SETTINGS.stubs(:ssl_ca_file).returns(File.expand_path('../../fixtures/noca.crt', __FILE__))
+    get '/ca'
+    assert_equal 404, last_response.status
+  end
 end

data/test/omaha/omaha_protocol/request_test.rb

@@ -8,7 +8,8 @@ class RequestTest < Test::Unit::TestCase
     @request = Proxy::Omaha::OmahaProtocol::Request.new(
       xml_fixture('request_update_complete_update'),
       :ip => '1.1.1.1',
-      :base_url => 'http://www.example.org/'
+      :base_url => 'http://www.example.org/',
+      :distribution => 'coreos'
     )
   end
 
@@ -44,6 +45,7 @@ class RequestTest < Test::Unit::TestCase
         :alephversion => '1010.5.0',
         :appid => 'e96281a6-d1af-4bde-9a0a-97b76e56dc57',
         :board => 'amd64-usr',
+        :distribution => 'coreos',
         :hostname => 'omaha.example.com',
         :ipaddress => '1.1.1.1',
         :ipaddress6 => nil,
@@ -74,7 +76,8 @@ class RequestTest < Test::Unit::TestCase
     request6 = Proxy::Omaha::OmahaProtocol::Request.new(
       xml_fixture('request_update_complete_update'),
       :ip => '2001:db8::1',
-      :base_url => 'http://www.example.org/'
+      :base_url => 'http://www.example.org/',
+      :distribution => 'coreos'
     )
 
     assert_nil request6.ipaddress
@@ -83,7 +86,8 @@ class RequestTest < Test::Unit::TestCase
     request64 = Proxy::Omaha::OmahaProtocol::Request.new(
       xml_fixture('request_update_complete_update'),
       :ip => '::ffff:1.1.1.1',
-      :base_url => 'http://www.example.org/'
+      :base_url => 'http://www.example.org/',
+      :distribution => 'coreos'
     )
 
     assert_equal '1.1.1.1', request64.ipaddress

data/test/omaha/release_provider_test.rb

@@ -1,15 +1,19 @@
 require 'test_helper'
 require 'smart_proxy_omaha/release'
 require 'smart_proxy_omaha/release_provider'
+require 'smart_proxy_omaha/distribution'
 
 class ReleaseProviderTest < Test::Unit::TestCase
-  def setup
-    @provider = Proxy::Omaha::ReleaseProvider.new(:track => :stable, :architecture => 'amd64-usr')
-  end
+  def test_releases_coreos
+    distribution = ::Proxy::Omaha::Distribution::Coreos.new
+    provider = Proxy::Omaha::ReleaseProvider.new(
+      distribution: distribution,
+      track: :stable,
+      architecture: 'amd64-usr'
+    )
 
-  def test_releases
-    stub_request(:get, 'https://stable.release.core-os.net/amd64-usr/').
-      to_return(:status => [200, 'OK'], :body => fixture('stable.html'))
+    stub_request(:get, 'https://stable.release.core-os.net/amd64-usr/')
+      .to_return(status: [200, 'OK'], body: fixture('stable.html'))
 
     expected = ['367.1.0',
                 '410.0.0',
@@ -54,6 +58,22 @@ class ReleaseProviderTest < Test::Unit::TestCase
                 '1068.10.0',
                 '1122.2.0']
 
-    assert_equal expected.map {|v| Proxy::Omaha::Release.new(:track => @provider.track, :version => v, :architecture => 'amd64-usr') }, @provider.releases
+    assert_equal expected.map { |v| Proxy::Omaha::Release.new(distribution: distribution, track: provider.track, version: v, architecture: 'amd64-usr') }, provider.releases
+  end
+
+  def test_releases_flatcar
+    distribution = ::Proxy::Omaha::Distribution::Flatcar.new
+    provider = Proxy::Omaha::ReleaseProvider.new(
+      track: :stable,
+      architecture: 'amd64-usr',
+      distribution: distribution
+    )
+
+    stub_request(:get, 'https://www.flatcar-linux.org/releases-json/releases-stable.json')
+      .to_return(status: [200, 'OK'], body: fixture('flatcar_releases-stable.json'))
+
+    expected = ['1688.5.3', '1745.3.1', '1745.4.0', '1745.5.0', '1745.6.0', '1745.7.0', '1800.4.0', '1800.5.0', '1800.6.0', '1800.7.0', '1855.4.0', '1855.4.2', '1855.5.0', '1911.3.0', '1911.4.0', '1911.5.0', '1967.3.0', '1967.3.1', '1967.4.0', '1967.5.0', '1967.6.0', '2023.4.0', '2023.5.0', '2079.3.0', '2079.3.1', '2079.3.2', '2079.4.0', '2079.5.0', '2079.6.0', '2135.4.0', '2135.5.0', '2135.6.0', '2191.4.0', '2191.4.1', '2191.5.0', '2247.5.0', '2247.6.0', '2247.7.0', '2303.3.0', '2303.3.1', '2303.4.0', '2345.3.0']
+
+    assert_equal expected.map { |v| Proxy::Omaha::Release.new(distribution: distribution, track: provider.track, version: v, architecture: 'amd64-usr') }, provider.releases
   end
 end

data/test/omaha/release_repository_test.rb

@@ -5,12 +5,10 @@ require 'smart_proxy_omaha/release_repository'
 class ReleaseRepositoryTest < Test::Unit::TestCase
   def setup
     @contentpath = Dir.mktmpdir
-    Proxy::Omaha::Plugin.load_test_settings(
-      {
-        :contentpath => @contentpath
-      }
+    @repository = Proxy::Omaha::ReleaseRepository.new(
+      :contentpath => @contentpath,
+      :distribution => ::Proxy::Omaha::Distribution::Coreos.new
     )
-    @repository = Proxy::Omaha::ReleaseRepository.new
   end
 
   def teardown

data/test/omaha/release_test.rb

@@ -2,6 +2,7 @@ require 'test_helper'
 require 'fileutils'
 require 'tmpdir'
 require 'smart_proxy_omaha/release'
+require 'smart_proxy_omaha/distribution'
 
 class ReleaseTest < Test::Unit::TestCase
 
@@ -13,6 +14,7 @@ class ReleaseTest < Test::Unit::TestCase
       }
     )
     @release = Proxy::Omaha::Release.new(
+      :distribution => ::Proxy::Omaha::Distribution::Coreos.new,
       :track => :stable,
       :architecture => 'amd64-usr',
       :version => '1068.9.0'
@@ -56,11 +58,13 @@ class ReleaseTest < Test::Unit::TestCase
 
   def test_compare
     older = Proxy::Omaha::Release.new(
+      :distribution => ::Proxy::Omaha::Distribution::Coreos.new,
       :track => :stable,
       :architecture => 'amd64-usr',
       :version => '100.0.0'
     )
     newer = Proxy::Omaha::Release.new(
+      :distribution => ::Proxy::Omaha::Distribution::Coreos.new,
       :track => :stable,
       :architecture => 'amd64-usr',
       :version => '2000.0.0'
@@ -72,6 +76,7 @@ class ReleaseTest < Test::Unit::TestCase
 
   def test_equality
     other = Proxy::Omaha::Release.new(
+      :distribution => ::Proxy::Omaha::Distribution::Coreos.new,
       :track => :stable,
       :architecture => 'amd64-usr',
       :version => '100.0.0'
@@ -152,6 +157,7 @@ class ReleaseTest < Test::Unit::TestCase
   def test_current_release_update
     FileUtils.mkdir_p(@release.path)
     older = Proxy::Omaha::Release.new(
+      :distribution => ::Proxy::Omaha::Distribution::Coreos.new,
       :track => :stable,
       :architecture => 'amd64-usr',
       :version => '100.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_omaha
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Timo Goebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-24 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -127,6 +127,7 @@ files:
 - lib/smart_proxy_omaha.rb
 - lib/smart_proxy_omaha/configuration_loader.rb
 - lib/smart_proxy_omaha/dependency_injection.rb
+- lib/smart_proxy_omaha/distribution.rb
 - lib/smart_proxy_omaha/foreman_client.rb
 - lib/smart_proxy_omaha/http_download.rb
 - lib/smart_proxy_omaha/http_request.rb
@@ -146,6 +147,7 @@ files:
 - lib/smart_proxy_omaha/omaha_protocol/request.rb
 - lib/smart_proxy_omaha/omaha_protocol/response.rb
 - lib/smart_proxy_omaha/omaha_protocol/updateresponse.rb
+- lib/smart_proxy_omaha/plugin_validators.rb
 - lib/smart_proxy_omaha/release.rb
 - lib/smart_proxy_omaha/release_provider.rb
 - lib/smart_proxy_omaha/release_repository.rb
@@ -154,6 +156,8 @@ files:
 - lib/smart_proxy_omaha/version.rb
 - settings.d/omaha.yml.example
 - smart_proxy_omaha.gemspec
+- test/fixtures/ca.crt
+- test/fixtures/flatcar_releases-stable.json
 - test/fixtures/request_ping.xml
 - test/fixtures/request_update_complete_error.xml
 - test/fixtures/request_update_complete_noupdate.xml
@@ -176,9 +180,9 @@ files:
 - test/omaha/syncer_test.rb
 - test/omaha/track_test.rb
 - test/test_helper.rb
-homepage: http://github.com/theforeman/smart_proxy_omaha
+homepage: https://github.com/theforeman/smart_proxy_omaha
 licenses:
-- GPLv3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -196,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Omaha protocol support for smart-proxy