chook 1.1.5 → 1.1.9

data/lib/chook/event_testing.rb

@@ -1,27 +1,9 @@
-### Copyright 2017 Pixar
-
-###
-###    Licensed under the Apache License, Version 2.0 (the "Apache License")
-###    with the following modification; you may not use this file except in
-###    compliance with the Apache License and the following modification to it:
-###    Section 6. Trademarks. is deleted and replaced with:
-###
-###    6. Trademarks. This License does not grant permission to use the trade
-###       names, trademarks, service marks, or product names of the Licensor
-###       and its affiliates, except as required to comply with Section 4(c) of
-###       the License and to reproduce the content of the NOTICE file.
-###
-###    You may obtain a copy of the Apache License at
-###
-###        http://www.apache.org/licenses/LICENSE-2.0
-###
-###    Unless required by applicable law or agreed to in writing, software
-###    distributed under the Apache License with the above modification is
-###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-###    KIND, either express or implied. See the Apache License for the specific
-###    language governing permissions and limitations under the Apache License.
-###
-###
+# Copyright 2025 Pixar
+#
+#    Licensed under the terms set forth in the LICENSE.txt file available at
+#    at the root of this project.
+#
+#
 # foundation
 require 'chook/foundation'
 

data/lib/chook/foundation.rb

@@ -1,27 +1,9 @@
-### Copyright 2017 Pixar
-
-###
-###    Licensed under the Apache License, Version 2.0 (the "Apache License")
-###    with the following modification; you may not use this file except in
-###    compliance with the Apache License and the following modification to it:
-###    Section 6. Trademarks. is deleted and replaced with:
-###
-###    6. Trademarks. This License does not grant permission to use the trade
-###       names, trademarks, service marks, or product names of the Licensor
-###       and its affiliates, except as required to comply with Section 4(c) of
-###       the License and to reproduce the content of the NOTICE file.
-###
-###    You may obtain a copy of the Apache License at
-###
-###        http://www.apache.org/licenses/LICENSE-2.0
-###
-###    Unless required by applicable law or agreed to in writing, software
-###    distributed under the Apache License with the above modification is
-###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-###    KIND, either express or implied. See the Apache License for the specific
-###    language governing permissions and limitations under the Apache License.
-###
-###
+# Copyright 2025 Pixar
+#
+#    Licensed under the terms set forth in the LICENSE.txt file available at
+#    at the root of this project.
+#
+#
 
 # require the foundational files of chook
 require 'json'

data/lib/chook/handled_events.rb

@@ -1,27 +1,9 @@
-### Copyright 2017 Pixar
-
-###
-###    Licensed under the Apache License, Version 2.0 (the "Apache License")
-###    with the following modification; you may not use this file except in
-###    compliance with the Apache License and the following modification to it:
-###    Section 6. Trademarks. is deleted and replaced with:
-###
-###    6. Trademarks. This License does not grant permission to use the trade
-###       names, trademarks, service marks, or product names of the Licensor
-###       and its affiliates, except as required to comply with Section 4(c) of
-###       the License and to reproduce the content of the NOTICE file.
-###
-###    You may obtain a copy of the Apache License at
-###
-###        http://www.apache.org/licenses/LICENSE-2.0
-###
-###    Unless required by applicable law or agreed to in writing, software
-###    distributed under the Apache License with the above modification is
-###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-###    KIND, either express or implied. See the Apache License for the specific
-###    language governing permissions and limitations under the Apache License.
-###
-###
+# Copyright 2025 Pixar
+#
+#    Licensed under the terms set forth in the LICENSE.txt file available at
+#    at the root of this project.
+#
+#
 
 module Chook
 

data/lib/chook/handled_subjects.rb

@@ -1,27 +1,9 @@
-### Copyright 2017 Pixar
-
-###
-###    Licensed under the Apache License, Version 2.0 (the "Apache License")
-###    with the following modification; you may not use this file except in
-###    compliance with the Apache License and the following modification to it:
-###    Section 6. Trademarks. is deleted and replaced with:
-###
-###    6. Trademarks. This License does not grant permission to use the trade
-###       names, trademarks, service marks, or product names of the Licensor
-###       and its affiliates, except as required to comply with Section 4(c) of
-###       the License and to reproduce the content of the NOTICE file.
-###
-###    You may obtain a copy of the Apache License at
-###
-###        http://www.apache.org/licenses/LICENSE-2.0
-###
-###    Unless required by applicable law or agreed to in writing, software
-###    distributed under the Apache License with the above modification is
-###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-###    KIND, either express or implied. See the Apache License for the specific
-###    language governing permissions and limitations under the Apache License.
-###
-###
+# Copyright 2025 Pixar
+#
+#    Licensed under the terms set forth in the LICENSE.txt file available at
+#    at the root of this project.
+#
+#
 
 module Chook
 

