fx-tftp 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39beafe0ad28d4186166ddaa02fdb501c2d303f3
-  data.tar.gz: 4069a701c1205324e86eae44e8153fd377ee1b0a
+  metadata.gz: ff40fb730a73ee5fe8f1ffe16cdbb9202001c46a
+  data.tar.gz: 460430ac661a1b4da1dcb80eb2fb107b1efa6983
 SHA512:
-  metadata.gz: 1f97391b5831198c2528ab81200c0b4175c70f1de238ceafbd03d4e5e6809f18b3568d8873db2db649163eef3615270252036733ec535a7f05dd15511346b364
-  data.tar.gz: b22a2355500c4cb7e7f3a9bfdb66fc7200edf70190ab05bd58baa6ab81a7aa79b6c6de13cfb13d726c154a454160882e09dd63468f7910ef378147eeaab5ed32
+  metadata.gz: be546342f4f560c6830af311548025b8dd1e2ef4ebb36548897e5c893bd4ceafd587090f75c03a60fca97b9dea04c746fe882ab970c68959a88fe35f018e3b2e
+  data.tar.gz: e6ebe1401188bbf0b98f0c4b5bf54a03f091e0addf28757fc806ffff7f09185f6f8c1af6f4f0bb22c9d47f03733eb7fe76627cebf0491cd03fe3edf72a26185f

data/README.md

@@ -16,13 +16,6 @@ The included `tftpd` executable gives you a fully-fledged read-write TFTP server
 Suppose we want to have a TFTP server that only supports reading, but the files served should depend on the IP block the client is connecting from:
 
     class CustomHandler < TFTP::Handler::RWSimple
-      def run!(tag, req, sock, src)
-        if req.is_a? TFTP::Packet::WRQ
-          sock.send(TFTP::Packet::ERROR.new(4, 'Nope').encode, 0)
-          sock.close
-          return
-        end
-    
         ip = src.remote_address.ip_address.split('.')
         block = ip.slice(0, 3).join('-')
         req.filename = File.join(block, req.filename)
@@ -31,7 +24,7 @@ Suppose we want to have a TFTP server that only supports reading, but the files
       end
     end
     
-    srv = TFTP::Server::Base.new(CustomHandler.new(path), opts)
+    srv = TFTP::Server::Base.new(CustomHandler.new(path, :no_write => true), opts)
 
 When you combine filename inspection and `#send` and `#recv` methods working on plain `IO` objects you can easily whip up things like serving dynamically built scripts/binaries/archives based on parameters passed as the requested 'filename'.
 
@@ -43,6 +36,7 @@ When you combine filename inspection and `#send` and `#recv` methods working on
         -d, --debug                      Enable debug output
         -l, --log PATH                   Log to file
         -b, --background                 Fork into background
+        -m, --mode MODE                  Run in R/W only mode
         -h, --host HOST                  Bind do host
         -p, --path PATH                  Serving root directory
 

data/bin/tftpd

@@ -8,7 +8,8 @@ require 'optparse'
 require 'tftp'
 
 config = {:path => Dir.pwd, :host => '127.0.0.1', :fork => false,
-          :ver => false, :loglevel => Logger::INFO, :logfile => STDOUT}
+          :ver => false, :loglevel => Logger::INFO, :logfile => STDOUT,
+          :no_read => false, :no_write => false}
 
 def die!(msg)
   STDERR.puts msg
@@ -21,10 +22,21 @@ op = OptionParser.new do |o|
   o.on('-d', '--debug', 'Enable debug output')                {    config[:loglevel]  = Logger::DEBUG }
   o.on('-l', '--log PATH',  String, 'Log to file')            {|a| config[:logfile]   = a }
   o.on('-b', '--background', 'Fork into background')          {|a| config[:fork]      = true }
+  o.on('-m', '--mode MODE', String, 'Run in R/W only mode')   do |a|
+    case a.downcase[0]
+    when 'r'
+      config[:no_write] = true
+    when 'w'
+      config[:no_read]  = true
+    else
+      config[:bad_mode] = true
+    end
+  end
   o.on('-h', '--host HOST', String, 'Bind do host')           {|a| config[:host]      = a }
   o.on('-p', '--path PATH', String, 'Serving root directory') {|a| config[:path]      = a }
 end
 op.parse! or die!(op)
+die!(op) if config[:bad_mode]
 
 if config[:ver]
   puts "fx-tftpd v#{TFTP::VERSION} Copyright (c) 2015, Piotr S. Staszewski"
@@ -45,9 +57,12 @@ if config[:fork]
   Process.daemon(true)
 end
 
+config[:logger] = log
+config[:port]   = PORT
+
 begin
   log.info "Serving from and to #{config[:path]}"
-  srv = TFTP::Server::RWSimple.new(config[:path], :host => config[:host], :port => PORT, :logger => log)
+  srv = TFTP::Server::RWSimple.new(config[:path], config)
   srv.run!
 rescue SignalException => e
   puts if e.is_a? Interrupt

data/lib/tftp/tftp.rb

@@ -197,7 +197,15 @@ module TFTP
 
     # Basic read-write session over a 'physical' directory.
     class RWSimple < Base
-      # @param path [String] Path to serving root directory
+      # Initialize the handler.
+      #
+      # Options:
+      #
+      #  - :no_read  => deny read access if true
+      #  - :no_write => deny write access if true
+      #
+      # @param path [String]  Path to serving root directory
+      # @param opts [Hash]    Options
       def initialize(path, opts = {})
         @path = path
         super(opts)
@@ -219,6 +227,12 @@ module TFTP
 
         case req
         when Packet::RRQ
+          if @opts[:no_read]
+            log :info, "#{tag} Denied read request for #{req.filename}"
+            sock.send(Packet::ERROR.new(2, 'Access denied.').encode, 0)
+            sock.close
+            return
+          end
           log :info, "#{tag} Read request for #{req.filename} (#{req.mode})"
           unless File.exist? path
             log :warn, "#{tag} File not found"
@@ -233,6 +247,12 @@ module TFTP
           sock.close
           io.close
         when Packet::WRQ
+          if @opts[:no_write]
+            log :info, "#{tag} Denied write request for #{req.filename}"
+            sock.send(Packet::ERROR.new(2, 'Access denied.').encode, 0)
+            sock.close
+            return
+          end
           log :info, "#{tag} Write request for #{req.filename} (#{req.mode})"
           if File.exist? path
             log :warn, "#{tag} File already exist"

data/lib/tftp/version.rb

@@ -1,4 +1,4 @@
 module TFTP
   # Current version string.
-  VERSION = '0.3'
+  VERSION = '0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fx-tftp
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Piotr S. Staszewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks