meshchat 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d92a2e7b4e026335fc14b3c574cd4252a5f0dbb7
-  data.tar.gz: 37348ba21effad3647ef2ccd154235b371243810
+  metadata.gz: 710116e03c53eb697697204b0fcc82f03dd65f0b
+  data.tar.gz: d296660e62b2dca5dcdfb7338045217c7b14da8e
 SHA512:
-  metadata.gz: 6477e3bff10e2bd795ad277a6376351c87fd520796a0bc717baf27776a0698caecfc6573190cb4074c9a3feea2f4fe1fd930d518ce18212978297e39af9a17fc
-  data.tar.gz: a3031e4f8b1a5196c3407798006c8ef750eabd83ae791973505480bae32399380d6f76d87c1ff1f400b010452b95f3854fb30520ced07f28e4a355818dcc333d
+  metadata.gz: 41acfb1c0c96b46fd6f39c5e76d9892c3eb24ee0ecc28b32119f45a2bf950f9f5daea6b1e6b5de2f619b2a5b5130dd7233e81f9c9531f440583f938582d89775
+  data.tar.gz: 5edd7cee532eb5ecc845178a50d5a5a042357c0d9b2e7912d3137f652d12a3f1a21f189bb951616dc79c793da3c35ee7addd8e1eb9759198cdf40a529a46bbc6

data/README.md

@@ -4,7 +4,7 @@ This is the core functionality for implementing a [mesh-chat](https://github.com
 
 #Usage
 
-See [Spiced Gracken](https://github.com/NullVoxPopuli/spiced_gracken)
+See [Spiced Rumby](https://github.com/NullVoxPopuli/spiced_rumby)
 
 In order to use meshchat with your own interface, you only need to pass in your own implementations of `Display::Base` and `CLI::Base`
 

data/lib/meshchat/message/node_list.rb

@@ -25,10 +25,11 @@ module MeshChat
           end
         end
 
-        if we_only_have.present?
-          location = payload['sender']['location']
 
-          node = Node.find_by_location(location)
+        location = payload['sender']['location']
+
+        node = Node.find_by_location(location)
+        if we_only_have.present?
 
           # give the sender our list
           MeshChat::Net::Client.send(
@@ -36,14 +37,23 @@ module MeshChat
             message: NodeListDiff.new(message: we_only_have)
           )
 
-          # give the network their list
+          # give people we know about
+          # (but the sender of the Node List may not know about)
+          # our node list diff
           Node.online.each do |entry|
             MeshChat::Net::Client.send(
               node: entry,
               message: NodeListDiff.new(message: they_only_have)
             )
           end
+        else
+          # lists are in sync, confirm with hash
+          MeshChat::Net::Client.send(
+            node: node,
+            message: NodeListHash.new
+          )
         end
+
       end
     end
   end

data/lib/meshchat/message/node_list_hash.rb

@@ -14,8 +14,10 @@ module MeshChat
 
       def respond
         if message != Node.as_sha512
+          Display.debug 'node list hashes do not match'
           location = payload['sender']['location']
 
+          Display.debug 'sending a node list to ' + location
           node = Node.find_by_location(location)
 
           MeshChat::Net::Client.send(

data/lib/meshchat/net/client.rb

@@ -14,8 +14,8 @@ module MeshChat
         node = self.node_for(location: location, uid: uid, node: node)
 
         Thread.new(node, message) do |node, message|
-          request = MeshChat::Net::Request.new(node, message)
-          payload = { message: request.payload }
+          payload = Client.payload_for(node, message)
+
           begin
             Curl::Easy.http_post(node.location, payload.to_json) do |c|
               c.headers['Accept'] = 'application/json'
@@ -37,6 +37,12 @@ module MeshChat
         end
       end
 
+      # creates a json payload
+      def self.payload_for(node, message)
+        request = MeshChat::Net::Request.new(node, message)
+        { message: request.payload }
+      end
+
       # private
 
       # @return [Node]

data/lib/meshchat/net/listener/errors.rb

@@ -0,0 +1,11 @@
+module MeshChat
+  module Net
+    module Listener
+      module Errors
+        class NotAuthorized < StandardError; end
+        class Forbidden < StandardError; end
+        class BadRequest < StandardError; end
+      end
+    end
+  end
+end

data/lib/meshchat/net/listener/request.rb

@@ -7,7 +7,14 @@ module MeshChat
 
         def initialize(input)
           self._input = try_decrypt(input)
-          self.json = JSON.parse(_input)
+
+          begin
+            self.json = JSON.parse(_input)
+          rescue => e
+            Display.debug e.message
+            Display.debug e.backtrace.join("\n")
+            raise Errors::BadRequest.new
+          end
           self.message = process_json
         end
 
@@ -15,19 +22,15 @@ module MeshChat
 
         def try_decrypt(input)
           begin
-            # TODO: do we want to try to decrypting anyway if decoding fails?
             decoded = Base64.decode64(input)
             input = Cipher.decrypt(decoded, Settings[:privateKey])
           rescue => e
             Display.debug e.message
             Display.debug e.backtrace.join("\n")
-            Display.warning e.message
-            Display.info 'It\'s possible that this message was sent in cleartext, or was encrypted with the wrong public key'
+            Display.debug input
+            raise Errors::NotAuthorized.new(e.message)
           end
 
-          Display.debug 'server received message:'
-          Display.debug input
-
           input
         end
 
@@ -35,10 +38,7 @@ module MeshChat
           type = json['type']
           klass = Message::TYPES[type]
 
-          unless klass
-            Display.alert 'message recieved and not recognized...'
-            return
-          end
+          raise Errors::BadRequest.new(type) unless klass
 
           klass.new(payload: json)
         end

data/lib/meshchat/net/listener/request_processor.rb

@@ -22,9 +22,7 @@ module MeshChat
           # if the sender isn't currently marked as active,
           # perform the server list exchange
           node = Node.find_by_uid(sender['uid'])
-          if node.nil?
-            return Display.alert "#{sender['alias']} is not authorized!"
-          end
+          raise Errors::Forbidden.new if node.nil?
 
           unless node.online?
             node.update(online: true)

data/lib/meshchat/net/listener/server.rb

@@ -1,9 +1,15 @@
 require 'sinatra/base'
+require 'meshchat/net/listener/errors'
 
 module MeshChat
   module Net
     module Listener
       class Server < Sinatra::Base
+        OK = 200
+        BAD_REQUEST = 400
+        NOT_AUTHORIZED = 401
+        FORBIDDEN = 403
+
         configure :development do
           # only shows resulting status
           disable :logging
@@ -32,25 +38,11 @@ module MeshChat
         end
 
         def process_request
-          Display.debug request.env
-
           begin
             # form params should override
             # raw body
-            raw =
-              if msg = params[:message]
-                msg
-              else
-                request_body = request.body.read
-                json_body = JSON.parse(request_body)
-                json_body['message']
-              end
-
-            # decode, etc
-            RequestProcessor.process(raw)
-
-            # hopefully everything went ok
-            ok
+            raw = get_message
+            process(raw)
           rescue => e
             Display.error e.message
             Display.error e.backtrace.join("\n")
@@ -59,9 +51,32 @@ module MeshChat
           end
         end
 
-        def ok
-          status 200
-          body 'OK'
+        def get_message
+          # if received as form data
+          return params[:message] if params[:message]
+
+          # if received as json
+          request_body = request.body.read
+          json_body = JSON.parse(request_body)
+          json_body['message']
+        end
+
+        def process(raw)
+          # decode, etc
+          begin
+            RequestProcessor.process(raw)
+          rescue Errors::NotAuthorized
+            status_of NOT_AUTHORIZED
+          rescue Errors::Forbidden
+            status_of FORBIDDEN
+          rescue Errors::BadRequest
+            status_of BAD_REQUEST
+          end
+        end
+
+        def status_of(s)
+          status s
+          body ''
         end
       end
     end

data/lib/meshchat/version.rb

@@ -1,3 +1,3 @@
 module MeshChat
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meshchat
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - L. Preston Sego III
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-22 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -228,6 +228,7 @@ files:
 - lib/meshchat/message/whisper.rb
 - lib/meshchat/models/entry.rb
 - lib/meshchat/net/client.rb
+- lib/meshchat/net/listener/errors.rb
 - lib/meshchat/net/listener/request.rb
 - lib/meshchat/net/listener/request_processor.rb
 - lib/meshchat/net/listener/server.rb
@@ -257,6 +258,6 @@ rubyforge_project:
 rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
-summary: MeshChat-0.6.3
+summary: MeshChat-0.6.4
 test_files: []
 has_rdoc: