sshakery 0.0.5 → 0.0.6

data/Rakefile

@@ -3,6 +3,7 @@ require "bundler/gem_tasks"
 require 'rake/testtask'
 Rake::TestTask.new do |t|
   t.libs << 'lib/sshakery'
+  t.libs << 'test'
   t.test_files = FileList[
     'test/lib/*_test.rb',
     'test/lib/sshakery/*_test.rb'

data/changelog.md

@@ -0,0 +1,47 @@
+## 0.0.6 (Dec 19, 2012)
+
+Bugfixes:
+
+- fixed test_helper require that was broken in ruby 1.9.2
+
+Features:
+
+- Created this changelog
+
+- Added load_pubkey method to auth_keys class that restricts
+the attributes that can be set by a pubkey.
+
+- Reworked load_raw_line in auth_keys class to accept optional
+array of attributes to be set, ignoring all other attributes
+not listed.
+
+## 0.0.5 (Nov 9, 2012)
+
+Bugfixes:
+
+- fixed bug that prevented documentation generation by rubygems
+
+## 0.0.4 (Nov 8, 2012)
+
+Features:
+
+- Added additional unit tests and documentation
+
+## 0.0.3 (Nov 1, 2012)
+
+Features:
+
+- Added additional unit tests and documentation
+
+## 0.0.2 (Oct 30, 2012)
+
+Features:
+
+- Added unit tests
+- Added error class for auth_keys validation errors
+
+## 0.0.1 (Oct 24, 2012)
+
+Features:
+
+- Initial commit

data/lib/sshakery/auth_keys.rb

@@ -236,6 +236,7 @@ class AuthKeys
                 f.puts line
             end
         end
+        return true
     end
     
     ##
@@ -255,41 +256,68 @@ class AuthKeys
             instance_variable_set("@#{attr}", args.has_key?( attr ) ? args[attr] : nil )
         end
 
+        self.raw_line = args[:raw_pubkey] || args[:raw_line]
+
+        if args.has_key? :raw_pubkey
+            self.load_pubkey
+            return
+        end
+
         unless self.raw_line.nil? 
             self.load_raw_line
         end
     end
-    
+
+    ##
+    # Instantiate key based on pubkey file
+    # only set key_data,key_type and note attributes
+    def load_pubkey
+        #filter line data
+        load_raw_line([:key_data,:key_type,:note]) 
+        
+        # sanitize old raw line
+        self.raw_line = self.gen_raw_line
+    end
+
     ##
     # Instantiate key object based on contents of raw_line
-    def load_raw_line
+    def load_raw_line opts = OPTS_REGEX.keys
         self.raw_line.chomp!
-        OPTS_REGEX.each do |xfield,pattern|
-            field = "@#{xfield}"
-            m= self.raw_line.match pattern
-            next if m.nil?
-            #p "#{field} => #{m.inspect}" 
-            if BOOL_ATTRIBUTES.include? xfield
-                self.instance_variable_set(field, true)
-                next  
-            end
+        opts.each do |xfield|
+            pattern = OPTS_REGEX[xfield]
+            did_set = raw_setter xfield, pattern
+            #puts did_set
+        end
+    end
 
-            if STR_ATTRIBUTES.include? xfield 
-                self.instance_variable_set(field,  m[1])
-                next
-            end
+    ##
+    # set attribute (field) obtained from
+    # matching pattern in raw_line
+    def raw_setter xfield,pattern
+       field = "@#{xfield}"
+       m = self.raw_line.match pattern
+       return false if m.nil?
+       #p "#{field} => #{m.inspect}" 
+       if BOOL_ATTRIBUTES.include? xfield
+           self.instance_variable_set(field, true)
+           return true  
+       end
 
-            if ARR_STR_ATTRIBUTES.include? xfield 
-                self.instance_variable_set(field, m.to_a)
-                next
-            end
+       if STR_ATTRIBUTES.include? xfield 
+           self.instance_variable_set(field,  m[1])
+           return true
+       end
 
-            if SUB_STR_ATTRIBUTES.include? xfield 
-                self.instance_variable_set(field, m[1])
-                next
-            end 
+       if ARR_STR_ATTRIBUTES.include? xfield 
+           self.instance_variable_set(field, m.to_a)
+           return true
+       end
 
-        end
+       if SUB_STR_ATTRIBUTES.include? xfield 
+           self.instance_variable_set(field, m[1])
+           return true
+       end 
+       return false
     end
 
     ##

data/lib/sshakery/version.rb

@@ -1,4 +1,4 @@
 module Sshakery
   # Sshakery version
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/fixtures/sshakery_malicous_pubkey.txt

@@ -0,0 +1 @@
+command="fortune" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsBWq5F1n4FcZILZt42B6NthVrfGo0whFfSbyPuc/wfQcACpOy8EeAsCIGw0m+pDF8KlmDhYJhC/DGv4zXqk6yO+X3n5x+zfJY4AL1bu72kBnOuXbPhiDfmoBmcApbHDVJnzhRzd8sWv6qLd7bF+Dd malicious

data/test/lib/sshakery/auth_keys_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require 'test_helper'
 
 describe Sshakery::AuthKeys do
     # create a copy of test data to manipulate
@@ -29,7 +29,23 @@ describe Sshakery::AuthKeys do
         key.valid?.must_equal false
         key.errors.wont_be_empty
     end
-
+    
+    it "must safely load pubkey files" do
+        src = "#{$dir}/fixtures/sshakery_malicous_pubkey.txt" 
+        line = nil
+        File.open(src,'r'){|f|line=f.read}
+        key = @keys.new
+        key.raw_line = line
+        key.load_pubkey
+        key.key_type.must_equal 'ssh-rsa'
+        key.command.must_be_nil
+        key.note.must_equal 'malicious'
+        key.key_data.wont_be_empty
+        key.save.must_equal true
+        key.raw_line = line
+        key.load_raw_line
+        key.command.must_equal 'fortune'
+    end
     it "must not save when empty" do
         key=@keys.new
         key.save.must_equal false

data/test/lib/sshakery/fs_utils_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require 'test_helper'
 
 describe Sshakery::FsUtils do
     it "must lock for writes" do

data/test/lib/sshakery/version_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require 'test_helper'
 
 describe Sshakery do
     it "must be defined" do

data/test/lib/sshakery_test.rb

@@ -1,4 +1,5 @@
-require 'test/test_helper'
+require 'test_helper'
+#require File.dirname(__FILE__) + '/../test_helper'
 require 'tempfile'
 require 'fileutils'
 

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 
 require 'rubygems'
+require 'bundler/setup'
 require 'minitest/autorun'
 require 'minitest/pride'
 require File.expand_path('../../lib/sshakery.rb', __FILE__)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sshakery
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - hattwj
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-12 00:00:00 Z
+date: 2012-12-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -48,12 +48,14 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- changelog.md
 - lib/sshakery.rb
 - lib/sshakery/auth_keys.rb
 - lib/sshakery/errors.rb
 - lib/sshakery/fs_utils.rb
 - lib/sshakery/version.rb
 - sshakery.gemspec
+- test/fixtures/sshakery_malicous_pubkey.txt
 - test/fixtures/sshakery_nofail_fixture.txt
 - test/lib/sshakery/auth_keys_test.rb
 - test/lib/sshakery/fs_utils_test.rb
@@ -94,6 +96,7 @@ signing_key:
 specification_version: 3
 summary: SSHakery is a ruby gem for manipulating OpenSSH authorized_keys files. It features file locking, backups (todo), and atomic writes
 test_files: 
+- test/fixtures/sshakery_malicous_pubkey.txt
 - test/fixtures/sshakery_nofail_fixture.txt
 - test/lib/sshakery/auth_keys_test.rb
 - test/lib/sshakery/fs_utils_test.rb