sockd 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9bb01a2e4b1d24261fce56f2b66bd25975e33b5
-  data.tar.gz: fa1a0fc24b4d2e0e7f53f948cc0ae0765566ef44
+  metadata.gz: bbba093ffbc8962d151f715d579043d0ad84c9c3
+  data.tar.gz: 433ef664dc0ce7a7c5607dd54bd131c25b8db5d6
 SHA512:
-  metadata.gz: e55c7365353edd8d87b9862f3e52ae328b247360ae738225d49085a2e05099636ac846b9d48a319eac0f1f413fec6e515dcbe1d3e2d98b709edc0c2cd0b3fddd
-  data.tar.gz: a1bf0d11bcd74d917ae0c0a64e1ee60c862a0189799c3dd32ec3df9b423ab1d0dac80998dae1e61491c7f4168fb93bd2864c110ed139a9adcb888bc8bc34446b
+  metadata.gz: 5724116c5a2f1d859dd9ab1d6532d73ffe5272ccf107f09e56aa74329ca9151fc0615407eec5d307a2052b393a02f59f2e67ad787f19701a478d864a8dd95c34
+  data.tar.gz: dcf9c51370d19e3af1cea9d37d4c9bd1d6be504b3395c73e72633b80cfef552a013c18218960d414b5a2121abaf83af9f4a6cd0d905968b946cd47233323b56e

data/examples/listd.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+$: << File.expand_path(File.dirname(File.realpath(__FILE__)) + '/../lib')
 require 'sockd'
 
 Sockd.run 'listd' do |sockd|

data/lib/sockd/optparse.rb

@@ -14,6 +14,7 @@ module Sockd
         host:      "127.0.0.1",
         port:      0,
         socket:    false,
+        mode:      0660,
         daemonize: true,
         pid_path:  "/var/run/#{safe_name}.pid",
         log_path:  false,
@@ -63,6 +64,10 @@ module Sockd
           options[:socket] = File.expand_path(x)
         end
 
+        opts.on("-m", "--mode MODE", String, "Set file permissions when using Unix socket", "(default: #{options[:mode]})") do |x|
+          options[:mode] = x
+        end
+
         opts.on("-P", "--pid FILE", String, "Where to write the PID file", "(default: #{options[:pid_path]})") do |x|
           options[:pid_path] = File.expand_path(x)
         end

data/lib/sockd/runner.rb

@@ -21,6 +21,7 @@ module Sockd
         :host      => "127.0.0.1",
         :port      => 0,
         :socket    => false,
+        :mode      => 0660,
         :daemonize => true,
         :pid_path  => "/var/run/#{safe_name}.pid",
         :log_path  => false,
@@ -92,18 +93,38 @@ module Sockd
         return self unless daemonize
       end
 
-      drop_privileges options[:user], options[:group]
+      server do |server|
+        drop_privileges options[:user], options[:group]
 
-      setup
+        setup
 
-      on_interrupt do |signal|
-        log "#{signal} received, shutting down..."
-        teardown
-        cleanup
-        exit 130
-      end
+        on_interrupt do |signal|
+          log "#{signal} received, shutting down..."
+          teardown
+          # cleanup
+          exit 130
+        end
 
-      serve
+        while true
+          sock = server.accept
+          begin
+            # wait for input
+            if IO.select([sock], nil, nil, 2.0)
+              msg = sock.recv(256, Socket::MSG_PEEK)
+              if msg.chomp == "ping"
+                sock.print "pong\r\n"
+              else
+                handle msg, sock
+              end
+            else
+              log "connection timed out"
+            end
+          rescue Errno::EPIPE, Errno::ECONNRESET
+            log "connection broken"
+          end
+          sock.close unless sock.closed?
+        end
+      end
     end
 
     # stop our service
@@ -155,37 +176,11 @@ module Sockd
 
     protected
 
-    # run a server loop, passing data off to our handler
-    def serve
-      server do |server|
-        log "listening on " + server.local_address.inspect_sockaddr
-        while 1
-          sock = server.accept
-          begin
-            # wait for input
-            if IO.select([sock], nil, nil, 2.0)
-              msg = sock.recv(256, Socket::MSG_PEEK)
-              if msg.chomp == "ping"
-                sock.print "pong\r\n"
-              else
-                handle msg, sock
-              end
-            else
-              log "connection timed out"
-            end
-          rescue Errno::EPIPE, Errno::ECONNRESET
-            log "connection broken"
-          end
-          sock.close unless sock.closed?
-        end
-      end
-    end
-
     # return a UNIXServer or TCPServer instance depending on config
-    def server(&block)
-      if options[:socket]
+    def server
+      server = if options[:socket]
         begin
-          UNIXServer.open(options[:socket], &block)
+          UNIXServer.new(options[:socket])
         rescue Errno::EADDRINUSE
           begin
             Timeout.timeout(5) do
@@ -198,13 +193,28 @@ module Sockd
             end
             raise ProcError, "socket #{options[:socket]} already in use by another process"
           rescue Errno::ECONNREFUSED, Timeout::Error
-            log "socket is stale, reopening"
-            cleanup
-            UNIXServer.open(options[:socket], &block)
+            File.delete(options[:socket])
+            UNIXServer.new(options[:socket])
           end
+        end.tap do
+          # get user and group ids
+          uid = Etc.getpwnam(options[:user]).uid if options[:user]
+          gid = Etc.getgrnam(options[:group]).gid if options[:group]
+          gid = Etc.getpwnam(options[:user]).gid if !gid && options[:user]
+          File.chown(uid, gid, options[:socket]) if uid || gid
+
+          # ensure mode is octal if string provided
+          options[:mode] = options[:mode].to_i(8) if options[:mode].is_a?(String)
+          File.chmod(options[:mode], options[:socket])
         end
       else
-        TCPServer.open(options[:host], options[:port], &block)
+        TCPServer.new(options[:host], options[:port])
+      end
+      begin
+        log "listening on " + server.local_address.inspect_sockaddr
+        yield(server)
+      ensure
+        server.close
       end
     rescue Errno::EACCES
       sock = options[:socket] || "#{options[:host]}:#{options[:port]}"
@@ -223,15 +233,6 @@ module Sockd
       raise ProcError, "unable to open socket: #{sock} (check permissions)"
     end
 
-    # clean up UNIXSocket upon termination
-    def cleanup
-      if options[:socket] && File.exists?(options[:socket])
-        File.delete(options[:socket])
-      end
-    rescue StandardError
-      raise ProcError, "unable to unlink socket: #{options[:socket]} (check permissions)"
-    end
-
     # handle process termination signals
     def on_interrupt(&block)
       trap("INT")  { yield "SIGINT" }
@@ -295,7 +296,7 @@ module Sockd
 
       Process::Sys.setgid(gid) if gid
       Process::Sys.setuid(uid) if uid
-    rescue ArgumentError => e
+    rescue ArgumentError, Errno::EPERM => e
       # user or group does not exist
       raise ProcError, "unable to drop privileges (#{e})"
     end

data/lib/sockd/version.rb

@@ -1,3 +1,3 @@
 module Sockd
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sockd
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Mike Greiling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler