sftp_server 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6579fc72d42db229fdc52951724810a74e81661
-  data.tar.gz: a73bb16cb690daa050997e727c195740e70c841b
+  metadata.gz: 445996399523862768032cf1c5792561c134ef29
+  data.tar.gz: f1b84c99308b24cd2403797ae69a2feb42856ad8
 SHA512:
-  metadata.gz: c27a18a11ed53b0c762c48d6c43f2ba495bcb8ca18f85ce561ae8550be0d84df7d1220bd4ec0d1795dc32fb2abcd42cdacfc3ce20d4b346b574c456f20def542
-  data.tar.gz: 840fa2cfe4cc9ae5de894a94b03e07d1d8b98679d1d8f996226db9ff382feb025fb5fd561555b79f3a278789e6e7807f72b25d18a6256ffac70babcdd2783d8b
+  metadata.gz: 917a9c983158448c44d5d240bab0fafd8002c7da1dad9f7b18a73630f74a3f7a8421fba51b881b0f3f7cfa01d3052e6b3febe956db242ee680dab08d040fdbac
+  data.tar.gz: d7f345a7112a144a2b2565099f501ae65476d311579fa0bd4d199d9edf8dd01ee5217e61b1def3959ec339eabb370b952d135b021b9f68c9e02c990382e8029f

data/README.md

@@ -6,6 +6,20 @@ Uses libssh via FFI to create an SFTP server. Useful for testing interactions wi
 
 ## Installation
 
+### Installing libssh
+
+This gem was developed against libssh 0.6.3. It will **not work** when using an older version.
+
+To install libssh using Homebrew on Mac OS X:
+
+```
+brew install libssh
+```
+
+~~To install on Ubuntu 12.04 or Ubuntu 14.04, you'll need to build the library from source, because the versions that are available in Ubuntu package repositories are too old.~~ To work on Linux, [a patched version of libssh is required](https://github.com/corgibytes/sftp_server/issues/1). 
+
+### Installing the gem
+
 Add this line to your application's Gemfile:
 
 ```ruby

data/lib/sftp_server/server.rb

@@ -212,11 +212,27 @@ module SFTPServer
 
           if @handles[long_dir_name] == :open
             Dir.entries(long_dir_name).each do |entry|
+              file_stat = File.lstat(File.join(long_dir_name, entry))
+
+              attributes = SSH::API::SFTPAttributes.new
+
+              attributes[:flags] = 0
+              attributes[:flags] |= SSH::API::Attributes::SSH_FILEXFER_ATTR_SIZE
+              attributes[:size] = file_stat.size
+              attributes[:flags] |= SSH::API::Attributes::SSH_FILEXFER_ATTR_UIDGID
+              attributes[:uid] = file_stat.uid
+              attributes[:gid] = file_stat.gid
+              attributes[:flags] |= SSH::API::Attributes::SSH_FILEXFER_ATTR_PERMISSIONS
+              attributes[:permissions] = file_stat.mode
+              attributes[:flags] |= SSH::API::Attributes::SSH_FILEXFER_ATTR_ACMODTIME
+              attributes[:atime] = file_stat.atime.to_i
+              attributes[:mtime] = file_stat.mtime.to_i
+
               SSH::API.sftp_reply_names_add(
                 client_message,
                 entry,
                 entry,
-                SSH::API::SFTPAttributes.new.to_ptr
+                attributes.to_ptr
               )
             end
             @handles[long_dir_name] = :read
@@ -232,6 +248,11 @@ module SFTPServer
           long_dir_name = handle.read_string
           log "long_dir_name: #{long_dir_name}"
 
+          entry = @handles[long_dir_name]
+          if entry.respond_to?(:close)
+            entry.close
+          end
+
           @handles.delete(long_dir_name)
 
           SSH::API.sftp_reply_status(client_message, SSH::API::SFTPStatus::SSH_FX_OK, 'Success')
@@ -361,6 +382,16 @@ module SFTPServer
             file.write(buffer.read_string)
             SSH::API.sftp_reply_status(client_message, SSH::API::SFTPStatus::SSH_FX_OK, 'Success')
           end
+        when SSH::API::SFTPCommands::SSH_FXP_REMOVE
+          log 'remove'
+
+          file_name = SSH::API.sftp_client_message_get_filename(client_message)
+          long_file_name = File.expand_path(file_name)
+          log "long_file_name: #{long_file_name}"
+
+          File.unlink(long_file_name)
+
+          SSH::API.sftp_reply_status(client_message, SSH::API::SFTPStatus::SSH_FX_OK, 'Success')
         end
 
         SSH::API.sftp_client_message_free(client_message)
@@ -389,7 +420,6 @@ module SFTPServer
 
     def open
       ssh_bind = SSH::API.ssh_bind_new
-      session = SSH::API.ssh_new
 
       set_bind_option(ssh_bind, :int, SSH::API::BindOptions::SSH_BIND_OPTIONS_BINDADDR, :string, listen_address) if listen_address
       set_bind_option(ssh_bind, :int, SSH::API::BindOptions::SSH_BIND_OPTIONS_BINDPORT_STR, :string, port) if port
@@ -397,20 +427,23 @@ module SFTPServer
       set_bind_option(ssh_bind, :int, SSH::API::BindOptions::SSH_BIND_OPTIONS_DSAKEY, :string, dsa_key) if dsa_key
 
       bind_listen(ssh_bind)
-      bind_accept(ssh_bind, session)
-      handle_key_exchange(session)
-
-      if authenticate(session)
-        channel = open_channel(session)
-        if channel
-          if sftp_channel_request(session)
-            sftp_session = SSH::API.sftp_server_new(session, channel)
-            init_sftp_session(sftp_session)
-            sftp_message_loop(sftp_session)
+      loop do
+        session = SSH::API.ssh_new
+        bind_accept(ssh_bind, session)
+        handle_key_exchange(session)
+
+        if authenticate(session)
+          channel = open_channel(session)
+          if channel
+            if sftp_channel_request(session)
+              sftp_session = SSH::API.sftp_server_new(session, channel)
+              init_sftp_session(sftp_session)
+              sftp_message_loop(sftp_session)
+            end
           end
+          close_channel(channel)
+          free_channel(channel)
         end
-        close_channel(channel)
-        free_channel(channel)
       end
     end
   end

data/lib/sftp_server/version.rb

@@ -1,3 +1,3 @@
 module SFTPServer
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sftp_server
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - M. Scott Ford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler