smart_proxy_pulp 3.3.0 → 3.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/smart_proxy_pulp_plugin/pulpcore_client.rb +4 -0
  3. data/lib/smart_proxy_pulp_plugin/pulpcore_plugin.rb +1 -0
  4. data/lib/smart_proxy_pulp_plugin/version.rb +1 -1
  5. data/settings.d/pulpcore.yml.example +1 -0
  6. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: aab95a11d6f8ddfd3d856ed26bb4da3600561323442ae4e83820dc0428b50829
4
- data.tar.gz: 13764f192fa6a7770cc6d05b12d19a4ff8246383bee85cc9ba83f18e25850916
3
+ metadata.gz: 0dc738e9e4af81c22244e4daef6f5f9bc0b46ff8365e80b55013b7adadddb823
4
+ data.tar.gz: e2cb04bedb9fed3c5dbd180c7f90d0782dc47b6e9f56c501941a78b54b3046cf
5
5
  SHA512:
6
- metadata.gz: 1ff2ada564ea544755a507b11b1114b17f28d8c8f143b0a0f68453e2fc064922c5b074bc9fe5f30c52389275984b7234ca1569a2db6497f589ca2d1e389f42a0
7
- data.tar.gz: cbd18836405c2bf1de7c3a09eea4c87ead10e3c804eb43ac966e672959463b54576b92316361293b4a5265d3f5d375be4a947a820acb88d2ca477ebb0356e1a5
6
+ metadata.gz: 4556a56d00efc823d3a149510021c1e52da6cb1aab0225cae0ad90055edf38084ea5903f8873ed1676bac8a0c814b57ac9b6add83edebe87eef4180237384c98
7
+ data.tar.gz: 7c37ab16f56ab8cb74305fd43434de35a675e8e00d47262835141001c31727a358e269502541aed98717485dd91b561b92f79e91836e5c8414f8e9eeff29147e
data/lib/smart_proxy_pulp_plugin/pulpcore_client.rb CHANGED
@@ -27,9 +27,13 @@ module PulpProxy
27
27
  end
28
28
 
29
29
  def self.http
30
+ ssl_ca = ::PulpProxy::PulpcorePlugin.settings.ssl_ca ||
31
+ ::Proxy::SETTINGS.foreman_ssl_ca ||
32
+ ::Proxy::SETTINGS.ssl_ca_file
30
33
  uri = URI.parse(pulp_url)
31
34
  http = Net::HTTP.new(uri.host, uri.port)
32
35
  http.use_ssl = uri.scheme == 'https'
36
+ http.ca_file = ssl_ca if http.use_ssl? && ssl_ca && !ssl_ca.empty?
33
37
  http
34
38
  end
35
39
 
data/lib/smart_proxy_pulp_plugin/pulpcore_plugin.rb CHANGED
@@ -18,6 +18,7 @@ module PulpProxy
18
18
  validate :content_app_url, :url => true
19
19
  validate :client_authentication, :include => AUTH_TYPES
20
20
  validate :rhsm_url, :url => true
21
+ validate :ssl_ca, :file_readable => true
21
22
 
22
23
  expose_setting :pulp_url
23
24
  expose_setting :mirror
data/lib/smart_proxy_pulp_plugin/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module PulpProxy
4
- VERSION = "3.3.0"
4
+ VERSION = "3.4.0"
5
5
  end
data/settings.d/pulpcore.yml.example CHANGED
@@ -7,3 +7,4 @@
7
7
  #:mirror: false
8
8
  #:client_authentication: ['password', 'client_certificate']
9
9
  #:rhsm_url: https://localhost/rhsm
10
+ #:ssl_ca: /etc/ssl/certs/custom_ca.crt
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: smart_proxy_pulp
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.3.0
4
+ version: 3.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dmitri Dolguikh
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-01-08 00:00:00.000000000 Z
11
+ date: 2024-10-14 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: Basic Pulp support for Foreman Smart-Proxy
14
14
  email:
@@ -50,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
50
50
  - !ruby/object:Gem::Version
51
51
  version: '0'
52
52
  requirements: []
53
- rubygems_version: 3.4.10
53
+ rubygems_version: 3.5.16
54
54
  signing_key:
55
55
  specification_version: 4
56
56
  summary: Basic Pulp support for Foreman Smart-Proxy