openscap 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bd3f590e5876554843cf78f32d92869dcfcad36
-  data.tar.gz: 3daf5f1520a8932045a9ba0f43916934d114b66c
+  metadata.gz: 074803ceb32fdfbe49ce4a347e166b33ae2737d7
+  data.tar.gz: 628f26e6b604746130063faf1eecec3aaba118c0
 SHA512:
-  metadata.gz: abef2aa76207a6ba403dd7ba219672970b3ac51616972d5113ac944f70912ecdb23a143ad90d7d6a699cced9b57c24bd6bf649632f3ec3b8d5a87e0be40faa39
-  data.tar.gz: d26290405c9d441ab477730d8e1de22bd95bf3d0a274cc9ad0ac794ca7c9104a570561e924ad5c166ca5b54b96d3f048c33fe0aedb5f9dfdcd6389c1924b62bf
+  metadata.gz: 6fdb0130e40eab32d48982683e0f01363936f8b5ad01d7be8ff7b41b86081529354ab7732f0dca12ea4c397547eb0deab5f080043c64176c534a651306568933
+  data.tar.gz: 4e90b1f1ea0fc9e905879125001357e06f1c8ff64c3684f437193193e44cafb3607d7719bed4a04a4730230631b188582808a9f1e1ca6003184d3ac48648fd17

data/Rakefile

@@ -1,6 +1,6 @@
 require 'bundler'
 
-Bundler::GemHelper.install_tasks
+Bundler::GemHelper.install_tasks :name => 'openscap'
 
 task :test do
   $LOAD_PATH.unshift('lib')

data/lib/openscap/ds/arf.rb

@@ -0,0 +1,46 @@
+#
+# Copyright (c) 2014 Red Hat Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+
+require 'openscap/source'
+require 'openscap/libc'
+
+module OpenSCAP
+  module DS
+    class Arf
+      def initialize(input_filename)
+        @source = OpenSCAP::Source.new(input_filename)
+        @session = OpenSCAP.ds_rds_session_new_from_source @source.raw
+        if @session.null?
+          OpenSCAP.raise!
+        end
+      end
+
+      def destroy
+        OpenSCAP.ds_rds_session_free(@session)
+        @session = nil
+        @source.destroy()
+      end
+
+      def html
+        html_p = OpenSCAP.ds_rds_session_get_html_report @session
+        OpenSCAP.raise! if OpenSCAP.error?
+        return nil if html_p.null?
+        html = html_p.read_string()
+        OpenSCAP::LibC.free html_p
+        return html
+      end
+    end
+  end
+
+  attach_function :ds_rds_session_new_from_source, [:pointer], :pointer
+  attach_function :ds_rds_session_free, [:pointer], :void
+  attach_function :ds_rds_session_get_html_report, [:pointer], :pointer
+end

data/lib/openscap/helper.rb

@@ -0,0 +1,18 @@
+#
+# Copyright (c) 2014 Red Hat Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+
+module OpenSCAP::Helper
+  def self.get_html_report_for_arf
+    # This is workaround function for the installation with
+    # old OpenSCAP without the oscap_source functionality
+    
+  end
+end

data/lib/openscap/libc.rb

@@ -0,0 +1,22 @@
+#
+# Copyright (c) 2014 Red Hat Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+
+require 'ffi'
+
+module OpenSCAP
+  module LibC
+    extend FFI::Library
+
+    ffi_lib FFI::Library::LIBC
+
+    attach_function :free, [:pointer], :void
+  end
+end

data/lib/openscap/source.rb

@@ -0,0 +1,34 @@
+#
+# Copyright (c) 2014 Red Hat Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+
+module OpenSCAP
+  class Source
+    def initialize(input_filename)
+      raise OpenSCAPError, "No filename specified!" unless input_filename
+      @s = OpenSCAP.oscap_source_new_from_file(input_filename)
+      if @s.null?
+        OpenSCAP.raise!
+      end
+    end
+
+    def raw
+      @s
+    end
+
+    def destroy
+      OpenSCAP.oscap_source_free(@s)
+      @s = nil
+    end
+  end
+
+  attach_function :oscap_source_new_from_file, [:string], :pointer
+  attach_function :oscap_source_free, [:pointer], :void
+end

data/lib/openscap/version.rb

@@ -0,0 +1,14 @@
+#
+# Copyright (c) 2014 Red Hat Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+
+module OpenSCAP
+  VERSION = "0.3.0"
+end

data/test/common/testcase.rb

@@ -13,16 +13,6 @@ require 'test/unit'
 
 module OpenSCAP
   class TestCase < Test::Unit::TestCase
-    class << self
-      def startup
-        OpenSCAP.oscap_init
-      end
-
-      def shutdown
-        OpenSCAP.oscap_cleanup
-      end
-    end
-
     def setup
       workdir = "test/output"
       if Dir.pwd.end_with? 'test/output'
@@ -32,12 +22,14 @@ module OpenSCAP
       Dir.mkdir workdir
       Dir.chdir workdir
       @s = nil
+      OpenSCAP.oscap_init
     end
 
     def cleanup
       @s.destroy if @s
       Dir.chdir "../.."
       OpenSCAP.raise! if OpenSCAP.error?
+      OpenSCAP.oscap_cleanup
     end
 
     def test_x

data/test/ds/arf_test.rb

@@ -0,0 +1,53 @@
+#
+# Copyright (c) 2014 Red Hat Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+
+require 'openscap'
+require 'openscap/ds/arf'
+require 'common/testcase'
+
+class TestSession < OpenSCAP::TestCase
+  def test_arf_new_nil
+    msg = nil
+    begin
+      s = OpenSCAP::DS::Arf.new(nil)
+      assert false
+    rescue OpenSCAP::OpenSCAPError => e
+      msg = e.to_s
+    end
+    assert msg.start_with?("No filename specified!"), "Message was: " + msg
+  end
+
+  def test_arf_new_wrong_format
+    msg = nil
+    begin
+      s = OpenSCAP::DS::Arf.new("data/xccdf.xml")
+      assert false
+    rescue OpenSCAP::OpenSCAPError => e
+      msg = e.to_s
+    end
+    assert msg.start_with?('failed to load external entity "data/xccdf.xml"'), "Message was: " + msg
+    assert msg.include?('Could not create Result DataStream session: File is not Result DataStream.'),
+        "Message was: " + msg
+  end
+
+  def test_create_arf_and_get_html
+    @s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
+    @s.load(:component_id => "scap_org.open-scap_cref_second-xccdf.xml")
+    @s.profile = "xccdf_moc.elpmaxe.www_profile_1"
+    @s.evaluate
+    @s.export_results(:rds_file => "report.rds.xml")
+    arf = OpenSCAP::DS::Arf.new("report.rds.xml")
+    html = arf.html
+    assert html.start_with?('<!DOCTYPE html><html'), "DOCTYPE missing."
+    assert html.include?('OpenSCAP')
+    assert html.include?('Compliance and Scoring')
+  end
+end

data/test/source_test.rb

@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2014 Red Hat Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+
+require 'openscap'
+require 'openscap/source'
+require 'common/testcase'
+
+class TestSource < OpenSCAP::TestCase
+  def test_source_new_nil
+    msg = nil
+    begin
+      s = OpenSCAP::Source.new(nil)
+      assert false
+    rescue OpenSCAP::OpenSCAPError => e
+      msg = e.to_s
+    end
+    assert msg.start_with?("No filename specified!"), "Message was: " + msg
+  end
+
+  def test_source_new_ok
+    s = OpenSCAP::Source.new("data/xccdf.xml")
+    s.destroy
+  end
+end

data/test/xccdf/session_test.rb

@@ -21,7 +21,8 @@ class TestSession < OpenSCAP::TestCase
     rescue OpenSCAP::OpenSCAPError => e
       msg = e.to_s
     end
-    assert msg.start_with?("Unable to open file: ''"), "Message was: " + msg
+    assert msg.start_with?('failed to load external entity ""'), "Message was: " + msg
+    assert msg.include?('Unable to parse XML at:'), "Message was: " + msg
   end
 
   def test_session_new_nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openscap
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
-- Šimon Lukašík
+- Simon Lukasik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.0.9
 description: |-
   A FFI wrapper around the OpenSCAP library.
     Currently it provides only subset of libopenscap functionality.
@@ -46,22 +46,26 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- COPYING
-- README.md
-- Rakefile
-- VERSION
 - lib/openscap.rb
-- lib/openscap/exceptions.rb
-- lib/openscap/openscap.rb
+- lib/openscap/ds/arf.rb
+- lib/openscap/libc.rb
 - lib/openscap/xccdf/session.rb
-- openscap.gemspec
-- test/common/testcase.rb
+- lib/openscap/helper.rb
+- lib/openscap/source.rb
+- lib/openscap/openscap.rb
+- lib/openscap/version.rb
+- lib/openscap/exceptions.rb
+- test/openscap_test.rb
+- test/ds/arf_test.rb
 - test/data/sds-complex.xml
 - test/data/xccdf.xml
-- test/openscap_test.rb
-- test/xccdf/session_ds_test.rb
 - test/xccdf/session_test.rb
+- test/xccdf/session_ds_test.rb
+- test/common/testcase.rb
+- test/source_test.rb
+- COPYING
+- README.md
+- Rakefile
 homepage: https://github.com/OpenSCAP/ruby-openscap
 licenses:
 - GPL-2.0

data/.gitignore

@@ -1,4 +0,0 @@
-.buildpath
-.project
-.settings
-test/output

data/VERSION

@@ -1 +0,0 @@
-0.2.0

data/openscap.gemspec

@@ -1,24 +0,0 @@
-# -*- encoding: utf-8 -*-
-require 'date'
-
-GEMSPEC = Gem::Specification.new do |gem|
-  gem.name = "openscap"
-  gem.version = File.open('VERSION').readline.chomp
-  gem.date = Date.today.to_s
-  gem.platform = Gem::Platform::RUBY
-
-  gem.author = "Šimon Lukašík"
-  gem.email = "isimluk@fedoraproject.org"
-  gem.homepage = "https://github.com/OpenSCAP/ruby-openscap"
-  gem.license = "GPL-2.0"
-
-  gem.summary = "A FFI wrapper around the OpenSCAP library"
-  gem.description = "A FFI wrapper around the OpenSCAP library.
-  Currently it provides only subset of libopenscap functionality."
-
-  gem.add_development_dependency "bundler", ">=1.0.0"
-  gem.add_runtime_dependency "ffi", ">= 1.4.0"
-
-  gem.files = `git ls-files`.split("\n")
-  gem.require_path = 'lib'
-end