smart_proxy_omaha 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff55772702ef7eed25897db70f4f41833672a88199cae09f5e967b1aba310848
-  data.tar.gz: d8f7c5e29f20ffd51fa1c6c129985efdd2fb1f448d460c35f07415e2126631c1
+  metadata.gz: 5d051d24703ccf8ca213ea5ef8f32eac0957800eab212ef3ed1359d6ac81e974
+  data.tar.gz: 390ac44a594df027120ac70e5d937aa62f149a5f08a80546ba7fbd237605e41c
 SHA512:
-  metadata.gz: 6f032ca7e9029c0651828afb4c0665107b3d5e203b69bea1138a25dc9f0598bae42bde8801bab95197c53fd3b6615c4af422f01b23267ede7858978188fc112b
-  data.tar.gz: b6f941bbb0ddd7feb0ea63c2028669f44b23741671c357727d37fa4a9b41fb6b44ebaeea43fb62372723c468f5082a055c4a37ae97e2e6612d151c909d36a2dc
+  metadata.gz: 7e5e1154726883c8c6ff199b44a83ff104ba9d418099c35bc08f60858a9e10f243f5756ac6dfabe483969d1839020e557397f5f486d36f9b983bff89f25f126b
+  data.tar.gz: bb2b1b8d15424edb89f55ad7e0e672e7efbb1b6588ff20742adc867ce64629421d136871cef291decd33118fcfe9510152084a082907e08201a442a7240e28f5

data/README.md

@@ -39,7 +39,8 @@ vim /etc/ssl/certs/customCA_root.pem
 sudo /usr/sbin/update-ca-certificates
 ```
 
-To configure CoreOS to connect to the Omaha smart-proxy for updates, edit `/etc/coreos/update.conf`:
+To configure CoreOS to connect to the Omaha smart-proxy for updates, edit `/etc/coreos/update.conf`,
+to configure Flatcar to connect to the Omaha smart-proxy for updates, edit `/etc/flatcar/update.conf`:
 
 ```
 GROUP=stable
@@ -111,11 +112,19 @@ $ journalctl -u update-engine.service
 In the settings file you can specify a http proxy that is used to download Omaha content.
 You need to allow https access to these servers:
 
+For CoreOS:
 * alpha.release.core-os.net
 * beta.release.core-os.net
 * stable.release.core-os.net
 * update.release.core-os.net
 
+For Flatcar:
+* www.flatcar-linux.org
+* alpha.release.flatcar-linux.net
+* beta.release.flatcar-linux.net
+* stable.release.flatcar-linux.net
+* update.release.flatcar-linux.net
+
 ## Make it High Available
 
 In order to make the Omaha Smart Proxy high available or add additional capacity, just scale out and put a loadbalancer in front of the proxies.

data/lib/smart_proxy_omaha/configuration_loader.rb

@@ -4,11 +4,20 @@ module ::Proxy::Omaha
       require 'smart_proxy_omaha/dependency_injection'
       require 'smart_proxy_omaha/foreman_client'
       require 'smart_proxy_omaha/omaha_api'
+      require 'smart_proxy_omaha/distribution'
     end
 
     def load_dependency_injection_wirings(container_instance, settings)
       container_instance.singleton_dependency :foreman_client_impl, Proxy::Omaha::ForemanClient
-      container_instance.singleton_dependency :release_repository_impl, Proxy::Omaha::ReleaseRepository
+      container_instance.singleton_dependency :distribution_impl, (lambda do
+        Proxy::Omaha::Distribution.new(settings[:distribution])
+      end)
+      container_instance.singleton_dependency :release_repository_impl, (lambda do
+        Proxy::Omaha::ReleaseRepository.new(
+          :contentpath => settings[:contentpath],
+          :distribution => container_instance.get_dependency(:distribution_impl)
+        )
+      end)
       container_instance.singleton_dependency :metadata_provider_impl, (lambda do
         Proxy::Omaha::MetadataProvider.new(:contentpath => settings[:contentpath])
       end)

data/lib/smart_proxy_omaha/distribution.rb

@@ -0,0 +1,82 @@
+require 'smart_proxy_omaha/http_request'
+
+module Proxy
+  module Omaha
+    module Distribution
+      def self.new(distribution)
+        case distribution
+        when 'coreos'
+          Coreos.new
+        when 'flatcar'
+          Flatcar.new
+        else
+          raise "Unsupported distribution."
+        end
+      end
+
+      class Base
+        private
+
+        def http_request
+          @http_request ||= ::Proxy::Omaha::HttpRequest.new
+        end
+      end
+
+      class Coreos < Base
+        def identifier
+          :coreos
+        end
+
+        def prefix
+          'coreos'
+        end
+
+        def update_filename
+          'update.gz'
+        end
+
+        def upstream(track, architecture, version)
+          "https://#{track}.release.core-os.net/#{architecture}/#{version}"
+        end
+
+        def update_upstream(architecture, version)
+          "https://update.release.core-os.net/#{architecture}/#{version}"
+        end
+
+        def releases(track, architecture)
+          release_data = http_request.get("https://#{track}.release.core-os.net/#{architecture}/")
+          xml = Nokogiri::HTML(release_data)
+          (xml.xpath('//a/text()').map(&:to_s) - ['current'])
+        end
+      end
+
+      class Flatcar < Base
+        def identifier
+          :flatcar
+        end
+
+        def prefix
+          'flatcar'
+        end
+
+        def update_filename
+          'flatcar_production_update.gz'
+        end
+
+        def upstream(track, architecture, version)
+          "https://#{track}.release.flatcar-linux.net/#{architecture}/#{version}"
+        end
+
+        def update_upstream(architecture, version)
+          "https://update.release.flatcar-linux.net/#{architecture}/#{version}"
+        end
+
+        def releases(track, architecture)
+          feed_data = http_request.get("https://www.flatcar-linux.org/releases-json/releases-#{track}.json")
+          json_feed = JSON.parse(feed_data)
+          json_feed.select { |_, release| release['architectures'].include?(architecture.split('-').first) }.keys - ['current']
+        end
+      end
+    end
+  end
+end

data/lib/smart_proxy_omaha/omaha_api.rb

@@ -12,6 +12,7 @@ module Proxy::Omaha
     inject_attr :foreman_client_impl, :foreman_client
     inject_attr :release_repository_impl, :release_repository
     inject_attr :metadata_provider_impl, :metadata_provider
+    inject_attr :distribution_impl, :distribution
 
     post '/v1/update' do
       request.body.rewind
@@ -19,7 +20,8 @@ module Proxy::Omaha
       omaha_request = Proxy::Omaha::OmahaProtocol::Request.new(
         request_body,
         :ip => request.ip,
-        :base_url => request.base_url
+        :base_url => request.base_url,
+        :distribution => distribution.identifier
       )
       omaha_handler = Proxy::Omaha::OmahaProtocol::Handler.new(
         :request => omaha_request,
@@ -50,5 +52,11 @@ module Proxy::Omaha
         )
       end.to_json
     end
+
+    get '/ca' do
+      not_found if Proxy::SETTINGS.ssl_ca_file.nil? || Proxy::SETTINGS.ssl_ca_file.empty? || !File.exists?(Proxy::SETTINGS.ssl_ca_file)
+      content_type 'text/plain'
+      File.read(Proxy::SETTINGS.ssl_ca_file)
+    end
   end
 end

data/lib/smart_proxy_omaha/omaha_plugin.rb

@@ -1,3 +1,5 @@
+require 'smart_proxy_omaha/plugin_validators'
+
 module Proxy::Omaha
   class NotFound < RuntimeError; end
 
@@ -10,9 +12,14 @@ module Proxy::Omaha
     load_classes ::Proxy::Omaha::ConfigurationLoader
     load_dependency_injection_wirings ::Proxy::Omaha::ConfigurationLoader
 
+    load_validators :distribution_validator => ::Proxy::Omaha::PluginValidators::DistributionValidator
+
     default_settings :sync_releases => 0,
-      :contentpath => '/var/lib/foreman-proxy/omaha/content'
+      :contentpath => '/var/lib/foreman-proxy/omaha/content',
+      :distribution => 'coreos'
 
     validate_readable :contentpath
+
+    validate :distribution, :distribution_validator => true
   end
 end

data/lib/smart_proxy_omaha/omaha_protocol/handler.rb

@@ -102,7 +102,8 @@ module Proxy::Omaha::OmahaProtocol
           :appid => request.appid,
           :metadata => metadata_provider.get(request.track, latest_os, request.board),
           :board => request.board,
-          :base_url => request.base_url
+          :base_url => request.base_url,
+          :name => latest_os.update_filename
         )
       else
         logger.info "OmahaHandler: No update."

data/lib/smart_proxy_omaha/omaha_protocol/request.rb

@@ -6,12 +6,13 @@ module Proxy::Omaha::OmahaProtocol
     attr_reader :appid, :version, :track, :updatecheck, :eventtype, :eventresult, :board,
       :alephversion, :oemversion, :oem, :machineid,
       :platform, :osmajor, :osminor, :hostname, :ipaddress, :ipaddress6,
-      :body, :ip, :base_url, :ping
+      :body, :ip, :base_url, :ping, :distribution
 
     def initialize(body, options)
       @body = body
       @ip = options.fetch(:ip)
       @base_url = options.fetch(:base_url)
+      @distribution = options.fetch(:distribution)
       parse_request
       parse_ipaddress
       raise "Could not determine request hostname." if hostname.nil?
@@ -111,7 +112,8 @@ module Proxy::Omaha::OmahaProtocol
         :ipaddress => ipaddress,
         :ipaddress6 => ipaddress6,
         :hostname => hostname,
-        :machineid => machineid
+        :machineid => machineid,
+        :distribution => distribution
       }
     end
   end

data/lib/smart_proxy_omaha/omaha_protocol/updateresponse.rb

@@ -5,7 +5,7 @@ module Proxy::Omaha::OmahaProtocol
     def initialize(options = {})
       @metadata = options.fetch(:metadata)
       @architecture = options.fetch(:board)
-      @name = 'update.gz'
+      @name = options.fetch(:name)
       @size = metadata.size
       @sha1_b64 = metadata.sha1_b64
       @sha256_b64 = metadata.sha256_b64

data/lib/smart_proxy_omaha/plugin_validators.rb

@@ -0,0 +1,11 @@
+module Proxy
+  module Omaha
+    module PluginValidators
+      class DistributionValidator < ::Proxy::PluginValidators::Base
+        def validate!(settings)
+          raise ::Proxy::Error::ConfigurationError, "Setting '#{@setting_name}' must be a supported Omaha distribution ('coreos' or 'flatcar')" unless ['coreos', 'flatcar'].include?(settings[@setting_name])
+        end
+      end
+    end
+  end
+end

data/lib/smart_proxy_omaha/release.rb

@@ -2,15 +2,17 @@ require 'fileutils'
 require 'digest/md5'
 require 'smart_proxy_omaha/http_download'
 require 'smart_proxy_omaha/metadata_provider'
+require 'smart_proxy_omaha/distribution'
 
 module Proxy::Omaha
   class Release
     include Proxy::Log
 
-    attr_accessor :track, :version, :architecture
+    attr_accessor :distribution, :track, :version, :architecture
     attr_writer :digests
 
     def initialize(options)
+      @distribution = options.fetch(:distribution)
       @track = options.fetch(:track).to_s
       @architecture = options.fetch(:architecture)
       @version = Gem::Version.new(options.fetch(:version))
@@ -108,26 +110,32 @@ module Proxy::Omaha
       false
     end
 
+    def update_filename
+      distribution.update_filename
+    end
+
     def updatefile
-      File.join(path, 'update.gz')
+      File.join(path, update_filename)
     end
 
     def sources
-      upstream = "https://#{track}.release.core-os.net/#{architecture}/#{version}"
+      upstream = distribution.upstream(track, architecture, version)
+      update_upstream = distribution.update_upstream(architecture, version)
+      prefix = distribution.prefix
       [
-        "#{upstream}/coreos_production_pxe.vmlinuz",
-        "#{upstream}/coreos_production_pxe.DIGESTS",
-        "#{upstream}/coreos_production_image.bin.bz2",
-        "#{upstream}/coreos_production_image.bin.bz2.sig",
-        "#{upstream}/coreos_production_image.bin.bz2.DIGESTS",
-        "#{upstream}/coreos_production_pxe_image.cpio.gz",
-        "#{upstream}/coreos_production_pxe_image.cpio.gz.DIGESTS",
-        "#{upstream}/coreos_production_vmware_raw_image.bin.bz2",
-        "#{upstream}/coreos_production_vmware_raw_image.bin.bz2.sig",
-        "#{upstream}/coreos_production_vmware_raw_image.bin.bz2.DIGESTS",
+        "#{upstream}/#{prefix}_production_pxe.vmlinuz",
+        "#{upstream}/#{prefix}_production_pxe.DIGESTS",
+        "#{upstream}/#{prefix}_production_image.bin.bz2",
+        "#{upstream}/#{prefix}_production_image.bin.bz2.sig",
+        "#{upstream}/#{prefix}_production_image.bin.bz2.DIGESTS",
+        "#{upstream}/#{prefix}_production_pxe_image.cpio.gz",
+        "#{upstream}/#{prefix}_production_pxe_image.cpio.gz.DIGESTS",
+        "#{upstream}/#{prefix}_production_vmware_raw_image.bin.bz2",
+        "#{upstream}/#{prefix}_production_vmware_raw_image.bin.bz2.sig",
+        "#{upstream}/#{prefix}_production_vmware_raw_image.bin.bz2.DIGESTS",
         "#{upstream}/version.txt",
         "#{upstream}/version.txt.DIGESTS",
-        "https://update.release.core-os.net/#{architecture}/#{version}/update.gz"
+        "#{update_upstream}/#{update_filename}"
       ]
     end
 

data/lib/smart_proxy_omaha/release_provider.rb

@@ -1,6 +1,5 @@
 require 'nokogiri'
 require 'fileutils'
-require 'smart_proxy_omaha/http_request'
 require 'smart_proxy_omaha/release'
 
 module Proxy::Omaha
@@ -8,12 +7,12 @@ module Proxy::Omaha
     include ::Proxy::Log
     include HttpShared
 
-    attr_accessor :track
-    attr_accessor :architecture
+    attr_reader :track, :architecture, :distribution
 
     def initialize(options)
       @track = options.fetch(:track)
       @architecture = options.fetch(:architecture, 'amd64-usr')
+      @distribution = options.fetch(:distribution)
     end
 
     def releases
@@ -21,19 +20,12 @@ module Proxy::Omaha
     end
 
     def fetch_releases
-      releases = http_request.get("https://#{track}.release.core-os.net/#{architecture}/")
-      xml = Nokogiri::HTML(releases)
-      parsed = (xml.xpath('//a/text()').map(&:to_s) - ['current']).map do |v|
-        Proxy::Omaha::Release.new(:version => v, :track => track, :architecture => architecture)
+      releases = distribution.releases(track, architecture)
+      release_objects = releases.map do |version|
+        Proxy::Omaha::Release.new(:distribution => distribution, :version => version, :track => track, :architecture => architecture)
       end.sort
-      logger.debug "Fetched releases for #{architecture}/#{track}: #{parsed.map(&:to_s).join(', ')}"
-      parsed
-    end
-
-    private
-
-    def http_request
-      @http_request ||= ::Proxy::Omaha::HttpRequest.new
+      logger.debug "Fetched releases for #{architecture}/#{track}: #{release_objects.map(&:to_s).join(', ')}"
+      release_objects
     end
   end
 end

data/lib/smart_proxy_omaha/release_repository.rb

@@ -2,11 +2,20 @@ require 'smart_proxy_omaha/release'
 
 module Proxy::Omaha
   class ReleaseRepository
+
+    attr_reader :contentpath, :distribution
+
+    def initialize(options)
+      @contentpath = options.fetch(:contentpath)
+      @distribution = options.fetch(:distribution)
+    end
+
     def releases(track, architecture)
-      Dir.glob(File.join(Proxy::Omaha::Plugin.settings.contentpath, track, architecture, '*')).select do |f|
+      Dir.glob(File.join(contentpath, track, architecture, '*')).select do |f|
         File.directory?(f) && ! File.symlink?(f)
       end.map do |f|
         Proxy::Omaha::Release.new(
+          :distribution => distribution,
           :track => track,
           :architecture => architecture,
           :version => File.basename(f)
@@ -15,11 +24,11 @@ module Proxy::Omaha
     end
 
     def tracks
-      Dir.glob(File.join(Proxy::Omaha::Plugin.settings.contentpath, '*')).select {|f| File.directory? f }.map { |f| File.basename(f) }
+      Dir.glob(File.join(contentpath, '*')).select {|f| File.directory? f }.map { |f| File.basename(f) }
     end
 
     def architectures(track)
-      Dir.glob(File.join(Proxy::Omaha::Plugin.settings.contentpath, track, '*')).select {|f| File.directory? f }.map { |f| File.basename(f) }
+      Dir.glob(File.join(contentpath, track, '*')).select {|f| File.directory? f }.map { |f| File.basename(f) }
     end
 
     def latest_os(track, architecture)

data/lib/smart_proxy_omaha/syncer.rb

@@ -1,6 +1,7 @@
 require 'smart_proxy_omaha/release'
 require 'smart_proxy_omaha/track'
 require 'smart_proxy_omaha/release_provider'
+require 'smart_proxy_omaha/distribution'
 
 module Proxy::Omaha
   class Syncer
@@ -46,10 +47,15 @@ module Proxy::Omaha
       Proxy::Omaha::Plugin.settings.sync_releases.to_i
     end
 
+    def distribution
+      Proxy::Omaha::Plugin.settings.distribution
+    end
+
     def release_provider(track)
       @release_provider ||= {}
       @release_provider[track] ||= ReleaseProvider.new(
-        :track => track
+        :track => track,
+        :distribution => ::Proxy::Omaha::Distribution.new(distribution)
       )
     end
   end

data/lib/smart_proxy_omaha/track.rb

@@ -1,7 +1,7 @@
 module Proxy
   module Omaha
     module Track
-      TRACKS = ['alpha', 'beta', 'stable'].freeze
+      TRACKS = ['alpha', 'beta', 'stable'].freeze # edge
 
       def self.all
         TRACKS

data/lib/smart_proxy_omaha/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module Omaha
-    VERSION = '0.0.5'
+    VERSION = '0.1.0'
   end
 end