session-validator-client 5.1.2 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6242bc6b7c02d62ac8bceff4c620ae8836bd1935a23df95a839cd84b8b5c1934
-  data.tar.gz: ca9638fab46429d9df13658fd728cbabc0773998d61554dbb00ac7aa397f10fe
+  metadata.gz: 2498a668e8f669382a1a88f6555356823e7115d6978d8c9331bf84d1395190cc
+  data.tar.gz: 2ea169bd1b520056db1b7cc8fd65c0bac5aa206c8e7899e533267c104bec45e4
 SHA512:
-  metadata.gz: ad5b41199775adc15dbaa11e72b169a2651fb352a7c4ca279abc93e14c72f74b55c6a7618c8cf6714936b3c6cce7ad6bff1222511e1dc4ca640aacacbd1bffd6
-  data.tar.gz: b1a9477a886cbc02cd11d04cd27c18385a18970cb48be418b1addec74514823ec34f35d35f73a7d4c632cfdbb532f461cc3414fc8844e8eceefde86c3d64f21b
+  metadata.gz: 2e0884a245a05850cc5412fe3f710ca875467093431f4514d591bcfcc9a8c8fc4373cede425204ccf80268e52c7f2ac9f3440fcb66bf32ab37fa4dba63833575
+  data.tar.gz: 023273a70c9d99daa8768ba44b1e50abc8cb8e76f39991e3def548f4bcebecf2771c704f9ffbb9e142cedb16c5cdee995ba1037b17a1ba39e276bb9ef2453e56

data/.github/workflows/ruby.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-versions: ['2.6', '2.7', '3.0', '3.2']
+        ruby-versions: ['3.2', '3.3', '3.4']
 
     steps:
     - uses: actions/checkout@v4
@@ -19,7 +19,7 @@ jobs:
     - name: Run tests
       run: bundle exec rspec
     - name: Deploy
-      if : github.event_name == 'push' && startsWith(github.ref, 'refs/tags') && matrix.ruby-versions == '3.0'
+      if : github.event_name == 'push' && startsWith(github.ref, 'refs/tags') && matrix.ruby-versions == '3.2'
       run: |
           mkdir -p $HOME/.gem
           touch $HOME/.gem/credentials

data/.gitignore

@@ -2,3 +2,4 @@
 Gemfile.lock
 .ruby-version
 .env
+.bundle

data/Dockerfile

@@ -0,0 +1,20 @@
+FROM ruby:3.2-alpine
+
+RUN addgroup -g 1000 ruby && \
+    adduser -u 1000 -G ruby -s /bin/sh -D ruby && \
+    mkdir /app && \
+    chown ruby:ruby /app
+
+RUN apk update && \
+    apk upgrade
+RUN apk add --virtual .build-deps build-base git
+
+RUN gem update --system && \
+    gem update && \
+    gem cleanup && \
+    gem install bundler
+
+USER ruby
+WORKDIR /app
+
+RUN bundle config --local path .bundle

data/Makefile

@@ -1,7 +1,6 @@
-.PHONY: test sh
+.PHONY: build install test sh
 
-test:
-	docker compose run --rm app bash -c "bundle install && rspec"
-
-sh:
-	docker compose run --rm app bash -c "bundle install && bash"
+build: ; docker compose build
+install: ; docker compose run --rm app bundle install
+test: ; docker compose run --rm app bundle exec rspec
+sh: ; docker compose run --rm app sh

data/docker-compose.yml

@@ -1,6 +1,5 @@
 services:
   app:
-    image: ruby:3.2.5
-    working_dir: /home/app/src
+    build: .
     volumes:
-      - .:/home/app/src
+      - .:/app

data/lib/session_validator/client.rb

@@ -5,6 +5,7 @@ require "faraday/retry"
 require "faraday_middleware/escher"
 
 class SessionValidator::Client
+  MSID_PATTERN = /^[a-z0-9._]+_[0-9a-f]{14}\.[0-9]{8}$/.freeze
   CREDENTIAL_SCOPE = "eu/session-validator/ems_request".freeze
   ESCHER_AUTH_OPTIONS = {
     algo_prefix: "EMS",
@@ -19,13 +20,26 @@ class SessionValidator::Client
     @use_escher = use_escher
   end
 
-  def valid?(msid)
-    response_status = client.get("/sessions/#{msid}", nil, headers).status
-    (200..299).include?(response_status) || (500..599).include?(response_status)
+  def valid?(id)
+    if id.match(MSID_PATTERN)
+      valid_by_msid? id
+    else
+      valid_by_session_data_token? id
+    end
+  end
+
+  def session_data(token)
+    response = client.get("/sessions", nil, headers.merge(authorization_header token))
+    case response.status
+      when 200 then JSON.parse(response.body)
+      when 400..499 then raise SessionValidator::SessionDataNotFound
+      when 500.. then raise SessionValidator::SessionDataError, "Service unreachable"
+    end
   rescue *NETWORK_ERRORS
-    true
+    raise SessionValidator::SessionDataError, "Service unreachable"
   end
 
+  # @deprecated
   def filter_invalid(msids)
     response = client.post("/sessions/filter", JSON.generate({ msids: msids }), headers)
     if response.status == 200
@@ -39,11 +53,29 @@ class SessionValidator::Client
 
   private
 
+  def valid_by_msid?(msid)
+    response_status = client.get("/sessions/#{msid}", nil, headers).status
+    (200..299).include?(response_status) || (500..599).include?(response_status)
+  rescue *NETWORK_ERRORS
+    true
+  end
+
+  def valid_by_session_data_token?(token)
+    response_status = client.head("/sessions", nil, headers.merge(authorization_header token)).status
+    case response_status
+      when 200 then true
+      when 400..499 then false
+      when 500.. then raise SessionValidator::SessionDataError, "Service unreachable"
+    end
+  rescue *NETWORK_ERRORS
+    raise SessionValidator::SessionDataError, "Service unreachable"
+  end
+
   def client
     Faraday.new(url) do |faraday|
       faraday.options[:open_timeout] = SERVICE_REQUEST_TIMEOUT
       faraday.options[:timeout] = SERVICE_REQUEST_TIMEOUT
-      faraday.request :retry, interval: 0.05, interval_randomness: 0.5, backoff_factor: 2, methods: [:get, :post], exceptions: NETWORK_ERRORS
+      faraday.request :retry, interval: 0.05, interval_randomness: 0.5, backoff_factor: 2, methods: [:head, :get, :post], exceptions: NETWORK_ERRORS
       faraday.use(Faraday::Middleware::Escher::RequestSigner, escher_config) if @use_escher
       faraday.adapter Faraday.default_adapter
     end
@@ -73,4 +105,8 @@ class SessionValidator::Client
   def headers
     { "content-type" => "application/json" }
   end
+
+  def authorization_header(token)
+    { "Authorization" =>  "Bearer #{token}" }
+  end
 end

data/lib/session_validator.rb

@@ -3,6 +3,10 @@ module SessionValidator
   autoload :CachedClient, "session_validator/cached_client"
   autoload :InMemoryCache, "session_validator/in_memory_cache"
 
+  class SessionDataError < StandardError; end
+
+  class SessionDataNotFound < SessionDataError; end
+
   def self.base_url
     ENV['SESSION_VALIDATOR_URL']
   end

data/session-validator-client.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "session-validator-client"
-  s.version     = "5.1.2"
+  s.version     = "6.0.0"
   s.summary     = "Ruby client for Emarsys session validator service"
   s.authors     = ["Emarsys Technologies Ltd."]
   s.email       = "security@emarsys.com"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: session-validator-client
 version: !ruby/object:Gem::Version
-  version: 5.1.2
+  version: 6.0.0
 platform: ruby
 authors:
 - Emarsys Technologies Ltd.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-08 00:00:00.000000000 Z
+date: 2025-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escher-keypool
@@ -128,7 +128,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: security@emarsys.com
 executables: []
 extensions: []
@@ -138,6 +138,7 @@ files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - Makefile
@@ -154,7 +155,7 @@ homepage: https://github.com/emartech/session-validator-client-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -169,8 +170,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Ruby client for Emarsys session validator service
 test_files: []