rack-dedos 0.3.2 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0f4f96c99d1126d17cd0ede822cce3e90e0d56cceb51cb4d8396e3f72242d03
-  data.tar.gz: 1fba85f7f58c450dcd7fc82b0a26098790d21befae28f411ae96c26f62d23811
+  metadata.gz: a6136473af715369f93cdd16ed44fbbbdc241ee0efa1c7743a5590735ec5d392
+  data.tar.gz: cd541b5cfb7cd9dfdb4262670d8190bf942215a65e6a984e48e9e7e7f7db1f6c
 SHA512:
-  metadata.gz: 86320d0b5bb8c3328f50101ff9b460a3efaf10f31b5ff54c7f350a436d5e594e4c6fabbcf11a943f766a136f7999a9610fb20912ffc4ad9843537c9871a49a4c
-  data.tar.gz: 9f5d286d924b2ab3cfb22402a9894cdfc0b96a0ca2fc31e451a572d43257237dbbe4226cc3c438a2bc5cf3f226fbe681ee8fc9fc9b6d16796b8b28507816d428
+  metadata.gz: caf872690a89e1e502974fa7560a5e5aa6499545a213cb82b2e03b788cda2075822ae1a8be23e23ff67a220087d56c6fa6d76a7388d6b4887c8f0a6e51f10f0c
+  data.tar.gz: 14a31dd383c251c9333968744c91ebb9833e7dc501b68db2cda7e2c1c10b4f44090dafbdb1edf1de1f9042dba0338c44279852478a48a1bbd1a5394b05078b4a

data/CHANGELOG.md

@@ -2,53 +2,64 @@
 
 Nothing so far
 
+## 0.4.1
+
+### Fixes
+* Correctly include details in warnings (i.e. country code)
+
+## 0.4.0
+
+### Changes
+* Drop certs
+* Add action for trusted release
+
 ## 0.3.2
 
-#### Changes
+### Changes
 * Resolve all paths to prevent problems with relative paths
 
 ## 0.3.1
 
-#### Changes
+### Changes
 * Root `File` operations to prevent clashes with Rack
 
 ## 0.3.0
 
-#### Changes
+### Changes
 * Convert `geoipget` from Bash to Ruby
 
 ## 0.2.4
 
-#### Changes
+### Changes
 * Use Bash for `geoipget` to prevent problems with `/bin/sh` diversity
 
 ## 0.2.3
 
-#### Additions
+### Additions
 * `geoipget` shell script
 
 ## 0.2.2
 
-#### Changes
+### Changes
 * Update to Ruby 3.4
 
 ## 0.2.1
 
-#### Fixes
+### Fixes
 
 * Fix paths on conditional requires
 * Renew certificate
 
 ## 0.2.0
 
-#### Changes
+### Changes
 
 * Determine real client IP
 * Drop autoload and put filters in proper namespace
 
 ## 0.1.0
 
-#### Initial implementation
+### Initial implementation
 
 * UserAgent filter
 * Country filter

data/README.md

@@ -19,16 +19,6 @@ Thank you for supporting free and open-source software by sponsoring on [GitHub]
 
 ## Install
 
