cable_room 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5969f6c18b991780a679a01426571046c9118c033ea238cbdcc69d362595a86a
-  data.tar.gz: 5f534f87fc9565fc9eeae80a01a9671b90b83762e9fe7ef9621dfd3e0020e247
+  metadata.gz: 928184ed2b2f5a529bb24cccde6e0048f9c9f5a7ce2b60b62779bc8f06a998ca
+  data.tar.gz: 440782d877fbdc28948fe8499de860bb0d99c4bcde01b1abb933a23f20a14074
 SHA512:
-  metadata.gz: f670e13c1944482c446701d6434b3f6d3bde6c77268c70f4c1fbf047281c74825d2500787e3abe4285b12afff4b175320291be610dc06ec8d3bf7cbfe35ddba4
-  data.tar.gz: 57c4cc7b7d11176accc28f71caa04f0b6ff67e7e386cdbb74c2b1f1623fa79d858f260002b402087cf0301481f510c43cb56775e0a249fc9cc52fa316382af57
+  metadata.gz: 95047199ea82748e023d3ca246ba942cc4e5845613bd7f76f18c2700e027027f60277f904bc9f3cc5514f808ae7ca4d9305d051fdf40b00d6c280a5fc4e8aba0
+  data.tar.gz: 5e4e966735dffddf5c074776ea44702dd52b6cd5559a5b814f7d87a03c3fb58e7acfb3b0b7401452b67e9444d7e67d29352ae726c8ab4ba35353e5390495685b

data/lib/cable_room/room/base.rb

@@ -25,6 +25,9 @@ module CableRoom
           vchannel.subscribe_to_channel
 
           true
+        rescue => e
+          CableRoom.lock_manager.unlock(lock_info) if lock_info
+          raise e
         end
 
         def room_port_key(room_key, port = nil)

data/lib/cable_room/room/input_handling.rb

@@ -28,11 +28,20 @@ module CableRoom
             end
           end
         end
+
+        # Prevent certain message types being forwarded from clients
+        def system_message_types(*types)
+          ([self] + ActiveSupport::DescendantsTracker.descendants(self)).reverse_each do |target|
+            target._system_message_types = target._system_message_types | Set.new(types.map(&:to_sym))
+          end
+        end
       end
 
       included do
         define_callbacks :receive_message
 
+        class_attribute :_system_message_types, instance_writer: false, default: Set.new
+
         set_callback(:receive_message, :before) do
           logger.debug "Received message: #{message.inspect}"
         end

data/lib/cable_room/room/port_management.rb

@@ -3,9 +3,6 @@ module CableRoom
     module PortManagement
       extend ActiveSupport::Concern
 
-      require_relative 'port_policies'
-      include PortPolicies
-
       PORT_TIMEOUT = 30.seconds
 
       class_methods do
@@ -38,6 +35,17 @@ module CableRoom
             @current_message_origin = previous_mtok
           end
         end
+
+        system_message_types(:port_connected, :port_disconnected, :port_ping)
+
+        require_relative 'port_policies'
+        include PortPolicies
+
+        PortPolicies::TagPolicy.define_tag_alias :connect, [:port_connected, :port_ping, :port_disconnected]
+
+        inbound_tag_policy(priority: -10) do
+          allow :*, :connect
+        end
       end
 
       def initialize(...)

data/lib/cable_room/room/port_policies.rb

@@ -36,10 +36,6 @@ module CableRoom
           next true if %i[port_connected port_disconnected].include?(msg_type)
           policy_allows?(msg_type)
         end
-
-        inbound_tag_policy(priority: -10) do
-          allow :*, :connect
-        end
       end
 
       protected
@@ -58,8 +54,6 @@ module CableRoom
           end
         end
 
-        define_tag_alias :connect, [:port_connected, :port_ping, :port_disconnected]
-
         def initialize()
           @policy_rules = []
           @fallback_rule = { action: :allow, priority: -100, tag: :*, methods: :* }

data/lib/cable_room/room/user_management.rb

@@ -25,11 +25,13 @@ module CableRoom
           end
         end
 
+        system_message_types(:user_joined, :user_left)
+
+        PortPolicies::TagPolicy.define_tag_alias :join, [:connect, :user_joined, :user_left]
+
         inbound_tag_policy(priority: -10) do
           allow :*, :join
         end
-
-        PortPolicies::TagPolicy.define_tag_alias :join, [:connect, :user_joined, :user_left]
       end
 
       def initialize(...)

data/lib/cable_room/room_member.rb

@@ -120,7 +120,7 @@ module CableRoom
     def ping!
       return if left?
 
-      self << { type: 'port_ping' }
+      port_transmit(room_class::ROOM_IN_CHANNEL, { type: 'port_ping' }, secure_context: true)
       maybe_provision_room
     end
 
@@ -129,7 +129,7 @@ module CableRoom
 
       close_streamed_ports!
       @cable_channel._room_memberships.delete(self)
-      self << { type: 'port_disconnected' }
+      port_transmit(room_class::ROOM_IN_CHANNEL, { type: 'port_disconnected' }, secure_context: true)
       @has_left = true
       @on_closed&.call(self)
     end
@@ -138,9 +138,18 @@ module CableRoom
 
     protected
 
-    def port_transmit(port, data)
+    def port_transmit(port, data, secure_context: false)
       data[:mtok] = @token
-      super
+
+      unless secure_context
+        t = (data[:type] || data['type']).to_sym
+        if room_class._system_message_types.include?(t)
+          logger.warn "Dropping attempt to send system message type: #{t.inspect}"
+          return
+        end
+      end
+
+      super(port, data)
     end
 
     def room_port_key(port)
@@ -172,7 +181,7 @@ module CableRoom
         tags: @tags,
       }
       msg[:extra] = ::ActiveJob::Arguments.serialize([@extra]) if @extra
-      self << msg
+      port_transmit(room_class::ROOM_IN_CHANNEL, msg, secure_context: true)
     end
 
     def maybe_provision_room

data/lib/cable_room/version.rb

@@ -1,3 +1,3 @@
 module CableRoom
-  VERSION = "0.4.2".freeze
+  VERSION = "0.4.4".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cable_room
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors:
 - Ethan Knapp