net-knocker 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2b9e2759985d6e60c6ff108157155b7862d703c2e1836284f89f2786e58d199
-  data.tar.gz: dce4cd990ad60f354628f15e83bb2fe9cadfd7d1bb1ea973e7211447711107a7
+  metadata.gz: 8a38824a21ea2beda34df5f73f6be239301b3aa40fe7b83a41c9d2c384af1ca3
+  data.tar.gz: 487b9e354c702565c4aeb4e95595a39e9b38b9979d40112175f7aea3add534cf
 SHA512:
-  metadata.gz: 43ae20154a32b3a730952bec81a0b0c5a2159c7038b9d1276e4ff11fbf8edbcfb07ae8b6bfc6021c0d892ec47b797a6db14f2a13a7f496fe221c2bcc5540114b
-  data.tar.gz: 3b3783e2c1d6a7d7b842f6e93f07ad4b0ca2dbe1e759b94e39ea7942c085d3f2b35a7532bbbff77ee8f74bd6fd24b64dfd6bb74ee242089d4ac4337a94f642fa
+  metadata.gz: ae90907f7a0d12d3b189f2df89fca91013b127fd5e7126391e2c2de35d850750c4c27f911b9b31cb448332c336cf9fef1cc5337d25fdfbbab40dcec2c5fb582e
+  data.tar.gz: 28880d5f8e3937140eb1648fdc11aa995880b5afc3ad4e1f9873ef1a14410f93fd1697e5b495c9570cdd7c0286edc439d54ef4d4bc47ba19bb7eb805aedf7b67

data/README.md

@@ -25,7 +25,7 @@ Or install it yourself as:
 |---------------------------|--------------------|
 | NET_KNOCKER_URL           | |
 | NET_KNOCKER_SECRET        | |
-| NET_KNOCKER_HTTP_DEBUG    | |
+| NET_KNOCKER_DEBUG    | |
 
 
 ## Usage

data/lib/net/knocker/env.rb

@@ -16,7 +16,7 @@ module Net
           http.use_ssl = true
           http.cert = ssl_certificate
           http.key = ssl_key
-          http.set_debug_output $stderr if ENV.key? 'NET_KNOCKER_HTTP_DEBUG'
+          http.set_debug_output $stderr if ENV.key? 'NET_KNOCKER_DEBUG'
         end
       end
 
@@ -40,21 +40,30 @@ module Net
         end
       end
 
-      def info(method = :info, msg)
-        tags = [self.class.name, Process.pid, method.to_s.upcase].join('][')
+      def info(msg, method = :info)
+        tags = [Net::Knocker, Process.pid, method.to_s.upcase].join('][')
         log.send(method, "[#{tags}] #{msg}")
       end
 
       def error(msg)
-        info(__method__, msg)
+        info(msg, __method__)
       end
 
       def warn(msg)
-        info(__method__, msg)
+        info(msg, __method__)
       end
 
       def debug(msg)
-        info(__method__, msg)
+        return unless debugging?
+
+        info(msg, __method__)
+      end
+
+      def debugging?
+        @debugging ||= begin
+          env_debug = ENV.fetch('NET_KNOCKER_DEBUG', false).to_s.downcase
+          %w[true yes yep 1].include? env_debug
+        end
       end
 
       def ssl_certificate
@@ -62,7 +71,9 @@ module Net
       end
 
       def url
-        @url ||= URI.parse(ENV.fetch('NET_KNOCKER_URL')) unless should_omit?
+        return if should_omit?
+
+        @url ||= URI.parse(ENV.fetch('NET_KNOCKER_URL'))
       end
 
       def log
@@ -74,6 +85,10 @@ module Net
                     ::Logger.new($stderr)
                   end
       end
+
+      def var_names
+        @var_names ||= %w[NET_KNOCKER_SECRET NET_KNOCKER_URL].freeze
+      end
     end
   end
 end

data/lib/net/knocker/peer.rb

@@ -1,42 +1,61 @@
 # frozen_string_literal: true
 
+require_relative 'env'
 module Net
   class Knocker
     class Peer
-      def self.env_var_patterns
-        @env_var_patterns ||= %W[NET_KNOCKER_URL NET_KNOCKER_SECRET #{ENV['NET_KNOCKER_URL']}].freeze
+      extend Env
+
+      attr_reader :pid, :exe, :environ_path
+
+      def initialize(pid)
+        @pid = pid
+        @exe ||= Pathname("/proc/#{pid}/exe").realpath
+        @environ_path ||= Pathname("/proc/#{pid}/environ")
       end
 
-      # filter out /proc/self/environ, /proc/thread-self/environ, /proc/<PID>/environ" and "/proc/1/environ"
-      def self.self_patterns
-        @self_patterns ||= %r{proc/((?:thread-)?self|#{Process.pid}|1)/environ}.freeze
+      def environ
+        @environ ||= environ_path.binread.split("\0").map do |line|
+          line.split('=', 2)
+        end.to_h
       end
 
-      def self.environ_paths
-        Dir['/proc/*/environ'].grep_v(self_patterns)
-                              .map { |p| Pathname.new(p) }
-                              .compact
+      # rubocop:todo Metrics/PerceivedComplexity
+      # rubocop:todo Metrics/AbcSize
+      def self.try_peer(path) # rubocop:todo Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+        pid = File.basename(path).to_i
+        return if pid.zero? || (pid.eql? Process.pid)
+
+        peer_candidate = new(pid)
+        return unless peer_candidate.exe.basename.eql? Pathname('/proc/self/exe').realpath.basename
+        return unless var_names.all? { |e| peer_candidate.environ.key? e }
+        return unless URI.parse(peer_candidate.environ.fetch('NET_KNOCKER_URL')).eql? url
+        return unless peer_candidate.environ.fetch('NET_KNOCKER_SECRET').eql? env_secret
+
+        peer_candidate
+      rescue Errno::EACCES
+        nil
+      rescue StandardError => e
+        debug "non-crical exception raised: #{e.class}: #{e.message}"
+        nil
       end
+      # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/PerceivedComplexity
 
-      def self.pid_with_content
-        environ_paths.map do |path|
-          content = begin
-            path.binread
-                .split("\0")
-                .select { |e| env_var_patterns.any? { |p| e.include? p } }
-                .compact
-          rescue StandardError
-            next
+      def self.peers
+        @peers ||= Dir['/proc/*/'].map do |path|
+          try_peer(path).tap do |p|
+            debug("peer found #{p.pid}") unless p.nil?
           end
-          pid = path.to_s.split('/').third.to_s
-          [pid, content] unless content.empty? || pid.empty?
-        end
-        .compact
-        .to_h
+        end.compact
+      end
+
+      def self.pids
+        @pids ||= peers.map(&:pid)
       end
 
       def self.any?(&block)
-        pid_with_content.any?(&block)
+        peers.any?(&block)
       end
     end
   end

data/lib/net/knocker/version.rb

@@ -2,6 +2,6 @@
 
 module Net
   class Knocker
-    VERSION = '0.0.4'
+    VERSION = '0.0.6'
   end
 end

data/lib/net/knocker.rb

@@ -17,16 +17,19 @@ module Net
     end
 
     def in
+      return debug(omit_message('PUT')) if should_omit?
+
       send_request 'PUT'
     end
 
-    def msg_end
-      "to #{url}" unless url.to_s.empty?
+    def omit_message(http_method = 'DELETE')
+      msg_end = url.to_s.empty? ? '' : "to #{url}"
+      "not sending #{http_method} request #{msg_end}"
     end
 
     def out
-      return debug("not sending DELETE request #{msg_end})") if should_omit?
-      return info("sending DELETE request is blocked by PID(s) #{Peer.pid_with_content.keys.join(',')}") if Peer.any?
+      return debug(omit_message) if should_omit?
+      return info("#{omit_message}, blocked by PID(s) #{Peer.pids.join(',')}") if Peer.any?
 
       send_request 'DELETE'
     end
@@ -34,8 +37,6 @@ module Net
     private
 
     def send_request(http_method)
-      return debug("not sending #{http_method} request #{msg_end}") if should_omit?
-
       http_client.send_request(http_method, '/') do |response|
         debug("[#{self.class}][#{__method__}] Public IP: #{response.body} ")
       end

data/net-knocker.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Use Mutual TLS to knock to remote endpoint.'
   # spec.description   = ''
   spec.homepage      = 'https://github.com/todosmodos/net-knocker'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.4.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.4.0') # rubocop:todo Gemspec/RequiredRubyVersion
 
   # spec.metadata['homepage_uri'] = spec.homepage
   # spec.metadata['source_code_uri'] = 'TODO: Put your gem's public repo URL here.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: net-knocker
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Tio Teath
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-13 00:00:00.000000000 Z
+date: 2022-04-14 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: