ban 0.0.1 → 0.1.0.pre0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yjc1YjBmYzk5YTJkMzczMzEyZTNjZTE3MGExNjNhNDg3NGJmMTEyNg==
+    OGFmMWY5Y2IzODBjODkzMTk5OTc5NTU5NzRlYjIyM2QzMTgxMTYwZQ==
   data.tar.gz: !binary |-
-    ZTg0MzMwZGNjOGI0M2I1NjYzOGUxOTY0YjFmMzgzYmI2NzZmZmRmNw==
+    ZWZkMWMyZWI0OWZkNDk1YzBmMWRmMjQyMjZmZWEwZDUzNDdiY2FkYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmIzODg4ZTMyNTI3NmRhNDY5NmUxMWI4YWJlYTllOGFlNDdhM2ZkNTU0MTA2
-    MWM4MzczYTJjNDk3YWU0M2M0NWM0N2QxZGM0NTY3YzgxNTcxNWY3YmQ0MDFh
-    YTBhMzY2YjEzNjE2NjEzNmRjYTEyYzQyN2MxMjQxNTAzZmRkZTU=
+    NjE2OTM4NzNjYWJhYzI3NTg0YWE5ZWQzYjgzMmJlODgyMDlhMGEzM2ExODNh
+    MTg2OTdiMTZkY2M3NzIxMzQ5OTJhNTUxNTExMTA1NjRhZGFmODI2MjYyNDEz
+    MDI2ZGRhNjA0YjgxMGM4MTY0N2MyZWY1MzYxMTZlNDk1ODljNWI=
   data.tar.gz: !binary |-
-    MzNlZjlmZGIxYWUwNDA4MzMxYzE5MTE2ZmQ4Njc0YzljZjliNjU2MmRjZGQz
-    OTAyMTQzZGEzNDAwYTE3M2FlMDY3ZTJkZDEzYjhkMzJlMTBmN2NjNmIzODM3
-    OWM3MTdiZTM5NWJjNTlmYzcyYjQyMjlmZGJlMWZjMzllYTYyZWM=
+    Yjk0ODcyZDYwMWJmMWU1OGYyZTQyMjA5ZmE3NTM3OTgzNTE0ZDNkMDAxOTI1
+    YTEwNTEzZWJlMzRmMzNkNjExYzljYzc5NTQ5YzBhMzcyNjQyYzA0OTViOWIy
+    MWNmZDEyN2M4MDdhZTNjNmMyNDY4YmE3YTFiMmYzYzY5ZTE5ZDM=

data/bin/ban

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+$0 = 'ban'
 begin
   require 'ban'
 rescue LoadError

data/init/ban.conf

@@ -0,0 +1,13 @@
+# Upstart configuration file
+# Note: expects ban to be installed with the system ruby.
+description "Starts the ban home control system"
+version "0.0.1"
+
+start on runlevel [2345]
+stop on runlevel [016]
+
+chdir "/tmp"
+exec /usr/bin/ruby -S ban server
+respawn
+
+console log

data/lib/ban/cli.rb

@@ -3,6 +3,10 @@ module Ban
     option :device, default: nil
     option :port, type: :numeric, default: 8080
     option :interface, type: :string, default: '0.0.0.0'
+    option :user, type: :string, default: 'dialout'
+    option :group, type: :string, default: 'nobody'
+    option :chroot, type: :string, default: Dir.getwd
+    option :em_threads, type: :numeric, default: 4
     desc "server", "starts the ban server"
     def server
       device = options[:device]
@@ -10,9 +14,10 @@ module Ban
       port = options[:port]
 
       EM.epoll
+      EM.threadpool_size = options[:em_threads]
       EM.run do
         board = Board.new
-        server = Server.new
+        server = Server.new(options[:user], options[:group], options[:chroot])
 
         board.on :event do |event|
           if event.valid?

data/lib/ban/server.rb

@@ -1,8 +1,10 @@
 module Ban
   class Server
     include EventEmitter
-    def initialize
+    
+    def initialize(user, group, chroot)
       @clients = []
+      @user, @group, @chroot = user, group, chroot
     end
 
     def broadcast(event)
@@ -13,6 +15,7 @@ module Ban
 
     def start(interface, port)
       @server = EM::WebSocket.run(host: interface, port: port) do |ws|
+        drop_priviledges!
         ws.onopen do |handshake|
           Ban::Logger.debug "WebSocket connection open"
           @clients << ws
@@ -33,5 +36,15 @@ module Ban
         end
       end
     end
+    
+    def drop_priviledges!
+      gid = Etc.getgrnam(@user).gid
+      uid = Etc.getpwnam(@group).uid
+      Dir.chroot(@chroot)
+      Process::Sys.setgid(gid)
+      Process::Sys.setuid(uid)
+    rescue => ex
+      Ban::Logger.warn "Dropping the proviledges didn't work: #{ex}"
+    end
   end
 end

data/lib/ban/version.rb

@@ -1,3 +1,3 @@
 module Ban
-  VERSION = "0.0.1"
+  VERSION = "0.1.0.pre0"
 end

data/lib/ban.rb

@@ -1,6 +1,7 @@
 require 'ban/version'
 require 'logger'
 require 'json'
+require 'etc'
 
 # used gems
 require 'eventmachine'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ban
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0.pre0
 platform: ruby
 authors:
 - Vincent Landgraf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-07 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,6 +144,7 @@ files:
 - doc/ban-layout.svg
 - doc/ban.fzz
 - examples/client.rb
+- init/ban.conf
 - ino.ini
 - lib/ban.rb
 - lib/ban/board.rb
@@ -175,9 +176,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.6