slosilo 0.0.0 → 0.1.2

data/spec/key_spec.rb

@@ -1,129 +1,51 @@
 require 'spec_helper'
 
-require 'active_support'
-require 'active_support/core_ext/numeric/time'
-
 describe Slosilo::Key do
   include_context "with example key"
   
   subject { key }
-
-  describe '#to_der' do
-    subject { super().to_der }
-    it { is_expected.to eq(rsa.to_der) }
-  end
-
-  describe '#to_s' do
-    subject { super().to_s }
-    it { is_expected.to eq(rsa.public_key.to_pem) }
-  end
-
-  describe '#fingerprint' do
-    subject { super().fingerprint }
-    it { is_expected.to eq(key_fingerprint) }
-  end
-  it { is_expected.to be_private }
-
-  context "with identical key" do
-    let(:other) { Slosilo::Key.new rsa.to_der }
-    it "is equal" do
-      expect(subject).to eq(other)
-    end
-
-    it "is eql?" do
-      expect(subject.eql?(other)).to be_truthy
-    end
-
-    it "has equal hash" do
-      expect(subject.hash).to eq(other.hash)
-    end
-  end
+  its(:to_der) { should == rsa.to_der }
+  its(:to_s) { should == rsa.public_key.to_pem }
   
-  context "with a different key" do
-    let(:other) { Slosilo::Key.new another_rsa }
-    it "is not equal" do
-      expect(subject).not_to eq(other)
-    end
-
-    it "is not eql?" do
-      expect(subject.eql?(other)).not_to be_truthy
-    end
-
-    it "has different hash" do
-      expect(subject.hash).not_to eq(other.hash)
-    end
-  end
-
-  describe '#public' do
-    it "returns a key with just the public half" do
-      pkey = subject.public
-      expect(pkey).to be_a(Slosilo::Key)
-      expect(pkey).to_not be_private
-      expect(pkey.key).to_not be_private
-      expect(pkey.to_der).to eq(rsa.public_key.to_der)
-    end
-  end
-
   let(:plaintext) { 'quick brown fox jumped over the lazy dog' }
   describe '#encrypt' do
     it "generates a symmetric encryption key and encrypts the plaintext with the public key" do
       ctxt, skey = subject.encrypt plaintext
       pskey = rsa.private_decrypt skey
-      expect(Slosilo::Symmetric.new.decrypt(ctxt, key: pskey)).to eq(plaintext)
-    end
-  end
-
-  describe '#encrypt_message' do
-    it "#encrypts a message and then returns the result as a single string" do
-      expect(subject).to receive(:encrypt).with(plaintext).and_return ['fake ciphertext', 'fake key']
-      expect(subject.encrypt_message(plaintext)).to eq('fake keyfake ciphertext')
+      Slosilo::Symmetric.new.decrypt(ctxt, key: pskey).should == plaintext
     end
   end
   
-  let(:ciphertext){ "G\xAD^\x17\x11\xBBQ9-b\x14\xF6\x92#Q0x\xF4\xAD\x1A\x92\xC3VZW\x89\x8E\x8Fg\x93\x05B\xF8\xD6O\xCFGCTp\b~\x916\xA3\x9AN\x8D\x961\x1F\xA3mSf&\xAD\xA77/]z\xA89\x01\xA7\xA9\x92\f".force_encoding('ASCII-8BIT') }
-  let(:skey){  "\x82\x93\xFAA\xA6wQA\xE1\xB5\xA6b\x8C.\xCF#I\x86I\x83u\x99\rTA\xEF\xC4\x91\xC5)-\xEBQ\xB1\xC0\xC6\xFF\x90L\xFE\x1E\x15\x81\x12\x16\xDD:A\xC5d\xE1B\xD2f@\xB8o\xB7+N\xB7\n\x92\xDC\x9E\xE3\x83\xB8>h\a\xC7\xCC\xCF\xD0t\x06\x8B\xA8\xBF\xEFe\xA4{\x88\f\xDD\roF\xEB.\xDA\xBF\x9D_0>\xF03c'\x1F!)*-\x19\x97\xAC\xD2\x1F(,6h\a\x93\xDB\x8E\x97\xF9\x1A\x11\x84\x11t\xD9\xB2\x85\xB0\x12\x7F\x03\x00O\x8F\xBE#\xFFb\xA5w\xF3g\xCF\xB4\xF2\xB7\xDBiA=\xA8\xFD1\xEC\xBF\xD7\x8E\xB6W>\x03\xACNBa\xBF\xFD\xC6\xB32\x8C\xE2\xF1\x87\x9C\xAE6\xD1\x12\vkl\xBB\xA0\xED\x9A\xEE6\xF2\xD9\xB4LL\xE2h/u_\xA1i=\x11x\x8DGha\x8EG\b+\x84[\x87\x8E\x01\x0E\xA5\xB0\x9F\xE9vSl\x18\xF3\xEA\xF4NH\xA8\xF1\x81\xBB\x98\x01\xE8p]\x18\x11f\xA3K\xA87c\xBB\x13X~K\xA2".force_encoding('ASCII-8BIT') }
   describe '#decrypt' do
