chook 1.0.1.b2 → 1.1.5

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

@@ -0,0 +1,33 @@
+.section_label#log_label
+  %button#view_log_btn{ type: 'button', onClick: 'view_log();', title: 'view the live Chook log' }
+    View
+  %button#hide_log_btn{ type: 'button', onClick: 'hide_log();', title: 'hide the live Chook log' }
+    Hide
+      
+
+  The Live Chook Log     
+
+  Server Log Level:
+  %select#log_level_select{ onchange: 'change_log_level();',
+    title: 'changes here affect logging the server, not just your view' }
+
+    %option{ value: 'fatal', selected: Chook.logger.level == Logger::FATAL } fatal
+    %option{ value: 'error', selected: Chook.logger.level == Logger::ERROR } error
+    %option{ value: 'warn', selected: Chook.logger.level == Logger::WARN } warn
+    %option{ value: 'info', selected: Chook.logger.level == Logger::INFO } info
+    %option{ value: 'debug', selected: Chook.logger.level == Logger::DEBUG } debug
+
+#logbox_div
+  #logbox_btns
+    %input#pause_log{ type: 'checkbox', checked: false, onclick: 'update_logbox();' }
+      Pause
+        
+
+    %button#clear_log_btn{ type: 'button', onClick: 'clear_log();', title: 'clear the live Chook log' }
+      Clear
+
+        
+
+
+
+  %textarea.monospaced#logbox{ readonly: true, rows: 20 }

data/lib/chook/server/views/sketch_admin

@@ -0,0 +1,44 @@
+[image] Chook v.XXX
+
+
+Log (view/hide)        Log Level: [popup list] (set)
+--------- hidable text area with streaming log -----------
+
+
+Current Handlers
+  filename/type (view/edit) (remove)
+  ...
+  ...
+  (Add new handler)
+--------- text area with editable handler -----------
+  (save)
+
+
+Configuration (save)
+--------- text area with editable (?) config file -----------
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+(c) Pixar....  [links]

data/lib/chook/subject.rb

@@ -49,6 +49,11 @@ module Chook
     # Chook::HandledSubjects and Chook::TestSubjects
     COMPUTER = 'Computer'.freeze
 
+    # The name of the DeviceAddedtoDEP subject (a.k.a. 'event_object')
+    # as known to the JSS. Also the class name of such subjects in
+    # Chook::HandledSubjects and Chook::TestSubjects
+    DEP_DEVICE = 'DEPDevice'.freeze
+
     # The name of the JSS subject (a.k.a. 'event_object')
     # as known to the JSS. Also the class name of such subjects in
     # Chook::HandledSubjects and Chook::TestSubjects
@@ -64,6 +69,11 @@ module Chook
     # Chook::HandledSubjects and Chook::TestSubjects
     PATCH_SW_UPDATE = 'PatchSoftwareTitleUpdated'.freeze
 
+    # The name of the ComputerPolicyFinished subject (a.k.a. 'event_object')
+    # as known to the JSS. Also the class name of such subjects in
+    # Chook::HandledSubjects and Chook::TestSubjects
+    POLICY_FINISHED = 'PolicyFinished'.freeze
+
     # The name of the Push subject (a.k.a. 'event_object')
     # as known to the JSS. Also the class name of such subjects in
     # Chook::HandledSubjects and Chook::TestSubjects
@@ -122,9 +132,8 @@ module Chook
     #       Proc: Pass an API object to the PROC to get a value
     #
     def self.classes
-      @classes
+      @classes ||= {}
     end
-    @classes = {}
 
   end # class Subject
 
@@ -141,3 +150,5 @@ require 'chook/subject/rest_api_operation'
 require 'chook/subject/scep_challenge'
 require 'chook/subject/smart_group'
 require 'chook/test_subjects'
+require 'chook/subject/dep_device'
+require 'chook/subject/policy_finished'

data/lib/chook/subject/dep_device.rb

@@ -0,0 +1,81 @@
+### 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.
+###
+###
+Chook::Subject.classes[Chook::Subject::DEP_DEVICE] = {
+  assetTag: {
+    validation: String,
+    # randomizer: ,
+    # sampler: ,
+    # api_object_attribute:
+  },
+  description: {
+    validation: String,
+    randomizer: :word,
+    # sampler: ,
+    # api_object_attribute:
+  },
+  deviceAssignedDate: {
+    to_json: :to_jss_epoch,
+    validation: Time,
+    randomizer: :time,
+    # sampler: ,
+    # api_object_attribute:
+  },
+  deviceEnrollmentProgramInstanceId: {
+    validation: Integer,
+    randomizer: :int,
+    # sampler: ,
+    # api_object_attribute:
+  },
+  model: {
+    validation: String,
+    randomizer: [:computer_model, :mobile_model], # /:
+    # sampler: ,
+    api_object_attribute: [:hardware, :model]
+  },
+  serialNumber: {
+    validation: String, #:validate_serial_number,
+    # randomizer: :computer_serial_number,
+    # sampler: ,
+    api_object_attribute: :serial_number
+  }
+}
+
+# https://www.jamf.com/developers/webhooks/#deviceaddedtoDEP
+# {
+#     "event": {
+#         "assetTag": "1664194",
+#         "description": "Mac Pro",
+#         "deviceAssignedDate": 1552478234000,
+#         "deviceEnrollmentProgramInstanceId": 1,
+#         "model": "Mac Pro",
+#         "serialNumber": "92D8014694C4BE96B3"
+#     },
+#     "webhook": {
+#         "eventTimestamp": 1553550275590,
+#         "id": 1,
+#         "name": "Webhook Documentation",
+#         "webhookEvent": "DeviceAddedToDEP"
+#     }
+# }

data/lib/chook/subject/policy_finished.rb

@@ -0,0 +1,43 @@
+### 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.
+###
+###
+
+# Add the attrbutes of a Computer subject to the Chook::Subject.attributes
+# hash, to be used in defining Chook::TestSubjects::Computer and
+# Chook::HandledSubjects::Computer
+#
+Chook::Subject.classes[Chook::Subject::POLICY_FINISHED] = {
+  computer: {
+    validation: Hash,
+    api_object_attribute: :computer
+  },
+  policyId: {
+    validation: Integer,
+    api_object_attribute: :policyId
+  },
+  successful: {
+    validation: :boolean,
+    api_object_attribute: :successful
+  }
+}

data/lib/chook/subject/smart_group.rb

@@ -41,6 +41,12 @@ Chook::Subject.classes[Chook::Subject::SMART_GROUP] = {
     # sampler: :smart_group_jssid,
     api_object_attribute: :id
   },
+  groupAddedDevicesIds: {
+    validation: Array
+  },
+  groupRemovedDevicesIds: {
+    validation: Array
+  },
   computer: { # SmartGroupComputerMembershipChange == true, SmartGroupMobileDeviceMembershipChange == false
     validation: :boolean,
     randomizer: :bool,

data/lib/chook/version.rb

@@ -27,6 +27,6 @@
 module Chook
 
   ### The version of the Chook framework
-  VERSION = '1.0.1.b2'.freeze
+  VERSION = '1.1.5'.freeze
 
 end # module

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chook
 version: !ruby/object:Gem::Version
-  version: 1.0.1.b2
+  version: 1.1.5
 platform: ruby
 authors:
 - Chris Lasell
@@ -9,27 +9,69 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2020-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.8
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.8
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: |2
     Chook is a Ruby module which implements a framework for working with webhook events
     sent by the JSS, the core of Jamf Pro, a management tool for Apple devices.
 
-    Chook also provides a simple, sinatra-based HTTP server, for handling those Events,
+    Chook also provides a simple, sinatra-based HTTP(S) server, for handling those Events,
     and classes for sending simulated TestEvents to a webhook handling server.
 email: chook@pixar.com
 executables:
@@ -38,10 +80,14 @@ extensions: []
 extra_rdoc_files:
 - README.md
 - LICENSE.txt
+- CHANGES.md
 files:
+- CHANGES.md
 - LICENSE.txt
 - README.md
 - bin/chook-server
+- data/chook.conf.example
+- data/com.pixar.chook-server.plist
 - data/sample_handlers/RestAPIOperation-executable
 - data/sample_handlers/RestAPIOperation.rb
 - data/sample_handlers/SmartGroupComputerMembershipChange-executable
@@ -70,6 +116,7 @@ files:
 - lib/chook/event.rb
 - lib/chook/event/handled_event.rb
 - lib/chook/event/handled_event/handlers.rb
+- lib/chook/event/handled_event_logger.rb
 - lib/chook/event/test_event.rb
 - lib/chook/event_handling.rb
 - lib/chook/event_testing.rb
@@ -78,15 +125,34 @@ files:
 - lib/chook/handled_subjects.rb
 - lib/chook/procs.rb
 - lib/chook/server.rb
+- lib/chook/server/auth.rb
+- lib/chook/server/log.rb
+- lib/chook/server/public/css/chook.css
+- lib/chook/server/public/imgs/ChookLogoAlMcWhiggin.png
+- lib/chook/server/public/js/chook.js
+- lib/chook/server/public/js/logstream.js
 - lib/chook/server/routes.rb
+- lib/chook/server/routes/handle_by_name.rb
 - lib/chook/server/routes/handle_webhook_event.rb
+- lib/chook/server/routes/handlers.rb
 - lib/chook/server/routes/home.rb
+- lib/chook/server/routes/log.rb
+- lib/chook/server/routes/login_logout.rb
+- lib/chook/server/views/admin.haml
+- lib/chook/server/views/bak.haml
+- lib/chook/server/views/config.haml
+- lib/chook/server/views/handlers.haml
+- lib/chook/server/views/layout.haml
+- lib/chook/server/views/logstream.haml
+- lib/chook/server/views/sketch_admin
 - lib/chook/subject.rb
 - lib/chook/subject/computer.rb
+- lib/chook/subject/dep_device.rb
 - lib/chook/subject/handled_subject.rb
 - lib/chook/subject/jss.rb
 - lib/chook/subject/mobile_device.rb
 - lib/chook/subject/patch_software_title_update.rb
+- lib/chook/subject/policy_finished.rb
 - lib/chook/subject/push.rb
 - lib/chook/subject/randomizers.rb
 - lib/chook/subject/rest_api_operation.rb
@@ -103,28 +169,22 @@ licenses:
 - Nonstandard
 metadata: {}
 post_install_message: 
-rdoc_options:
-- --title
-- Chook
-- --line-numbers
-- --main
-- README.md
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: A Ruby framework for simulating and processing Jamf Pro Webhooks
+summary: A Ruby framework for simulating and processing Jamf Pro Webhook Events
 test_files: []