blocklistshow 1.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d12abe9119afea6df652e56becb1cd8589a7cc877c6d02906924c9a4c1fc55de
-  data.tar.gz: 04ccb9bd6eb05003552941e5e7f97ee69962e88600549ef1b4f61f763776bcd5
+  metadata.gz: 34b39ec980acfb4429c4db89284e00377f0b87d6fc55b0809bc510b77c6ec0c6
+  data.tar.gz: 60867006da7dc29205e0cfae0b8dd2211bac5246f45aad9dac35d1bb16863a4d
 SHA512:
-  metadata.gz: 3e00f66b08006f8027d4dfca7a5cec2b20246426e5b4f4d0774eff69dcc049cc2f58555a1a6903bfe9710badbe97d87ea2ec912109040a5c42ccc80fef715914
-  data.tar.gz: a789c14563f452b07f127c4eef4e8b95c1cfde14936a6b9671a734bd102bece3c879c1357315acae4848fba6d425256268e194c11136bc5c5c28f9c158152219
+  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,7 @@
+## 1.4 (2026-03-29)
+  - Gem release
+  - Support database format 2025
+
 ## 1.3 (2024-12-01)
 
   - Gem release

data/Makefile

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

data/TODO

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

data/bin/blocklist.rb

@@ -27,7 +27,7 @@ DNS_CACHE_FILES = [
 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 )
@@ -164,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 = `#{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

@@ -32,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;
@@ -60,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
@@ -92,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}"
@@ -122,25 +133,25 @@ def decode_key( key )
     rmask: key[ 280 .. 283 ].unpack1( 'L' ),
     duration: key[ 284 .. 287 ].unpack1( 'L' )
   }
-end 
+end
 
-def decode_data( key )
+def decode_data( buffer )
   {
-    count: key[ 0 .. 3 ].unpack1( 'L' ),
-    pad1: key[ 4 .. 7 ].unpack1( 'L' ),
-    time1: Time.at( key[ 8 .. 11 ].unpack1( 'L' ) ),
-    time2: key[ 12 .. 15 ].unpack1( 'L' ),
-    text: key[ 16 .. 79 ].delete( "\0" )
+    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 
+end
 
 def remove_db( dbh, found )
   removed = 0
   found.each do |key|
     # pp key
-    h = decode_key( key )
-    # data = dbh[ key ]
-    # pp decode_data( data )
+    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 ]}'"

metadata

@@ -1,18 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: blocklistshow
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - Dirk Meyer
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-01 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.5.22
-signing_key:
+rubygems_version: 4.0.7
 specification_version: 4
 summary: show blocklistd data
 test_files: []