-### Security
-
-This gem is [cryptographically signed](https://guides.rubygems.org/security/#using-gems) in order to assure it hasn't been tampered with. Unless already done, please add the author's public key as a trusted certificate now:
-
-```
-gem cert --add <(curl -Ls https://raw.github.com/svoop/rack-dedos/main/certs/svoop.pem)
-```
-
-### Bundler
-
 Add the following to the <tt>Gemfile</tt> or <tt>gems.rb</tt> of your [Bundler](https://bundler.io) powered Ruby project:
 
 ```ruby
@@ -38,7 +28,7 @@ gem 'rack-dedos'
 And then install the bundle:
 
 ```
-bundle install --trust-policy MediumSecurity
+bundle install
 ```
 
 ## Configuration

data/lib/rack/dedos/filters/base.rb

@@ -12,12 +12,14 @@ module Rack
 
         attr_reader :app
         attr_reader :options
+        attr_reader :details
 
         # @param app [#call]
         # @param options [Hash{Symbol => Object}]
         def initialize(app, options = {})
           @app = app
           @options = DEFAULT_OPTIONS.merge(options)
+          @details = nil
         end
 
         def call(env)
@@ -26,7 +28,8 @@ module Rack
           if allowed?(request, ip)
             app.call(env)
           else
-            warn("rack-dedos: request from #{ip} blocked by #{self.class} `#{@country_code.inspect}'")
+            message = "rack-dedos: request from #{ip} blocked by #{self.class}"
+            warn([message, details].compact.join(": "))
             [options[:status], { 'Content-Type' => 'text/plain' }, [options[:text]]]
           end
         end

data/lib/rack/dedos/filters/country.rb

@@ -22,8 +22,8 @@ module Rack
         end
 
         def allowed?(request, ip)
-          if country = maxmind_db.get(ip)
-            country_code = country.dig('country', 'iso_code').to_sym
+          if country = maxmind_db&.get(ip)
+            country_code = @details = country.dig('country', 'iso_code').to_sym
             @countries.include?(country_code) ? @allowed : !@allowed
           else   # not found in database
             true

data/lib/rack/dedos/version.rb

@@ -2,6 +2,6 @@
 
 module Rack
   module Dedos
-    VERSION = "0.3.2"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -1,34 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rack-dedos
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.1
 platform: ruby
 authors:
 - Sven Schwyn
 bindir: exe
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDODCCAiCgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhydWJ5
-  L0RDPWJpdGNldGVyYS9EQz1jb20wHhcNMjQxMTIwMjExMDIwWhcNMjUxMTIwMjEx
-  MDIwWjAjMSEwHwYDVQQDDBhydWJ5L0RDPWJpdGNldGVyYS9EQz1jb20wggEiMA0G
-  CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcLg+IHjXYaUlTSU7R235lQKD8ZhEe
-  KMhoGlSUonZ/zo1OT3KXcqTCP1iMX743xYs6upEGALCWWwq+nxvlDdnWRjF3AAv7
-  ikC+Z2BEowjyeCCT/0gvn4ohKcR0JOzzRaIlFUVInlGSAHx2QHZ2N8ntf54lu7nd
-  L8CiDK8rClsY4JBNGOgH9UC81f+m61UUQuTLxyM2CXfAYkj/sGNTvFRJcNX+nfdC
-  hM9r2kH1+7wsa8yG7wJ2IkrzNACD8v84oE6qVusN8OLEMUI/NaEPVPbw2LUM149H
-  PVa0i729A4IhroNnFNmw4wOC93ARNbM1+LW36PLMmKjKudf5Exg8VmDVAgMBAAGj
-  dzB1MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSfK8MtR62mQ6oN
-  yoX/VKJzFjLSVDAdBgNVHREEFjAUgRJydWJ5QGJpdGNldGVyYS5jb20wHQYDVR0S
-  BBYwFIEScnVieUBiaXRjZXRlcmEuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQDSeB1x
-  8QK8F/ML37isgvwGiQxovDUqu6Sq14cQ1qE9y5prUBmL2AsDuCBpXXctcvamFqNC
-  PgfJtj7ZZcXmY0SfKCog7T1btkr6zYxPXpxwUqB45n0I6v5qc0UCNvMEfBzxlak5
-  VW7UMNlKD9qukeN55hxuLF2F/sLldMcHUo/ATgdV4zk1t3sK6A9+02wz5K5qfWdM
-  Mi+XWXmGd57uojk3RcIXNwBRRP4DTKcKgVXhuyHb7q1vjTXrS6bw1Ortu0KmWOIk
-  jTyRsT1gymASS2KHe+BaCTwD74GqO8q4woYLZgXnJ/PvgcFgY2FEi2Kn/sXLp4JE
-  boIgxQCMT+nxBHCD
-  -----END CERTIFICATE-----
-date: 2025-01-16 00:00:00.000000000 Z
+cert_chain: []
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -199,9 +178,9 @@ executables:
 - geoipget
 extensions: []
 extra_rdoc_files:
-- README.md
 - CHANGELOG.md
 - LICENSE.txt
+- README.md
 files:
 - CHANGELOG.md
 - LICENSE.txt
@@ -244,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Radical filters to block denial-of-service (DoS) requests.
 test_files: []