+    let(:ciphertext) { "\x8B\xE6\xEC\x8C\xAB\xA4\xC0\x8EF\"\x0F\xD5Yh\xA1\aq\x00\xF5\xAC\xAB\v\a\xEC\xF6G\xA6\e\x14N\xFF\x11\x98\xDA\x19\xB5\x8994_:\xA0\xF8\x06l\xDC\x9B\xB1\xE8z\x83\xCC\x9A\x02E\x02tOhu\x92F]h" }
+    let(:skey) { "\x15\xFF\xD4>\x9C\xF4\x0F\xB6\x04C\x18\xC1\x96\xC3\xE0T\xA3\xF5\xE8\x17\xA6\xE0\x86~rrw\xC3\xDF\x11)$\x9B\r@\x0E\xE4Zv\rw-\xFC\x1C\x84\x17\xBD\xDB\x12u\xCD\r\xFEo\xD5\xC8[\x8FEA\\\xA9\xA2F#\x8BH -\xFA\xF7\xA9\xEBf\x97\xAAT}\x8E*\xC0r\x944p\xD0\x9A\xE7\xBD\a;O\f\xEF\xE4B.y\xFA\xB4e@O\xBB\x15>y\xC9\t=\x01\xE1J\xF3X\xA9\x9E3\x04^H\x1F\xFF\x19C\x93ve)@\xF7\t_\xCF\xDE\xF1\xB7]\x83lL\xB8%A\x93p{\xE9Y\xBAu\xCE\x99T\xDC\xDF\xE7\x0FD%\xB9AXb\x1CW\x94$P\xBB\xE1g\xDEE\t\xC4\x92\x9E\xFEt\xDF\xD0\xEA\x03\xC4\x12\xA9\x02~u\xF4\x92 ;\xA0\xCE.\b+)\x05\xEDo\xA5cF\xF8\x12\xD7F\x97\xE44\xBF\xF1@\xA5\xC5\xA8\xE5\a\xE8ra<\x04\xB5\xA2\f\t\xF7T\x97\e\xF5(^\xAB\xA5%84\x10\xD1\x13e<\xCA/\xBF}%\xF6\xB1%\xB2" }
+    
     it "decrypts the symmetric key and then uses it to decrypt the ciphertext" do
-      expect(subject.decrypt(ciphertext, skey)).to eq(plaintext)
+      subject.decrypt(ciphertext, skey).should == plaintext
     end
   end
   
-  describe '#decrypt_message' do
-    it "splits the message into key and rest, then #decrypts it" do
-      expect(subject).to receive(:decrypt).with(ciphertext, skey).and_return plaintext
-      expect(subject.decrypt_message(skey + ciphertext)).to eq(plaintext)
-    end
-  end
-
   describe '#initialize' do
     context "when no argument given" do
       subject { Slosilo::Key.new }
       let (:rsa) { double "key" }
       it "generates a new key pair" do
-        expect(OpenSSL::PKey::RSA).to receive(:new).with(2048).and_return(rsa)
-        expect(subject.key).to eq(rsa)
+        OpenSSL::PKey::RSA.should_receive(:new).with(2048).and_return(rsa)
+        subject.key.should == rsa
       end
     end
     context "when given an armored key" do
       subject { Slosilo::Key.new rsa.to_der }
-
-      describe '#to_der' do
-        subject { super().to_der }
-        it { is_expected.to eq(rsa.to_der) }
-      end
+      its(:to_der) { should == rsa.to_der }
     end
     context "when given a key instance" do
       subject { Slosilo::Key.new rsa }
-
-      describe '#to_der' do
-        subject { super().to_der }
-        it { is_expected.to eq(rsa.to_der) }
-      end
+      its(:to_der) { should == rsa.to_der }
     end
     context "when given something else" do
       subject { Slosilo::Key.new "foo" }
       it "fails early" do
-        expect { subject }.to raise_error ArgumentError
+        expect { subject }.to raise_error
       end
     end
   end
@@ -131,34 +53,21 @@ describe Slosilo::Key do
   describe "#sign" do
     context "when given a hash" do
       it "converts to a sorted array and signs that" do
-        expect(key).to receive(:sign_string).with '[["a",3],["b",42]]'
+        key.should_receive(:sign_string).with '[["a",3],["b",42]]'
         key.sign b: 42, a: 3
       end
     end
     context "when given an array" do
       it "signs a JSON representation instead" do
-        expect(key).to receive(:sign_string).with '[2,[42,2]]'
+        key.should_receive(:sign_string).with '[2,[42,2]]'
         key.sign [2, [42, 2]]
       end
     end
     context "when given a string" do
