xolo-server 2.2.2 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52595d7268e2f989402fd60e3c8c992b993a1342d4a5f4436953a025493d2409
-  data.tar.gz: 39ecea967112210302c3242d7c0f9f53da34ffa8a803c71cf4edced97b26113a
+  metadata.gz: 0af0f8b82fade2b7a8d3c65dedf4146e00e9adba56b7c553506a072b4942fcdb
+  data.tar.gz: f351cb8a10515a30b851490f77b64067f9485783a5ea0522c0ddf739f5a2ea25
 SHA512:
-  metadata.gz: be740aa47014789519e5d167bda8fa19d517331945c6e5520403e59643620cf660a09f142031e65e385a254b427362b9e78c459dfde20b1ecf3c0835e6fc030b
-  data.tar.gz: 7c4792d23e49b5d486c3f24aab9b51d35f510d303597d5d1ce84b7eb5dfb4723a5bf07b357d1429b6c99c0d85737df75c04b3cd6f70967277088faa40db76145
+  metadata.gz: 9575c70693bbc8acf6abfb662e7d535a416dcb1bf32dfa69614194017011247ebcf8e4552f987952d484e30bca490100de0e311942eb9c18cf0bb2d7129ccb31
+  data.tar.gz: 1a3ce31608e7fe9d62fe86465a8c8c686c6caec1d44062f2fce899e8e6ccc56ee353adf4b84ac834b8aa500d30c1a9bbe7e222400742609a1df3856131b87432

data/lib/xolo/core/base_classes/configuration.rb

@@ -33,7 +33,7 @@ module Xolo
       # Instance method #conf_file [Pathname]
       #  The full expanded absolute path to the config yaml file.
       #
-      # Constant KEYS [Hash{Symbol: Hash}]
+      # Constant KEYS [Hash {Symbol: Hash}]
       #   The keys of this Hash are the keys that may be found in the yaml file.
       #   The Hash values here define the value in the YAML file, with these keys:
       #

data/lib/xolo/core/base_classes/server_object.rb

@@ -14,12 +14,9 @@ module Xolo
 
     module BaseClasses
 
-      # The base class for dealing with Titles and Versions/Patches in the
-      # Xolo Server, Admin, and Client modules.
-      #
       # The base class for "xolo objects stored on the xolo server", i.e.
       # Titles and Versions/Patches - whether they are being used on the server,
-      # in xadm, or in the client.
+      # or in xadm.
       #
       # This class holds stuff common to all no matter where or how they are used.
       #

data/lib/xolo/core/base_classes/title.rb

@@ -15,12 +15,12 @@ module Xolo
     module BaseClasses
 
       # The base class for dealing with Titles in the
-      # Xolo Server, Admin, and Client modules.
+      # Xolo Server & Admin modules.
       #
       # This class holds the common aspects of Xolo Titles as used
-      # on the Xolo server, in the Xolo Admin CLI app 'xadm', and the
-      # client app 'xolo' - most importately it defines which data they
-      # exchange.
+      # on the Xolo server and in the Xolo Admin CLI app 'xadm'
+      # and the 'xolo' client app (as JSON data).
+      # - most importately it defines which data they exchange.
       #
       ############################
       class Title < Xolo::Core::BaseClasses::ServerObject
@@ -43,7 +43,7 @@ module Xolo
         #
         # This hash defines the common attributes of all Xolo titles - which should
         # be available in all subclasses, both on the server, in xadm, and via the
-        # client.
+        # client (as JSON data).
         #
         # Each of those subclasses might define (and store or calculate) other
         # attributes as needed.
@@ -759,7 +759,7 @@ module Xolo
 
               By default this is false, Patch Policies for versions will be set to 'Install Automatically'.
 
-              If set to true, Patch Policies for versions will be set to 'Make Available in Self Service' and the version will appear in the Updates section when available. The update won't happen until the user clicks a button, or the 7-day deadline passes. Notifications will be displayed daily.
+              If set to true, Patch Policies for versions will be set to 'Make Available in Self Service' and the version will appear in the Updates section when available. The update won't happen until the user clicks a button, or the 7-day deadline passes. Notifications will be displayed daily. For these titles, 'xolo update' will not apply the update, but 'xolo install <title>' will update/install the current release.
 
               When installing automatically, or the deadline passes, the update will happen at the checkin after the next recon. If the version has any KillApps, the user will be prompted to quit them, with a grace period of 15 minutes before the update starts.
 
@@ -966,6 +966,14 @@ module Xolo
           version_order&.first
         end
 
+        # Does a given version exist for this title?
+        # @param vers [String] the version in question
+        # @return [Boolean]
+        #######################
+        def version_exist?(vers)
+          version_order.include? vers
+        end
+
         # Is this a managed title?
         # @return [Boolean]
         #######################

data/lib/xolo/core/base_classes/version.rb

@@ -15,12 +15,12 @@ module Xolo
     module BaseClasses
 
       # The base class for dealing with Versions/Patches in the
-      # Xolo Server, Admin, and Client modules.
+      # Xolo Server & Admin modules.
       #
       # This class holds the common aspects of Xolo Versinos as used
-      # on the Xolo server, in the Xolo Admin CLI app 'xadm', and the
-      # client app 'xolo' - most importately it defines which data they
-      # exchange.
+      # on the Xolo server and in the Xolo Admin CLI app 'xadm'
+      # and the 'xolo' client app (as JSON data).
+      # - most importately it defines which data they exchange.
       #
       ############################
       class Version < Xolo::Core::BaseClasses::ServerObject

data/lib/xolo/core/version.rb

@@ -12,7 +12,7 @@ module Xolo
 
     module Version
 
-      VERSION = '2.2.2'.freeze
+      VERSION = '2.2.4'.freeze
 
     end
 

data/lib/xolo/server/helpers/client_data.rb

@@ -160,15 +160,24 @@ module Xolo
         #
         # This process is protected by a mutex to prevent multiple updates at the same time.
         #
+        # @param post_maint [Boolean] Are we being called at the end of the run_maint method?
+        #
         # @return [void]
         #####################
-        def update_client_data
+        def update_client_data(post_maint: false)
           # don't do anything if we are in developer/test mode
           if Xolo::Server.config.developer_mode?
             log_debug 'Jamf: Skipping client-data update in developer mode'
             return
           end
 
+          # don't do anything if maintenance is running,
+          # the main process will call this method once at the end
+          if Xolo::Server::Helpers::Maintenance.maint_running? && !post_maint
+            log_debug 'Jamf: Skipping client-data update while maintenance is running'
+            return
+          end
+
           log_info 'Jamf: Updating client-data package'
 
           # TODO: Use Concurrent Ruby instead of Mutex

data/lib/xolo/server/helpers/file_transfers.rb

@@ -124,6 +124,8 @@ module Xolo
           pkg_src = Pathname.new pkg_src
           orig_filename ||= pkg_src.basename.to_s
 
+          log_debug "Starting process_and_upload_to_jamf for #{title}, #{version}, pkg src: #{pkg_src}, orig filename: #{orig_filename}"
+
           version = instantiate_version(title: title, version: version) if version.is_a?(String)
 
           staged_pkg = prep_pkg_for_upload(version, pkg_src)

data/lib/xolo/server/helpers/maintenance.rb

@@ -123,6 +123,12 @@ module Xolo
           @last_maint = time
         end
 
+        # @return [Time] Is maintenance running right now? true if the mutex is locked
+        ######################################
+        def self.maint_running?
+          maint_mutex.locked?
+        end
+
         # post to the server to start the maint process
         # This is done so that the maint can run in the context of a request,
         # having access to Title and Version instantiation.
@@ -136,12 +142,14 @@ module Xolo
             return
           end
 
