smart_proxy_pulp 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d466a8b14430625f9d636f3324f5a617ce5ff96f
-  data.tar.gz: adc6fa1e589b56a2504b374b4d880a52a4f2105f
+SHA256:
+  metadata.gz: e11236f52109a604b1171429f0d824d2997d1f366af7ddec1c606d3b041cf8ad
+  data.tar.gz: 4f3d157ba4e93fcabbbc846ecec510235f0010c0dd728560e9e83331a06a624f
 SHA512:
-  metadata.gz: f0d5b5abc4b048205f9347745651d5ead876475b0eb24ed5ea8667240b407141eb9e2ca9042c5f73777e12ee7b0c54797eb9dc65084d7dc8cc42b2cdfbe1a36b
-  data.tar.gz: 72d174734b54cf88d1d0d39221ccf225a3cdb846d1e716c2cd9e81af61ed32d2439fb443b928ece14b57243ad24ef882b64c644cb73df0138496fec5564cdf60
+  metadata.gz: 92005aeed682489ea51bdca541668fca8c2ba453974d99642e13abe1b8e4774b46d2d269c4ec4b37bceb8ff97bdce83b08eeecc9fbeac5508768e2c0da46ea50
+  data.tar.gz: 95c595b02e6006bfc53fa99d3dce666a9274cfc7b61446f3f51202cd1a23c0c783c4776ef0b24b3f575db17bd34f56995b1d29302ef7608df99f3d0a8baffbbf

data/Gemfile

@@ -5,5 +5,24 @@ group :development do
   gem 'smart_proxy', :git => 'https://github.com/theforeman/smart-proxy', :branch => 'develop'
 end
 
-gem 'addressable', '< 2.4.0', :platforms => :ruby_18
-gem 'json', '~> 1.0', :platforms => [:ruby_18, :ruby_19]
+group :test do
+  gem 'webmock'
+  if RUBY_VERSION < '2.1'
+    gem 'public_suffix', '< 3'
+  else
+    gem 'public_suffix'
+  end
+  if RUBY_VERSION < '2.2'
+    gem 'rack-test', '< 0.8'
+  else
+    gem 'rack-test'
+  end
+end
+
+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_pulp.rb

@@ -1,3 +1,4 @@
 require 'smart_proxy_pulp_plugin/version'
 require 'smart_proxy_pulp_plugin/pulp_plugin'
-require 'smart_proxy_pulp_plugin/pulp_node_plugin'
+require 'smart_proxy_pulp_plugin/pulp_node_plugin'
+require 'smart_proxy_pulp_plugin/pulp3_plugin'

data/lib/smart_proxy_pulp_plugin/disk_usage.rb

@@ -2,7 +2,7 @@ module PulpProxy
   class DiskUsage
     include ::Proxy::Util
     include ::Proxy::Log
-    SIZE = { :kilobyte => 1_024, :megabyte => 1_048_576, :gigabyte => 1_073_741_824, :terabyte => 1_099_511_627_776 }
+    SIZE = { :byte => 1, :kilobyte => 1_024, :megabyte => 1_048_576, :gigabyte => 1_073_741_824, :terabyte => 1_099_511_627_776 }
 
     attr_reader :path, :stat, :size
 

data/lib/smart_proxy_pulp_plugin/pulp3_api.rb

@@ -0,0 +1,38 @@
+require 'sinatra'
+require 'smart_proxy_pulp_plugin/pulp3_client'
+require 'smart_proxy_pulp_plugin/disk_usage'
+
+module PulpProxy
+  class Pulp3Api < Sinatra::Base
+    helpers ::Proxy::Helpers
+
+    get '/status' do
+      content_type :json
+      begin
+        result = Pulp3Client.get("api/v3/status/")
+        return result.body if result.is_a?(Net::HTTPSuccess)
+        log_halt result.code, "Pulp server at #{::PulpProxy::Settings.settings.pulp_url} returned an error: '#{result.message}'"
+      rescue SocketError, Errno::ECONNREFUSED => e
+        log_halt 503, "Communication error with '#{URI.parse(::PulpProxy::Settings.settings.pulp_url.to_s).host}': #{e.message}"
+      end
+    end
+
+    get '/status/disk_usage' do
+      content_type :json
+      if params[:size]
+        size = params[:size] ? params[:size].to_sym : nil
+        log_halt 400, "size parameter must be of: #{DiskUsage::SIZE.keys.join(',')}" unless DiskUsage::SIZE.include?(size)
+      else
+        size = :byte
+      end
+
+      monitor_dirs = Hash[::PulpProxy::Pulp3Plugin.settings.marshal_dump.select { |key, _| key == :pulp_dir || key == :pulp_content_dir }]
+      begin
+        pulp_disk = DiskUsage.new({:path => monitor_dirs, :size => size.to_sym})
+        pulp_disk.to_json
+      rescue ::Proxy::Error::ConfigurationError
+        log_halt 500, 'Could not find df command to evaluate disk space'
+      end
+    end
+  end
+end

data/lib/smart_proxy_pulp_plugin/pulp3_client.rb

@@ -0,0 +1,35 @@
+require 'net/http'
+require 'net/https'
+require 'uri'
+require 'smart_proxy_pulp_plugin/settings'
+require 'proxy/log'
+
+module PulpProxy
+  class Pulp3Client
+    def self.get(path)
+      uri = URI.parse(::PulpProxy::Pulp3Plugin.settings.pulp_url.to_s)
+      req = Net::HTTP::Get.new(URI.join(uri.to_s.chomp('/') + '/', path))
+      req.add_field('Accept', 'application/json')
+      self.http.request(req)
+    end
+
+    def self.capabilities
+      body = JSON.parse(get("api/v3/status/").body)
+      body['versions'].map{|item| item['component'] }
+    rescue => e
+      logger.error("Could not fetch capabilities: #{e.message}")
+      []
+    end
+
+    def self.logger
+      Proxy::LoggerFactory.logger
+    end
+
+    def self.http
+      uri = URI.parse(::PulpProxy::Pulp3Plugin.settings.pulp_url.to_s)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = uri.scheme == 'https'
+      http
+    end
+  end
+end

data/lib/smart_proxy_pulp_plugin/pulp3_http_config.ru

@@ -0,0 +1,5 @@
+require 'smart_proxy_pulp_plugin/pulp3_api'
+
+map "/pulp3" do
+  run PulpProxy::Pulp3Api
+end

data/lib/smart_proxy_pulp_plugin/pulp3_plugin.rb

@@ -0,0 +1,22 @@
+require 'puppet_proxy_common/custom_validators'
+
+module PulpProxy
+  class Pulp3Plugin < ::Proxy::Plugin
+    plugin "pulp3", ::PulpProxy::VERSION
+    default_settings :pulp_url => 'https://localhost/pulp/',
+                     :pulp_dir => '/var/lib/pulp',
+                     :pulp_content_dir => '/var/lib/pulp/content',
+                     :mirror => false
+
+    load_validators :url => ::Proxy::Puppet::Validators::UrlValidator
+    validate :pulp_url, :url => true
+
+    expose_setting :pulp_url
+    expose_setting :mirror
+    capability( lambda do ||
+      Pulp3Client.capabilities
+    end)
+    http_rackup_path File.expand_path("pulp3_http_config.ru", File.expand_path("../", __FILE__))
+    https_rackup_path File.expand_path("pulp3_http_config.ru", File.expand_path("../", __FILE__))
+  end
+end

data/lib/smart_proxy_pulp_plugin/pulp_api.rb

@@ -6,11 +6,13 @@ require 'smart_proxy_pulp_plugin/settings'
 module PulpProxy
   class Api < Sinatra::Base
     helpers ::Proxy::Helpers
+    authorize_with_trusted_hosts
+    authorize_with_ssl_client
 
     get "/status" do
       content_type :json
       begin
-        result = PulpClient.get("/api/v2/status/")
+        result = PulpClient.get("api/v2/status/")
         return result.body if result.is_a?(Net::HTTPSuccess)
         log_halt result.code, "Pulp server at #{::PulpProxy::Settings.settings.pulp_url} returned an error: '#{result.message}'"
       rescue Errno::ECONNREFUSED => e

data/lib/smart_proxy_pulp_plugin/pulp_client.rb

@@ -7,8 +7,7 @@ module PulpProxy
   class PulpClient
     def self.get(path)
       uri = URI.parse(::PulpProxy::Settings.settings.pulp_url.to_s)
-      path = [uri.path, path].join('/') unless uri.path.empty?
-      req = Net::HTTP::Get.new(URI.join(uri.to_s, path).path)
+      req = Net::HTTP::Get.new(URI.join(uri.to_s.chomp('/') + '/', path))
       req.add_field('Accept', 'application/json')
       req.content_type = 'application/json'
       response = self.http.request(req)

data/lib/smart_proxy_pulp_plugin/pulp_node_plugin.rb

@@ -7,6 +7,7 @@ module PulpNodeProxy
                      :puppet_content_dir => '/etc/puppet/environments',
                      :mongodb_dir => '/var/lib/mongodb'
 
+    expose_setting :pulp_url
     http_rackup_path File.expand_path("pulp_node_http_config.ru", File.expand_path("../", __FILE__))
     https_rackup_path File.expand_path("pulp_node_http_config.ru", File.expand_path("../", __FILE__))
   end

data/lib/smart_proxy_pulp_plugin/pulp_plugin.rb

@@ -7,6 +7,8 @@ module PulpProxy
                      :puppet_content_dir => '/etc/puppet/environments',
                      :mongodb_dir => '/var/lib/mongodb'
 
+    expose_setting :pulp_url
+
     http_rackup_path File.expand_path("pulp_http_config.ru", File.expand_path("../", __FILE__))
     https_rackup_path File.expand_path("pulp_http_config.ru", File.expand_path("../", __FILE__))
   end

data/lib/smart_proxy_pulp_plugin/version.rb

@@ -1,3 +1,3 @@
 module PulpProxy
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/settings.d/pulp3.yml.example

@@ -0,0 +1,7 @@
+---
+:enabled: true
+#:pulp_url: https://localhost/pulp/
+#:pulp_dir: /var/lib/pulp
+#:pulp_content_dir: /var/lib/pulp/content
+#:puppet_content_dir: /etc/pupppet/environments
+#:mirror: false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_pulp
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Dmitri Dolguikh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -56,14 +56,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
@@ -92,6 +92,10 @@ files:
 - bundler.d/pulp.rb
 - lib/smart_proxy_pulp.rb
 - lib/smart_proxy_pulp_plugin/disk_usage.rb
+- lib/smart_proxy_pulp_plugin/pulp3_api.rb
+- lib/smart_proxy_pulp_plugin/pulp3_client.rb
+- lib/smart_proxy_pulp_plugin/pulp3_http_config.ru
+- lib/smart_proxy_pulp_plugin/pulp3_plugin.rb
 - lib/smart_proxy_pulp_plugin/pulp_api.rb
 - lib/smart_proxy_pulp_plugin/pulp_client.rb
 - lib/smart_proxy_pulp_plugin/pulp_http_config.ru
@@ -101,10 +105,11 @@ files:
 - lib/smart_proxy_pulp_plugin/settings.rb
 - lib/smart_proxy_pulp_plugin/version.rb
 - settings.d/pulp.yml.example
+- settings.d/pulp3.yml.example
 - settings.d/pulpnode.yml.example
 homepage: https://github.com/theforeman/smart-proxy-pulp-plugin
 licenses:
-- GPLv3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -122,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Basic Pulp support for Foreman Smart-Proxy