data/lib/chook/procs.rb

@@ -1,29 +1,10 @@
-### Copyright 2017 Pixar
-
-###
-###    Licensed under the Apache License, Version 2.0 (the "Apache License")
-###    with the following modification; you may not use this file except in
-###    compliance with the Apache License and the following modification to it:
-###    Section 6. Trademarks. is deleted and replaced with:
-###
-###    6. Trademarks. This License does not grant permission to use the trade
-###       names, trademarks, service marks, or product names of the Licensor
-###       and its affiliates, except as required to comply with Section 4(c) of
-###       the License and to reproduce the content of the NOTICE file.
-###
-###    You may obtain a copy of the Apache License at
-###
-###        http://www.apache.org/licenses/LICENSE-2.0
-###
-###    Unless required by applicable law or agreed to in writing, software
-###    distributed under the Apache License with the above modification is
-###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-###    KIND, either express or implied. See the Apache License for the specific
-###    language governing permissions and limitations under the Apache License.
-###
-###
-
-###
+# Copyright 2025 Pixar
+#
+#    Licensed under the terms set forth in the LICENSE.txt file available at
+#    at the root of this project.
+#
+#
+
 module Chook
 
   # A namespace to hold Proc objects in constants
@@ -42,10 +23,21 @@ module Chook
         level
       else
         lvl = Chook::Server::Log::LOG_LEVELS[level.to_sym]
-        lvl ? lvl : Logger::UNKNOWN
+        lvl || Logger::UNKNOWN
       end # if..else
     end
 
+    COMMA_STRING_TO_ARRAY = proc { |val| val.split(/\s*,\s*/) }
+
+    ENV_FROM_CONFIG = proc do |envs|
+      envs = envs.split(/\s*,\s*/)
+      envs.each do |env|
+        var, val = env.split '='
+        ENV[var] = val
+      end
+      envs
+    end
+
     MOBILE_USERID = proc { |_device| '-1' }
 
     PRODUCT = proc { |_device| nil }

data/lib/chook/server/auth.rb

@@ -1,27 +1,9 @@
-### Copyright 2017 Pixar
-
-###
-###    Licensed under the Apache License, Version 2.0 (the "Apache License")
-###    with the following modification; you may not use this file except in
-###    compliance with the Apache License and the following modification to it:
-###    Section 6. Trademarks. is deleted and replaced with:
-###
-###    6. Trademarks. This License does not grant permission to use the trade
-###       names, trademarks, service marks, or product names of the Licensor
-###       and its affiliates, except as required to comply with Section 4(c) of
-###       the License and to reproduce the content of the NOTICE file.
-###
-###    You may obtain a copy of the Apache License at
-###
-###        http://www.apache.org/licenses/LICENSE-2.0
-###
-###    Unless required by applicable law or agreed to in writing, software
-###    distributed under the Apache License with the above modification is
-###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-###    KIND, either express or implied. See the Apache License for the specific
-###    language governing permissions and limitations under the Apache License.
-###
-###
+# Copyright 2025 Pixar
+#
+#    Licensed under the terms set forth in the LICENSE.txt file available at
+#    at the root of this project.
+#
+#
 
 module Chook
 
@@ -37,6 +19,7 @@ module Chook
         # don't protect if user isn't defined
         return unless Chook.config.webhooks_user
         return if webhook_user_authorized?
+
         headers['WWW-Authenticate'] = 'Basic realm="Restricted Area"'
         halt 401, "Not authorized\n"
       end
@@ -67,6 +50,7 @@ module Chook
       # admin user auth might come from config, might come from Jamf Pro
       def authenticate_admin(user, pw)
         return authenticate_jamf_admin(user, pw) if Chook.config.admin_user == USE_JAMF_ADMIN_USER
+
         authenticate_admin_user(user, pw)
       end
 
@@ -94,6 +78,13 @@ module Chook
           use_ssl: Chook.config.jamf_use_ssl,
           verify_cert: Chook.config.jamf_verify_cert
         )
+
+        if Chook.config.jamf_admins && !Chook.config.jamf_admins.include?(user)
+          Chook.logger.warn "Jamf Admin login FAILED for: #{user}@#{request.ip}, Not listed in config.jamf_admins"
+          session[:authed_admin] = nil
+          return false
+        end
+
         Chook.logger.debug "Jamf Admin login for: #{user}@#{request.ip}"
 
         session[:authed_admin] = user
@@ -138,22 +129,24 @@ module Chook
     def self.pw_from_command(cmd)
       cmd = cmd.chomp '|'
       output = `#{cmd} 2>&1`.chomp
-      raise "Can't get password from #{setting}: #{output}" unless $CHILD_STATUS.exitstatus.zero?
+      raise "Can't get password from #{cmd}: #{output}" unless $CHILD_STATUS.exitstatus.zero?
+
       output
     end
 
     def self.pw_from_file(file)
       file = Pathname.new file
       return nil unless file.file?
+
       stat = file.stat
       mode = format('%o', stat.mode)
       raise "Password file #{setting} has insecure mode, must be 0600." unless mode.end_with?('0600')
       raise "Password file #{setting} has insecure owner, must be owned by UID #{Process.euid}." unless stat.owned?
+
       # chomping an empty string removes all trailing \n's and \r\n's
       file.read.chomp('')
     end
 
-
   end # server
 
 end # Chook

data/lib/chook/server/log.rb

@@ -1,27 +1,9 @@
-### Copyright 2017 Pixar
-
-###
-###    Licensed under the Apache License, Version 2.0 (the "Apache License")
-###    with the following modification; you may not use this file except in
-###    compliance with the Apache License and the following modification to it:
-###    Section 6. Trademarks. is deleted and replaced with:
-###
-###    6. Trademarks. This License does not grant permission to use the trade
-###       names, trademarks, service marks, or product names of the Licensor
-###       and its affiliates, except as required to comply with Section 4(c) of
-###       the License and to reproduce the content of the NOTICE file.
-###
-###    You may obtain a copy of the Apache License at
-###
-###        http://www.apache.org/licenses/LICENSE-2.0
-###
-###    Unless required by applicable law or agreed to in writing, software
-###    distributed under the Apache License with the above modification is
-###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-###    KIND, either express or implied. See the Apache License for the specific
-###    language governing permissions and limitations under the Apache License.
-###
-###
+# Copyright 2025 Pixar
+#
+#    Licensed under the terms set forth in the LICENSE.txt file available at
+#    at the root of this project.
+#
+#
 
 # the main module
 module Chook
@@ -92,6 +74,7 @@ module Chook
             active_stream << "#{LOGSTREAM_DATA_PFX}#{str}\n\n"
           end
         end
+
       end # class
 
       # mapping of integer levels to symbols
@@ -138,7 +121,7 @@ module Chook
             Logger.new(
               LogFileWithStream.new(Chook.config.log_file, 'a'),
               Chook.config.logs_to_keep,
-              (Chook.config.log_max_megs * 1024 * 1024)
+              Chook.config.log_max_megs * 1024 * 1024
             )
           else
             Logger.new(LogFileWithStream.new(Chook.config.log_file, 'a'))
@@ -164,6 +147,9 @@ module Chook
         if level == Logger::DEBUG
           @logger.debug 'Config: '
           Chook::Configuration::CONF_KEYS.keys.each do |key|
+            # don't log :env, it might have sensitive data
+            next if key == :env
+
             @logger.debug "  Chook.config.#{key} = #{Chook.config.send key}"
           end
         end

data/lib/chook/server/public/css/chook.css

@@ -6,6 +6,16 @@
   font-family: "Lucida Console", Monaco, monospace;
 }
 
+.label_cell {
+  text-align: right;
+  vertical-align: top;
+  padding-right: 5px;
+}
+
+.value_cell {
+  text-align: left;
+  vertical-align: top;
+}
 
 /* ******* Title Header Area ******* */
 

data/lib/chook/server/routes/handle_by_name.rb

@@ -1,27 +1,9 @@
-### Copyright 2017 Pixar
-
-###
-###    Licensed under the Apache License, Version 2.0 (the "Apache License")
-###    with the following modification; you may not use this file except in
-###    compliance with the Apache License and the following modification to it:
-###    Section 6. Trademarks. is deleted and replaced with:
-###
-###    6. Trademarks. This License does not grant permission to use the trade
-###       names, trademarks, service marks, or product names of the Licensor
-###       and its affiliates, except as required to comply with Section 4(c) of
-###       the License and to reproduce the content of the NOTICE file.
-###
-###    You may obtain a copy of the Apache License at
-###
-###        http://www.apache.org/licenses/LICENSE-2.0
-###
-###    Unless required by applicable law or agreed to in writing, software
-###    distributed under the Apache License with the above modification is
-###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-###    KIND, either express or implied. See the Apache License for the specific
-###    language governing permissions and limitations under the Apache License.
-###
-###
+# Copyright 2025 Pixar
+#
+#    Licensed under the terms set forth in the LICENSE.txt file available at
+#    at the root of this project.
+#
+#
 
 module Chook
 
@@ -33,7 +15,7 @@ module Chook
       protect_via_basic_auth!
 
       # rewind to ensure read-pointer is at the start
-      request.body.rewind #
+      request.body.rewind
       raw_json = request.body.read
 
       event = Chook::HandledEvent.parse_event raw_json

data/lib/chook/server/routes/handle_webhook_event.rb

@@ -1,27 +1,9 @@
-### Copyright 2017 Pixar
-
-###
-###    Licensed under the Apache License, Version 2.0 (the "Apache License")
-###    with the following modification; you may not use this file except in
-###    compliance with the Apache License and the following modification to it:
-###    Section 6. Trademarks. is deleted and replaced with:
-###
-###    6. Trademarks. This License does not grant permission to use the trade
-###       names, trademarks, service marks, or product names of the Licensor
-###       and its affiliates, except as required to comply with Section 4(c) of
-###       the License and to reproduce the content of the NOTICE file.
-###
-###    You may obtain a copy of the Apache License at
-###
-###        http://www.apache.org/licenses/LICENSE-2.0
-###
-###    Unless required by applicable law or agreed to in writing, software
-###    distributed under the Apache License with the above modification is
-###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-###    KIND, either express or implied. See the Apache License for the specific
-###    language governing permissions and limitations under the Apache License.
-###
-###
+# Copyright 2025 Pixar
+#
+#    Licensed under the terms set forth in the LICENSE.txt file available at
+#    at the root of this project.
+#
+#
 
 module Chook
 
@@ -33,7 +15,7 @@ module Chook
       protect_via_basic_auth!
 
       # rewind to ensure read-pointer is at the start
-      request.body.rewind #
+      request.body.rewind
       raw_json = request.body.read
 
       event = Chook::HandledEvent.parse_event raw_json

data/lib/chook/server/routes/handlers.rb

@@ -1,27 +1,9 @@
-### Copyright 2017 Pixar
-
-###
-###    Licensed under the Apache License, Version 2.0 (the "Apache License")
-###    with the following modification; you may not use this file except in
-###    compliance with the Apache License and the following modification to it:
-###    Section 6. Trademarks. is deleted and replaced with:
-###
-###    6. Trademarks. This License does not grant permission to use the trade
-###       names, trademarks, service marks, or product names of the Licensor
-###       and its affiliates, except as required to comply with Section 4(c) of
-###       the License and to reproduce the content of the NOTICE file.
-###
-###    You may obtain a copy of the Apache License at
-###
-###        http://www.apache.org/licenses/LICENSE-2.0
-###
-###    Unless required by applicable law or agreed to in writing, software
-###    distributed under the Apache License with the above modification is
-###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-###    KIND, either express or implied. See the Apache License for the specific
-###    language governing permissions and limitations under the Apache License.
-###
-###
+# Copyright 2025 Pixar
+#
+#    Licensed under the terms set forth in the LICENSE.txt file available at
+#    at the root of this project.
+#
+#
 
 module Chook
 

data/lib/chook/server/routes/home.rb

@@ -1,27 +1,9 @@
-### Copyright 2017 Pixar
-
-###
-###    Licensed under the Apache License, Version 2.0 (the "Apache License")
-###    with the following modification; you may not use this file except in
-###    compliance with the Apache License and the following modification to it:
-###    Section 6. Trademarks. is deleted and replaced with:
-###
-###    6. Trademarks. This License does not grant permission to use the trade
-###       names, trademarks, service marks, or product names of the Licensor
-###       and its affiliates, except as required to comply with Section 4(c) of
-###       the License and to reproduce the content of the NOTICE file.
-###
-###    You may obtain a copy of the Apache License at
-###
-###        http://www.apache.org/licenses/LICENSE-2.0
-###
-###    Unless required by applicable law or agreed to in writing, software
-###    distributed under the Apache License with the above modification is
-###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-###    KIND, either express or implied. See the Apache License for the specific
-###    language governing permissions and limitations under the Apache License.
-###
-###
+# Copyright 2025 Pixar
+#
+#    Licensed under the terms set forth in the LICENSE.txt file available at
+#    at the root of this project.
+#
+#
 
 module Chook
 
@@ -29,7 +11,6 @@ module Chook
   class Server < Sinatra::Base
 
     get '/' do
-
       # a list of current handlers for the admin page
       @handlers_for_admin_page = []
 
@@ -49,7 +30,7 @@ module Chook
       # a list of current named handlers for the admin page
       @named_handlers_for_admin_page = []
 
-      Chook::HandledEvent::Handlers.named_handlers.each do |name, handler|
+      Chook::HandledEvent::Handlers.named_handlers.each do |_name, handler|
         if handler.is_a? Pathname
           file = handler
           type = :external
@@ -60,7 +41,6 @@ module Chook
         @named_handlers_for_admin_page << { file: file, type: type }
       end # handlers each
 
-
       # the current config, for the admin page
       @config_text =
         if Chook::Configuration::DEFAULT_CONF_FILE.file?

data/lib/chook/server/routes/log.rb

@@ -1,27 +1,9 @@
-### Copyright 2017 Pixar
-
-###
-###    Licensed under the Apache License, Version 2.0 (the "Apache License")
-###    with the following modification; you may not use this file except in
-###    compliance with the Apache License and the following modification to it:
-###    Section 6. Trademarks. is deleted and replaced with:
-###
-###    6. Trademarks. This License does not grant permission to use the trade
-###       names, trademarks, service marks, or product names of the Licensor
-###       and its affiliates, except as required to comply with Section 4(c) of
-###       the License and to reproduce the content of the NOTICE file.
-###
-###    You may obtain a copy of the Apache License at
-###
-###        http://www.apache.org/licenses/LICENSE-2.0
-###
-###    Unless required by applicable law or agreed to in writing, software
-###    distributed under the Apache License with the above modification is
-###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-###    KIND, either express or implied. See the Apache License for the specific
-###    language governing permissions and limitations under the Apache License.
-###
-###
+# Copyright 2025 Pixar
+#
+#    Licensed under the terms set forth in the LICENSE.txt file available at
+#    at the root of this project.
+#
+#
 
 module Chook
 

data/lib/chook/server/routes/login_logout.rb

@@ -1,27 +1,9 @@
-### Copyright 2017 Pixar
-
-###
-###    Licensed under the Apache License, Version 2.0 (the "Apache License")
-###    with the following modification; you may not use this file except in
-###    compliance with the Apache License and the following modification to it:
-###    Section 6. Trademarks. is deleted and replaced with:
-###
-###    6. Trademarks. This License does not grant permission to use the trade
-###       names, trademarks, service marks, or product names of the Licensor
-###       and its affiliates, except as required to comply with Section 4(c) of
-###       the License and to reproduce the content of the NOTICE file.
-###
-###    You may obtain a copy of the Apache License at
-###
-###        http://www.apache.org/licenses/LICENSE-2.0
-###
-###    Unless required by applicable law or agreed to in writing, software
-###    distributed under the Apache License with the above modification is
-###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-###    KIND, either express or implied. See the Apache License for the specific
-###    language governing permissions and limitations under the Apache License.
-###
-###
+# Copyright 2025 Pixar
+#
+#    Licensed under the terms set forth in the LICENSE.txt file available at
+#    at the root of this project.
+#
+#
 
 module Chook
 
@@ -42,7 +24,6 @@ module Chook
       redirect '/'
     end # get /
 
-
   end # class
 
 end # module