-      let(:expected_signature) { "d[\xA4\x00\x02\xC5\x17\xF5P\x1AD\x91\xF9\xC1\x00P\x0EG\x14,IN\xDE\x17\xE1\xA2a\xCC\xABR\x99'\xB0A\xF5~\x93M/\x95-B\xB1\xB6\x92!\x1E\xEA\x9C\v\xC2O\xA8\x91\x1C\xF9\x11\x92a\xBFxm-\x93\x9C\xBBoM\x92%\xA9\xD06$\xC1\xBC.`\xF8\x03J\x16\xE1\xB0c\xDD\xBF\xB0\xAA\xD7\xD4\xF4\xFC\e*\xAB\x13A%-\xD3\t\xA5R\x18\x01let6\xC8\xE9\"\x7F6O\xC7p\x82\xAB\x04J(IY\xAA]b\xA4'\xD6\x873`\xAB\x13\x95g\x9C\x17\xCAB\xF8\xB9\x85B:^\xC5XY^\x03\xEA\xB6V\x17b2\xCA\xF5\xD6\xD4\xD2\xE3u\x11\xECQ\x0Fb\x14\xE2\x04\xE1<a\xC5\x01eW-\x15\x01X\x81K\x1A\xE5A\vVj\xBF\xFC\xFE#\xD5\x93y\x16\xDC\xB4\x8C\xF0\x02Y\xA8\x87i\x01qC\xA7#\xE8\f\xA5\xF0c\xDEJ\xB0\xDB BJ\x87\xA4\xB0\x92\x80\x03\x95\xEE\xE9\xB8K\xC0\xE3JbE-\xD4\xCBP\\\x13S\"\eZ\xE1\x93\xFDa pinch of salt".force_encoding("ASCII-8BIT") }
+      let(:expected_signature) { "d[\xA4\x00\x02\xC5\x17\xF5P\x1AD\x91\xF9\xC1\x00P\x0EG\x14,IN\xDE\x17\xE1\xA2a\xCC\xABR\x99'\xB0A\xF5~\x93M/\x95-B\xB1\xB6\x92!\x1E\xEA\x9C\v\xC2O\xA8\x91\x1C\xF9\x11\x92a\xBFxm-\x93\x9C\xBBoM\x92%\xA9\xD06$\xC1\xBC.`\xF8\x03J\x16\xE1\xB0c\xDD\xBF\xB0\xAA\xD7\xD4\xF4\xFC\e*\xAB\x13A%-\xD3\t\xA5R\x18\x01let6\xC8\xE9\"\x7F6O\xC7p\x82\xAB\x04J(IY\xAA]b\xA4'\xD6\x873`\xAB\x13\x95g\x9C\x17\xCAB\xF8\xB9\x85B:^\xC5XY^\x03\xEA\xB6V\x17b2\xCA\xF5\xD6\xD4\xD2\xE3u\x11\xECQ\x0Fb\x14\xE2\x04\xE1<a\xC5\x01eW-\x15\x01X\x81K\x1A\xE5A\vVj\xBF\xFC\xFE#\xD5\x93y\x16\xDC\xB4\x8C\xF0\x02Y\xA8\x87i\x01qC\xA7#\xE8\f\xA5\xF0c\xDEJ\xB0\xDB BJ\x87\xA4\xB0\x92\x80\x03\x95\xEE\xE9\xB8K\xC0\xE3JbE-\xD4\xCBP\\\x13S\"\eZ\xE1\x93\xFDa pinch of salt" }
       it "signs it" do
-        allow(key).to receive_messages shake_salt: 'a pinch of salt'
-        expect(key.sign("this sentence is not this sentence")).to eq(expected_signature)
-      end
-    end
-
-    context "when given a Hash containing non-ascii characters" do
-      let(:unicode){ "adèle.dupuis" }
-      let(:encoded){
-        unicode.dup.tap{|s| s.force_encoding Encoding::ASCII_8BIT}
-      }
-      let(:hash){ {"data" => unicode} }
-
-      it "converts the value to raw bytes before signing it" do
-        expect(key).to receive(:sign_string).with("[[\"data\",\"#{encoded}\"]]").and_call_original
-        key.sign hash
+        key.stub salt: 'a pinch of salt'
+        key.sign("this sentence is not this sentence").should == expected_signature
       end
     end
   end
@@ -169,90 +78,38 @@ describe Slosilo::Key do
     let(:token_to_sign) { { "data" => data, "timestamp" => "2012-01-01 01:01:01 UTC" } }
     let(:signature) { "signature" }
     let(:salt) { 'a pinch of salt' }
-    let(:expected_signature) { Base64::urlsafe_encode64 "\xB0\xCE{\x9FP\xEDV\x9C\xE7b\x8B[\xFAil\x87^\x96\x17Z\x97\x1D\xC2?B\x96\x9C\x8Ep-\xDF_\x8F\xC21\xD9^\xBC\n\x16\x04\x8DJ\xF6\xAF-\xEC\xAD\x03\xF9\xEE:\xDF\xB5\x8F\xF9\xF6\x81m\xAB\x9C\xAB1\x1E\x837\x8C\xFB\xA8P\xA8<\xEA\x1Dx\xCEd\xED\x84f\xA7\xB5t`\x96\xCC\x0F\xA9t\x8B\x9Fo\xBF\x92K\xFA\xFD\xC5?\x8F\xC68t\xBC\x9F\xDE\n$\xCA\xD2\x8F\x96\x0EtX2\x8Cl\x1E\x8Aa\r\x8D\xCAi\x86\x1A\xBD\x1D\xF7\xBC\x8561j\x91YlO\xFA(\x98\x10iq\xCC\xAF\x9BV\xC6\v\xBC\x10Xm\xCD\xFE\xAD=\xAA\x95,\xB4\xF7\xE8W\xB8\x83;\x81\x88\xE6\x01\xBA\xA5F\x91\x17\f\xCE\x80\x8E\v\x83\x9D<\x0E\x83\xF6\x8D\x03\xC0\xE8A\xD7\x90i\x1D\x030VA\x906D\x10\xA0\xDE\x12\xEF\x06M\xD8\x8B\xA9W\xC8\x9DTc\x8AJ\xA4\xC0\xD3!\xFA\x14\x89\xD1p\xB4J7\xA5\x04\xC2l\xDC8<\x04Y\xD8\xA4\xFB[\x89\xB1\xEC\xDA\xB8\xD7\xEA\x03Ja pinch of salt".force_encoding("ASCII-8BIT") }
-    let(:expected_token) { token_to_sign.merge "signature" => expected_signature, "key" => key_fingerprint }
+    let(:expected_signature) { Base64::urlsafe_encode64 "\xB0\xCE{\x9FP\xEDV\x9C\xE7b\x8B[\xFAil\x87^\x96\x17Z\x97\x1D\xC2?B\x96\x9C\x8Ep-\xDF_\x8F\xC21\xD9^\xBC\n\x16\x04\x8DJ\xF6\xAF-\xEC\xAD\x03\xF9\xEE:\xDF\xB5\x8F\xF9\xF6\x81m\xAB\x9C\xAB1\x1E\x837\x8C\xFB\xA8P\xA8<\xEA\x1Dx\xCEd\xED\x84f\xA7\xB5t`\x96\xCC\x0F\xA9t\x8B\x9Fo\xBF\x92K\xFA\xFD\xC5?\x8F\xC68t\xBC\x9F\xDE\n$\xCA\xD2\x8F\x96\x0EtX2\x8Cl\x1E\x8Aa\r\x8D\xCAi\x86\x1A\xBD\x1D\xF7\xBC\x8561j\x91YlO\xFA(\x98\x10iq\xCC\xAF\x9BV\xC6\v\xBC\x10Xm\xCD\xFE\xAD=\xAA\x95,\xB4\xF7\xE8W\xB8\x83;\x81\x88\xE6\x01\xBA\xA5F\x91\x17\f\xCE\x80\x8E\v\x83\x9D<\x0E\x83\xF6\x8D\x03\xC0\xE8A\xD7\x90i\x1D\x030VA\x906D\x10\xA0\xDE\x12\xEF\x06M\xD8\x8B\xA9W\xC8\x9DTc\x8AJ\xA4\xC0\xD3!\xFA\x14\x89\xD1p\xB4J7\xA5\x04\xC2l\xDC8<\x04Y\xD8\xA4\xFB[\x89\xB1\xEC\xDA\xB8\xD7\xEA\x03Ja pinch of salt" }
+    let(:expected_token) { { "data" => data, "timestamp" => "2012-01-01 01:01:01 UTC", "signature" => expected_signature } }
     before do
-      allow(key).to receive_messages shake_salt: salt
-      allow(Time).to receive_messages new: time
+      key.stub salt: salt
+      Time.stub new: time
     end
     subject { key.signed_token data }
-    it { is_expected.to eq(expected_token) }
-  end
-
-  describe "#validate_jwt" do
-    let(:token) do
-      instance_double Slosilo::JWT,
-          header: { 'alg' => 'conjur.org/slosilo/v2' },
-          claims: { 'iat' => Time.now.to_i },
-          string_to_sign: double("string to sign"),
-          signature: double("signature")
-    end
-
-    before do
-      allow(key).to receive(:verify_signature).with(token.string_to_sign, token.signature) { true }
-    end
-
-    it "verifies the signature" do
-      expect { key.validate_jwt token }.not_to raise_error
-    end
-
-    it "rejects unknown algorithm" do
-      token.header['alg'] = 'HS256' # we're not supporting standard algorithms
-      expect { key.validate_jwt token }.to raise_error /algorithm/
-    end
-
-    it "rejects bad signature" do
-      allow(key).to receive(:verify_signature).with(token.string_to_sign, token.signature) { false }
-      expect { key.validate_jwt token }.to raise_error /signature/
-    end
-
-    it "rejects expired token" do
-      token.claims['exp'] = 1.hour.ago.to_i
-      expect { key.validate_jwt token }.to raise_error /expired/
-    end
-
-    it "accepts unexpired token with implicit expiration" do
-      token.claims['iat'] = 5.minutes.ago
-      expect { key.validate_jwt token }.to_not raise_error
-    end
-
-    it "rejects token expired with implicit expiration" do
-      token.claims['iat'] = 10.minutes.ago.to_i
-      expect { key.validate_jwt token }.to raise_error /expired/
-    end
+    it { should == expected_token }
   end
-
+  
   describe "#token_valid?" do
     let(:data) { { "foo" => :bar } }
-    let(:signature) { Base64::urlsafe_encode64 "\xB0\xCE{\x9FP\xEDV\x9C\xE7b\x8B[\xFAil\x87^\x96\x17Z\x97\x1D\xC2?B\x96\x9C\x8Ep-\xDF_\x8F\xC21\xD9^\xBC\n\x16\x04\x8DJ\xF6\xAF-\xEC\xAD\x03\xF9\xEE:\xDF\xB5\x8F\xF9\xF6\x81m\xAB\x9C\xAB1\x1E\x837\x8C\xFB\xA8P\xA8<\xEA\x1Dx\xCEd\xED\x84f\xA7\xB5t`\x96\xCC\x0F\xA9t\x8B\x9Fo\xBF\x92K\xFA\xFD\xC5?\x8F\xC68t\xBC\x9F\xDE\n$\xCA\xD2\x8F\x96\x0EtX2\x8Cl\x1E\x8Aa\r\x8D\xCAi\x86\x1A\xBD\x1D\xF7\xBC\x8561j\x91YlO\xFA(\x98\x10iq\xCC\xAF\x9BV\xC6\v\xBC\x10Xm\xCD\xFE\xAD=\xAA\x95,\xB4\xF7\xE8W\xB8\x83;\x81\x88\xE6\x01\xBA\xA5F\x91\x17\f\xCE\x80\x8E\v\x83\x9D<\x0E\x83\xF6\x8D\x03\xC0\xE8A\xD7\x90i\x1D\x030VA\x906D\x10\xA0\xDE\x12\xEF\x06M\xD8\x8B\xA9W\xC8\x9DTc\x8AJ\xA4\xC0\xD3!\xFA\x14\x89\xD1p\xB4J7\xA5\x04\xC2l\xDC8<\x04Y\xD8\xA4\xFB[\x89\xB1\xEC\xDA\xB8\xD7\xEA\x03Ja pinch of salt".force_encoding("ASCII-8BIT") }
+    let(:signature) { Base64::urlsafe_encode64 "\xB0\xCE{\x9FP\xEDV\x9C\xE7b\x8B[\xFAil\x87^\x96\x17Z\x97\x1D\xC2?B\x96\x9C\x8Ep-\xDF_\x8F\xC21\xD9^\xBC\n\x16\x04\x8DJ\xF6\xAF-\xEC\xAD\x03\xF9\xEE:\xDF\xB5\x8F\xF9\xF6\x81m\xAB\x9C\xAB1\x1E\x837\x8C\xFB\xA8P\xA8<\xEA\x1Dx\xCEd\xED\x84f\xA7\xB5t`\x96\xCC\x0F\xA9t\x8B\x9Fo\xBF\x92K\xFA\xFD\xC5?\x8F\xC68t\xBC\x9F\xDE\n$\xCA\xD2\x8F\x96\x0EtX2\x8Cl\x1E\x8Aa\r\x8D\xCAi\x86\x1A\xBD\x1D\xF7\xBC\x8561j\x91YlO\xFA(\x98\x10iq\xCC\xAF\x9BV\xC6\v\xBC\x10Xm\xCD\xFE\xAD=\xAA\x95,\xB4\xF7\xE8W\xB8\x83;\x81\x88\xE6\x01\xBA\xA5F\x91\x17\f\xCE\x80\x8E\v\x83\x9D<\x0E\x83\xF6\x8D\x03\xC0\xE8A\xD7\x90i\x1D\x030VA\x906D\x10\xA0\xDE\x12\xEF\x06M\xD8\x8B\xA9W\xC8\x9DTc\x8AJ\xA4\xC0\xD3!\xFA\x14\x89\xD1p\xB4J7\xA5\x04\xC2l\xDC8<\x04Y\xD8\xA4\xFB[\x89\xB1\xEC\xDA\xB8\xD7\xEA\x03Ja pinch of salt" }
     let(:token) { { "data" => data, "timestamp" => "2012-01-01 01:01:01 UTC", "signature" => signature } }
-    before { allow(Time).to receive_messages now: Time.new(2012,1,1,1,2,1,0) }
+    before { Time.stub now: Time.new(2012,1,1,1,2,1,0) }
     subject { key.token_valid? token }
-    it { is_expected.to be_truthy }
-    
-    it "doesn't check signature on the advisory key field" do
-      expect(key.token_valid?(token.merge "key" => key_fingerprint)).to be_truthy
-    end
-    
-    it "rejects the token if the key field is present and doesn't match" do
-      expect(key.token_valid?(token.merge "key" => "this is not the key you are looking for")).not_to be_truthy
-    end
-    
+    it { should be_true }
     context "when token is 1 hour old" do
-      before { allow(Time).to receive_messages now: Time.new(2012,1,1,2,1,1,0) }
-      it { is_expected.to be_falsey }
+      before { Time.stub now: Time.new(2012,1,1,2,1,1,0) }
+      it { should be_false }
       context "when timestamp in the token is changed accordingly" do
         let(:token) { { "data" => data, "timestamp" => "2012-01-01 02:00:01 UTC", "signature" => signature } }
-        it { is_expected.to be_falsey }
+        it { should be_false }
       end
     end
     context "when the data is changed" do
       let(:data) { { "foo" => :baz } }
-      it { is_expected.to be_falsey }
+      it { should be_false }
     end
     context "when RSA decrypt raises an error" do
-      before { expect_any_instance_of(OpenSSL::PKey::RSA).to receive(:public_decrypt).and_raise(OpenSSL::PKey::RSAError) }
-      it { is_expected.to be_falsey }
+      before { OpenSSL::PKey::RSA.any_instance.should_receive(:public_decrypt).and_raise(OpenSSL::PKey::RSAError) }
+      it { should be_false }
     end
   end
 end

data/spec/keystore_spec.rb

@@ -5,22 +5,9 @@ describe Slosilo::Keystore do
   include_context "with mock adapter"
   
   describe '#put' do
-    it "handles Slosilo::Keys" do
+    it "handles Slosilo::Keys too" do
       subject.put(:test, key)
-      expect(adapter['test'].to_der).to eq(rsa.to_der)
-    end
-
-    it "refuses to store a key with a nil id" do
-      expect { subject.put(nil, key) }.to raise_error(ArgumentError)
-    end
-
-    it "refuses to store a key with an empty id" do
-      expect { subject.put('', key) }.to raise_error(ArgumentError)
-    end
-
-    it "passes the Slosilo key to the adapter" do
-      expect(adapter).to receive(:put_key).with "test", key
-      subject.put :test, key
+      adapter['test'].should == rsa.to_der
     end
   end
 end

data/spec/rack_middleware_spec.rb

@@ -0,0 +1,109 @@
+require 'spec_helper'
+
+describe Slosilo::Rack::Middleware do
+  include_context "with example key"
+  mock_own_key
+  
+  let(:app) { double "app" }
+  subject { Slosilo::Rack::Middleware.new app }
+  
+  describe '#path' do
+    context "when QUERY_STRING is empty" do
+      let(:env) { { 'SCRIPT_NAME' => '/foo', 'PATH_INFO' => '/bar', 'QUERY_STRING' => '' } }
+      before { subject.stub env: env }
+      its(:path) { should == '/foo/bar' }
+    end
+    context "when QUERY_STRING is not" do
+      let(:env) { { 'SCRIPT_NAME' => '/foo', 'PATH_INFO' => '/bar', 'QUERY_STRING' => 'baz' } }
+      before { subject.stub env: env }
+      its(:path) { should == '/foo/bar?baz' }
+    end
+  end
+  
+  describe '#call' do
+    let(:call) { subject.call(env) }
+    let(:path) { "/this/is/the/path" }
+    before { subject.stub path: path }
+    context "when no X-Slosilo-Key is given" do
+      let(:env) { {} }
+      let(:result) { double "result" }
+      it "passes the env verbatim" do
+        app.should_receive(:call).with(env).and_return(result)
+        call.should == result
+      end
+
+      context "and X-Slosilo-Signature is given" do
+        let(:body) { "the body" }
+        let(:timestamp) { "long time ago" }
+        let(:signature) { "in blood" }
+        let(:env) { {'rack.input' => StringIO.new(body), 'HTTP_TIMESTAMP' => timestamp, 'HTTP_X_SLOSILO_SIGNATURE' => signature } }
+        let(:token) { { "data" => { "path" => path, "body" => "dGhlIGJvZHk=" }, "timestamp" => timestamp, "signature" => signature } }
+        context "when the signature is valid" do
+          before { Slosilo.stub(:token_valid?).with(token).and_return true }
+          it "passes the env verbatim" do
+            app.should_receive(:call).with(env).and_return(result)
+            call.should == result
+          end
+        end
+        context "when the signature is invalid" do
+          before { Slosilo.stub(:token_valid?).with(token).and_return false }
+          it "returns 401" do
+            call[0].should == 401
+          end
+        end
+      end
+
+      context "but encryption is required" do
+        subject { Slosilo::Rack::Middleware.new app, encryption_required: true }
+        context "and the body is not empty" do
+          let(:env) { {'rack.input' => StringIO.new('foo') } }
+          it "returns 403" do
+            status, headers, body = call
+            status.should == 403
+          end
+        end
+        context "but the body is empty" do
+          subject { Slosilo::Rack::Middleware.new app, encryption_required: true, signature_required: false }
+          let(:body) { "" }
+          let(:timestamp) { "long time ago" }
+          let(:env) { {'rack.input' => StringIO.new(body) } }
+          it "passes the env verbatim" do
+            app.should_receive(:call).with(env).and_return(result)
+            call.should == result
+          end
+        end
+      end
+    end
+    
+    context "when no X-Slosilo-Signature is given" do
+      context "but signature is required" do
+        let(:env) {{}}
+        subject { Slosilo::Rack::Middleware.new app, signature_required: true }
+        it "returns 401" do
+          status, headers, body = call
+          status.should == 401
+        end
+      end
+    end
+      
+    let(:plaintext) { "If you were taught that elves caused rain, every time it rained, you'd see the proof of elves." }
+    let(:skey) { "Eiho7xIoFj-Qwqc0swcQQJzJyM1sSv_b6VdRIoHCPRUwemB0v5MNyOirU_5dQ_bNzlmSlo8HDvfAnMgapwpIBH__uDUV_3nCkzrzQVV3-bSp6owJnqebeSQxJMoVMKEWqqek3ZCBPo0OB63A8mkYGu9955gDEDOnlxLkETGb3SmDQIVJtiMmAkUWN0fh9z1M9Ycw9FfworaHKQXRLw6z6Rl-Yoe_TDaiKVlGIYjQKpCz8h_I5lRdrhPJaP53d0yQuKMK3PBHMzE77IikZyQ3VZdoqI9XqzUJF27KehxJ_BCx0oAcPaxG6I7WWe3Xb7K7MhE4HgzqVZACDLhYfm_0XA==" }
+    let(:ciphertext) { "0\xDE\xE1\xBA=\x06+K\xE0\xCAD\xC6\xE3 d\xC7kx\x90\r\ni\xDCXmS!EP\xAB\xEF\xAA\x13{\x85f\x8FU,\xB3zO\x1F\x85\f\x0E\xAE\xF8\x10`\x1C\x94\xAB@\xFA\xBC\xC0/\x1F\xA6nX\xFF-m\xF4\xC3f\xBB\xCA\x05\xC82\x18l\xC3\xF0v\x96\v\x8F\xFC\xB2\xC7wX;\xF6v\xDCX:\xCC\xF8\xD7\x99\xC8\x1A\xBA\x9F\xDB\xE7\x0F\xF2\xC9f\aaGs\xEFc" }
+    context "when X-Slosilo-Key is given" do
+      context "when the key decrypts cleanly" do
+        let(:env) { {'HTTP_X_SLOSILO_KEY' => skey, 'rack.input' => StringIO.new(ciphertext) } }
+        it "passes the decrypted contents" do
+          app.should_receive(:call).with(rack_environment_with_input(plaintext)).and_return(:result)
+          call.should == :result
+        end
+      end
+      context "when the key is invalid" do
+        let(:env) { {'HTTP_X_SLOSILO_KEY' => "broken #{skey}", 'rack.input' => StringIO.new(ciphertext) } }
+        it "returns 403 status" do
+          status, headers, body = call
+          status.should == 403
+        end
+      end
+    end
+  end
+end

data/spec/random_spec.rb

@@ -4,16 +4,6 @@ describe Slosilo::Random do
   subject { Slosilo::Random }
   let(:other_salt) { Slosilo::Random::salt }
   
-  describe '#salt' do
-    subject { super().salt }
-    describe '#length' do
-      subject { super().length }
-      it { is_expected.to eq(32) }
-    end
-  end
-
-  describe '#salt' do
-    subject { super().salt }
-    it { is_expected.not_to eq(other_salt) }
-  end
+  its('salt.length') { should == 32 }
+  its(:salt) { should_not == other_salt }
 end

data/spec/sequel_adapter_spec.rb

@@ -1,43 +1,25 @@
 require 'spec_helper'
-require 'sequel'
-require 'io/grab'
 
 require 'slosilo/adapters/sequel_adapter'
 
 describe Slosilo::Adapters::SequelAdapter do
-  include_context "with example key"
-
   let(:model) { double "model" }
-  before { allow(subject).to receive_messages create_model: model }
+  before { subject.stub create_model: model }
   
   describe "#get_key" do
     context "when given key does not exist" do
-      before { allow(model).to receive_messages :[] => nil }
+      before { model.stub :[] => nil }
       it "returns nil" do
-        expect(subject.get_key(:whatever)).not_to be
-      end
-    end
-
-    context "when it exists" do
-      let(:id) { "id" }
-      before { allow(model).to receive(:[]).with(id).and_return (double "key entry", id: id, key: rsa.to_der) }
-      it "returns it" do
-        expect(subject.get_key(id)).to eq(key)
+        subject.get_key(:whatever).should_not be
       end
     end
   end
   
   describe "#put_key" do
     let(:id) { "id" }
+    let(:key) { "key" }
     it "creates the key" do
