chook 1.1.5 → 1.1.9

data/lib/chook/server/routes.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
 
@@ -30,11 +12,11 @@ module Chook
 
     HANDLE_EVENT_ROUTE = '/handle_webhook_event'.freeze
 
-  #   before do
-  #     break if request.path_info == Chook::Server::HANDLE_EVENT_ROUTE
-  # #    break if request.path_info == '/' && session[:authed_admin]
-  # #    redirect '/' unless session[:authed_admin]
-  #   end
+    #   before do
+    #     break if request.path_info == Chook::Server::HANDLE_EVENT_ROUTE
+    # #    break if request.path_info == '/' && session[:authed_admin]
+    # #    redirect '/' unless session[:authed_admin]
+    #   end
 
     # log errors in production (in dev, they go to stdout and the browser)
     error do

data/lib/chook/server/views/layout.haml

@@ -21,9 +21,8 @@
         %tr
           %td{ valign: 'bottom', width: '120' }
             #header_logo
-              %img{ alt: '', height: '120', src: '/imgs/ChookLogoAlMcWhiggin.png', width: '120' }
-            #header_version
-              v#{Chook::VERSION}
+              %img{ alt: '', height: '120', src: Chook::Server::CHOOK_LOGO_URL , width: '120' }
+
           %td
             #definition
               %span.chook_title Chook
@@ -34,10 +33,36 @@
               %span.def_dialect Australian/NZ informal
               %br/
               %span.def_definition a chicken or fowl
-          %td#serverstats{ valign: 'bottom' }
-            Server started: #{Chook::Server.starttime.strftime '%Y-%m-%d %H:%M:%S'}
-            %br/
-            (#{Chook::Server.uptime})
+          %td#serverstats{ valign: :bottom, align: :right }
+            %table
+              %tr
+                %td.label_cell
+                  Chook version:
+                %td.value_cell
+                  #{Chook::VERSION}
+              %tr
+                %td.label_cell
+                  Sinatra version:
+                %td.value_cell
+                  #{Sinatra::VERSION}
+              %tr
+                %td.label_cell
+                  Thin version:
+                %td.value_cell
+                  #{Thin::VERSION::STRING}
+              %tr
+                %td.label_cell
+                  Ruby version:
+                %td.value_cell
+                  #{RUBY_VERSION} @ #{Gem.ruby}
+              %tr
+                %td.label_cell
+                  Server started:
+                %td.value_cell
+                  #{Chook::Server.starttime.strftime '%Y-%m-%d %H:%M:%S'}
+                  (#{Chook::Server.uptime})
+
+
 
     %hr/
     - if Chook.config.admin_user

data/lib/chook/server.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 'sinatra/base'
 require 'sinatra/custom_logger'
@@ -43,6 +25,8 @@ module Chook
     DEFAULT_CONCURRENCY = true
     DEFAULT_SESSION_EXPIRE = 24 * 60 * 60 # one day
 
+    CHOOK_LOGO_URL = 'https://pixaranimationstudios.github.io/chook/images/Chook_Al_McWhiggin_Logo_Web.png'.freeze
+
     # set defaults in config
     Chook.config.port ||= Chook.config.use_ssl ? DEFAULT_SSL_PORT : DEFAULT_PORT
     Chook.config.admin_session_expires ||= DEFAULT_SESSION_EXPIRE

data/lib/chook/subject/computer.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.
+#
+#
 
 # Add the attrbutes of a Computer subject to the Chook::Subject.attributes
 # hash, to be used in defining Chook::TestSubjects::Computer and
@@ -41,32 +23,32 @@ Chook::Subject.classes[Chook::Subject::COMPUTER] = {
   model: {
     validation: String,
     randomizer: :computer_model,
-    api_object_attribute: [:hardware, :model]
+    api_object_attribute: %i[hardware model]
   },
   macAddress: {
-    validation: String, #:validate_mac_address,
+    validation: String, # :validate_mac_address,
     randomizer: :mac_address,
     api_object_attribute: :mac_address
   },
   alternateMacAddress: {
-    validation: String, #:validate_mac_address, # TODO: sometimes this value is nil !
+    validation: String, # :validate_mac_address, # TODO: sometimes this value is nil !
     randomizer: :mac_address,
     api_object_attribute: :alt_mac_address
   },
   serialNumber: {
-    validation: String, #:validate_serial_number,
+    validation: String, # :validate_serial_number,
     randomizer: :computer_serial_number,
     api_object_attribute: :serial_number
   },
   osVersion: {
     validation: String,
     randomizer: :computer_os_version,
-    api_object_attribute: [:hardware, :os_version]
+    api_object_attribute: %i[hardware os_version]
   },
   osBuild: {
     validation: String,
     randomizer: :os_build,
-    api_object_attribute: [:hardware, :os_build]
+    api_object_attribute: %i[hardware os_build]
   },
   userDirectoryID: {
     validation: String,
@@ -84,12 +66,12 @@ Chook::Subject.classes[Chook::Subject::COMPUTER] = {
     api_object_attribute: :real_name
   },
   emailAddress: {
-    validation: String, #:validate_email,
+    validation: String, # :validate_email,
     randomizer: :email_address,
     api_object_attribute: :email_address
   },
   phone: {
-    validation: String, #:validate_phone_number,
+    validation: String, # :validate_phone_number,
     randomizer: :phone,
     api_object_attribute: :phone
   },

data/lib/chook/subject/dep_device.rb

@@ -1,61 +1,43 @@
-### Copyright 2020 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.
+#
+#
 Chook::Subject.classes[Chook::Subject::DEP_DEVICE] = {
   assetTag: {
-    validation: String,
+    validation: String
     # randomizer: ,
     # sampler: ,
     # api_object_attribute:
   },
   description: {
     validation: String,
-    randomizer: :word,
+    randomizer: :word
     # sampler: ,
     # api_object_attribute:
   },
   deviceAssignedDate: {
     to_json: :to_jss_epoch,
     validation: Time,
-    randomizer: :time,
+    randomizer: :time
     # sampler: ,
     # api_object_attribute:
   },
   deviceEnrollmentProgramInstanceId: {
     validation: Integer,
-    randomizer: :int,
+    randomizer: :int
     # sampler: ,
     # api_object_attribute:
   },
   model: {
     validation: String,
-    randomizer: [:computer_model, :mobile_model], # /:
+    randomizer: %i[computer_model mobile_model], # /:
     # sampler: ,
-    api_object_attribute: [:hardware, :model]
+    api_object_attribute: %i[hardware model]
   },
   serialNumber: {
-    validation: String, #:validate_serial_number,
+    validation: String, # :validate_serial_number,
     # randomizer: :computer_serial_number,
     # sampler: ,
     api_object_attribute: :serial_number

data/lib/chook/subject/handled_subject.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/subject/jss.rb

@@ -1,42 +1,24 @@
-### 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.
+#
+#
 Chook::Subject.classes[Chook::Subject::JAMF_SOFTWARE_SERVER] = {
   institution: {
     validation: String,
-    randomizer: :word,
+    randomizer: :word
     # sampler: :institution,
     # api_object_attribute: :institution
   },
   hostAddress: {
     validation: String,
-    randomizer: :host,
+    randomizer: :host
     # sampler: ,
     # api_object_attribute: :hostAddress
   },
   webApplicationPath: {
-    validation: String,
+    validation: String
     # randomizer: ,
     # sampler: ,
     # api_object_attribute: :webApplicationPath
@@ -49,7 +31,7 @@ Chook::Subject.classes[Chook::Subject::JAMF_SOFTWARE_SERVER] = {
   },
   jssUrl: {
     validation: :url,
-    randomizer: :url,
+    randomizer: :url
     # sampler: ,
     # api_object_attribute: :jssUrl
   }

data/lib/chook/subject/mobile_device.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.
+#
+#
 
 Chook::Subject.classes[Chook::Subject::MOBILE_DEVICE] = {
   udid: {
@@ -37,7 +19,7 @@ Chook::Subject.classes[Chook::Subject::MOBILE_DEVICE] = {
   version: {
     validation: String,
     randomizer: :version,
-    api_object_attribute: [:network, :carrier_settings_version]
+    api_object_attribute: %i[network carrier_settings_version]
   },
   model: {
     validation: String,
@@ -45,24 +27,24 @@ Chook::Subject.classes[Chook::Subject::MOBILE_DEVICE] = {
     api_object_attribute: :model
   },
   bluetoothMacAddress: {
-    validation: String, #:validate_mac_address,
+    validation: String, # :validate_mac_address,
     randomizer: :mac_address,
     api_object_attribute: :bluetooth_mac_address
   },
   wifiMacAddress: {
-    validation: String, #:validate_mac_address,
+    validation: String, # :validate_mac_address,
     randomizer: :mac_address,
     api_object_attribute: :wifi_mac_address
   },
   imei: {
     validation: :imei,
     randomizer: :imei,
-    api_object_attribute: [:network, :imei]
+    api_object_attribute: %i[network imei]
   },
   icciID: {
-    validation: String, #:iccid,
+    validation: String, # :iccid,
     randomizer: :iccid,
-    api_object_attribute: [:network, :iccid]
+    api_object_attribute: %i[network iccid]
   },
   product: {
     # Product is null in the sample JSONs... And there isn't anything labeled "product" in JSS::API.get_rsrc("mobiledevices/id/#{id}")

data/lib/chook/subject/patch_software_title_update.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.
+#
+#
 Chook::Subject.classes[Chook::Subject::PATCH_SW_UPDATE] = {
   name: {
     validation: :patch,

data/lib/chook/subject/policy_finished.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.
+#
+#
 
 # Add the attrbutes of a Computer subject to the Chook::Subject.attributes
 # hash, to be used in defining Chook::TestSubjects::Computer and

data/lib/chook/subject/push.rb

@@ -1,37 +1,19 @@
-### 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.
+#
+#
 Chook::Subject.classes[Chook::Subject::PUSH] = {
   type: { # TODO: "PushSent" for a Computer or "MobileDevicePushSent" for a Mobile Device
     validation: String,
-    randomizer: :push,
+    randomizer: :push
     # sampler:,
     # api_object_attribute: :type
   },
   jssID: {
     validation: Integer,
-    randomizer: :int,
+    randomizer: :int
     # sampler: :jssid, # TODO: This should be computer_jssid or mobile_jssid based on the type, see above
     # api_object_attribute: :id
   }

data/lib/chook/subject/rest_api_operation.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.
+#
+#
 Chook::Subject.classes[Chook::Subject::REST_API_OPERATION] = {
   operationSuccessful: {
     validation: :boolean,
@@ -31,31 +13,31 @@ Chook::Subject.classes[Chook::Subject::REST_API_OPERATION] = {
   },
   objectID: {
     validation: Integer,
-    randomizer: :int,
+    randomizer: :int
     # sampler: ,
     # api_object_attribute: :objectID
   },
   objectName: { # This can be "" if the object doesn't have a name attribute.
     validation: String,
-    randomizer: :word,
+    randomizer: :word
     # sampler: ,
     # api_object_attribute: :objectName
   },
   objectTypeName: {
     validation: String,
-    randomizer: :word, 
+    randomizer: :word
     # sampler: ,
     # api_object_attribute: :objectTypeName
   },
   authorizedUsername: {
     validation: String,
-    randomizer: :word,
+    randomizer: :word
     # sampler: :username,
     # api_object_attribute: :authorizedUsername
   },
   restAPIOperationType: {
     validation: String,
-    randomizer: :rest_operation,
+    randomizer: :rest_operation
     # sampler: ,
     # api_object_attribute: :restAPIOperationType
   }