cm-graphql 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3adaf1303f53f1360bcb8497b025b1960958b8fc285c7abe2a6547a6be56a620
-  data.tar.gz: 857f7282ed8dc874f1f886cba9d93b384cd2be4ee4d4ec84513bf989265f99d1
+  metadata.gz: f96a2b69bc022c0d1c34f17f3446eeb9e568675a3311085850673299f538dc5d
+  data.tar.gz: 1312ee2a215b9bf4a3f8506105c41dd9a05f66b70624bbaf5f9a74aab2366030
 SHA512:
-  metadata.gz: 9f5d3aa1a49d5fc8922a72366a7ba05b2a821cea8c094994aad1bbd205d8a1cdb11dce7ceb7ad0755547629c140753da12b728a5d84f1c5db0b239fb1222d26e
-  data.tar.gz: 70b4a6394d65a12ffd916c1e44f6d1654e40104c7c1ab348a7680c12a3726583bfb49da56d7a9bbe7a062e9542bd32f1a2e0ab200a9dfd442b92af6fe976d89d
+  metadata.gz: 3934404241a4ddb217799a54dee2da3c019941a1ee61c3313391e9cd768d836bd46d382cc01fa95b673ef12f5554a8e5cc37460f604f15e8eea52fad7c132035
+  data.tar.gz: 3e564a39769a51646162853f7ad72c7331ea86f5a079450480a1e168ceee4276c1d91aa68f1cb41cfe2dfb704af1a96f266c6ec20864ee2e25aba97ad4f6c1aa

data/Gemfile

@@ -3,3 +3,7 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :development, :test do
+  gem 'rspec', '~> 3.12'
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-graphql (0.0.12)
+    cm-graphql (0.0.14)
       graphiql-rails (>= 1.9)
       graphql (>= 2.2.5)
       graphql-rails_logger (>= 1.2.4)
@@ -53,6 +53,7 @@ GEM
     connection_pool (2.5.2)
     crass (1.0.6)
     date (3.4.1)
+    diff-lcs (1.6.2)
     drb (2.2.1)
     erubi (1.13.1)
     fiber-storage (1.0.1)
@@ -90,11 +91,7 @@ GEM
     loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    mini_portile2 (2.8.8)
     minitest (5.25.5)
-    nokogiri (1.18.8)
-      mini_portile2 (~> 2.8.2)
-      racc (~> 1.4)
     nokogiri (1.18.8-arm64-darwin)
       racc (~> 1.4)
     pp (0.6.2)
@@ -133,6 +130,19 @@ GEM
     reline (0.6.1)
       io-console (~> 0.5)
     rouge (4.5.1)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.7)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
     securerandom (0.4.1)
     stringio (3.1.7)
     thor (1.3.2)
@@ -146,10 +156,12 @@ GEM
 PLATFORMS
   arm64-darwin-20
   arm64-darwin-22
-  ruby
+  arm64-darwin-23
+  arm64-darwin-24
 
 DEPENDENCIES
   cm-graphql!
+  rspec (~> 3.12)
 
 BUNDLED WITH
    2.6.8

data/app/graphql/cm_graphql/extensions/recaptcha_extension.rb

@@ -2,18 +2,15 @@ module CmGraphql
   module Extensions
     class RecaptchaExtension < GraphQL::Schema::FieldExtension
       def apply
-        if field.resolver
-          field.resolver.argument(:recaptcha_token, String, required: true)
-        else
-          field.argument(:recaptcha_token, String, required: true)
-        end
+        input_arg = field.arguments["input"]
+        input_type = input_arg.type.unwrap
+        input_type.argument(:recaptcha_token, String, required: true)
       end
- 
-      def resolve(object:, arguments:, context:)
-        args_hash = arguments.to_h
-        input_hash = args_hash[:input].respond_to?(:to_h) ? args_hash[:input].to_h : nil
 
-        recaptcha_token = input_hash ? input_hash[:recaptcha_token] : args_hash[:recaptcha_token]
+      def resolve(object:, arguments:, context:, **_rest)
+        args_hash = arguments.to_h
+        input_hash = args_hash[:input].to_h
+        recaptcha_token = input_hash[:recaptcha_token]
 
         RecaptchaVerifier.verify_v3!(
           token: recaptcha_token,
@@ -22,13 +19,8 @@ module CmGraphql
           minimum_score: options[:minimum_score] || RECAPTCHA_MINIMUM_SCORE
         )
 
-        if input_hash
-          next_input = input_hash.dup
-          next_input.delete(:recaptcha_token)
-          yield(object, args_hash.merge(input: next_input))
-        else
-          yield(object, arguments.except(:recaptcha_token))
-        end
+        next_input = input_hash.except(:recaptcha_token)
+        yield(object, args_hash.except(:input).merge(input: next_input), nil)
       end
     end
   end

data/app/services/recaptcha_verifier.rb

@@ -2,19 +2,39 @@ require 'net/http'
 require 'json'
 
 class RecaptchaVerifier
-  VERIFY_URL = URI.parse('https://www.google.com/recaptcha/api/siteverify').freeze
+  API_HOST = 'recaptchaenterprise.googleapis.com'
 
   def self.verify_v3(token:, action:, remote_ip: nil, minimum_score: 0.5)
