foreman_scap_client 0.5.0 → 0.5.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 83d36963b277620c532c048595b0bc57f024918bcf0ee44073930bd0297b4b56
4
- data.tar.gz: 9acaf0257a5c1b18ab6f096a2f4025e8d5732ee4e7a45ef195853fe70ab9dd55
3
+ metadata.gz: 7697820fd581d3723fb127ccdf83de310d2f7112d7ceddc6884d7c6ccb56e155
4
+ data.tar.gz: 3562f518e5bb87437d248e4270ab8ab7fd8508e3bc6b3aac21aef3bfda4bf6b4
5
5
  SHA512:
6
- metadata.gz: 4d68a98ce43eb6ebae0f268a56c1ca87d2f84748e783c1bfda80ffbf170cf4443929b32543d9a30da85a6c554ff7b2952a275a90f98b521c63cae63ff562ebad
7
- data.tar.gz: fc864752d527e1118ed4f4a147921ea4b5dd5c49f995e298a10a9400561f7df2bbf2a88bb8137a9c9262b781d791aad4fea672b652a1692d63e075aa3199e777
6
+ metadata.gz: f0f2ee21010276e9ef25f3d623ada4afc9a8fcb3314dd4773e94fab4d75fc4d6aa3a076c4b54ede2de4b9afb9da3b286af55538b35641a89c635a49f222a308f
7
+ data.tar.gz: 80b63cabe6478142a34c0d365ba698774e23d8ee86ea21d6c204a700f8d590f3e8dfc05cc409338390ea527298582770b05ddae4b4b5e5d5cd587bd1887b6c75
@@ -28,11 +28,11 @@
28
28
  # leave empty for default profile
29
29
  :profile: ''
30
30
  # ds input file
31
- :content_path: '/usr/share/xml/scap/ssg/fedora/ssg-fedora-ds.xml'
31
+ :content_path: '/usr/share/xml/scap/ssg/content/ssg-fedora-ds.xml'
32
32
 
33
33
  2:
34
34
  :profile: 'xccdf_org.ssgproject.content_profile_common'
35
- :content_path: '/usr/share/xml/scap/ssg/fedora/ssg-fedora-ds.xml'
35
+ :content_path: '/usr/share/xml/scap/ssg/content/ssg-fedora-ds.xml'
36
36
 
37
37
  :oval:
38
38
  3:
@@ -36,7 +36,18 @@ module ForemanScapClient
36
36
  else
37
37
  ''
38
38
  end
39
- "oscap xccdf eval #{fetch_remote_resources} #{profile} #{tailoring_subcommand} --results-arf #{results_path} #{config[@policy_id][:content_path]}"
39
+ "oscap xccdf eval #{fetch_remote_resources} #{local_files_subcommand} #{profile} #{tailoring_subcommand} --results-arf #{results_path} #{config[@policy_id][:content_path]}"
40
+ end
41
+
42
+ def local_files_subcommand
43
+ supports_local_file_option? && !config[:fetch_remote_resources] ? '--local-files /root' : ''
44
+ end
45
+
46
+ def supports_local_file_option?
47
+ # OpenSCAP 1.3.6 and newer requires the `--local-files` option to use local copies of remote SDS components
48
+ version, _stderr, status = Open3.capture3('rpm', '-q', '--qf', '%{version}', 'openscap')
49
+ return false unless status.success?
50
+ Gem::Version.new(version) >= Gem::Version.new('1.3.6')
40
51
  end
41
52
 
42
53
  def tailoring_subcommand
@@ -1,3 +1,3 @@
1
1
  module ForemanScapClient
2
- VERSION = "0.5.0"
2
+ VERSION = "0.5.1"
3
3
  end
metadata CHANGED
@@ -1,31 +1,31 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_scap_client
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.0
4
+ version: 0.5.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Marek Hulan
8
8
  - Šimon Lukašík
9
9
  - Shlomi Zadok
10
- autorequire:
10
+ autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2021-05-18 00:00:00.000000000 Z
13
+ date: 2023-05-09 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: bundler
17
17
  requirement: !ruby/object:Gem::Requirement
18
18
  requirements:
19
- - - "~>"
19
+ - - ">="
20
20
  - !ruby/object:Gem::Version
21
- version: '1.7'
21
+ version: '0'
22
22
  type: :development
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
- - - "~>"
26
+ - - ">="
27
27
  - !ruby/object:Gem::Version
28
- version: '1.7'
28
+ version: '0'
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: rake
31
31
  requirement: !ruby/object:Gem::Requirement
@@ -60,11 +60,11 @@ files:
60
60
  - lib/foreman_scap_client/client.rb
61
61
  - lib/foreman_scap_client/oval_client.rb
62
62
  - lib/foreman_scap_client/version.rb
63
- homepage: https://github.com/openscap/foreman_scap_client
63
+ homepage: https://github.com/theforeman/foreman_scap_client
64
64
  licenses:
65
65
  - GPL-3.0
66
66
  metadata: {}
67
- post_install_message:
67
+ post_install_message:
68
68
  rdoc_options: []
69
69
  require_paths:
70
70
  - lib
@@ -80,8 +80,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
80
80
  version: '0'
81
81
  requirements:
82
82
  - bzip2
83
- rubygems_version: 3.1.2
84
- signing_key:
83
+ rubygems_version: 3.1.6
84
+ signing_key:
85
85
  specification_version: 4
86
86
  summary: Client script that runs openscap scan and uploads the result to foreman proxy
87
87
  test_files: []