monitor_page 0.1.3 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 451326ea22afa5c979768540e1c19176f3ac239a
-  data.tar.gz: c0e8f5b62db50491978e5cb1171dc808f04a2e33
+  metadata.gz: 611be1f377905d73941412872c95effe32a05a4a
+  data.tar.gz: e0e4606e7e9ce28b9db4622262431d9230c954dd
 SHA512:
-  metadata.gz: be490ed8025440a848e662fb3c2ec6f85297a1603fff314ca9303c30570485b3412215eb3b1d0abf2becc1865048aca4da7a14403cf9f3ceefa1ccd4f79549ab
-  data.tar.gz: 91dcd03dac22decfae551db5fd3d094f3bbda4fb6baab0f1a85623bdf8fa827a91a5354d068736f4bac9fd0561bc170975ae2e1a492e4d0c7163b3049c67e12e
+  metadata.gz: '097960b0e14a984c162298b0a9a84b2200c9edbc0b3c01f85ddc3137d44420917a8cd8b291d62101f02e16c380f27500ee69ed1c34e6f708d6b1eac920463576'
+  data.tar.gz: 529a0d559385d2c0e896597d90c6aaf0522b30010c558f59addb4ead743764554aae7e83bef5d38469a63315dd7edc753957550b3b5fd05358029178bf69e3c4

data/README.md

@@ -6,7 +6,9 @@ Create an initializer and setup your checks. Each check should have a `pass` and
 
 ```ruby
 MonitorPage.configure do
-  permit '1.1.1.1', '1.1.2.2' # optional, will be available everywhere if left out
+  # Whitelist IPs that have access to the status page. Can be a single IP or of CIDR notation.
+  # Optional: if left out it will be publically available
+  permit '1.1.1.1', '1.1.2.0/24'
 
   check 'Sidekiq' do
     if Sidekiq::Queue.all.select{ |q| q.size > 50 }.any?

data/app/controllers/monitor_page/status_controller.rb

@@ -5,7 +5,7 @@ module MonitorPage
     layout 'monitor_page/application'
 
     def index
-      if MonitorPage.allowed_ips && !MonitorPage.allowed_ips.include?(request.remote_ip)
+      unless MonitorPage.ip_whitelisted?(request.remote_ip)
         render html: 'Forbidden' and return
       end
 

data/lib/monitor_page/engine.rb

@@ -1,13 +1,12 @@
-module MonitorPage
+require "ipaddr"
 
+module MonitorPage
   class Engine < ::Rails::Engine
     isolate_namespace MonitorPage
-
   end
 
-
   class << self
-    attr_accessor :checks, :allowed_ips
+    attr_accessor :checks, :whitelisted_ips
 
     def checks
       @checks || []
@@ -22,7 +21,13 @@ module MonitorPage
     end
 
     def permit(ips)
-      self.allowed_ips = ips.is_a?(String) ? ips.split(/,\s?/) : ips
+      ip_ranges = ips.is_a?(String) ? ips.split(/,\s?/) : ips
+
+      self.whitelisted_ips = ip_ranges.map{|ip| IPAddr.new(ip) }
+    end
+
+    def ip_whitelisted?(request_ip)
+      @whitelisted_ips.inject(false){|res,ip| ip.include?(IPAddr.new(request_ip)) or res }
     end
   end
 

data/lib/monitor_page/version.rb

@@ -1,3 +1,3 @@
 module MonitorPage
-  VERSION = '0.1.3'
+  VERSION = '0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monitor_page
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: '0.2'
 platform: ruby
 authors:
 - Chris Gooley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails