blocklistshow 1.0 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46d7101d4cdf766ddc1d332f752a4c2982acd54643404cc00483d56a1d05712b
-  data.tar.gz: 36600a16f4683373926827f8cb8654629dff00ba51281a6a3bdc151cebf2d006
+  metadata.gz: d59160b951cd30f78713bb78065b2891114950c9a425f78cd9118c4703c91360
+  data.tar.gz: 370a9a88615ff07b03f5742278578bb369ad689a23e6e4f8f464699d3a374d2b
 SHA512:
-  metadata.gz: 8823bb78fb271dac8bd7703507221e0f30e3ebdfd2ac4cec1a97dd3cccbece4957509d6c8e9ccf8b2b5ccf1cd3d61578ef3ea71984425541151e2c24c925ca02
-  data.tar.gz: 9b7152a0d4167660e3d1ae67d6e8e26dce9bc91a6dc0e183175a628b17070b84555493e16ace16036c927956c7e4f23691a21eff38e06eb238663ea9af4b6ff3
+  metadata.gz: 5afef2dd7e33c4cc6e1ab5f4b5a5cad207b80a4dbce31b1f940f8477b46ea43d92b083670e2d059af40ec7a5e1e951907a60f9a03f85a7f86ffa1b7e5724a34a
+  data.tar.gz: 57100a4f6132e6b0182ef9995a7a712514cd0972ce52b7c0298dd9cfd64f5481fd2790a5b2d3022c15abdf9940dd59dd02a0e135ab94e8404fde0be1c786344d

data/.rubocop.yml

@@ -2,6 +2,9 @@ inherit_from: .rubocop_todo.yml
 
 # rubocop configuration
 
+AllCops:
+  NewCops: enable
+
 Layout/SpaceInsideArrayLiteralBrackets:
   EnforcedStyle: space
   Exclude:

data/bin/blocklist.rb

@@ -2,7 +2,6 @@
 
 require 'ipaddr'
 require 'json'
-require 'pp'
 
 DNS_CACHE_FILE = '/var/db/blacklistd.dns.json'.freeze
 CC_CACHE_FILE = '/var/db/blacklistd.cc.json'.freeze

data/bin/unblock.rb

@@ -0,0 +1,99 @@
+#!/usr/local/bin/ruby
+
+BDB_FILE = '/var/db/blacklistd.db'.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
+
+def remove_db( dbh, found )
+  removed = 0
+  found.each do |key|
+    dbh.delete( key )
+    removed += 1
+  end
+  puts "removed: #{removed}"
+  dbh.sync
+  dbh.close
+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.0'
+  version: '1.2'
 platform: ruby
 authors:
 - Dirk Meyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2023-09-30 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
@@ -25,10 +26,10 @@ files:
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
-- Makefile
 - README.md
 - bin/blocklist.rb
 - bin/geodb-lookup.rb
+- bin/unblock.rb
 homepage: https://rubygems.org/gems/blocklistshow
 licenses:
 - MIT
@@ -41,14 +42,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: show blocklistd data

data/Makefile

@@ -1,7 +0,0 @@
-
-cop:
-	rubocop
-
-auto::
-	rubocop --auto-gen-config
-