rack-dedos 0.2.2 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5358dccb09197e0042d35f689f02a913a8c566e975b2bac47c7dbdfbd4c01c56
-  data.tar.gz: 63c029725b96d240ac4700c02585772b8a8a843c2e8fcca574ada29ae344a740
+  metadata.gz: c0f4f96c99d1126d17cd0ede822cce3e90e0d56cceb51cb4d8396e3f72242d03
+  data.tar.gz: 1fba85f7f58c450dcd7fc82b0a26098790d21befae28f411ae96c26f62d23811
 SHA512:
-  metadata.gz: bc44d5579d132a3960f280f26f8c4f0b1eca01d7001d15d5dbfbe907fbc08f2a0d0ad775e610c018ff1f8f7cef6e47611bcf0ad0c4618cf5eed100d59cc97188
-  data.tar.gz: 329b51f582b0c664b1754f8f8169b8623c0675695171560aadacd3ce6963863644ced781a144c8d55d35d8de5cd75801f85a1d7640ff4bba43e6f14ab0196679
+  metadata.gz: 86320d0b5bb8c3328f50101ff9b460a3efaf10f31b5ff54c7f350a436d5e594e4c6fabbcf11a943f766a136f7999a9610fb20912ffc4ad9843537c9871a49a4c
+  data.tar.gz: 9f5d286d924b2ab3cfb22402a9894cdfc0b96a0ca2fc31e451a572d43257237dbbe4226cc3c438a2bc5cf3f226fbe681ee8fc9fc9b6d16796b8b28507816d428

data/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 Nothing so far
 
+## 0.3.2
+
+#### Changes
+* Resolve all paths to prevent problems with relative paths
+
+## 0.3.1
+
+#### Changes
+* Root `File` operations to prevent clashes with Rack
+
+## 0.3.0
+
+#### Changes
+* Convert `geoipget` from Bash to Ruby
+
+## 0.2.4
+
+#### Changes
+* Use Bash for `geoipget` to prevent problems with `/bin/sh` diversity
+
+## 0.2.3
+
+#### Additions
+* `geoipget` shell script
+
 ## 0.2.2
 
 #### Changes

data/README.md

@@ -125,18 +125,13 @@ Either allow or deny requests by probable country of origin. If both are set, th
 
 The MaxMind GeoLite2 database is free, however, you have to create an account on [maxmind.com](https://www.maxmind.com) and then download the country database.
 
-For automatic updates, create a `geoipupdate.conf` file and then use the [geoipupdate tool](https://github.com/maxmind/geoipupdate/releases) to fetch the latest country database:
+For automatic updates, create a `geoipupdate.conf` file and then use the [geoipupdate tool for your arch](https://github.com/maxmind/geoipupdate/releases) to fetch the latest country database.
 
-```
-version=4.10.0
-arch=linux_amd64
-conf=/etc/geoipupdate.conf
-dir=/var/db/maxmind/
+The bundled `geoipget` executable does all this in one swipe:
 
-mkdir -p "${dir}"
-wget --quiet -O /tmp/geoipupdate.tgz https://github.com/maxmind/geoipupdate/releases/download/v${version}/geoipupdate_${version}_${arch}.tar.gz
-tar -xz -C /tmp -f /tmp/geoipupdate.tgz
-/tmp/geoipupdate_${version}_${arch}/geoipupdate -f "${conf}" -d "${dir}"
+```
+geoipget --help
+geoipget --dir . --arch linux_amd64 /etc/geoipupdate.conf
 ```
 
 ## Real Client IP

data/exe/geoipget

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'rack/dedos'
+
+Rack::Dedos::Executables::Geoipget.new.run

data/lib/rack/dedos/executables/geoipget.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require 'optparse'
+require 'tmpdir'
+require 'open-uri'
+require 'json'
+require 'rubygems/package'
+
+module Rack
+  module Dedos
+    module Executables
+      class Geoipget
+        attr_reader :config, :dir, :arch
+
+        def initialize(**options)
+          @arch, @dir = 'linux_amd64', '.'
+          OptionParser.new do |o|
+            o.banner = <<~END
+              Download the geoip database from Maxmind.
+              Usage: #{::File.basename($0)} CONFIG_FILE
+            END
+            o.on('-a', '--arch ARCH', String, "architecture (default: #{arch})") { @arch = _1 }
+            o.on('-d', '--dir DIR', String, "destination directory (default: #{dir})") { @dir = _1 }
+            o.on('-A', '--about', 'show author/license information and exit') { self.class.about }
+            o.on('-V', '--version', 'show version and exit') { self.class.version }
+          end.parse!
+          @config = ARGV.first
+        end
+
+        def run
+          fail "cannot read config file #{config}" unless config && ::File.readable?(config)
+          Maxmind.new(::File.realpath(config), ::File.realpath(dir), arch).get
+        end
+
+        def self.about
+          puts 'Written by Sven Schwyn (bitcetera.com) and distributed under MIT license.'
+          exit
+        end
+
+        def self.version
+          puts Rack::Dedos::VERSION
+          exit
+        end
+
+        class Maxmind
+          REPO = "maxmind/geoipupdate"
+
+          attr_reader :config, :dir, :arch
+
+          def initialize(config, dir, arch)
+            @config, @dir, @arch = config, dir, arch
+          end
+
+          def get
+            prepare(latest_version) { download }
+          end
+
+          private
+
+          def latest_version
+            URI("https://api.github.com/repos/#{REPO}/releases/latest")
+              .read
+              .then { JSON.parse(_1) }
+              .fetch('tag_name')
+              .slice(1..)
+          end
+
+          def prepare(version)
+            uri = URI("https://github.com/#{REPO}/releases/download/v#{version}/geoipupdate_#{version}_#{arch}.tar.gz")
+            Dir.mktmpdir do |tmp|
+              Dir.chdir tmp
+              uri.open do |file|
+                Zlib::GzipReader.wrap(file) do |gz|
+                  Gem::Package::TarReader.new(gz) do |tar|
+                    tar.each do |entry|
+                      if entry.full_name.match? %r(/geoipupdate$)
+                        ::File.write('geoipupdate', entry.read)
+                      end
+                    end
+                  end
+                end
+              end
+              ::File.chmod(0755, 'geoipupdate')
+              yield
+            end
+          ensure
+            lockfile = "#{dir}/.geoipupdate.lock"
+            ::File.unlink(lockfile) if ::File.exist? lockfile
+          end
+
+          def download
+            `./geoipupdate -f "#{config}" -d "#{dir}"`
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rack/dedos/version.rb

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

data/lib/rack/dedos.rb

@@ -3,6 +3,7 @@
 require 'rack'
 
 require_relative 'dedos/version'
+require_relative 'dedos/executables/geoipget'
 
 module Rack
   module Dedos

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: rack-dedos
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.2
 platform: ruby
 authors:
 - Sven Schwyn
-bindir: bin
+bindir: exe
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
@@ -28,7 +28,7 @@ cert_chain:
   jTyRsT1gymASS2KHe+BaCTwD74GqO8q4woYLZgXnJ/PvgcFgY2FEi2Kn/sXLp4JE
   boIgxQCMT+nxBHCD
   -----END CERTIFICATE-----
-date: 2024-12-25 00:00:00.000000000 Z
+date: 2025-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -195,7 +195,8 @@ description: |
   resort only to be enabled during an attack.
 email:
 - ruby@bitcetera.com
-executables: []
+executables:
+- geoipget
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -205,8 +206,10 @@ files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
+- exe/geoipget
 - lib/rack/dedos.rb
 - lib/rack/dedos/cache.rb
+- lib/rack/dedos/executables/geoipget.rb
 - lib/rack/dedos/filters/base.rb
 - lib/rack/dedos/filters/country.rb
 - lib/rack/dedos/filters/user_agent.rb