-      expect(model).to receive(:create).with(hash_including(:id => id, :key => key.to_der))
-      allow(model).to receive_messages columns: [:id, :key]
-      subject.put_key id, key
-    end
-
-    it "adds the fingerprint if feasible" do
-      expect(model).to receive(:create).with(hash_including(:id => id, :key => key.to_der, :fingerprint => key.fingerprint))
-      allow(model).to receive_messages columns: [:id, :key, :fingerprint]
+      model.should_receive(:create).with id: id, key: key
       subject.put_key id, key
     end
   end
@@ -46,126 +28,33 @@ describe Slosilo::Adapters::SequelAdapter do
   describe "#each" do
     let(:one) { double("one", id: :one, key: :onek) }
     let(:two) { double("two", id: :two, key: :twok) }
-    before { allow(model).to receive(:each).and_yield(one).and_yield(two) }
+    before { model.stub(:each).and_yield(one).and_yield(two) }
     
     it "iterates over each key" do
       results = []
-      allow(Slosilo::Key).to receive(:new) {|x|x}
       adapter.each { |id,k| results << { id => k } }
-      expect(results).to eq([ { one: :onek}, {two: :twok } ])
+      results.should == [ { one: :onek}, {two: :twok } ]
     end
   end
-
-  shared_context "database" do
+  
+  describe '#model' do
     let(:db) { Sequel.sqlite }
     before do
-      allow(subject).to receive(:create_model).and_call_original
-      Sequel::Model.cache_anonymous_models = false
+      Slosilo::encryption_key = Slosilo::Symmetric.new.random_key
+      subject.unstub :create_model
+      require 'sequel'
       Sequel::Model.db = db
-    end
-  end
-
-  shared_context "encryption key" do
-    before do
-      Slosilo.encryption_key = Slosilo::Symmetric.new.random_key
-    end
-  end
-
-  context "with old schema" do
-    include_context "encryption key"
-    include_context "database"
-
-    before do
-      db.create_table :slosilo_keystore do
-        String :id, primary_key: true
-        bytea :key, null: false
-      end
-      subject.put_key 'test', key
-    end
-
-    context "after migration" do
-      before { subject.migrate! }
-
-      it "supports look up by id" do
-        expect(subject.get_key("test")).to eq(key)
-      end
-
-      it "supports look up by fingerprint, without a warning" do
-        expect($stderr.grab do
-          expect(subject.get_by_fingerprint(key.fingerprint)).to eq([key, 'test'])
-        end).to be_empty
-      end
-    end
-
-    it "supports look up by id" do
-      expect(subject.get_key("test")).to eq(key)
-    end
-
-    it "supports look up by fingerprint, but issues a warning" do
-      expect($stderr.grab do
-        expect(subject.get_by_fingerprint(key.fingerprint)).to eq([key, 'test'])
-      end).not_to be_empty
-    end
-  end
-
-  shared_context "current schema" do
-    include_context "database"
-    before do
       Sequel.extension :migration
-      require 'slosilo/adapters/sequel_adapter/migration.rb'
-      Sequel::Migration.descendants.first.apply db, :up
-    end
-  end
-
-  context "with current schema" do
-    include_context "encryption key"
-    include_context "current schema"
-    before do
-      subject.put_key 'test', key
-    end
-
-    it "supports look up by id" do
-      expect(subject.get_key("test")).to eq(key)
-    end
-
-    it "supports look up by fingerprint" do
-      expect(subject.get_by_fingerprint(key.fingerprint)).to eq([key, 'test'])
-    end
-  end
-
-  context "with an encryption key", :wip do
-    include_context "encryption key"
-    include_context "current schema"
-
-    it { is_expected.to be_secure }
-
-    it "saves the keys in encrypted form" do
-      subject.put_key 'test', key
-
-      expect(db[:slosilo_keystore][id: 'test'][:key]).to_not eq(key.to_der)
-      expect(subject.get_key 'test').to eq(key)
-    end
-  end
-
-  context "without an encryption key", :wip do
-    before do
-      Slosilo.encryption_key = nil
-    end
-
-    include_context "current schema"
-
-    it { is_expected.not_to be_secure }
-
-    it "refuses to store a private key" do
-      expect { subject.put_key 'test', key }.to raise_error(Slosilo::Error::InsecureKeyStorage)
-    end
-
-    it "saves the keys in plaintext form" do
-      pkey = key.public
-      subject.put_key 'test', pkey
-
-      expect(db[:slosilo_keystore][id: 'test'][:key]).to eq(pkey.to_der)
-      expect(subject.get_key 'test').to eq(pkey)
+      require 'slosilo/adapters/sequel_adapter/migration'
+      Sequel::Migration::descendants.first.apply db, :up
+    end
+      
+    let(:key) { 'fake key' }
+    let(:id) { 'some id' }
+    it "transforms (encrypts) the key" do
+      subject.model.create id: id, key: key
+      db[:slosilo_keystore][id: id][:key].should_not == key
+      subject.model[id].key.should == key
     end
   end
 end