simplerpc 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe0eb8578d0b1f0f41f18696580bf8b8bb26439d
-  data.tar.gz: ab97b64f7519ea0b18e9f04c7b7fc52a6206917d
+  metadata.gz: 8a69be8244f05f17f48dc37898ebd7d180be43ed
+  data.tar.gz: ef009b4b827ba659167e73d69c16721ffaaadd56
 SHA512:
-  metadata.gz: 0152af8e2cff5b277fdb40f02fc18732b14c6a249e33840587a682fc9a7ae9a5867301394ec049eacbed133f321f3d1a1877d982dddf7f9071839c91c5ceed6d
-  data.tar.gz: 6d5ba75c705eb414ae87482f144f638001623b7d6250aa9dec2ee3addc156e862f58ea200ec1d376d818dc41da9374578991d03330016cffd546a5617b591508
+  metadata.gz: 06793a5e5a8216ed99477655b77a28f7dc970ae8db9c6ca9225b3562fad4688503851d68d20b9ec9e2a67ece57195002e9fba010a4dd0ce4ec17ed1e97db2a1b
+  data.tar.gz: 4c1f26fdb2435251ca550bb7320b31e812838da40a1030b4466ae9fd9ff20d65a84a0331790fbc332220e5e4d89242669136f6ba33d3a988afcfdbbb157a0be8

data/lib/simplerpc/client.rb

@@ -157,6 +157,7 @@ module SimpleRPC
     # [:password] The password clients need to connect
     # [:secret] The encryption key used during password authentication.
     #           Should be some long random string that matches the server's.
+    #           This should be ASCII-8bit encoded (it will be converted if not)
     # [:fast_auth] Use a slightly faster auth system that is incapable of knowing if it has failed or not.
     #              By default this is off.
     # [:threaded] Support multiple connections to the server (default is on)
@@ -393,6 +394,7 @@ module SimpleRPC
       if @password && @secret
         salt      = SocketProtocol::Simple.recv(s, @timeout)
         challenge = Encryption.encrypt(@password, @secret, salt)
+
         SocketProtocol::Simple.send(s, challenge, @timeout)
 
         # Check return if not @fast_auth

data/lib/simplerpc/encryption.rb

@@ -21,8 +21,6 @@ module SimpleRPC
         cipher.encrypt
         cipher.key     = salt_key(salt, secret)
         return cipher.update(password) + cipher.final
-    rescue StandardError
-      return nil  # Don't allow anyone to deliberately cause lockups
     end
 
     # Decrypt data
@@ -32,14 +30,13 @@ module SimpleRPC
         decipher.decrypt
         decipher.key  = salt_key(salt, secret)
         return decipher.update(raw) + decipher.final
-    rescue StandardError
-      return nil  # Don't allow anyone to deliberately cause lockups
     end
 
     # Salt a key by simply adding the two
     # together
     def self.salt_key(salt, key)
-      return salt + key
+      return salt.encode('ASCII-8BIT', :undef => :replace, :invalid => :replace) + 
+              key.encode('ASCII-8BIT', :undef => :replace, :invalid => :replace)
     end
 
   end

data/lib/simplerpc/server.rb

@@ -99,6 +99,7 @@ module SimpleRPC
     #             Default is on.
     # [:password] The password clients need to connect
     # [:secret] The encryption key used during password authentication.  Should be some long random string.
+    #           This should be ASCII-8bit encoded (it will be converted if not)
     # [:salt_size] The size of the string used as a nonce during password auth.  Defaults to 10 chars
     # [:fast_auth] Use a slightly faster auth system that is incapable of knowing if it has failed or not.
     #              By default this is off.
@@ -254,21 +255,26 @@ module SimpleRPC
 
       # Encrypted password auth
       if @password && @secret
-        # Send challenge
-        # XXX: this is notably not crytographically random,
-        #      but it's better than nothing against replay attacks
-        salt = Random.new.bytes(@salt_size)
-        SocketProtocol::Simple.send(c, salt, @timeout)
-
-        # Receive encrypted challenge
-        raw = SocketProtocol::Simple.recv(c, @timeout)
-
-        # D/c if failed
-        unless Encryption.decrypt(raw, @secret, salt) == @password
-          SocketProtocol::Simple.send(c, SocketProtocol::AUTH_FAIL, @timeout) unless @fast_auth
+        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)
+          SocketProtocol::Simple.send(c, salt, @timeout)
+
+          # Receive encrypted challenge
+          raw = SocketProtocol::Simple.recv(c, @timeout)
+
+          # D/c if failed
+          unless Encryption.decrypt(raw, @secret, salt) == @password
+            SocketProtocol::Simple.send(c, SocketProtocol::AUTH_FAIL, @timeout) unless @fast_auth
+            return
+          end
+          SocketProtocol::Simple.send(c, SocketProtocol::AUTH_SUCCESS, @timeout) unless @fast_auth
+        rescue
+          # Auth failure is silent for the server
           return
         end
-        SocketProtocol::Simple.send(c, SocketProtocol::AUTH_SUCCESS, @timeout) unless @fast_auth
       end
 
       # Handle requests

data/lib/simplerpc/socket_protocol.rb

@@ -10,11 +10,11 @@ module SimpleRPC
   #
   module SocketProtocol
 
-    # Sent when auth succeeds
-    AUTH_SUCCESS = 'C'
+    # Sent when auth succeeds (ASCII to match simple protocol)
+    AUTH_SUCCESS = 'C'.encode('ASCII-8BIT', :undef => :replace, :invalid => :replace)
 
-    # Sent when auth fails
-    AUTH_FAIL    = 'F'
+    # Sent when auth fails (ASCII to match simple protocol)
+    AUTH_FAIL    = 'F'.encode('ASCII-8BIT', :undef => :replace, :invalid => :replace)
 
     # The request succeeded
     REQUEST_SUCCESS = 0

data/lib/simplerpc.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplerpc
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Stephen Wattam