service_skeleton 0.0.0.41.g9507cda → 0.0.0.43.g678698a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4ef4c44c6af279c8870e58b4bf078424a30c87b6d979d2513fe093c15926287
-  data.tar.gz: 5a9d7d4fc51bae03eac369f6f902dabcfea925d3fd175b69e7888d4368fe87f0
+  metadata.gz: b149de67b978a61b485db23c5c35adb077212835af64a44c6ea1a883501bfa40
+  data.tar.gz: 77bd9a46e93fb02b46bbe7c84b2664226fc06ca99a5266a228359ba83d7ea79e
 SHA512:
-  metadata.gz: 353f92e555ba95c3e5776a0acb10119500671182a0efc082ff0d9e91a247f14209ff23dbc0f64cec73df445daba2435acac7104f18bef0e6cccd01a48e6b4954
-  data.tar.gz: c0c3341e8ab56f4cfed5809a94b6a9b8295e30b59a04977e1b45a24c1d64b3a5ad8f14927e0453145a4bcf93d94579b08d1e432bee49d0e8ac5352f88da6f3f9
+  metadata.gz: 1135ca4d0b40e80230fb11af004ccc0bd985ec7a032d9371f0bd7e356466c1ed720f696d202fb976a85b1353fecf7cb721fb704be65c7fd6f06cdd40cca7f62c
+  data.tar.gz: 3ae9fdb382bf5861743ff895ff4965401d98b9318234d4cdc5ed82410d315e5edd9d6cd2b53f22985b781646753192906735e71d13b81f3e10e18125f06907aa

data/README.md

@@ -533,7 +533,7 @@ signals will be hooked with the following behaviour:
 * **`SIGHUP`** -- close and reopen the log file, if logging to a file on disk.
   Because of the `ServiceSkeleton`'s default log rotation policy, this shouldn't
   ordinarily be required, but if you've turned off the default log rotation,
-  you may need tis.
+  you may need this.
 
 * **`SIGQUIT`** -- dump a *whooooooole* lot of debugging information to
   standard error, including memory allocation summaries and stack traces of all

data/lib/service_skeleton/config.rb

@@ -45,9 +45,13 @@ class ServiceSkeleton
           val = new_value
         end
       end.each do |var|
-        if var.redact!(env) && env.object_id != ENV.object_id
-          raise ServiceSkeleton::Error::CannotSanitizeEnvironmentError,
-                "Attempted to sanitize sensitive variable #{var.name}, but we're not operating on the process' environment"
+        if var.redact?(env)
+          if env.object_id != ENV.object_id
+            raise ServiceSkeleton::Error::CannotSanitizeEnvironmentError,
+                  "Attempted to sanitize sensitive variable #{var.name}, but we're not operating on the process' environment"
+          else
+            var.redact!(env)
+          end
         end
       end
     end

data/lib/service_skeleton/config_variable.rb

@@ -16,6 +16,10 @@ class ServiceSkeleton
       @name.to_s.gsub(/\A#{Regexp.quote(svc_name)}_/i, '').downcase
     end
 
+    def redact?(env)
+      @opts[:sensitive]
+    end
+
     def redact!(env)
       if @opts[:sensitive]
         env[@name.to_s] = "*SENSITIVE*" if env.has_key?(@name.to_s)

data/lib/service_skeleton/config_variable/url.rb

@@ -3,6 +3,10 @@
 require "service_skeleton/config_variable"
 
 class ServiceSkeleton::ConfigVariable::URL < ServiceSkeleton::ConfigVariable
+  def redact?(env)
+    !!(env.has_key?(@name.to_s) && (@opts[:sensitive] || URI(env[@name.to_s] || "").password))
+  end
+
   def redact!(env)
     if env.has_key?(@name.to_s)
       super

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: service_skeleton
 version: !ruby/object:Gem::Version
-  version: 0.0.0.41.g9507cda
+  version: 0.0.0.43.g678698a
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2019-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: frankenstein
@@ -307,8 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: The bare bones of a service