nitos_testbed_rc 1.0.0.pre.5 → 1.0.0.pre.6

data/README.md

@@ -35,7 +35,8 @@ Use omf_cert.rb script to generate the following certificates and place them on
     % mkdir /root/.omf/trusted_roots
     % cd /root/.omf
 
-Create a root certificate (change DOMAIN)
+Create a root certificate (change DOMAIN).
+Importand!!! If you already have a root certificate (probably created while installing omf_sfa) DO NOT create this certificate again and use the old one instead.
 
     % ruby omf_cert.rb --email root@DOMAIN -o /root/.omf/trusted_roots/root.pem --duration 5000000 create_root
 
@@ -49,7 +50,7 @@ Create a certificate for cm_proxy of NTRC (change DOMAIN, XMPP_DOMAIN and if you
 
 Create a certificate for frisbee_proxy of NTRC (change DOMAIN, XMPP_DOMAIN and if you wish the output file names).
 
-    % ruby omf_cert.rb -o cm_factory.pem --email cm_factory@DOMAIN --resource-type cm_factory --resource-id xmpp://cm_factory@XMPP_DOMAIN --root /root/.omf/trusted_roots/root.pem --duration 50000000 create_resource
+    % ruby omf_cert.rb -o frisbee_factory.pem --email frisbee_factory@DOMAIN --resource-type frisbee_factory --resource-id xmpp://frisbee_factory@XMPP_DOMAIN --root /root/.omf/trusted_roots/root.pem --duration 50000000 create_resource
 
 Create a certificate for the omf6 script, this certificate is inside the directory '~/.omf', every user of the testbed should have his own certificate in order to use omf6 script (change DOMAIN, USERNAME and if you wish the output file names).
 
@@ -161,7 +162,21 @@ Change configuration file '~/.omf/etc/user_proxy_conf.yaml', which is related to
 Run proxies
 -----------
 
-You can execute all proxies with one command:
+To start/stop/restart the upstart service of nitos_testbed_rc use:
+
+    % start ntrc 
+    % stop ntrc
+    % restart ntrc
+
+Starting ntrc as an upstart will generate the following log files:
+
+- user rc: /var/log/upstart/ntrc_user.log
+
+- frisbee rc: /var/log/upstart/ntrc_frisbee.log
+
+- cm rc: /var/log/upstart/ntrc_cm.log
+
+Alternatively (mostly for debugging reasons) you can execute all proxies with one command:
 
     % run_proxies
 

data/bin/cm_proxy

@@ -77,14 +77,22 @@ class CmPDP
         return msg
       end
 
+      if acc == 'root'
+        debug "AUTH PASSED"
+        msg.properties.state.node = node[:resources].first
+        return msg
+      end
+
       node = node[:resources].first
       lease = nil
-      node[:leases].each do |l|
-        l = l[:lease]
-        next if l[:account][:name] != acc
-        if Time.parse(l[:valid_from]) <= Time.now && Time.parse(l[:valid_until]) >= Time.now
-          lease = l
-          break
+      unless node[:leases].nil?
+        node[:leases].each do |l|
+          l = l[:lease]
+          next if l[:account][:name] != acc
+          if Time.parse(l[:valid_from]) <= Time.now && Time.parse(l[:valid_until]) >= Time.now
+            lease = l
+            break
+          end
         end
       end
 

data/bin/frisbee_proxy

@@ -81,14 +81,22 @@ class FrisbeePDP
           return msg
         end
 
+        if acc == 'root'
+          debug "AUTH PASSED"
+          msg.properties.state.node = node
+          return msg
+        end
+
         node = node[:resources].first
         lease = nil
-        node[:leases].each do |l|
-          l = l[:lease]
-          next if l[:account][:name] != acc
-          if Time.parse(l[:valid_from]) <= Time.now && Time.parse(l[:valid_until]) >= Time.now
-            lease = l
-            break
+        unless node[:leases].nil?
+          node[:leases].each do |l|
+            l = l[:lease]
+            next if l[:account][:name] != acc
+            if Time.parse(l[:valid_from]) <= Time.now && Time.parse(l[:valid_until]) >= Time.now
+              lease = l
+              break
+            end
           end
         end
 

data/lib/nitos_testbed_rc/user.rb

@@ -169,8 +169,8 @@ module OmfRc::ResourceProxy::User
           }, :ALL)
         else #if msg!=0 then the application failed to complete
           path = "/home/#{res.property.username}/.ssh/"
-          if File.exists?("#{path}/pub_key.pem") && File.exists?("#{path}/key.pem")#if keys exist just read the pub_key for the inform
-            file = File.open("#{path}/pub_key.pem", "rb")
+          if File.exists?("#{path}/id_rsa.pub") && File.exists?("#{path}/id_rsa")#if keys exist just read the pub_key for the inform
+            file = File.open("#{path}/id_rsa.pub", "rb")
             pub_key = file.read
             file.close
           else #if keys do not exist create them and then inform
@@ -183,7 +183,9 @@ module OmfRc::ResourceProxy::User
               FileUtils.mkdir_p(path)
             end
 
-            File.write("#{path}/id_rsa.pub", pub_key.to_pem)
+            pub_key = pub_key.to_pem
+
+            File.write("#{path}/id_rsa.pub", pub_key)
             File.write("#{path}/id_rsa", key.to_pem)
           end
           res.inform(:status, {
@@ -193,7 +195,7 @@ module OmfRc::ResourceProxy::User
             exit_code: msg,
             msg: msg,
             uid: res.uid, # do we really need this? Should be identical to 'src'
-            pub_key: pub_key.to_pem
+            pub_key: pub_key
           }, :ALL)
         end
       else

data/lib/version.rb

@@ -1,5 +1,5 @@
 module NITOS
   module TestbedRc
-    VERSION = "1.0.0.pre.5"
+    VERSION = "1.0.0.pre.6"
   end
 end

data/nitos_testbed_rc.gemspec

@@ -22,5 +22,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "omf_common", "~> 6.1.3"
   s.add_runtime_dependency "omf_rc", "~> 6.1.3"
   s.add_runtime_dependency "nokogiri", "~> 1.6.0"
+  s.add_runtime_dependency "progress_bar", "~> 1.0.3"
   s.add_development_dependency "net-ssh", "~> 2.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nitos_testbed_rc
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.5
+  version: 1.0.0.pre.6
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omf_common
@@ -59,6 +59,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: progress_bar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement