splice 0.3 → 0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    splice (0.2)
+    splice (0.4)
 
 GEM
   remote: https://rubygems.org/

data/lib/execution_context.rb

@@ -2,6 +2,7 @@ require 'openssl'
 SEARCH_PATHS = ["local.dna","/tmp/ephemeral.dna", "/etc/system.dna"] #Search paths, in order of priority
 require 'erb'
 require 'yaml'
+require 'digest/sha1'
 
 module Splice
   include OpenSSL
@@ -11,28 +12,31 @@ module Splice
     def initialize(search_tmp = false)
       @settings = Hash.new
     
-      SEARCH_PATHS.each do |path|
-        is_not_tmp = true unless path == "/tmp/ephemeral.dna" and search_tmp == false
-      
-        if File.exists?(path) and is_not_tmp
+      SEARCH_PATHS.each do |path|      
+        if File.exists?(path)
           begin
-            dna_package = Marshal.load File.read(path)
+            delim = "!)@(#*$*$&%^)"
+            dna_package = File.read(path)
+            dna_package = dna_package.split(delim)
           rescue => e
-            puts "One or more dna files are invalid. Please check for corruption and try again."
+            puts "One or more dna files are invalid. Please check for corruption and try again.\n\n#{e.message}\n#{e.backtrace}"
             exit 1
           end
-          signature = dna_package[0]
+          
+          signature = Base64.decode64(dna_package[0])
           payload = dna_package[1]
           
           # First, we need to verify that the file
           # has not been tampered with
           
           begin
-            public_key = OpenSSL::PKey::RSA.new File.read("/etc/splice/bloodline.pem")
+            public_key = OpenSSL::PKey::RSA.new File.read("/etc/splice/bloodline")
+            throw "no bloodline" if public_key.nil?
           rescue => e
-            puts "ERROR: Invalid or no bloodline file installed. Please install the bloodline.pem file generated when you ran splice --master at /etc/splice/bloodline.pem"
+            puts "ERROR: Invalid or no bloodline file installed. Please install the bloodline file generated when you ran splice --master at /etc/splice/bloodline"
+            exit 14
           end
-          
+                    
           file_signed_correctly = public_key.verify(OpenSSL::Digest::SHA1.new,signature,payload)
           
           if !file_signed_correctly

data/lib/splice.rb

@@ -2,11 +2,13 @@ require "splice/version"
 require 'execution_context'
 require 'pp'
 require 'openssl'
+require 'base64'
+require 'digest/sha1'
 
 module Splice
   def parse_files
     context = ExecutionContext.new
-
+    
     if context.settings["splice"] and context.settings["splice"]["files"] and context.settings["splice"]["files"].count > 0
       context.settings["splice"]["files"].each {|p| context.parse(p); puts "Parsed and wrote file #{p}" }
     else
@@ -23,9 +25,10 @@ module Splice
     private_cert = private_key.to_pem
     public_cert = public_key.to_pem
     
-    if !Dir.exists?("/etc/splice_master/")
+    if !Dir.exists?("/etc/splice/master/")
       begin
-        Dir.mkdir("/etc/splice_master",0733)
+        Dir.mkdir("/etc/splice",0733) if !Dir.exists?("/etc/splice")
+        Dir.mkdir("/etc/splice/master/",0733)
       rescue => e
         puts "ERROR: could not write master key to disk. Check that you have permission to write to /etc/ and try again."
         exit 4
@@ -33,27 +36,27 @@ module Splice
     end
     
     begin
-      File.open("/etc/splice_master/splice.master",'w') {|f| f.write(private_key) }
-      File.open("bloodline.pem",'w') {|f| f.write(public_key) }
+      File.open("/etc/splice/master/splice.pem",'w') {|f| f.write(private_key) }
+      File.open("bloodline",'w') {|f| f.write(public_key) }
     rescue => e
       puts "ERROR: Could not write master key to disk."
       exit 2
     end
     
     puts "New master created"
-    puts "Bloodline file saved to './bloodline.pem'"
+    puts "Bloodline file saved to './bloodline'"
     exit 0
   end
   
   def sign_file(a_file)
     puts "Signing file #{a_file}"
     
-    if !File.exists?("/etc/splice_master/splice.master")
+    if !File.exists?("/etc/splice/master/splice.pem")
       puts "ERROR: No splice master key found. Run splice --master or import the correct key before you attempt to sign files."
       exit 1
     end
     
-    private_key = OpenSSL::PKey::RSA.new File.read('/etc/splice_master/splice.master')
+    private_key = OpenSSL::PKey::RSA.new File.read('/etc/splice/master/splice.pem')
     file_contents = File.read(a_file)
     sig = private_key.sign(OpenSSL::Digest::SHA1.new,file_contents)
     new_file_name = File.basename(a_file)
@@ -62,7 +65,8 @@ module Splice
     new_file_name = new_file_name.join(".")
     new_file_name += ".dna"
     
-    dna_payload = Marshal.dump [sig,file_contents]
+    delim = "!)@(#*$*$&%^)"
+    dna_payload = [Base64.encode64(sig),file_contents].join(delim)
     
     begin
       File.open(new_file_name,'w') { |f| f.write(dna_payload) }
@@ -72,6 +76,9 @@ module Splice
     end
     
     puts "Signed configuration file #{a_file} to #{new_file_name}"
+    puts "SHA1 Signatures:"
+    puts "Signature: " + Digest::SHA1.hexdigest(sig)
+    puts "Payload:   " + Digest::SHA1.hexdigest(file_contents)
     
     exit 0
   end

data/lib/splice/version.rb

@@ -1,3 +1,3 @@
 module Splice
-  VERSION = "0.3"
+  VERSION = "0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: splice
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-04 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies: []
 description: A simple way to manage Linux server configurations.
 email: