block 0.0.8 → 0.0.9

data/README.markdown

@@ -0,0 +1,46 @@
+block
+=====
+
+To install - first off make sure you have Redis available to you. Then:
+
+    gem install block
+    
+From there, here's how you run it:
+
+    NAME
+        block - Ruby Gem to block IP addresses that are requesting URLs you determine are bad.
+
+    SYNOPSIS
+        block [global options] command [command options] [arguments...]
+
+    VERSION
+        0.0.9
+
+    GLOBAL OPTIONS
+        -d, --[no-]disable                 - Disable adding firewall rules
+        -e, --expiry=10                    - Expiry time in seconds (default: 10)
+        -f, --file=filename.txt            - The filename to watch (default: none)
+        --help                             - Show this message
+        -r, --redis=redis://127.0.0.1:6379 - Redis server location (default: redis://127.0.0.1:6379)
+        -s, --search=passwd,acunetrix      - The searches - separated by commas. (default: none)
+        -t, --threshold=30                 - Block threshold number (default: 30)
+        --version                          - 
+
+    COMMANDS
+        help  - Shows a list of commands or help for one command
+        watch - Watch and (optionally) block bad IP addresses
+
+Monitor an Apache logfile and block IP addresses that are requesting pages that match strings you pass on the command line.
+
+    block -f logfile-to-watch.txt -s passwd,acunetrix watch
+  
+We watch the logs and increment a counter each time there's a match for a particular IP address and string, once they hit a certain number of matches they're blocked using Linux's iptables.
+
+If you're not sure whether it's tuned correctly, you can run it with the `-d` flag and watch what **would** happen.
+
+Requires
+--------
+
+Ruby 1.8.7 or 1.9.x
+
+Redis

data/bin/block

@@ -4,8 +4,6 @@ require 'block'
 
 include GLI::App
 
-$redis = Redis.new
-
 program_desc 'Ruby Gem to block IP addresses that are requesting URLs you determine are bad.'
 
 version Block::VERSION
@@ -19,8 +17,8 @@ arg_name 'filename.txt'
 flag [:f,:file]
 
 desc 'Redis server location'
-arg_name '127.0.0.1:6379'
-default_value '127.0.0.1:6379'
+arg_name 'redis://127.0.0.1:6379'
+default_value 'redis://127.0.0.1:6379'
 flag [:r,:redis]
 
 desc 'Expiry time in seconds'
@@ -44,7 +42,7 @@ pre do |global,command,options,args|
   searches = check_for_searches(global)
   
   # Make sure redis is available.
-  redis = check_for_redis
+  redis = check_for_redis(global)
 end
 
 desc 'Watch and (optionally) block bad IP addresses'

data/lib/block.rb

@@ -5,7 +5,9 @@ require 'redis'
 # Add requires for other files you add to your project here, so
 # you just need to require this one file in your bin file
 
-def check_for_redis
+def check_for_redis(args)
+  uri = URI.parse(args[:redis])
+  $redis = Redis.new(:host => uri.host, :port => uri.port, :password => uri.password)
   begin
     $redis.ping
     true

data/lib/block/version.rb

@@ -1,3 +1,3 @@
 module Block
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: block
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -145,14 +145,14 @@ executables:
 - block
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- README.markdown
 - block.rdoc
 files:
 - bin/block
 - lib/block/version.rb
 - lib/block/reader.rb
 - lib/block.rb
-- README.rdoc
+- README.markdown
 - block.rdoc
 homepage: https://github.com/darron/block
 licenses: []
@@ -161,7 +161,7 @@ rdoc_options:
 - --title
 - block
 - --main
-- README.rdoc
+- README.markdown
 - -ri
 require_paths:
 - lib

data/README.rdoc

@@ -1,6 +0,0 @@
-= block
-
-Describe your project here
-
-:include:block.rdoc
-