durable_streams-rails 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb1d7090c279daba2ebd2d5556eeaf2df8f56d7f01a2e5c09d236ea03f4142cd
-  data.tar.gz: 06ff468c7882ce7d06d0d62f77960350476d5a33c2c3e552c914aa1974724541
+  metadata.gz: 32b7136264c3c58bf1d1abafec7d87de85527739a1eebfd099042df478fbeb9a
+  data.tar.gz: 4cad011b7effea1efeb9f9be19845ed8b5652e0ccce7e2c8971723d9fc661043
 SHA512:
-  metadata.gz: 11f0a0dd900fd4526b4566d2794c5bed38f345ed9b7001a8444a72be4b6c3bab53cdd18b10c480b4018f6466829586ceebd3973e309fd60a1adc0be14ac9bc7d
-  data.tar.gz: a3a6b953074677a5ddccb88769071b92f03f20c5ebf8010fc541c2d4b1e3ff9a9389a16eee170cc50a855d0e7ae95f9bb3f975770bab91fa983bf0c9878d4da8
+  metadata.gz: fb55c88972044fd2888e7798df09283878acaccfbd077330b2025908482f6fc9f82c90cdeb8cbd40aecf5cbc421728867da8495034c0e24ae2e6cf37e9a91441
+  data.tar.gz: b4a27e45cf852435c8a374654c8ddfb0fcb664a6a92712aa308ab9649bff4e091a7a0c11419d41c08b0632f0138608d7755c34a1d74300f7e68274fbf51b5a64

data/app/controllers/durable_streams/auth_controller.rb

@@ -1,7 +1,9 @@
 module DurableStreams
   class AuthController < ActionController::API
     def verify
-      if stream_name
+      if request.headers["X-Forwarded-Uri"]
+        stream_name ? head(:ok) : head(:unauthorized)
+      elsif valid_server_api_key?
         head :ok
       else
         head :unauthorized
@@ -10,14 +12,13 @@ module DurableStreams
 
     private
       def stream_name
-        if token = extract_token
-          DurableStreams.verified_stream_name(token)
-        end
+        DurableStreams.verify_signed_url(request.headers["X-Forwarded-Uri"])
       end
 
-      def extract_token
-        if uri = request.headers["X-Forwarded-Uri"]
-          DurableStreams.extract_token_from_url(uri)
+      def valid_server_api_key?
+        if auth_header = request.headers["Authorization"]
+          auth_header.start_with?("Bearer ") &&
+            ActiveSupport::SecurityUtils.secure_compare(auth_header.delete_prefix("Bearer "), DurableStreams.server_api_key)
         end
       end
   end

data/lib/durable_streams/engine.rb

@@ -42,6 +42,21 @@ module DurableStreams
       end
     end
 
+    initializer "durable_streams.server_api_key" do
+      config.after_initialize do
+        DurableStreams.server_api_key =
+          config.durable_streams.server_api_key ||
+          Rails.application.key_generator.generate_key("durable_streams/server_api_key").unpack1("H*")
+
+        if DurableStreams.base_url.present?
+          DurableStreams.configure do |c|
+            c.base_url = DurableStreams.base_url
+            c.default_headers = { "Authorization" => "Bearer #{DurableStreams.server_api_key}" }
+          end
+        end
+      end
+    end
+
     # No Action Cable dependency -- load test helpers directly.
     initializer "durable_streams.test_assertions" do
       ActiveSupport.on_load(:active_support_test_case) do

data/lib/durable_streams/version.rb

@@ -1,3 +1,3 @@
 module DurableStreams
-  RAILS_VERSION = "0.2.2"
+  RAILS_VERSION = "0.2.4"
 end

data/lib/durable_streams-rails.rb

@@ -14,7 +14,7 @@ module DurableStreams
   mattr_accessor :draw_routes, default: true
 
   class << self
-    attr_writer :signed_stream_verifier_key
+    attr_writer :signed_stream_verifier_key, :server_api_key
 
     def signed_stream_verifier
       @signed_stream_verifier ||= ActiveSupport::MessageVerifier.new(signed_stream_verifier_key, digest: "SHA256", serializer: JSON)
@@ -24,6 +24,10 @@ module DurableStreams
       @signed_stream_verifier_key or raise ArgumentError, "DurableStreams requires a signed_stream_verifier_key"
     end
 
+    def server_api_key
+      @server_api_key or raise ArgumentError, "DurableStreams requires a server_api_key"
+    end
+
     def signed_stream_url(*streamables, expires_in: 24.hours)
       path = stream_name_from(streamables)
       token = signed_stream_verifier.generate(path, expires_in: expires_in)

data/lib/tasks/durable_streams.rake

@@ -1,6 +1,9 @@
 namespace :durable_streams do
   desc "Download the Durable Streams server binary for the current platform"
   task :download do
+    require "net/http"
+    require "json"
+
     version = ENV.fetch("DURABLE_STREAMS_VERSION", "latest")
     install_dir = Rails.root.join("bin", "dist")
     bin_path = install_dir.join("durable-streams-server")
@@ -25,18 +28,27 @@ namespace :durable_streams do
       end
     }
 
-    FileUtils.mkdir_p(install_dir)
-
     if version == "latest"
-      url = "https://github.com/durable-streams/durable-streams/releases/latest/download/durable-streams-server_#{os}_#{arch}.tar.gz"
-    else
-      url = "https://github.com/durable-streams/durable-streams/releases/download/caddy-v#{version}/durable-streams-server_#{version}_#{os}_#{arch}.tar.gz"
+      version = resolve_latest_version
     end
 
+    FileUtils.mkdir_p(install_dir)
+
+    url = "https://github.com/durable-streams/durable-streams/releases/download/v#{version}/durable-streams-server_#{version}_#{os}_#{arch}.tar.gz"
+
     puts "Downloading durable-streams-server #{version} (#{os}/#{arch})..."
-    system("curl", "-sL", url, "-o", "-", out: IO.popen(["tar", "xz", "-C", install_dir.to_s], "w").fileno) ||
-      abort("Download failed")
+    system("curl", "-sfL", url, "-o", "-", out: IO.popen(["tar", "xz", "-C", install_dir.to_s], "w").fileno) ||
+      abort("Download failed — check https://github.com/durable-streams/durable-streams/releases")
     FileUtils.chmod(0755, bin_path)
     puts "Installed to #{bin_path}"
   end
 end
+
+def resolve_latest_version
+  uri = URI("https://api.github.com/repos/durable-streams/durable-streams/releases/latest")
+  response = Net::HTTP.get(uri)
+  tag = JSON.parse(response).fetch("tag_name")
+  tag.delete_prefix("v")
+rescue => e
+  abort "Failed to resolve latest version: #{e.message}"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: durable_streams-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - tokimonki