blocklistshow 1.1 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e81f6d181936fd047ceca1e81ba0f8ae9089ab94083afdd81691f3174510b65b
-  data.tar.gz: 8bb3478a87de213a5db44a19fd00b689662c9f36791642846acdb20b0bad8831
+  metadata.gz: d12abe9119afea6df652e56becb1cd8589a7cc877c6d02906924c9a4c1fc55de
+  data.tar.gz: 04ccb9bd6eb05003552941e5e7f97ee69962e88600549ef1b4f61f763776bcd5
 SHA512:
-  metadata.gz: d897b281d6a46addf76372889640e8ea2bc73aee86b8673fdaae1bc66512868d7b4db06f589bc6c4cdcc698b9cc2b72b6f0763a5cc3ecc1b5ef5deaa611adfb0
-  data.tar.gz: a1cfc381e812c65101ee0244b9db1bb1ff94e86e99cf17ffe3dbb61518b2daabb0939f74d8a3ae58b2b056b82d48e19b6416d75fdd83a51711db184d40af7518
+  metadata.gz: 3e00f66b08006f8027d4dfca7a5cec2b20246426e5b4f4d0774eff69dcc049cc2f58555a1a6903bfe9710badbe97d87ea2ec912109040a5c42ccc80fef715914
+  data.tar.gz: a789c14563f452b07f127c4eef4e8b95c1cfde14936a6b9671a734bd102bece3c879c1357315acae4848fba6d425256268e194c11136bc5c5c28f9c158152219

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 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/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/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" )
+]
+
+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
@@ -139,7 +166,7 @@ end
 
 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 )

data/bin/unblock.rb

@@ -0,0 +1,168 @@
+#!/usr/local/bin/ruby
+
+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
+
+require 'ipaddr'
+require 'bdb1'
+
+# /usr/src/contrib/blacklist/bin/conf.h
+#  struct conf {
+#         struct sockaddr_storage c_ss;
+#         int                     c_lmask;
+#         int                     c_port;
+#         int                     c_proto;
+#         int                     c_family;
+#         int                     c_uid;
+#         int                     c_nfail;
+#         char                    c_name[128];
+#         int                     c_rmask;
+#         int                     c_duration;
+# };
+
+# /usr/src/contrib/blacklist/bin/state.h
+# struct dbinfo {
+#         int count;
+#         time_t last;
+#         char id[64];
+# };
+
+# /usr/include/sys/_sockaddr_storage.h
+# struct sockaddr_storage {
+#         unsigned char   ss_len;         /* address length */
+#         sa_family_t     ss_family;      /* address family */
+#         char            __ss_pad1[_SS_PAD1SIZE];
+#         __int64_t       __ss_align;     /* force desired struct alignment */
+#         char            __ss_pad2[_SS_PAD2SIZE];
+# };
+
+def decode_ip( key, afamily )
+  case afamily
+  when 2
+    off = 4
+    key[ off .. ].unpack( 'C4' ).join( '.' )
+  when 28
+    off = 8
+    IPAddr::IN6FORMAT % key[ off .. ].unpack( 'n8' )
+  else
+    raise IPAddr::AddressFamilyError, 'unsupported address family'
+  end
+end
+
+def ip_from_key( key )
+  # puts "size: #{key.size}"
+
+  # len = key.unpack1( 'C' )
+  # puts "len: #{len}"
+
+  af = key[ 1 .. 1 ].unpack1( 'C' )
+  # puts "af: #{af}"
+
+  ip = decode_ip( key, af )
+  # puts "ip: #{ip}"
+
+  IPAddr.new( ip )
+end
+
+def search_db( dbh, list )
+  found = []
+  dbh.each_key do |key|
+    # pp key, val
+    ip2 = ip_from_key( key ).to_s
+    next unless list.include?( ip2 )
+
+    puts "ip2: #{ip2}"
+    found.push( key )
+  end
+  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( key )
+  {
+    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" )
+  }
+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 )
+    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}"
+  dbh.sync
+  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,
+                       LOCAL_BDB_OPTIONS )
+found = search_db( dbh, ARGV )
+remove_db( dbh, found )
+
+# eof

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blocklistshow
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.3'
 platform: ruby
 authors:
 - Dirk Meyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-27 00:00:00.000000000 Z
+date: 2024-12-01 00:00:00.000000000 Z
 dependencies: []
 description: Display of data from blocklistd on FreeBSD with country codes and reverse
   DNS.
@@ -16,6 +16,7 @@ email:
 executables:
 - blocklist.rb
 - geodb-lookup.rb
+- unblock.rb
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
@@ -28,6 +29,7 @@ files:
 - README.md
 - bin/blocklist.rb
 - bin/geodb-lookup.rb
+- bin/unblock.rb
 homepage: https://rubygems.org/gems/blocklistshow
 licenses:
 - MIT
@@ -47,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: show blocklistd data