ftpmvc-gpg 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 666547b5c0a29b7adab5379ce4df0f3a704c494e
-  data.tar.gz: 8bc83fcd6444c2f6aa70cff4bf600f5fc0d72b08
+  metadata.gz: 4e496802a7d34286f1ee248f9015e53516c62167
+  data.tar.gz: 7040b38ea69dbe17320ee88f0f68f942f3836adf
 SHA512:
-  metadata.gz: b4e26f5710c8aa65518213b74cfab3e71d1853dbf1d77693947da507d46e5edb95c695f56e2f1661f05b26a574725a57fec45f42f56405daf635f0480677cb14
-  data.tar.gz: bdfef1ca5938ef1f19d817535e0f74c4a49470dc78c5991f09ba937acc9c38ae127e3575ae21ed4500a78f2a723087d7b7a8ab5f3f863518f162a304bfd7e672
+  metadata.gz: 5232706bcf4a74d7675d685ddb080789cd0772d9772b5d22f5be9275e1ab7cd3303bd0e66f6ee67e61ace52b5e3bd8f9dfc3918ccf5eacb75644fb4f1818cd02
+  data.tar.gz: f1b49f3732872892026ae81d679ed5bacf5621223dc831b59bd04c2c3be566952504c5f926cda5bb6a4fb9d43709efa01bad0b5ed2a021f7a8d077e9d0d8fcb8

data/ftpmvc-gpg.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "guard-rspec"
-  spec.add_dependency "ftpmvc", '>= 0.7.0'
+  spec.add_dependency "ftpmvc", '>= 0.8.0'
   spec.add_dependency "gpgme"
 end

data/lib/ftpmvc/filter/gpg.rb

@@ -1,12 +1,14 @@
 require 'ftpmvc/filter/base'
 require 'gpgme'
+require 'ftpd/stream'
 
 module FTPMVC
   module Filter
     class Gpg < FTPMVC::Filter::Base
       def initialize(fs, chain, options={})
         super fs, chain
-        @crypto = GPGME::Crypto.new recipients: options[:recipients], always_trust: true
+        @crypto = GPGME::Crypto.new(
+          password: options[:passphrase], recipients: options[:recipients], always_trust: true)
         import_keys(options[:keys]) if options.include?(:keys)
       end
 
@@ -30,6 +32,14 @@ module FTPMVC
         @chain.directory?(remove_extension(path))
       end
 
+      def put(path, stream)
+        buffer = ''
+        while bytes = stream.read
+          buffer << bytes
+        end
+        @chain.put(remove_extension(path), ::Ftpd::Stream.new(@crypto.decrypt(buffer), 'B'))
+      end
+
       protected
 
       def original_data(path)
@@ -43,7 +53,7 @@ module FTPMVC
       end
 
       def remove_extension(path)
-        path.gsub(/\.gpg$/, '')
+        path.gsub(/\.(gpg|pgp)$/, '')
       end
     end
   end

data/lib/ftpmvc/gpg/version.rb

@@ -1,5 +1,5 @@
 module FTPMVC
   module GPG
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/spec/integration/ftpmvc/filter/gpg_spec.rb

@@ -5,41 +5,78 @@ require 'net/ftp'
 
 
 describe FTPMVC::Filter::Gpg do
+  let(:encrypted_dir) { EncryptedDirectory.new(name: 'encrypted') }
   let(:app) do
+    dir = encrypted_dir
     FTPMVC::Application.new do
       
-      filter FTPMVC::Filter::Gpg, recipients: ['john.doe@gmail.com'], keys: [
-        <<-EOF
-          -----BEGIN PGP PUBLIC KEY BLOCK-----
-          Version: GnuPG v1
+      filter FTPMVC::Filter::Gpg, passphrase: 'mypassphrase', recipients: ['john.doe@gmail.com'], keys: [
+        "-----BEGIN PGP PUBLIC KEY BLOCK-----
+        Version: GnuPG v1
 
-          mI0EVGNdYQEEALR159b8du6QsH0lQDx1ImFmdN9qVWHgbcXDK4CKwXMbLwNEsjIn
-          LNkGP7ZPtnvodywlV7G+CDcVDa2r7MrLJdk3/idQ25zBVnL8HndkZiEZHj+WEo5u
-          sR5uZQSshGjWdl2UKWOJoRCW0PEfNBxJeKbCrksaebXjzgXIJl7Mar6TABEBAAG0
-          HUpvaG4gRG9lIDxqb2huLmRvZUBnbWFpbC5jb20+iLgEEwECACIFAlRjXWECGwMG
-          CwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEGp4Yp2MJm5hxOQD/jGvwPiKEgHK
-          AKUqzMv8RpkfP+hkNMa+clhURYRReo0ISWDsb8XUZsZF84ZhwVshlAHqCVdJb13H
-          iK/uSBJpxgEHwzIIn+k1G14HK7DKC7kfheaN0mvS3Tq9sdd5PyWGnQyBiP3OYlmF
-          TWa/KEz5IfKs95nSBa1w3Vc9cjpn1YgxuI0EVGNdYQEEALZkxWWXptwEcdtYwdR6
-          wgXbmFKjeyhRutGJoAR/SwkDoQBqQhTLh6eFKTL9gHWolAJJm4H0pBwVGsVa5su8
-          wXfgIu2Y3rSItwjvof05mlTdqjaMVYM/jiHnfIBVJa/xuQRhkroa1jlK4iVZmKNY
-          8qsj6pvKGB0uOj+BHMMnMMz5ABEBAAGInwQYAQIACQUCVGNdYQIbDAAKCRBqeGKd
-          jCZuYcXBBACtBmIR5o/m2adUCzYfb/mNlh7eM/bvNMeXXmPsazhl5kp05izqy5Z1
-          iSQTnoJ8FKi4ke9GRbpKL4EZ4tWop4QKWAbbojIepR0Q6Ncvv4Ho9N32nmSEEfBU
-          UPgZz+71ilscZiuigmFSDhP368qBG6rmaxgOoK4O+wjVJEJzq4Yc8A==
-          =NH17
-          -----END PGP PUBLIC KEY BLOCK-----
-        EOF
+        mI0EVOyxnQEEALTim9Dk3e8UgzGltjsKBZi1blSSqH2sYSH6MQXHRDoeV0R/32oJ
+        OlWJ07INSy0DfX+XZupFk5yXkqM3Q9Vqrj2DUXAP1d/I4kBI/WOu6CL/bW5f45Vg
+        wQ8gKcowrniFMte8/1S98LneNQlViJiowmCsib7MfJCew/4BYHpnwd/TABEBAAG0
+        HUpvaG4gRG9lIDxqb2huLmRvZUBnbWFpbC5jb20+iLgEEwECACIFAlTssZ0CGwMG
+        CwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEAwbIKSlGNiWD7sD/Rmo9JlTFukC
+        7tbwHEz9q2D4hB7OZAVLlVhUszwJ0gZOb+cG55L59f/M4nSE7gC995d+2DuncZoC
+        NP48NWJMVzecTMDu1lcxTJ2pFVa7626kdwKH8QkM6NG0+E5kl5uaF2mUzcWpHF9t
+        U5uYmIUXxNghyKJE3/EqzLpJGtWqGd93uI0EVOyxnQEEANoIiUR0mI53Vn1/y2tx
+        NRfcweOxytHZFMkSUyE6lQcllU6tkQCBL60MWBEtNKvTulC7ciw/SbxID/ugTo4Q
+        lbnRNIyZTitnhzOPUD/OqvT1VE4+mi9fgaaIzKBu9OVVqAWh3ySo0SKQOJGKC15K
+        rMZJNek1DmtGwj0KiAFkxg3DABEBAAGInwQYAQIACQUCVOyxnQIbDAAKCRAMGyCk
+        pRjYlvddBACGn75Uer8DbRw+YjK454J3JB1g745ASE5H4WRVR/VjxTpwZ96+fcJQ
+        SS/MEvVJjG3hoe8Li55dJPOwefr6y2fkxIHrkeNVFCIz9ACfQCYdXGoEYX9MqucI
+        spD7r/SHY1ecipvzHCvcD6VaoPKmsck9XaWqt/jMx2Cp75MC1dd6tg==
+        =I7Sh
+        -----END PGP PUBLIC KEY BLOCK-----",
+        "-----BEGIN PGP PRIVATE KEY BLOCK-----
+        Version: GnuPG v1
+
+        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
+        +MzHYKnvkwLV13q2
+        =GFGp
+        -----END PGP PRIVATE KEY BLOCK-----"
       ]
       
       filesystem do
-        directory :encrypted
+        directory dir
       end
     end
   end
 
   before do
     class EncryptedDirectory < FTPMVC::Directory
+      attr_reader :received_data
+
       def index
         super + [ FTPMVC::File.new('password.txt') ]
       end
@@ -47,6 +84,10 @@ describe FTPMVC::Filter::Gpg do
       def get(path)
         StringIO.new('secret')
       end
+
+      def put(path, stream)
+        @received_data = stream.read
+      end
     end
   end
 
@@ -66,4 +107,13 @@ describe FTPMVC::Filter::Gpg do
       end
     end
   end
+  describe 'PUT/STOR' do
+    it 'encrypts files content' do
+      with_application(app) do |ftp|
+        ftp.login
+        ftp.putbinaryfile('spec/fixtures/data.gpg', '/encrypted/password.txt.gpg')
+        expect(encrypted_dir.received_data).to eq 'data'
+      end
+    end
+  end
 end

data/spec/lib/ftpmvc/filter/gpg_spec.rb

@@ -1,51 +1,58 @@
 require 'ftpmvc/filter/gpg'
 require 'ftpmvc/file'
 require 'ftpmvc/directory'
+require 'ftpd/stream'
 
 describe FTPMVC::Filter::Gpg do
-  before do
-    stub_const 'OtherFilter', Class.new(FTPMVC::Filter::Base)
+  let(:other_filter_class) do
+    Class.new(FTPMVC::Filter::Base) do
+      attr_reader :received_stream
+      def put(path, stream)
+        @received_stream = stream
+      end
+    end
   end
-  let(:other_filter) { OtherFilter.new(nil, nil) }
+  let(:other_filter) { other_filter_class.new(nil, nil) }
   let(:gpg_filter) { FTPMVC::Filter::Gpg.new(nil, other_filter, recipients: 'john.doe@gmail.com') }
-  describe '#index' do
-    before do
-      allow(other_filter)
-        .to receive(:index)
-        .and_return [ FTPMVC::File.new(original_filename), FTPMVC::Directory.new('documents') ]
-    end
-    let(:original_filename) { 'secret.txt' }
-    it 'adds .gpg extension to files returned by chain' do
-      expect(gpg_filter.index('/').map(&:name)).to include 'secret.txt.gpg'
-    end
-    context 'when file already has .gpg as extensions' do
-      let(:original_filename) { 'secret.txt.gpg' }
-      it 'keeps filename untouched' do
-        expect(gpg_filter.index('/').map(&:name)).to include 'secret.txt.gpg'
+    describe '#index' do
+      before do
+        allow(other_filter)
+          .to receive(:index)
+          .and_return [ FTPMVC::File.new(original_filename), FTPMVC::Directory.new(name: 'documents') ]
       end
-    end
-    it 'keeps directory names untouched' do
-      expect(gpg_filter.index('/').map(&:name)).to include 'documents'
-    end
-    context 'when file already has .gpg as extensions' do
-      let(:original_filename) { 'secret.txt.gpg' }
-      it 'keeps filename unchanged' do
+      let(:original_filename) { 'secret.txt' }
+      it 'adds .gpg extension to files returned by chain' do
         expect(gpg_filter.index('/').map(&:name)).to include 'secret.txt.gpg'
       end
+      context 'when file already has .gpg as extensions' do
+        let(:original_filename) { 'secret.txt.gpg' }
+        it 'keeps filename untouched' do
+          expect(gpg_filter.index('/').map(&:name)).to include 'secret.txt.gpg'
+        end
+      end
+      it 'keeps directory names untouched' do
+        expect(gpg_filter.index('/').map(&:name)).to include 'documents'
+      end
+      context 'when file already has .gpg as extensions' do
+        let(:original_filename) { 'secret.txt.gpg' }
+        it 'keeps filename unchanged' do
+          expect(gpg_filter.index('/').map(&:name)).to include 'secret.txt.gpg'
+        end
+      end
     end
-  end
 
-  describe '#get' do
-    before do
-      allow_any_instance_of(GPGME::Crypto)
-        .to receive(:encrypt)
-        .and_return StringIO.new('encrypted secret')
-      allow(other_filter)
-        .to receive(:get)
-        .and_return StringIO.new('secret')
-    end
-    it 'encrypts original content' do
-      expect(gpg_filter.get('/file.txt.gpg').read).to eq 'encrypted secret'
+    describe '#get' do
+      before do
+        allow_any_instance_of(GPGME::Crypto)
+          .to receive(:encrypt)
+          .and_return StringIO.new('encrypted secret')
+        allow(other_filter)
+          .to receive(:get)
+          .and_return StringIO.new('secret')
+      end
+      it 'encrypts original content' do
+        expect(gpg_filter.get('/file.txt.gpg').read).to eq 'encrypted secret'
+      end
     end
 
     describe '#initialize' do
@@ -91,5 +98,24 @@ describe FTPMVC::Filter::Gpg do
         gpg_filter.directory?('/secret/passwords.txt.gpg')
       end
     end
+
+  describe '#put' do
+    let(:stream) { Ftpd::Stream.new(StringIO.new('encrypted content'), 'B') }
+    before do
+      allow_any_instance_of(GPGME::Crypto)
+        .to receive(:decrypt)
+        .with('encrypted content')
+        .and_return GPGME::Data.new('decrypted content')
+    end
+    it 'removes .pgp extension from filename' do
+      expect(other_filter)
+        .to receive(:put)
+        .with('/secret/passwords.txt', kind_of(Ftpd::Stream))
+      gpg_filter.put('/secret/passwords.txt.pgp', stream)
+    end
+    it 'decrypts the stream' do
+      gpg_filter.put('/secret/passwords.txt.pgp', stream)
+      expect(other_filter.received_stream.read).to eq 'decrypted content'
+    end
   end
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: ftpmvc-gpg
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - André Aizim Kelmanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   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: guard-rspec
   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: ftpmvc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: gpgme
   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: FTPMVC filter to encrypt/decrypt files
@@ -87,9 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -99,6 +99,7 @@ files:
 - lib/ftpmvc/filter/gpg.rb
 - lib/ftpmvc/gpg.rb
 - lib/ftpmvc/gpg/version.rb
+- spec/fixtures/data.gpg
 - spec/integration/ftpmvc/filter/gpg_spec.rb
 - spec/lib/ftpmvc/filter/gpg_spec.rb
 - spec/spec_helper.rb
@@ -112,12 +113,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -127,6 +128,7 @@ signing_key:
 specification_version: 4
 summary: FTPMVC filter to encrypt/decrypt files
 test_files:
+- spec/fixtures/data.gpg
 - spec/integration/ftpmvc/filter/gpg_spec.rb
 - spec/lib/ftpmvc/filter/gpg_spec.rb
 - spec/spec_helper.rb