+          now = Time.now
+
           # only run the maintenance if it's during the MAINT_HOUR
           # and the last one was more than MAINT_MAX_FREQ_SECS ago
           if force
             Xolo::Server.logger.info 'Maint: Starting now due to force'
 
-          elsif Time.now.hour == MAINT_HOUR && (Time.now - last_maint) > MAINT_MAX_FREQ_SECS
+          elsif now.hour == MAINT_HOUR && (now - last_maint) > MAINT_MAX_FREQ_SECS
             Xolo::Server.logger.info 'Maint: Starting nightly run now'
 
           else
@@ -179,19 +187,25 @@ module Xolo
             return
           end
           mutex.lock
+
           log_info 'Maint: starting'
 
           # instantiate all the titles once now, rather than in all the task methods
-          title_objects_for_maint = Xolo::Server::Title.all_titles.map { |t| instantiate_title t }
+          title_objects_for_maint = all_title_objects refresh: true
 
           # add new maintenance tasks/methods here
+          ######
           accept_title_editor_eas title_objects_for_maint
           auto_release_versions title_objects_for_maint
           cleanup_versions title_objects_for_maint
           notify_admins_of_unreleased_pilots title_objects_for_maint
 
+          # make note of the time.
           Xolo::Server::Helpers::Maintenance.last_maint = Time.now
           log_info 'Maint: complete'
+
+          log_debug 'Maint: running update_client_data after all tasks'
+          update_client_data post_maint: true
         ensure
           mutex&.unlock
         end
@@ -279,6 +293,9 @@ module Xolo
             title_obj.release vobj_to_release.version
 
             log_info "Maint: Auto-released version '#{vobj_to_release.version}' of '#{title}' which came out #{vobj_to_release.creation_date}", alert: true
+
+            # pause for server to catch up
+            sleep 60
           end # each title
 
           log_debug 'Maint: Done auto-releasing'

data/lib/xolo/server/helpers/progress_streaming.rb

@@ -172,13 +172,17 @@ module Xolo
         # @return [void]
         #############################
         def stream_progress(stream_file:, stream:)
-          log_debug "About to tail: usr/bin/tail -f -c +1 #{Shellwords.escape stream_file.to_s}"
+          # log_debug "About to tail: usr/bin/tail -f -c +1 #{Shellwords.escape stream_file.to_s}"
+          log_debug "About to stream file: #{Shellwords.escape stream_file.to_s}"
+
+          # a moment for the file to exist..
+          until stream_file.readable?
+            log_debug 'Waiting for stream file to be readable'
+            sleep 2
+          end
 
           begin
             File.open(stream_file, 'r') do |file|
-              # Go straight to the end of the file if you only want new lines
-              file.seek(0, IO::SEEK_END)
-
               heartbeat_counter = 0
               loop do
                 # Check if the stream was closed by the user
@@ -187,10 +191,16 @@ module Xolo
                 # Try to read the next line
                 # This won't block but will return nil if no line is ready
                 if line = file.gets
-                  break if line.chomp == Xolo::Server::PROGRESS_COMPLETE
+                  # log_debug "STREAMING: line is: '#{line}'"
+
+                  if line.chomp == Xolo::Server::PROGRESS_COMPLETE
+                    stream.close
+                    break
+                  end
 
                   # Send the line to the browser immediately
                   stream << line
+
                 else
                   # If no new line, sleep for a fraction of a second
                   # This saves your computer's CPU from working too hard
@@ -205,8 +215,12 @@ module Xolo
             end # file open
           rescue IOError, Errno::ECONNRESET
             nil
+          ensure
+            stream.close unless stream.closed?
           end # begin
 
+          # the old way, using tail
+          ######
           # stdin, stdouterr, wait_thr = Open3.popen2e("/usr/bin/tail -f -c +1 #{Shellwords.escape stream_file.to_s}")
           # stdin.close
 

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

@@ -75,6 +75,11 @@ module Xolo
             subscribed_title = subscribed_title_objects.select { |tobj| tobj.jamf_patch_title_id.to_i == title_id.to_i }.first
 
             if subscribed_title
+              if subscribed_title.version_exist? new_version
+                log_info "Incoming Subscribed version '#{new_version}' of title '#{subscribed_title.title}' (#{subscribed_title.display_name}) already exists, nothing to do."
+                return
+              end
+
               msg = +"New version '#{new_version}' is available for subscribed title '#{subscribed_title.title}' (#{subscribed_title.display_name})."
 
               msg << " Running autopkg recipe '#{subscribed_title.autopkg_recipe}'." if subscribed_title.autopkg_enabled?
@@ -91,6 +96,7 @@ module Xolo
           rescue => e
             msg = "Error processing PatchSoftwareTitleUpdated webhook event: #{e.class}: #{e}"
             log_error msg
+            e.backtrace.each { |l| log_error "..#{l}" }
             raise e, msg
           end # thread
         end

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

@@ -50,6 +50,77 @@ module Xolo
           Xolo.verbose_include includer, self
         end
 
+        # Module Methods
+        # These must be called using Xolo::Server::Helpers::TitleEditor.<method>
+        ###############################
+        ##############################
+
+        # Given a Windoo::Patch object, and an
+        # app_name: & app_bundle_id: or an ea_name:
+        # Set the component criteria for the patch to
+        # be based either on the app data, or ea
+        #
+        # @param patch [Windoo::Patch] the patch to set
+        #
+        # @param title [String] the title for this patch
+        # @param app_name [String] the name of the app to use in app-based requirements,
+        #   must be used with app_bundle_id, cannot be used with ea_name
+        #
+        # @param app_bundle_id [String] the bundle id of the app to use in app-based requirements
+        #   must be used with app_name, cannot be used with ea_name
+        #
+        # @param ea_name [String] the name of the EA to use in EA-based requirements (the ted_ea_key)
+        #   Cannot be used with app_name or app_bundle_id
+        #
+        # @return [void]
+        ################################
+        def self.set_patch_component_criteria(ted_patch, app_name: nil, app_bundle_id: nil, ea_name: nil)
+          # delete any already there and make a new one
+          ted_patch.delete_component
+          ted_patch.add_component name: ted_patch.container.id, version: ted_patch.version
+
+          comp = ted_patch.component
+
+          if ea_name
+            set_ea_component(comp, ea_name, ted_patch.version)
+          else
+            set_app_component(comp, app_name, app_bundle_id, ted_patch.version)
+          end
+        end
+
+        # @return [void]
+        ##############################
+        def self.set_ea_component(comp, ea_name, version)
+          comp.criteria.add_criterion(
+            type: 'extensionAttribute',
+            name: ea_name,
+            operator: 'is',
+            value: version
+          )
+        end
+
+        # @return [void]
+        ##############################
+        def self.set_app_component(comp, app_name, app_bundle_id, version)
+          comp.criteria.add_criterion(
+            name: 'Application Title',
+            operator: 'is',
+            value: app_name
+          )
+
+          comp.criteria.add_criterion(
+            name: 'Application Bundle ID',
+            operator: 'is',
+            value: app_bundle_id
+          )
+
+          comp.criteria.add_criterion(
+            name: 'Application Version',
+            operator: 'is',
+            value: version
+          )
+        end
+
         # Instance methods
         #
         # These are available directly in sinatra routes and views

data/lib/xolo/server/mixins/title_jamf_access.rb

@@ -1716,7 +1716,9 @@ module Xolo
         def add_title_to_self_service(pol = nil)
           pol ||= jamf_manual_install_released_policy
 
-          unless pol.in_self_service?
+          if pol.in_self_service?
+            progress "Jamf: Manual Install Policy '#{pol.name}' already in Self Service."
+          else
             msg = "Jamf: Adding Manual Install Policy '#{pol.name}' to Self Service."
             progress msg, log: :info
             pol.add_to_self_service

data/lib/xolo/server/mixins/title_ted_access.rb

@@ -119,7 +119,10 @@ module Xolo
 
           # the capabilites
           stub_patch.capabilities.add_criterion(
-            name: Xolo::Server::Version::STUB_PATCH_CAPABILITY_CRITERION_NAME,
+            # Use the title as the name, so it matches all the future versions/patches
+            # avoiding a warning message in the TEd gui.
+            # name: Xolo::Server::Version::STUB_PATCH_CAPABILITY_CRITERION_NAME,
+            name: title,
             operator: Xolo::Server::Version::STUB_PATCH_CAPABILITY_CRITERION_OPERATOR,
             value: Xolo::Server::Version::STUB_PATCH_CAPABILITY_CRITERION_VALUE
           )
@@ -424,17 +427,36 @@ module Xolo
         # update the patch compotent criteria for all versions
         # to match changes in the title requirements
         #
+        # NOTE: we do all versions in the title editor, not just the ones known to
+        # xolo.
+        #
+        #
         # @return [void]
         ##############################
         def set_ted_patch_component_criteria_after_update(app_name: nil, app_bundle_id: nil, ea_name: nil)
-          version_objects.each do |vers_obj|
-            vers_obj.set_ted_patch_component_criteria(
+          ted_title.patches.each do |ted_patch|
+            Xolo::Server::Helpers::TitleEditor.set_patch_component_criteria(
+              ted_patch,
               app_name: app_name,
               app_bundle_id: app_bundle_id,
               ea_name: ea_name
             )
-            vers_obj.enable_ted_patch
-          end
+            # ensure its enabled
+            ted_patch.enable
+          end # ted_title.patches.each
+
+          # # this only dealt with versions currently known to xolo
+          # # but the title editor keeps all versions ever known
+          # # even if deleted from xolo.
+          #
+          # version_objects.each do |vers_obj|
+          #   vers_obj.set_ted_patch_component_criteria(
+          #     app_name: app_name,
+          #     app_bundle_id: app_bundle_id,
+          #     ea_name: ea_name
+          #   )
+          #   vers_obj.enable_ted_patch
+          # end
         end
 
         # Enable the title in the title editor when at least one patch is enabled
@@ -538,18 +560,36 @@ module Xolo
             version_objects.each do |vobj|
               vobj.repair_ted_patch
             end
+
+            # also update the component criteria for patches not known to xolo anymore.
+            ted_title.patches.each do |ted_patch|
+              # we've already done the known version objects, above
+              next if version_order.include? ted_patch.version
+
+              Xolo::Server::Helpers::TitleEditor.set_patch_component_criteria(
+                ted_patch,
+                app_name: app_name,
+                app_bundle_id: app_bundle_id,
+                ea_name: ted_ea_key
+              )
+              ted_patch.enable
+            end
           end
 
           ted_title.enable unless ted_title(refresh: true).enabled?
         end
 
         # Re-enable all patches in the title editor
+        # not just those known to xolo
+        #
         # @return [void]
         ###########################
         def reenable_all_ted_patches
           # re-enable all patches, after any change, which might have disabled them
           progress "Title Editor: Re-enabling all patches for '#{title}'", log: :info
-          version_objects.each { |vobj| vobj.enable_ted_patch }
+
+          # version_objects.each { |vobj| vobj.enable_ted_patch }
+          ted_title.patches.each { |ted_patch| ted_patch.enable }
         end
 
       end # TitleEditorTitle

data/lib/xolo/server/mixins/version_jamf_access.rb

@@ -438,8 +438,10 @@ module Xolo
         end
 
         # Delete the package for this version from Jamf Pro.
-        # Package deletion takes a long time, so we do it in a threadpool
+        # Package deletion in some versions of Jamf Pro takes a long time,
+        # especially when you have a lot of pkgs. so we do it in a threadpool
         # and tell the admin to check the Alert Tool for completion
+        #
         # (if we have an alert tool in place) or to wait at least 5 min before
         # re-adding the same version.
         #
@@ -452,16 +454,8 @@ module Xolo
           msg = "Jamf: Starting deletion of Package '#{jamf_pkg_name}' id #{jamf_pkg_id} at #{Time.now.strftime '%F %T'}"
           progress msg, log: :info
 
-          warning = +"IMPORTANT: Package deletion can be slow. If you plan to re-add this version, '#{version}', please\n  "
-          warning <<
-            if Xolo::Server.config.alert_tool
-              'check your Xolo alerts for completion, which can take up to 5 minutes,'
-            else
-              'wait at least 5 minutes'
-            end
-          warning << ' before re-adding this version.'
-
-          progress warning, log: nil
+          warning = "IMPORTANT: Package deletion can be slow. If you plan to re-add this version, '#{version}', please\nwait at least 5 minutes before doing so."
+          progress warning
 
           self.class.pkg_deletion_pool.post do
             start = Time.now
@@ -470,7 +464,7 @@ module Xolo
             Jamf::JPackage.delete pkg_id, cnx: jamf_cnx
             finish = Time.now
             duration = (finish - start).to_i.pix_humanize_secs
-            log_info "Jamf: Deleted Package '#{jamf_pkg_name}' id #{jamf_pkg_id} in #{duration}", alert: true
+            log_info "Jamf: Deleted Package '#{jamf_pkg_name}' id #{jamf_pkg_id} in #{duration}"
           rescue => e
             log_error "Package Deletion thread: #{e.class}: #{e}"
             e.backtrace.each { |l| log_error "..#{l}" }
@@ -887,14 +881,19 @@ module Xolo
 
           configure_jamf_patch_policy(ppol)
 
-          # This is always false to start will be set to true as needed if
-          # a rollback is being done
+          # This is always false to start, which is why we set it here in the create method
+          # will be set to true as needed if a rollback is being done
           ppol.allow_downgrade = false
 
           ppol.save
 
           # refetch it rather than using the one we just created
-          Jamf::PatchPolicy.fetch(name: jamf_patch_policy_name, cnx: jamf_cnx)
+          ppol = Jamf::PatchPolicy.fetch(name: jamf_patch_policy_name, cnx: jamf_cnx)
+
+          # set the ssvc icon, must happen after the policy is saved
+          set_patch_policy_ssvc_icon ppol
+
+          ppol
         end
 
         # repair the patch policy only
@@ -908,6 +907,9 @@ module Xolo
           configure_jamf_patch_policy(ppol)
 
           ppol.save
+
+          # set the ssvc icon, must happen after the policy is saved
+          set_patch_policy_ssvc_icon ppol
         end
 
         # update the :patch_unknown for the patch policy
@@ -939,14 +941,22 @@ module Xolo
           # explicit false
           ppol.patch_unknown = patch_unknown ? true : false
 
+          # Patch Pol. Scope Targets:
           # when first creating a patch policy, its status is always
           # 'pilot' so the scope targets are the pilot groups, if any.
+          #
           # When the version is released, the patch policy will be
-          # rescoped to all targets (limited by eligibility)
-          if pilot?
+          # rescoped to all computers (limited by eligibility)
+          #
+          # Any other state should have no scope targets
+          if pilot? || creating?
             set_policy_pilot_groups ppol
-          else
+          elsif released? || releasing?
+            log_debug "Setting Patch Policy Scope for Version '#{version}' of Title '#{title}' to all comptuers, for release"
             ppol.scope.set_all_targets
+          else
+            log_debug "Setting Patch Policy Scope for Version '#{version}' of Title '#{title}' to no targets: not in pilot or released"
+            ppol.scope.set_targets :computer_groups, []
           end
 
           # exclusions are for always
@@ -974,10 +984,24 @@ module Xolo
           ppol = jamf_patch_policy
           configure_patch_pol_deployment ttl_obj: ttl_obj, ppol: ppol
           ppol.save
+          # set the ssvc icon, must happen after the policy is saved
+          set_patch_policy_ssvc_icon ppol
+        end
+
+        # @return [Boolean] should this version use ssvc updates?
+        ##################
+        def use_ssvc_updates?(ttl_obj = nil)
+          ttl_obj ||= title_object
+
+          if ttl_obj.changes_for_update&.dig :self_service_updates
+            ttl_obj.changes_for_update[:self_service_updates][:new]
+          else
+            ttl_obj.self_service_updates
+          end
         end
 
         # Configure the patch policy for self service or automatic deployment
-        # NOTE: Does NOT save the policy changes!
+        # NOTE: this does not save changes to the policy - the caller must
         # @param ppol [Jamf::PatchPolicy] The patch policy to configure
         # @return [void]
         # ###############################
@@ -985,13 +1009,6 @@ module Xolo
           ppol ||= jamf_patch_policy
           ttl_obj ||= title_object
 
-          use_ssvc_updates =
-            if ttl_obj.changes_for_update&.dig :self_service_updates
-              ttl_obj.changes_for_update[:self_service_updates][:new]
-            else
-              ttl_obj.self_service_updates
-            end
-
           # always set the grace period regardless of deployment type
           progress "Jamf: Configuring Patch Policy grace period for version '#{version}' of title '#{title}' ", log: :info
           ppol.grace_period = PATCH_POL_GRACE_PERIOD_MINUTES
@@ -999,7 +1016,7 @@ module Xolo
           ppol.grace_period_message = PATCH_POL_GRACE_PERIOD_MSG
 
           # Self Service deployment
-          if use_ssvc_updates
+          if use_ssvc_updates?
             progress "Jamf: Configuring Patch Policy for version '#{version}' of title '#{title}' for Self Service", log: :info
 
             ppol.add_to_self_service
@@ -1016,10 +1033,6 @@ module Xolo
             ppol.self_service_reminder_frequency = PATCH_POL_SSVC_REMINDER_FREQ_HRS
             ppol.deadline = PATCH_POL_SSVC_DEADLINE_DAYS
 
-            return unless title_object.ssvc_icon_id
-
-            set_patch_policy_ssvc_icon ppol, title_object.ssvc_icon_id
-
           # Automatic deployment
           else
             progress "Jamf: Configuring Patch Policy for version '#{version}' of title '#{title}' for automatic deployment", log: :info
@@ -1039,7 +1052,23 @@ module Xolo
         # @param icon_id [Integer, String] The id of the existing icon to use.
         # @return [Void]
         ##########################
-        def set_patch_policy_ssvc_icon(ppol, icon_id)
+        def set_patch_policy_ssvc_icon(ppol)
+          return unless use_ssvc_updates?
+
+          if title_object.ssvc_icon_id
+            icon_id = title_object.ssvc_icon_id
+            log_debug "Jamf: ssvc_icon_id from title object is: #{icon_id}"
+          else
+            icon_id = title_object.jamf_manual_install_released_policy.self_service_icon.id
+            log_debug "Jamf: ssvc_icon_id from manual install policy is: #{icon_id}"
+
+          end
+
+          if icon_id.pix_empty?
+            log_debug 'Jamf: could not find ssvc icon id, not setting icon for patch policy.'
+            return
+          end
+
           # this str can't be frozen for now
           icon_xml = +<<~ENDXML
             <?xml version="1.0" encoding="UTF-8"?>
@@ -1053,9 +1082,11 @@ module Xolo
           ENDXML
 
           log_debug "Jamf: Adding existing SSvc icon to patch policy for version '#{version}' of title '#{title}'"
+
           # TODO: in ruby-jss, update c_put and related methods to
           # use unfrozen dups of strings for #gsub
-          jamf_cnx.c_put ppol.rest_rsrc, icon_xml
+
+          jamf_cnx.c_put "patchpolicies/id/#{ppol.id}", icon_xml
         end
 
         # @return [String] the URL for the Jamf Pro Patch Policy that updates to this version

data/lib/xolo/server/mixins/version_ted_access.rb

@@ -253,12 +253,12 @@ module Xolo
           msg = "Title Editor: Setting #{type}-based component criteria for Patch '#{version}' of SoftwareTitle '#{title}'"
           progress msg, log: :info
 
-          # delete any already there and make a new one
-          ted_patch.delete_component
-          ted_patch.add_component name: title, version: version
-          comp = ted_patch.component
-
-          ea_name ? set_ea_component(comp, ea_name) : set_app_component(comp, app_name, app_bundle_id)
+          Xolo::Server::Helpers::TitleEditor.set_patch_component_criteria(
+            ted_patch,
+            app_name: app_name,
+            app_bundle_id: app_bundle_id,
+            ea_name: ea_name
+          )
         end
 
         # get the param values for patch component criteria from the title object,
@@ -287,39 +287,6 @@ module Xolo
           [app_name, app_bundle_id, ea_name]
         end
 
-        # @return [void]
-        ##############################
-        def set_ea_component(comp, ea_name)
-          comp.criteria.add_criterion(
-            type: 'extensionAttribute',
-            name: ea_name,
-            operator: 'is',
-            value: version
-          )
-        end
-
-        # @return [void]
-        ##############################
-        def set_app_component(comp, app_name, app_bundle_id)
-          comp.criteria.add_criterion(
-            name: 'Application Title',
-            operator: 'is',
-            value: app_name
-          )
-
-          comp.criteria.add_criterion(
-            name: 'Application Bundle ID',
-            operator: 'is',
-            value: app_bundle_id
-          )
-
-          comp.criteria.add_criterion(
-            name: 'Application Version',
-            operator: 'is',
-            value: version
-          )
-        end
-
         # For a patch to be enabled in the Title Editor, it needs at least a component criterion
         # and one capability. Xolo enforces those when the patch is created, so from the title
         # editor's view it should be OK from the start.

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

@@ -144,8 +144,6 @@ module Xolo
 
           with_streaming do
             title.repair repair_versions: do_versions
-            # moved to title.repair
-            # update_client_data
           end
         end
 
@@ -159,8 +157,6 @@ module Xolo
 
           with_streaming do
             title.delete
-            # moved to title.delete
-            # update_client_data
           end
         end
 

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

@@ -127,8 +127,6 @@ module Xolo
 
           with_streaming do
             vers.update new_data
-            # moved to vers.update
-            # update_client_data
           end
         end
 
@@ -160,7 +158,10 @@ module Xolo
         # param with the uploaded file must be :file
         ######################
         post '/titles/:title/versions/:version/pkg' do
+          @pkg_upload_happening = true
+          log_debug "Starting POST to upload pkg for #{params[:title]}, #{params[:version]}"
           process_and_upload_uploaded_pkg
+          @pkg_upload_happening = false
           body({ result: :uploaded })
         end
 

data/lib/xolo/server/title.rb

@@ -1130,6 +1130,7 @@ module Xolo
         repair_ted_title
         set_subscribed_display_name_and_publisher
         repair_jamf_title_objects
+        self.ssvc_icon_id = jamf_manual_install_released_policy.self_service_icon.id
         save_local_data
         return unless repair_versions
 

data/lib/xolo/server/version.rb

@@ -85,7 +85,7 @@ module Xolo
       STUB_PATCH_CAPABILITY_CRITERION_VALUE = '10.0'
 
       # machines that have this version installed
-      STUB_PATCH_COMPONENT_NAME = 'Xolo Stub'
+      # STUB_PATCH_COMPONENT_NAME = 'Xolo Stub'
       STUB_PATCH_COMPONENT_CRITERION_NAME = 'Application Title'
       STUB_PATCH_COMPONENT_CRITERION_OPERATOR = 'is'
       STUB_PATCH_COMPONENT_CRITERION_VALUE = 'XoloStub-DoesNotExist.app'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xolo-server
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.4
 platform: ruby
 authors:
 - Chris Lasell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-15 00:00:00.000000000 Z
+date: 2026-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday