omf_common 6.0.7.1 → 6.0.8.pre.1

data/test/omf_common/auth/certificate_store_spec.rb

@@ -16,43 +16,41 @@ describe OmfCommon::Auth::CertificateStore do
   end
 
   it "must register certificate instance" do
-    cert = OmfCommon::Auth::Certificate.create_from_x509(File.read "#{@private_folder}/1st_level.pem")
+    cert = OmfCommon::Auth::Certificate.create_from_pem(File.read "#{@private_folder}/1st_level.pem")
 
-    OmfCommon::Auth::CertificateStore.instance.register(cert, 'ca1')
-
-    OmfCommon::Auth::CertificateStore.instance.cert_for("ca1").must_equal cert
+    OmfCommon::Auth::CertificateStore.instance.register_trusted(cert)
+    OmfCommon::Auth::CertificateStore.instance.cert_for("/C=AU/ST=NSW/L=Sydney/O=NICTA/CN=ROOT CA/emailAddress= ").must_equal cert
   end
 
   it "must verify certificate aginst store" do
     # 2 level CAs
-    cert_1 = OmfCommon::Auth::Certificate.create_from_x509(File.read "#{@private_folder}/1st_level.pem")
-    cert_2 = OmfCommon::Auth::Certificate.create_from_x509(File.read "#{@private_folder}/2nd_level.pem")
-    cert_3 = OmfCommon::Auth::Certificate.create_from_x509(File.read "#{@private_folder}/3rd_level.pem")
-
-
-    # 1 level CA
-
-    cert_4 = OmfCommon::Auth::Certificate.create(nil, 'omf_ca', 'ca', 'omf')
-    key = OpenSSL::PKey::RSA.new(2048)
-    cert_5 = cert_4.create_for('my_add', 'bob', 'my_resource', 'omf', 365, key.public_key)
+    cert_1 = OmfCommon::Auth::Certificate.create_from_pem(File.read "#{@private_folder}/1st_level.pem")
+    cert_2 = OmfCommon::Auth::Certificate.create_from_pem(File.read "#{@private_folder}/2nd_level.pem")
+    cert_3 = OmfCommon::Auth::Certificate.create_from_pem(File.read "#{@private_folder}/3rd_level.pem")
 
     OmfCommon::Auth::CertificateStore.instance.verify(cert_2.to_x509).must_equal false
 
-    OmfCommon::Auth::CertificateStore.instance.register(cert_1)
+    OmfCommon::Auth::CertificateStore.instance.register_trusted(cert_1)
+
     OmfCommon::Auth::CertificateStore.instance.verify(cert_2.to_x509).must_equal true
     OmfCommon::Auth::CertificateStore.instance.verify(cert_3.to_x509).must_equal false
 
-    OmfCommon::Auth::CertificateStore.instance.register(cert_2)
+    OmfCommon::Auth::CertificateStore.instance.register_trusted(cert_2)
+
     OmfCommon::Auth::CertificateStore.instance.verify(cert_3.to_x509).must_equal true
-    OmfCommon::Auth::CertificateStore.instance.verify(cert_5.to_x509).must_equal false
 
-    OmfCommon::Auth::CertificateStore.instance.register(cert_4)
+    # 1 level CA
+    cert_4 = OmfCommon::Auth::Certificate.create_root
+    key = OpenSSL::PKey::RSA.new(2048)
+    cert_5 = cert_4.create_for_resource('my_add', :my_resource)
+
+    OmfCommon::Auth::CertificateStore.instance.verify(cert_4.to_x509).must_equal true
     OmfCommon::Auth::CertificateStore.instance.verify(cert_5.to_x509).must_equal true
   end
 
   it "wont die if registering same cert again" do
-    cert_1 = OmfCommon::Auth::Certificate.create_from_x509(File.read "#{@private_folder}/1st_level.pem")
-    OmfCommon::Auth::CertificateStore.instance.register(cert_1)
-    OmfCommon::Auth::CertificateStore.instance.register(cert_1)
+    cert_1 = OmfCommon::Auth::Certificate.create_from_pem(File.read "#{@private_folder}/1st_level.pem")
+    OmfCommon::Auth::CertificateStore.instance.register_trusted(cert_1)
+    OmfCommon::Auth::CertificateStore.instance.register_trusted(cert_1)
   end
 end

data/test/omf_common/comm/xmpp/communicator_spec.rb

@@ -4,6 +4,7 @@
 # By downloading or using this software you accept the terms and the liability disclaimer in the License.
 
 require 'test_helper'
+require 'monitor'
 require 'fixture/pubsub'
 
 require 'omf_common/comm/xmpp/communicator'
@@ -15,6 +16,9 @@ describe OmfCommon::Comm::XMPP::Communicator do
     @stream.expect(:send, true, [Blather::Stanza])
     @client.post_init @stream, Blather::JID.new('bob@example.com')
     @xmpp = OmfCommon::Comm::XMPP::Communicator.new
+    @xmpp.instance_eval do
+      @lock = Monitor.new
+    end
   end
 
   describe "when communicating to xmpp server (via mocking)" do
@@ -35,7 +39,6 @@ describe OmfCommon::Comm::XMPP::Communicator do
       Blather::Client.stub :new, @client do
         @stream.expect(:close_connection_after_writing, true)
         @xmpp.disconnect
-        @stream.verify
       end
     end
 

data/test/omf_common/message/xml/message_spec.rb

@@ -153,8 +153,8 @@ describe OmfCommon::Message::XML::Message do
         OmfCommon.stubs(:comm).returns(comm)
         comm.expects(:create_topic).returns(topic)
 
-        cert = OmfCommon::Auth::Certificate.create(nil, 'sa', 'auth')
-        bob_cert = cert.create_for('bob', 'bob', 'bob')
+        root_cert = OmfCommon::Auth::Certificate.create_root
+        bob_cert = root_cert.create_for_resource('bob', :bob)
 
         message = Message::XML::Message.create(:create,
                                                 { type: 'bob', p1: 'p1_value'},

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: omf_common
 version: !ruby/object:Gem::Version
-  version: 6.0.7.1
+  version: 6.0.8.pre.1
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: em-minitest-spec
   requirement: !ruby/object:Gem::Requirement
@@ -42,42 +42,42 @@ dependencies:
   name: simplecov
   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
   name: pry
   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
   name: mocha
   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
@@ -164,6 +164,48 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.7
+- !ruby/object:Gem::Dependency
+  name: json-jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: amqp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Common library of OMF, a generic framework for controlling and managing
   networking testbeds.
 email:
@@ -180,11 +222,13 @@ files:
 - Rakefile
 - bin/file_broadcaster.rb
 - bin/file_receiver.rb
+- bin/omf_cert.rb
 - bin/omf_keygen
 - bin/omf_monitor_topic
 - bin/omf_send_configure
 - bin/omf_send_create
 - bin/omf_send_request
+- example/auth_test.rb
 - example/engine_alt.rb
 - example/ls_app.yaml
 - example/viz/garage_monitor.rb
@@ -197,10 +241,13 @@ files:
 - lib/omf_common/auth.rb
 - lib/omf_common/auth/certificate.rb
 - lib/omf_common/auth/certificate_store.rb
+- lib/omf_common/auth/jwt_authenticator.rb
+- lib/omf_common/auth/pdp/test_pdp.rb
 - lib/omf_common/auth/ssh_pub_key_convert.rb
 - lib/omf_common/comm.rb
 - lib/omf_common/comm/amqp/amqp_communicator.rb
 - lib/omf_common/comm/amqp/amqp_file_transfer.rb
+- lib/omf_common/comm/amqp/amqp_mp.rb
 - lib/omf_common/comm/amqp/amqp_topic.rb
 - lib/omf_common/comm/local/local_communicator.rb
 - lib/omf_common/comm/local/local_topic.rb
@@ -229,6 +276,8 @@ files:
 - test/fixture/1st_level.pem
 - test/fixture/2nd_level.pem
 - test/fixture/3rd_level.pem
+- test/fixture/alice-cert.pem
+- test/fixture/alice-key.pem
 - test/fixture/omf_test.cert.pem
 - test/fixture/omf_test.pem
 - test/fixture/omf_test.pub
@@ -258,40 +307,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: omf_common
-rubygems_version: 2.0.6
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Common library of OMF
-test_files:
-- test/fixture/1st_level.pem
-- test/fixture/2nd_level.pem
-- test/fixture/3rd_level.pem
-- test/fixture/omf_test.cert.pem
-- test/fixture/omf_test.pem
-- test/fixture/omf_test.pub
-- test/fixture/omf_test.pub.pem
-- test/fixture/pubsub.rb
-- test/fixture/rc.pem
-- test/fixture/root.pem
-- test/omf_common/auth/certificate_spec.rb
-- test/omf_common/auth/certificate_store_spec.rb
-- test/omf_common/auth/ssh_pub_key_convert_spec.rb
-- test/omf_common/comm/topic_spec.rb
-- test/omf_common/comm/xmpp/communicator_spec.rb
-- test/omf_common/comm/xmpp/topic_spec.rb
-- test/omf_common/comm_spec.rb
-- test/omf_common/command_spec.rb
-- test/omf_common/core_ext/string_spec.rb
-- test/omf_common/message/xml/message_spec.rb
-- test/omf_common/message_spec.rb
-- test/test_helper.rb
+test_files: []