puma-acme 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43b6d1dcea1155f14c48dbbe4c47bc7ebe762f2b0038fbc46f01c99742e0b333
-  data.tar.gz: 5b45027dffe9e5f8aaa71e632d86504162b9cb1807dc0dffca898f928daf2f78
+  metadata.gz: 2b4d5b3068b477bc92cdf7fe1c7f4a6c3c8639790195551f4164e3fc227234d8
+  data.tar.gz: 6720366b5a14eebcb08906a849488c42a6c8f28b0a0e9073abba1d81f6576657
 SHA512:
-  metadata.gz: fe92c43245052c55eb488ab2303904d68c07ca0c41c07b0b48b1b66d32d03f68ebfa4cacbe7f8d66336abfa75bee7fa397e89fe55d98a6ca6e58292cf052db8c
-  data.tar.gz: f009056926a174bb97fa49292cf21fb9d0ed6233e03214274d5e7f975ba310fca276fa12437a3af0c96b2b17d7b86492d3aae0ec6af356cc4d33ea1b99021bd7
+  metadata.gz: 5364f21424a664662d05d70c74435d66eceb0d0823b36601c88409fc513ff1767254ee3739d0d72fb4740bcc91af6b303912ffa27e43f0bb5d2e6c16732fe489
+  data.tar.gz: c9ef04b5033eeaa7200b9350960b269cb92c9ce1f87202b5e6ed3c1afe2986b8b521368fc01e9e53f79cc180c5f7520cd23bcfc93d71e46308d03181c7e19ff9

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## 0.1.8 - 07/29/24
+
+- remove sinatra to simplify and fix some unintended parsing bugs
+- drop jruby from CI matrix
+- add base64 dependency for future compatibility
+
 ## 0.1.7 - 07/17/24
 
 - fix #closed? on nil error when shutting down puma

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    puma-acme (0.1.7)
+    puma-acme (0.1.8)
       acme-client (~> 2.0.13)
+      base64 (~> 0.2)
       pstore (~> 0.1)
       puma (~> 6.0)
       sinatra (>= 3.2)
@@ -40,12 +41,14 @@ GEM
     puma (6.4.2)
       nio4r (~> 2.0)
     r509 (1.0.1)
-    rack (3.0.9.1)
+    rack (3.1.7)
     rack-protection (4.0.0)
       base64 (>= 0.1.0)
       rack (>= 3.0.0, < 4)
     rack-session (2.0.0)
       rack (>= 3.0.0)
+    rack-test (2.1.0)
+      rack (>= 1.3)
     rake (13.2.0)
     rexml (3.2.6)
     ruby2_keywords (0.0.5)
@@ -55,7 +58,7 @@ GEM
       rack-protection (= 4.0.0)
       rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
-    tilt (2.3.0)
+    tilt (2.4.0)
     uri (0.13.0)
     vcr (6.2.0)
     webmock (3.23.0)
@@ -72,6 +75,7 @@ DEPENDENCIES
   minitest-mock_expectations (~> 1.2)
   puma-acme!
   r509 (~> 1.0)
+  rack-test
   rake (~> 13.0)
   vcr (~> 6.1)
   webmock (~> 3.19)

data/lib/puma/acme/middleware.rb

@@ -3,16 +3,18 @@
 module Puma
   module Acme
     # ACME challenge response handler for HTTP-01 challenges.
-    class Middleware < Sinatra::Base
+    class Middleware
       def initialize(app, manager:)
         @app = app
         @manager = manager
+      end
 
-        super(app)
+      def call(env)
+        dup._call(env)
       end
 
-      get '/.well-known/acme-challenge/:token' do
-        if (token = params[:token]).nil?
+      def _call(env)
+        if (token = token(env)).nil?
           return @app.call(env)
         end
 
@@ -20,8 +22,15 @@ module Puma
           return @app.call(env)
         end
 
-        content_type 'text/plain'
-        answer.value
+        [200, {'content-type' => 'text/plain;charset=utf-8'}, [answer.value]]
+      end
+
+      private
+
+      def token(env)
+        path = ::Rack::Request.new(env).path_info
+        prefix = '/.well-known/acme-challenge/'
+        path[prefix.size..-1] if path.start_with?(prefix)
       end
     end
   end

data/lib/puma/acme/version.rb

@@ -2,6 +2,6 @@
 
 module Puma
   module Acme
-    VERSION = '0.1.7'
+    VERSION = '0.1.8'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma-acme
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Anchor Security, Inc
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-17 00:00:00.000000000 Z
+date: 2024-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acme-client
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.13
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: pstore
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement