xolo-server 1.0.1 → 2.0.3

data/lib/xolo/server/object_locks.rb

@@ -27,7 +27,8 @@ module Xolo
       end
 
       # How many seconds are update locks valid for?
-      OBJECT_LOCK_LIMIT = 60 * 60
+      # 15 min
+      OBJECT_LOCK_LIMIT = 60 * 15
 
       # The locks for titles and versions - when they are being created or updated
       # they appear in this data structure with an expiration timestamp.

data/lib/xolo/server/routes/auth.rb

@@ -16,7 +16,7 @@ module Xolo
 
       module Auth
 
-        # This is how we 'mix in' modules to Sinatra servers:
+        # This is how we 'extend' modules to Sinatra servers:
         # We make them extentions here with
         #    extend Sinatra::Extension (from sinatra-contrib)
         # and then 'register' them in the server with
@@ -33,7 +33,7 @@ module Xolo
         # Auth a Xolo Admin via Jamf API login
         # Must be a member of the Jamf Admin group
         # named in Xolo::Server.config.admin_jamf_group
-        # before
+        # NOTE: This cannot be an API Client - must be a real user account
         ###################
         post '/auth/login' do
           request.body.rewind

data/lib/xolo/server/routes/jamf_pro.rb

@@ -16,7 +16,7 @@ module Xolo
 
       module JamfPro
 
-        # This is how we 'mix in' modules to Sinatra servers
+        # This is how we 'extend' modules to Sinatra servers
         # for route definitions and similar things
         #
         # (things to be 'included' for use in route and view processing
@@ -80,6 +80,16 @@ module Xolo
           jcnx&.disconnect
         end
 
+        # A list of all currently available titles that can be subscribed to
+        ###############
+        get '/jamf/available-titles-for-subscription' do
+          log_debug "Jamf: Fetching titles available for subscription for #{session[:admin]}"
+          jcnx = jamf_cnx
+          body available_titles_for_subscription
+        ensure
+          jcnx&.disconnect
+        end
+
       end # Module
 
     end #  Routes

data/lib/xolo/server/routes/maint.rb

@@ -16,7 +16,7 @@ module Xolo
 
       module Maint
 
-        # This is how we 'mix in' modules to Sinatra servers:
+        # This is how we 'extend' modules to Sinatra servers:
         # We make them extentions here with
         #    extend Sinatra::Extension (from sinatra-contrib)
         # and then 'register' them in the server with
@@ -52,6 +52,7 @@ module Xolo
             uptime: uptime_secs.pix_humanize_secs,
             uptime_secs: uptime_secs,
             app_env: Xolo::Server.app_env,
+            test_server: Xolo::Server.test_server?,
             data_dir: Xolo::Server::DATA_DIR,
             log_file: Xolo::Server::Log::LOG_FILE,
             log_level: Xolo::Server::Log::LEVELS[Xolo::Server.logger.level],

data/lib/xolo/server/routes/subscriptions.rb

@@ -0,0 +1,126 @@
+# Copyright 2025 Pixar
+#
+#    Licensed under the terms set forth in the LICENSE.txt file available at
+#    at the root of this project.
+#
+
+# frozen_string_literal: true
+
+# main module
+module Xolo
+
+  # Server Module
+  module Server
+
+    module Routes
+
+      # See comments for Xolo::Server::Helpers::TitleEditor
+      #
+      module Subscriptions
+
+        # This is how we 'extend' modules to Sinatra servers
+        # for route definitions and similar things
+        #
+        # (things to be 'included' for use in route and view processing
+        # are mixed in by delcaring them to be helpers)
+        #
+        # We make them extentions here with
+        #    extend Sinatra::Extension (from sinatra-contrib)
+        # and then 'register' them in the server with
+        #    register Xolo::Server::<Module>
+        # Doing it this way allows us to split the code into a logical
+        # file structure, without re-opening the Sinatra::Base server app,
+        # and let xeitwork do the requiring of those files
+        extend Sinatra::Extension
+
+        # Module methods
+        #
+        ##############################
+        ##############################
+
+        # when this module is included
+        def self.included(includer)
+          Xolo.verbose_include includer, self
+        end
+
+        # when this module is extended
+        def self.extended(extender)
+          Xolo.verbose_extend extender, self
+        end
+
+        # Routes
+        #
+        ##############################
+        ##############################
+
+        # This endpoint receives Jamf Webhook PatchSoftwareTitleUpdated events
+        # from the Jamf Pro server, indicating that a subscribed title has a new version available.
+        #
+        # If the title is subscribed in Xolo, this creates a new xolo version for the title,
+        # and either notifies the contact email for the title, or uses autopkg to get an installer.
+        #
+        # The body will be JSON like this:
+        # {
+        #   "event": {
+        #     "jssID": integer,
+        #     "lastUpdate": epoch,
+        #     "latestVersion": "string",
+        #     "name": "string",
+        #     "reportUrls": [
+        #       "string",
+        #       "string"
+        #     ]
+        #   },
+        #   "webhook": {
+        #     "eventTimestamp": epoch,
+        #     "id": integer,
+        #     "name": "string",
+        #     "webhookEvent": "PatchSoftwareTitleUpdated"
+        #   }
+        # }
+        #
+        # Some real data:
+        #  {
+        #    "event": {
+        #      "jssID": 145,
+        #      "lastUpdate":1765926131000,
+        #      "latestVersion": "1.0.3",
+        #      "name": "Xolo Testing",
+        #      "reportUrls": [
+        #        "https://myjamf.mycompany.com:8443//patch.html?id=145&o=r"
+        #      ]
+        #    },
+        #    "webhook": {
+        #      "eventTimestamp":1765926428322,
+        #      "id": 4,
+        #      "name": "PatchSoftwareTitleUpdated",
+        #      "webhookEvent": "PatchSoftwareTitleUpdated"
+        #    }
+        #  }
+        #
+        # NOTE: The above reportUrls is incorrect on modern Jamf Pro servers.
+        # the correct one would be https://myjamf.mycompany.com:8443/view/computers/patch/145?tab=report
+        #
+        ###############
+        post '/subscribed-title-updates' do
+          session[:admin] = Xolo::Server::WEBHOOK_HANDLER_ADMIN_USERNAME
+          request.body.rewind
+
+          # this happens in a thread so that we can return a 200 response to the
+          # webhook immediately, and do the processing asynchronously (which may
+          # involve time-consuming tasks like autopkg runs)
+          process_patch_title_updated_webhook(request.body.read)
+
+          # always return 200 to the webhook sender
+          status 200
+          resp = { status: 200, message: 'Webhook event received' }
+          body resp
+        end
+
+      end # Module
+
+    end #  Routes
+
+  end #  Server
+
+end # module Xolo

data/lib/xolo/server/routes/title_editor.rb

@@ -18,7 +18,7 @@ module Xolo
       #
       module TitleEditor
 
-        # This is how we 'mix in' modules to Sinatra servers
+        # This is how we 'extend' modules to Sinatra servers
         # for route definitions and similar things
         #
         # (things to be 'included' for use in route and view processing

data/lib/xolo/server/routes/titles.rb

@@ -16,7 +16,7 @@ module Xolo
 
       module Titles
 
-        # This is how we 'mix in' modules to Sinatra servers
+        # This is how we 'extend' modules to Sinatra servers
         # for route definitions and similar things
         #
         # (things to be 'included' for use in route and view processing
@@ -48,11 +48,11 @@ module Xolo
           halt_on_existing_title title.title
 
           log_info "Admin #{session[:admin]} is creating title '#{title.title}'"
+          info = { status: 'created', title: title.title }
+          body info
+
           with_streaming do
             title.create
-            # we don't need to update client data when titles are created
-            # because they don't have any versions yet, so there's nothing a
-            # client can do with them.
           end
         end
 
@@ -93,7 +93,8 @@ module Xolo
           log_info "Admin #{session[:admin]} is updating title '#{params[:title]}'"
           with_streaming do
             title.update new_data
-            update_client_data
+            # Moved to title.update
+            # update_client_data
           end
         end
 
@@ -121,7 +122,8 @@ module Xolo
 
           with_streaming do
             title.release vers_to_release
-            update_client_data
+            # moved to title.release
+            # update_client_data
           end
         end
 
@@ -142,7 +144,8 @@ module Xolo
 
           with_streaming do
             title.repair repair_versions: do_versions
-            update_client_data
+            # moved to title.repair
+            # update_client_data
           end
         end
 
@@ -156,7 +159,8 @@ module Xolo
 
           with_streaming do
             title.delete
-            update_client_data
+            # moved to title.delete
+            # update_client_data
           end
         end
 
@@ -240,13 +244,14 @@ module Xolo
         #################################
         get '/titles/:title/urls' do
           log_debug "Admin #{session[:admin]} is fetching GUI URLS for title '#{params[:title]}'"
+
           halt_on_missing_title params[:title]
           title = instantiate_title params[:title]
-          data = {
-            ted_title_url: title.ted_title_url,
-            jamf_installed_group_url: title.jamf_installed_group_url,
-            jamf_frozen_group_url: title.jamf_frozen_group_url
-          }
+
+          data = {}
+          data[:ted_title_url] = title.ted_title_url if title.managed?
+          data[:jamf_installed_group_url] = title.jamf_installed_group_url if title.jamf_installed_group_exist?
+          data[:jamf_frozen_group_url] = title.jamf_frozen_group_url if title.jamf_frozen_group_exist?
           data[:jamf_manual_install_released_policy_url] = title.jamf_manual_install_released_policy_url if title.jamf_manual_install_released_policy_exist?
 
           if title.uninstallable?
@@ -255,13 +260,11 @@ module Xolo
             data[:jamf_expire_policy_url] = title.jamf_expire_policy_url if title.expiration
           end
 
-          if title.jamf_ted_title_active?
-            data[:jamf_patch_title_url] = title.jamf_patch_title_url unless title.versions.empty?
+          if title.jamf_title_active?
+            data[:jamf_patch_title_url] = title.jamf_patch_title_url unless title.jamf_patch_title_id.pix_empty?
             data[:jamf_patch_ea_url] = title.jamf_patch_ea_url if title.version_script
           end
 
-          data[:jamf_normal_ea_url] = title.jamf_normal_ea_url if title.version_script
-
           body data
         end
 
@@ -276,6 +279,16 @@ module Xolo
           body title.changelog
         end
 
+        # Does this xolo server support autopkg integration?
+        #
+        # @return [Array<Hash>] The changelog for a title
+        #################################
+        get '/titles/autopkg_enabled' do
+          log_debug "Admin #{session[:admin]} is checking if autopkg is enabled on this server"
+          data = { autopkg_enabled: autopkg_enabled? }
+          body data
+        end
+
       end # Titles
 
     end #  Routes

data/lib/xolo/server/routes/uploads.rb

@@ -62,20 +62,6 @@ module Xolo
         ##############################
         ##############################
 
-        # # param with the uploaded file must be :file
-        # ######################
-        # post '/upload/ssvc-icon/:title' do
-        #   process_incoming_ssvc_icon
-        #   body({ result: :uploaded })
-        # end
-
-        # # param with the uploaded file must be :file
-        # ######################
-        # post '/upload/pkg/:title/:version' do
-        #   process_incoming_pkg
-        #   body({ result: :uploaded })
-        # end
-
         # param with the uploaded file must be :file
         ######################
         post '/upload/test' do

data/lib/xolo/server/routes/versions.rb

@@ -16,7 +16,7 @@ module Xolo
 
       module Versions
 
-        # This is how we 'mix in' modules to Sinatra servers
+        # This is how we 'extend' modules to Sinatra servers
         # for route definitions and similar things
         #
         # (things to be 'included' for use in route and view processing
@@ -58,9 +58,10 @@ module Xolo
           data[:min_os] = default_min_os if data[:min_os].pix_empty?
 
           log_debug "Incoming new version data: #{data}"
-          log_debug "Incoming new version data: #{data.class}"
 
-          vers = instantiate_version(data)
+          vers = instantiate_version(**data)
+          log_debug "Instantiated version object: #{vers.class} - #{vers.title} #{vers.version}"
+
           halt_on_existing_version vers.title, vers.version
 
           if vers.title_object.jamf_patch_ea_awaiting_acceptance? && !Xolo::Server.config.jamf_auto_accept_xolo_eas
@@ -76,7 +77,8 @@ module Xolo
           Xolo::Server.rw_lock(data[:title], data[:version]).with_write_lock do
             with_streaming do
               vers.create
-              update_client_data
+              # moved to vers.create
+              # update_client_data
             end
           end
         end
@@ -89,9 +91,9 @@ module Xolo
 
           log_debug "Admin #{session[:admin]} is listing all versions for title '#{params[:title]}'"
           # body all_versions(params[:title])
-          vers_ins = all_version_instances(params[:title])
+          vers_objs = all_version_objects(params[:title])
           # log_debug "vers_ins: #{vers_ins}"
-          body vers_ins.map(&:to_h)
+          body vers_objs.map(&:to_h)
         end
 
         # get all the data for a single version
@@ -125,7 +127,8 @@ module Xolo
 
           with_streaming do
             vers.update new_data
-            update_client_data
+            # moved to vers.update
+            # update_client_data
           end
         end
 
@@ -148,7 +151,8 @@ module Xolo
 
           with_streaming do
             vers.delete
-            update_client_data
+            # moved to vers.delete
+            # update_client_data
           end
         end
 
@@ -156,7 +160,7 @@ module Xolo
         # param with the uploaded file must be :file
         ######################
         post '/titles/:title/versions/:version/pkg' do
-          process_incoming_pkg
+          process_and_upload_uploaded_pkg
           body({ result: :uploaded })
         end
 
@@ -205,7 +209,8 @@ module Xolo
 
           with_streaming do
             vers.repair
-            update_client_data
+            # moved to vers.repair
+            # update_client_data
           end
         end
 
@@ -239,13 +244,13 @@ module Xolo
 
           halt_on_missing_version params[:title], params[:version]
           vers = instantiate_version title: params[:title], version: params[:version]
-          data = {
-            ted_patch_url: vers.ted_patch_url,
-            jamf_auto_install_policy_url: vers.jamf_auto_install_policy_url,
-            jamf_manual_install_policy_url: vers.jamf_manual_install_policy_url,
-            jamf_patch_policy_url: vers.jamf_patch_policy_url,
-            jamf_package_url: vers.jamf_package_url
-          }
+
+          data = {}
+          data[:ted_patch_url] = vers.ted_patch_url if vers.managed?
+          data[:jamf_auto_install_policy_url] = vers.jamf_auto_install_policy_url if vers.jamf_auto_install_policy_exist?
+          data[:jamf_manual_install_policy_url] = vers.jamf_manual_install_policy_url if vers.jamf_manual_install_policy_exist?
+          data[:jamf_patch_policy_url] = vers.jamf_patch_policy_url if vers.jamf_patch_policy_exist?
+          data[:jamf_package_url] = vers.jamf_package_url if vers.jamf_package_exist?
           data[:jamf_version_installed_group] = vers.jamf_installed_group_url if vers.jamf_installed_group_exist?
           data[:jamf_auto_reinstall_policy_url] = vers.jamf_auto_reinstall_policy_url if vers.jamf_auto_reinstall_policy_exist?
 

data/lib/xolo/server/routes.rb

@@ -49,6 +49,14 @@ module Xolo
         log_debug "Checking if request path '#{request.path}' is in INTERNAL_ROUTES"
         break if Xolo::Server::Helpers::Auth::INTERNAL_ROUTES.include?(request.path) && valid_internal_auth_token?
 
+        # This route is used by Jamf Pro Webhooks to notify Xolo of subscribed title updates
+        log_debug "Checking if request path '#{request.path}' is PATCH_TITLE_UPDATED_WEBHOOK_ROUTE"
+        if request.path == Xolo::Server::Helpers::Auth::PATCH_TITLE_UPDATED_WEBHOOK_ROUTE
+          break if jamf_webhook_auth_token_ok?
+
+          halt 401, { status: 401, error: 'Valid Bearer Token Required' }
+        end
+
         # these routes are for server admins only, and require an authenticated session
         log_debug "Checking if request path '#{request.path}' is in SERVER_ADMIN_ROUTES"
         break if Xolo::Server::Helpers::Auth::SERVER_ADMIN_ROUTES.include?(request.path) && valid_server_admin?
@@ -149,3 +157,4 @@ require 'xolo/server/routes/title_editor'
 require 'xolo/server/routes/titles'
 require 'xolo/server/routes/uploads'
 require 'xolo/server/routes/versions'
+require 'xolo/server/routes/subscriptions'