blocklistshow 1.2 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d59160b951cd30f78713bb78065b2891114950c9a425f78cd9118c4703c91360
-  data.tar.gz: 370a9a88615ff07b03f5742278578bb369ad689a23e6e4f8f464699d3a374d2b
+  metadata.gz: 34b39ec980acfb4429c4db89284e00377f0b87d6fc55b0809bc510b77c6ec0c6
+  data.tar.gz: 60867006da7dc29205e0cfae0b8dd2211bac5246f45aad9dac35d1bb16863a4d
 SHA512:
-  metadata.gz: 5afef2dd7e33c4cc6e1ab5f4b5a5cad207b80a4dbce31b1f940f8477b46ea43d92b083670e2d059af40ec7a5e1e951907a60f9a03f85a7f86ffa1b7e5724a34a
-  data.tar.gz: 57100a4f6132e6b0182ef9995a7a712514cd0972ce52b7c0298dd9cfd64f5481fd2790a5b2d3022c15abdf9940dd59dd02a0e135ab94e8404fde0be1c786344d
+  metadata.gz: f12d7b7c0f3f8b7163af7cb6dab53f0e6b24c01b694fe9650a67479693eb2c78f2179fd18bb6745545b6c8a1bf2a53116fa6eb5e92b60f4c1986f92deef5865a
+  data.tar.gz: 47ae8bddda24ffd0238d45d83a5515a67289f8689aa7a7c677705310151f5bef03cfaf75332a622b345809b1d277f29ab7ef155b9cd894c682affa99d099418d

data/.rubocop.yml

@@ -24,7 +24,8 @@ Layout/SpaceInsideReferenceBrackets:
   Exclude:
     - 'blocklistshow.gemspec'
 
-Metrics/LineLength:
+#Metrics/LineLength:
+Layout/LineLength:
   Exclude:
     - 'blocklistshow.gemspec'
 

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 1.4 (2026-03-29)
+  - Gem release
+  - Support database format 2025
+
+## 1.3 (2024-12-01)
+
+  - Gem release
+  - call helper to unblock
+  - support new filenames
+
+## 1.2 (2023-09-30)
+
+  - Gem release
+  - add unblock.rb
+
+## 1.1 (2023-09-27)
+
+  - Gem release
+  - rubocop cleanups
+
+## 1.0 (2021-05-02)
+
+  - Gem release
+
 ## 1.0 (2020-11-06)
 
   - Initial Release.

data/Makefile

@@ -0,0 +1,10 @@
+
+cop:
+	rubocop
+
+auto::
+	rubocop --auto-gen-config
+
+gem::
+	gem build blocklistshow.gemspec
+

data/README.md

@@ -8,7 +8,7 @@ The reverse DNS and the country codes are cached.
 Install it on the server running blocklistd by:
 
     $ pkg install databases/ruby-bdb net/webalizer-geodb
-    $ gem install blocklist
+    $ gem install blocklistshow
 
 ## Usage
 

data/TODO

@@ -0,0 +1,3 @@
+
+Diagnostic tools for blocklistd
+

data/bin/blocklist.rb

@@ -3,8 +3,35 @@
 require 'ipaddr'
 require 'json'
 
-DNS_CACHE_FILE = '/var/db/blacklistd.dns.json'.freeze
-CC_CACHE_FILE = '/var/db/blacklistd.cc.json'.freeze
+# find matching filenames
+def find_files( list )
+  list.each do |filename|
+    next if filename == ''
+
+    return filename if File.exist?( filename )
+  end
+
+  list.first
+end
+
+CC_CACHE_FILES = [
+  '/var/db/blocklistd.cc.json',
+  '/var/db/blacklistd.cc.json'
+].freeze
+
+DNS_CACHE_FILES = [
+  '/var/db/blocklistd.dns.json',
+  '/var/db/blacklistd.dns.json'
+].freeze
+
+BLOCKLISTCTL_FILES = [
+  `which blocklistctl`.delete( "\n" ),
+  `which blacklistctl`.delete( "\n" )
+].freeze
+
+CC_CACHE_FILE = find_files( CC_CACHE_FILES )
+DNS_CACHE_FILE = find_files( DNS_CACHE_FILES )
+BLOCKLISTCTL = find_files( BLOCKLISTCTL_FILES )
 
 # pkg install databases/ruby-bdb net/webalizer-geodb
 GEODB_FILE = '/usr/local/share/geolizer/GeoDB.dat'.freeze
@@ -137,12 +164,28 @@ until ARGV.empty?
   end
 end
 
+#
+# Format 2024:
+# blocklistctl dump
+#                                 address/ma:port id      nfail   last access
+#                            XX.XXX.XX.XX/32:22   OK      3/3     2026/03/28 04:24:51
+#
+# Format 2025:
+# blocklistctl dump
+# rulename                address/ma:port id      nfail   last access
+# blocklistd        XXX.XX.XXX.XX/32:25           3/3     2026/03/28 20:40:06
+#
+
 load_cache
 list = []
-raw = `blacklistctl dump -b -n -w`
+raw = `#{BLOCKLISTCTL} dump -b -n -w`
 # pp raw
 raw.split( "\n" ).each do |line|
-  address_port, state, _nfail, access = line.split( "\t", 4 )
+  if line[ 0 ] == ' ' # Format 2024
+    address_port, state, _nfail, access = line.split( "\t", 4 )
+  else
+    _rulename, address_port, state, _nfail, access = line.split( "\t", 5 )
+  end
   list.push( [ access, address_port, state ] )
 end
 list.sort.each do |row|

data/bin/unblock.rb

@@ -1,6 +1,29 @@
 #!/usr/local/bin/ruby
 
-BDB_FILE = '/var/db/blacklistd.db'.freeze
+def find_files( list )
+  list.each do |filename|
+    next if filename == ''
+
+    return filename if File.exist?( filename )
+  end
+
+  list.first
+end
+
+BDB_FILES = [
+  '/var/db/blocklistd.db',
+  '/var/db/blacklistd.db'
+].freeze
+
+HELPER_FILES = [
+  '/usr/local/libexec/blocklistd-helper',
+  '/usr/libexec/blacklistd-helper',
+  '/libexec/blocklistd-helper'
+].freeze
+
+BDB_FILE = find_files( BDB_FILES ).freeze
+HELPER_FILE = find_files( HELPER_FILES ).freeze
+
 LOCAL_BDB_FILE_MODE = 0o0600
 LOCAL_BDB_OPTIONS = { 'set_pagesize' => 1024, 'set_cachesize' => 32 * 1024 }.freeze
 
@@ -9,6 +32,8 @@ require 'bdb1'
 
 # /usr/src/contrib/blacklist/bin/conf.h
 #  struct conf {
+#         size_t                  c_lineno; # Fromat 2025
+#         struct sockaddr_storage c_ss;
 #         struct sockaddr_storage c_ss;
 #         int                     c_lmask;
 #         int                     c_port;
@@ -37,6 +62,15 @@ require 'bdb1'
 #         char            __ss_pad2[_SS_PAD2SIZE];
 # };
 
+def fix_key( key )
+  case key.size
+  when 296 # Format 2025
+    return key[ 8 .. ]
+  end
+  # Format 2024
+  key
+end
+
 def decode_ip( key, afamily )
   case afamily
   when 2
@@ -69,7 +103,7 @@ def search_db( dbh, list )
   found = []
   dbh.each_key do |key|
     # pp key, val
-    ip2 = ip_from_key( key ).to_s
+    ip2 = ip_from_key( fix_key( key ) ).to_s
     next unless list.include?( ip2 )
 
     puts "ip2: #{ip2}"
@@ -78,10 +112,51 @@ def search_db( dbh, list )
   found
 end
 
+PROTOCOLS = {
+  6 => 'tcp',
+  17 => 'udp',
+  132 => 'sctp'
+}.freeze
+
+def decode_key( key )
+  af = key[ 1 .. 1 ].unpack1( 'C' )
+  {
+    af: af,
+    ip: decode_ip( key, af ),
+    mask: key[ 128 .. 131 ].unpack1( 'L' ),
+    port: key[ 132 .. 135 ].unpack1( 'L' ),
+    proto: PROTOCOLS[ key[ 136 .. 139 ].unpack1( 'L' ) ],
+    family: key[ 140 .. 143 ].unpack1( 'L' ),
+    uid: key[ 144 .. 147 ].unpack1( 'L' ),
+    nfail: key[ 148 .. 151 ].unpack1( 'L' ),
+    name: key[ 152 .. 279 ].delete( "\0" ),
+    rmask: key[ 280 .. 283 ].unpack1( 'L' ),
+    duration: key[ 284 .. 287 ].unpack1( 'L' )
+  }
+end
+
+def decode_data( buffer )
+  {
+    count: buffer[ 0 .. 3 ].unpack1( 'L' ),
+    pad1: buffer[ 4 .. 7 ].unpack1( 'L' ),
+    time1: Time.at( buffer[ 8 .. 11 ].unpack1( 'L' ) ),
+    time2: buffer[ 12 .. 15 ].unpack1( 'L' ),
+    text: buffer[ 16 .. 79 ].delete( "\0" )
+  }
+end
+
 def remove_db( dbh, found )
   removed = 0
   found.each do |key|
+    # pp key
+    h = decode_key( fix_key( key ) )
+    # buffer = dbh[ key ]
+    # pp decode_data( buffer )
     dbh.delete( key )
+    # pp h
+    line = "#{HELPER_FILE} 'rem' '#{h[ :name ]}' '#{h[ :proto ]}' '#{h[ :ip ]}' '#{h[ :mask ]}' '#{h[ :port ]}' '#{h[ :uid ]}'"
+    puts line
+    `#{line}`
     removed += 1
   end
   puts "removed: #{removed}"
@@ -89,6 +164,11 @@ def remove_db( dbh, found )
   dbh.close
 end
 
+if ARGV.empty?
+  warn "#{$0} IP-Addresss [ IP-Addresss ] [ ... ]"
+  exit 64
+end
+
 dbh = BDB1::Hash.open( BDB_FILE,
                        BDB1::WRITE | BDB1::CREATE,
                        LOCAL_BDB_FILE_MODE,

metadata

@@ -1,18 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: blocklistshow
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.4'
 platform: ruby
 authors:
 - Dirk Meyer
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Display of data from blocklistd on FreeBSD with country codes and reverse
   DNS.
-email:
 executables:
 - blocklist.rb
 - geodb-lookup.rb
@@ -26,15 +24,17 @@ files:
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
+- Makefile
 - README.md
+- TODO
 - bin/blocklist.rb
 - bin/geodb-lookup.rb
 - bin/unblock.rb
 homepage: https://rubygems.org/gems/blocklistshow
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -49,8 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
-signing_key:
+rubygems_version: 4.0.7
 specification_version: 4
 summary: show blocklistd data
 test_files: []