clerk-sdk-ruby 2.0.2 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14a199089622ba34863506e79d0dc93dfe86f88c7d1d2c2543bb6b15fb5fd927
-  data.tar.gz: 58e580b74208bcc0da98492257975c9d155c39b0e1c9c1704fae04e9cbeec57e
+  metadata.gz: 8a1b17c701d86ec55c4519f72231005a5b83efc07af4180ae98a292a63e422a5
+  data.tar.gz: 204eb5ac27340d5d4fc64c7edfc93287c293b9c3d973977b5aa1f87e3ba53ea9
 SHA512:
-  metadata.gz: 2dec6b419ca2398552cfb9806b046acee03a5440d122e53fac73446863f52c04d1ffc5009fa3458d88774092b79de2d603b10fc5beb7b3ab6124a0137e2aa679
-  data.tar.gz: d92a5e3dbf790b9ad0459f3c209ab2721077075bd9c574523b4ce6f7b2f8d7b1023fcf33aa9f21572215db63eb270c1f68e51cd2d5ed501206ff664c1e5d6e25
+  metadata.gz: af8693eb43e6f61133966fc47d3ee884697df94c1415fd05d921e6ff35f66807c47e65fba24d51d09db2f9e6177c0624267181ac42f0ea566c580c4c503c95fd
+  data.tar.gz: b46bd350059257dcb2b8f8b6d164ead13b563921417ea766b1a4d9847ed5aaa992755f21445ba899503b4f5587b95493121ff3d1a0c7206634f21125611d34ed

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## unreleased
 
+## 2.1.1 - 2022-02-24
+
+- fix: Make Authv2 middleware thread-safe
+
 ## 2.0.0 - 2021-10-21
 
 This release introduces the new networkless middleware which works with the new 

data/README.md

@@ -1,20 +1,25 @@
 # Clerk Ruby SDK
 
