Merge pull request #1748 from gfx/urlsafe_decode64_for_forward_compat…

…ibility

Use Base64.urlsafe_decode64 for forward compatibility

lib/graphql/relay.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'base64'
 
 require 'graphql/relay/page_info'
 require 'graphql/relay/edge'

lib/graphql/schema/base_64_bp.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'base64'
+
+# backport from ruby v2.5 to v2.2 that has no `padding` things
+# @api private
+module Base64Bp
+  extend Base64
+
+  module_function
+
+  def urlsafe_encode64(bin, padding:)
+    str = strict_encode64(bin).tr("+/", "-_")
+    str = str.delete("=") unless padding
+    str
+  end
+
+  def urlsafe_decode64(str)
+    str = str.tr("-_", "+/")
+    if !str.end_with?("=") && str.length % 4 != 0
+      str = str.ljust((str.length + 3) & ~3, "=")
+    end
+    strict_decode64(str)
+  end
+end

lib/graphql/schema/base_64_encoder.rb

@@ -1,4 +1,7 @@
 # frozen_string_literal: true
+
+require 'graphql/schema/base_64_bp'
+
 module GraphQL
   class Schema
     # @api private
@@ -8,7 +11,8 @@ def self.encode(plaintext, nonce: false)
       end
 
       def self.decode(ciphertext, nonce: false)
-        Base64.decode64(ciphertext)
+        # urlsafe_decode64 is for forward compatibility
+        Base64Bp.urlsafe_decode64(ciphertext)
       end
     end
   end

lib/graphql/schema/unique_within_type.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+require 'graphql/schema/base_64_bp'
+
 module GraphQL
   class Schema
     module UniqueWithinType
@@ -25,7 +27,8 @@ def encode(type_name, object_value, separator: self.default_id_separator)
       # @param node_id [String] A unique ID generated by {.encode}
       # @return [Array<(String, String)>] The type name & value passed to {.encode}
       def decode(node_id, separator: self.default_id_separator)
-        Base64.decode64(node_id).split(separator, 2)
+        # urlsafe_decode64 is for forward compatibility
+        Base64Bp.urlsafe_decode64(node_id).split(separator, 2)
       end
     end
   end