simplerpc 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 521bfa515c7830eb4eca67649e054da956972994
-  data.tar.gz: 7d31d733d09bc81671c773eb0019c1facc392a0c
+  metadata.gz: 52022e8918debc2f49826eece8e11e9574e2f95d
+  data.tar.gz: 2f0e477006ea17a446215935cc3e7c87269a0a66
 SHA512:
-  metadata.gz: 2f94ccd55a711885d245a67c173b3433fadc8463679c2ff1170f7c0e9a8cb50ca62f25b3071e43dc24fa77df4f1cb25b43030456bcc18e6f4a9b0d1a4d298db8
-  data.tar.gz: b4edb70aa87f803b57c08a38dd8e13db1c817916f6d3fdc82337a16e40dbffef26122eb056adcc17b67053688b73a064b8776b73c2a8b6487b58f140deb110bb
+  metadata.gz: c593b4f3e3214db8d174f24acff198434ec9239b226baa8fa34ac11a49c6cb85c3c52c49facdad515d9c84a78cde459893d78de60af956bbb03e28f653dd37f9
+  data.tar.gz: 3805c2bea6266ef4312f4984358d47ad003562ddb60cdc1cb0024dcf2689f5f9c8f9dc26345e65500e0f0ece2c1e7518c7d73e4c7295f5aac75b6047e11e0e48

data/lib/simplerpc/server.rb

@@ -125,6 +125,7 @@ module SimpleRPC
 
       # Auth
       if opts[:password] && opts[:secret]
+        require 'securerandom'
         require 'simplerpc/encryption'
         @password   = opts[:password]
         @secret     = opts[:secret]
@@ -156,7 +157,7 @@ module SimpleRPC
 
       # Handle clients
       loop do
-      
+
         # Accept in an interruptable manner
         if (c = interruptable_accept(s))
           # Threaded
@@ -256,10 +257,15 @@ module SimpleRPC
       # Encrypted password auth
       if @password && @secret
         begin
-          # Send challenge
-          # XXX: this is notably not crytographically random,
-          #      but it's better than nothing against replay attacks
-          salt = Random.new.bytes(@salt_size)
+          # Send challenge,
+          # try secure random data, but fall back to insecure.
+          # TODO: also alert the user, or make this fallback optional.
+          salt = ''
+          begin
+            salt = SecureRandom.random_bytes(@salt_size)
+          rescue NotImplementedError
+            salt = Random.new.bytes(@salt_size)
+          end
           SocketProtocol::Simple.send(c, salt, @timeout)
 
           # Receive encrypted challenge
@@ -349,7 +355,7 @@ module SimpleRPC
       end
       @port = s.addr[1]
 
-      s.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
+      s.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, true)
 
       return s
     end

data/lib/simplerpc.rb

@@ -15,6 +15,6 @@ require 'simplerpc/client'
 # and including it includes all other project files
 module SimpleRPC
 
-  VERSION = '0.2.1'
+  VERSION = '0.2.3'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplerpc
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Stephen Wattam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies: []
 description: A very simple and fast RPC library
 email: stephenwattam@gmail.com
@@ -42,7 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Simple RPC library