+
 Thank you for choosing [Clerk](https://clerk.dev/) for your authentication,
 session & user management needs!
 
 This SDK allows you to call the Clerk Backend API from Ruby code without having
 to implement the calls yourself.
 
----------
-
-**Note**: This is the v2 branch, which requires that you use [Auth 
+**Note**: You're looking at the main branch, which requires that you use [Auth 
 v2](https://docs.clerk.dev/main-concepts/auth-v2).
 
-If you're looking for the legacy authentication scheme (Auth v1), refer to the 
-[`main`](https://github.com/clerkinc/clerk-sdk-ruby/tree/main) branch.
+If you're looking for the legacy authentication scheme, refer to the 
+[`v1`](https://github.com/clerkinc/clerk-sdk-ruby/tree/v1) branch.
+
+---
+
+**Clerk is Hiring!**
+
+Would you like to work on Open Source software and help maintain this repository? Apply today https://apply.workable.com/clerk-dev/.
 
-----------
+---
 
 ## Installation
 

data/lib/clerk/rack_middleware_v2.rb

@@ -1,93 +1,103 @@
 require "clerk"
 
 module Clerk
-  class RackMiddlewareV2
-    class ProxyV2
-      CACHE_TTL = 60 # seconds
+  class ProxyV2
+    CACHE_TTL = 60 # seconds
 
-      attr_reader :session_claims, :session_token
+    attr_reader :session_claims, :session_token
 
-      def initialize(session_claims: nil, session_token: nil)
-        @session_claims = session_claims
-        @session_token = session_token
-        @session = nil
-      end
+    def initialize(session_claims: nil, session_token: nil)
+      @session_claims = session_claims
+      @session_token = session_token
+      @session = nil
+    end
 
-      def session
-        return nil if @session_claims.nil?
+    def session
+      return nil if @session_claims.nil?
 
-        @session ||= verify_session
-      end
+      @session ||= verify_session
+    end
 
-      def verify_session
-        return nil if @session_claims.nil?
+    def verify_session
+      return nil if @session_claims.nil?
 
-        sdk.sessions.verify_token(@session_claims["sid"], @session_token)
-      end
+      sdk.sessions.verify_token(@session_claims["sid"], @session_token)
+    end
 
-      def user
-        return nil if user_id.nil?
+    def user
+      return nil if user_id.nil?
 
-        @user ||= fetch_user(user_id)
-      end
+      @user ||= fetch_user(user_id)
+    end
 
-      def user_id
-        return nil if @session_claims.nil?
+    def user_id
+      return nil if @session_claims.nil?
 
-        @session_claims["sub"]
-      end
+      @session_claims["sub"]
+    end
 
-      private
+    private
 
-      def fetch_user(user_id)
-        cached_fetch("clerk_user:#{user_id}") do
-          sdk.users.find(user_id)
-        end
+    def fetch_user(user_id)
+      cached_fetch("clerk_user:#{user_id}") do
+        sdk.users.find(user_id)
       end
+    end
 
-      def cached_fetch(key, &block)
-        if store = Clerk.configuration.middleware_cache_store
-          store.fetch(key, expires_in: CACHE_TTL, &block)
-        else
-          yield
-        end
+    def cached_fetch(key, &block)
+      if store = Clerk.configuration.middleware_cache_store
+        store.fetch(key, expires_in: CACHE_TTL, &block)
+      else
+        yield
       end
+    end
 
-      def sdk
-        @sdk ||= Clerk::SDK.new
-      end
+    def sdk
+      @sdk ||= Clerk::SDK.new
     end
+  end
 
+  class RackMiddlewareV2
     def initialize(app)
       @app = app
     end
 
     def call(env)
-      @env = env
-      @req = Rack::Request.new(env)
-      @env["clerk"] = ProxyV2.new
-      @header_token = @req.env["HTTP_AUTHORIZATION"]&.strip
-      @cookie_token = @req.cookies["__session"]
-      @client_uat = @req.cookies["__client_uat"]
+      env = env
+      req = Rack::Request.new(env)
+      env["clerk"] = Clerk::ProxyV2.new
+      header_token = req.env["HTTP_AUTHORIZATION"]
+      header_token = header_token.strip.sub(/\ABearer /, '') if header_token
+      cookie_token = req.cookies["__session"]
+      client_uat = req.cookies["__client_uat"]
 
       ##########################################################################
       #                                                                        #
       #                          HEADER AUTHENTICATION                         #
       #                                                                        #
       ##########################################################################
-      if @header_token
-        return signed_out if !sdk.decode_token(@header_token) # malformed JWT
+      if header_token
+        return signed_out(env) if !sdk.decode_token(header_token) # malformed JWT
 
-        token = verify_token(@header_token)
-        return signed_in(token, @header_token) if token
+        token = verify_token(header_token)
+        return signed_in(env, token, header_token) if token
 
         # Clerk.js should refresh the token and retry
         return unknown(interstitial: false)
       end
 
       # in cross-origin XHRs the use of Authorization header is mandatory.
-      if cross_origin_request?(@req)
-        return signed_out
+      if cross_origin_request?(req)
+        return signed_out(env)
+      end
+
+      if development_or_staging? && !browser_request?(req)
+        # the interstitial won't work if the user agent is not a browser, so
+        # short-circuit and avoid rendering it
+        #
+        # We only limit this to dev/stg because we're not yet sure how robust
+        # this strategy is, yet. In the future, we might enable it for prod too.
+        return signed_out(env)
       end
 
       ##########################################################################
@@ -95,22 +105,22 @@ module Clerk
       #                             COOKIE AUTHENTICATION                      #
       #                                                                        #
       ##########################################################################
-      if development_or_staging? && (@req.referrer.nil? || cross_origin_request?(@req))
+      if development_or_staging? && (req.referrer.nil? || cross_origin_request?(req))
         return unknown(interstitial: true)
       end
 
-      if production? && @client_uat.nil?
-        return signed_out
+      if production? && client_uat.nil?
+        return signed_out(env)
       end
 
-      if @client_uat == "0"
-        return signed_out
+      if client_uat == "0"
+        return signed_out(env)
       end
 
-      token = verify_token(@cookie_token)
+      token = verify_token(cookie_token)
 
-      if token && token["iat"] && @client_uat && Integer(@client_uat) <= token["iat"]
-        return signed_in(token, @cookie_token)
+      if token && token["iat"] && client_uat && Integer(client_uat) <= token["iat"]
+        return signed_in(env, token, cookie_token)
       end
 
       unknown(interstitial: true)
@@ -119,15 +129,15 @@ module Clerk
     private
 
     # Outcome A
-    def signed_in(claims, token)
-      @env["clerk"] = ProxyV2.new(session_claims: claims, session_token: token)
+    def signed_in(env, claims, token)
+      env["clerk"] = ProxyV2.new(session_claims: claims, session_token: token)
 
-      @app.call(@env)
+      @app.call(env)
     end
 
     # Outcome B
-    def signed_out
-      @app.call(@env)
+    def signed_out(env)
+      @app.call(env)
     end
 
     # Outcome C
@@ -153,7 +163,7 @@ module Clerk
       return false if origin.nil?
 
       # strip scheme
-      origin = origin.strip.sub(/(^\w+:|^)\/\//, '')
+      origin = origin.strip.sub(/\A(\w+:)?\/\//, '')
       return false if origin.empty?
 
       # Rack's host and port helpers are reverse-proxy-aware; that
@@ -161,21 +171,27 @@ module Clerk
       request_host = req.host
       request_host << ":#{req.port}" if req.port != 80 && req.port != 443
 
-      origin == request_host
+      origin != request_host
+    end
+
+    def browser_request?(req)
+      user_agent = req.env["HTTP_USER_AGENT"]
+
+      !user_agent.nil? && user_agent.starts_with?("Mozilla/")
     end
 
     def verify_token(token)
       return false if token.nil? || token.strip.empty?
 
       begin
-        @session = sdk.verify_token(token)
+        sdk.verify_token(token)
       rescue JWT::DecodeError, JWT::RequiredDependencyError => e
         false
       end
     end
 
     def sdk
-      @sdk ||= Clerk::SDK.new
+      Clerk::SDK.new
     end
   end
 end

data/lib/clerk/sdk.rb

@@ -20,7 +20,8 @@ require_relative "errors"
 module Clerk
   class SDK
     DEFAULT_HEADERS = {
-      "User-Agent" => "Clerk/#{Clerk::VERSION}; Faraday/#{Faraday::VERSION}; Ruby/#{RUBY_VERSION}"
+      "User-Agent" => "Clerk/#{Clerk::VERSION}; Faraday/#{Faraday::VERSION}; Ruby/#{RUBY_VERSION}",
+      "X-Clerk-SDK" => "ruby/#{Clerk::VERSION}"
     }
 
     # How often (in seconds) should JWKs be refreshed

data/lib/clerk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Clerk
-  VERSION = "2.0.2"
+  VERSION = "2.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clerk-sdk-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.1
 platform: ruby
 authors:
 - Clerk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Clerk SDK for Ruby.