faye-websocket 0.11.1 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d911cb9311b3ebcba587cea651bc49cf4ba29db10ef7b3c0b9bb7440571e39e
-  data.tar.gz: 81a0a87fd328f88730e84033ad795b28d969d12dfd7bcdd6c5f93e12b865bf44
+  metadata.gz: 4d168176a9846ceffcccbf52d16d682553c7cfb8732e275b44aec51cbad3cf69
+  data.tar.gz: b766dc978b036ac357a0cf3000515582809565998ff06944723223d0f68e47c9
 SHA512:
-  metadata.gz: 7c4bc1540dcb37c6c7ed508ae0d459878fef3b66009acd26555ee63b3a7013ba262cffb6fe82120385a002e12847e5c3c33ec3c44cb7ba1e7be7e7f730b1ab05
-  data.tar.gz: 953bdb31da0463fbda511ca4b1276ce88a5e2e9273d52c34e4b13eb018d4dec41c1dbd678c8ebcad700a4230e26dc9576d89753fbebd743e743e1bdb48da394c
+  metadata.gz: b12ea7fff43a07f1e91501faa42bc561f8596fb96b0b5eeed2082212f002e97b898d00e791d2ac407007e12865b851c022aa3aec30728a80761b5b281d225f68
+  data.tar.gz: 3bb181944f60af75c33d7779fa58cde5f8da76f3814c5398421f835884f334f8c1d82f0e46e1ae478f9889a941c5fd6b745e21de48f2a87e9fc8b3b0ad52de9b

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+### 0.11.3 / 2023-07-25
+
+- Handle 'cert already in hash table' error message on Ruby 3.1+
+
+### 0.11.2 / 2023-04-04
+
+- Handle SSL certificate chains where not all the intermediate certificates are
+  recognised by the client
+
 ### 0.11.1 / 2021-05-24
 
 - Prevent the client hanging if `close()` is called when already closing

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright 2010-2021 James Coglan
+Copyright 2010-2023 James Coglan
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use
 this file except in compliance with the License. You may obtain a copy of the

data/lib/faye/websocket/ssl_verifier.rb

@@ -42,14 +42,13 @@ module Faye
         return true unless should_verify?
 
         certificate = parse_cert(cert_text)
-        return false unless certificate
-
-        unless @cert_store.verify(certificate)
-          raise SSLError, "Unable to verify the server certificate for '#{ @hostname }'"
+        unless certificate
+          raise SSLError, "Unable to parse SSL certificate for '#{ @hostname }'"
         end
 
-        store_cert(certificate)
         @last_cert = certificate
+        @last_cert_verified = @cert_store.verify(certificate)
+        store_cert(certificate) if @last_cert_verified
 
         true
       end
@@ -57,6 +56,10 @@ module Faye
       def ssl_handshake_completed
         return unless should_verify?
 
+        unless @last_cert_verified
+          raise SSLError, "Unable to verify the server certificate for '#{ @hostname }'"
+        end
+
         unless identity_verified?
           raise SSLError, "Host '#{ @hostname }' does not match the server certificate"
         end
@@ -77,7 +80,7 @@ module Faye
       def store_cert(certificate)
         @cert_store.add_cert(certificate)
       rescue OpenSSL::X509::StoreError => error
-        raise error unless error.message == 'cert already in hash table'
+        raise error unless error.message =~ /cert already in hash table/
       end
 
       def identity_verified?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faye-websocket
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.3
 platform: ruby
 authors:
 - James Coglan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2023-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -73,6 +73,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,6 +83,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -230,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Standards-compliant WebSocket server and client