Skip to content
This repository has been archived by the owner on Dec 12, 2021. It is now read-only.

Fixed crashing when ext doesn't exist in message #106

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed crashing when ext doesn't exist in message #106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/private_pub/faye_extension.rb
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ def incoming(message, callback)
# Ensure the subscription signature is correct and that it has not expired.
def authenticate_subscribe(message)
subscription = PrivatePub.subscription(:channel => message["subscription"], :timestamp => message["ext"]["private_pub_timestamp"])
if message["ext"]["private_pub_signature"] != subscription[:signature]
if message["ext"].nil? || message["ext"]["private_pub_signature"] != subscription[:signature]
message["error"] = "Incorrect signature."
elsif PrivatePub.signature_expired? message["ext"]["private_pub_timestamp"].to_i
message["error"] = "Signature has expired."
Expand All @@ -29,7 +29,7 @@ def authenticate_subscribe(message)
def authenticate_publish(message)
if PrivatePub.config[:secret_token].nil?
raise Error, "No secret_token config set, ensure private_pub.yml is loaded properly."
elsif message["ext"]["private_pub_token"] != PrivatePub.config[:secret_token]
elsif message["ext"].nil? || message["ext"]["private_pub_token"] != PrivatePub.config[:secret_token]
message["error"] = "Incorrect token."
else
message["ext"]["private_pub_token"] = nil
Expand Down