Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions lib/websocket/extensions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ def generate_offer
def activate(header)
responses = Parser.parse_header(header)
@sessions = []
activated = {}

responses.each_offer do |name, params|
unless record = @index[name]
Expand All @@ -83,6 +84,11 @@ def activate(header)

ext, session = *record

if activated[name]
raise ExtensionError, %Q{Server sent multiple responses for extension "#{ name }"}
end
activated[name] = true

if reserved = reserved?(ext)
raise ExtensionError, %Q{Server sent two extension responses that use the RSV#{ reserved[0] }} +
%Q{bit: "#{ reserved[1] }" and "#{ ext.name }"}
Expand Down
7 changes: 7 additions & 0 deletions spec/websocket/extensions_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,13 @@
expect { @extensions.activate("tar") }.not_to raise_error
end

it "rejects duplicate responses for an extension without reserved bits" do
allow(@ext).to receive(:rsv1).and_return(false)
expect(@session).to receive(:activate).with({}).exactly(1).and_return(true)

expect { @extensions.activate("deflate, deflate") }.to raise_error(ExtensionError)
end

it "raises if two extensions conflict on RSV bits" do
expect { @extensions.activate("deflate, tar") }.to raise_error(ExtensionError)
end
Expand Down