-    secret = Rails.application.credentials.dig(:gcp, :recaptcha_secret_key)
-    raise RecaptchaVerificationFailed, "Please cofigure recaptcha credentials, so it reads Rails.application.credentials.dig(:gcp, :recaptcha_secret_key)." if secret.blank? || token.blank?
+    project_id = Rails.application.credentials.dig(:gcp, :recaptcha_enterprise_project_id)
+    site_key = Rails.application.credentials.dig(:gcp, :recaptcha_site_key)
+    api_key = Rails.application.credentials.dig(:gcp, :recaptcha_api_key)
 
-    response = post_verify(secret:, token:, remote_ip:)
-    raise RecaptchaVerificationFailed, "Invalid response from recaptcha" unless response.is_a?(Hash)
+    if project_id.blank? || site_key.blank? || api_key.blank?
+      raise RecaptchaVerificationFailed,
+            'Please configure recaptcha enterprise credentials at Rails.application.credentials.dig(:gcp, :recaptcha_enterprise_project_id), :recaptcha_site_key, :recaptcha_api_key.'
+    end
 
-    raise RecaptchaVerificationFailed, "Recaptcha verification failed" unless response['success'] == true
-    raise RecaptchaVerificationFailed, "Recaptcha action mismatch" if response['action'].present? && response['action'] != action
+    raise RecaptchaVerificationFailed, 'Recaptcha token missing' if token.blank?
 
-    score = response['score']
+    response = create_assessment(project_id:, site_key:, api_key:, token:, action:, remote_ip:)
+    raise RecaptchaVerificationFailed, 'Invalid response from recaptcha' unless response.is_a?(Hash)
+
+    token_props = response['tokenProperties']
+    unless token_props.is_a?(Hash)
+      raise RecaptchaVerificationFailed, 'Invalid response from recaptcha'
+    end
+
+    unless token_props['valid'] == true
+      reason = token_props['invalidReason']
+      raise RecaptchaVerificationFailed, reason.present? ? "Recaptcha invalid token: #{reason}" : 'Recaptcha invalid token'
+    end
+
+    if token_props['action'].present? && token_props['action'] != action
+      raise RecaptchaVerificationFailed, 'Recaptcha action mismatch'
+    end
+
+    risk = response['riskAnalysis']
+    score = risk.is_a?(Hash) ? risk['score'] : nil
     return true if score.nil?
 
     score.to_f >= minimum_score.to_f
@@ -27,18 +47,44 @@ class RecaptchaVerifier
     true
   end
 
-  def self.post_verify(secret:, token:, remote_ip: nil)
-    request = Net::HTTP::Post.new(VERIFY_URL)
-    request.set_form_data({ secret:, response: token }.tap { |h| h[:remoteip] = remote_ip if remote_ip.present? })
+  def self.create_assessment(project_id:, site_key:, api_key:, token:, action:, remote_ip: nil)
+    uri = URI::HTTPS.build(
+      host: API_HOST,
+      path: "/v1/projects/#{project_id}/assessments",
+      query: URI.encode_www_form(key: api_key)
+    )
+
+    event = {
+      token: token,
+      siteKey: site_key,
+      expectedAction: action
+    }
+    event[:userIpAddress] = remote_ip if remote_ip.present?
 
-    http = Net::HTTP.new(VERIFY_URL.host, VERIFY_URL.port)
+    request = Net::HTTP::Post.new(uri)
+    request['Content-Type'] = 'application/json'
+    request.body = JSON.generate({ event: event })
+
+    http = Net::HTTP.new(uri.host, uri.port)
     http.use_ssl = true
 
     raw_response = http.request(request)
-    JSON.parse(raw_response.body)
-  rescue JSON::ParserError, SocketError, Timeout::Error, Errno::ECONNRESET, Errno::ECONNREFUSED
-    false
+    body = raw_response.body.to_s
+
+    parsed_body = JSON.parse(body)
+
+    unless raw_response.is_a?(Net::HTTPSuccess)
+      error_message = parsed_body.dig('error', 'message')
+      raise RecaptchaVerificationFailed,
+            "Recaptcha enterprise HTTP #{raw_response.code}: #{error_message.presence || raw_response.message}"
+    end
+
+    parsed_body
+  rescue JSON::ParserError
+    raise RecaptchaVerificationFailed, "Recaptcha enterprise returned invalid JSON"
+  rescue SocketError, Timeout::Error, Errno::ECONNRESET, Errno::ECONNREFUSED
+    raise RecaptchaVerificationFailed, 'Recaptcha enterprise request failed'
   end
 
-  private_class_method :post_verify
+  private_class_method :create_assessment
 end

data/cm-graphql.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'cm-graphql'
-  spec.version       = '0.0.12'
+  spec.version       = '0.0.14'
   spec.date          = '2022-09-14'
   spec.summary       = 'A gem to setup grapqhl basics like pagination, file upload'
   spec.description   = 'A gem to setup grapqhl basics like pagination, file upload'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-graphql
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.14
 platform: ruby
 authors:
 - Anbazhagan Palani