xolo-server 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f515836aab0143c5343395e240de91947be9aef7cc70b266d4e1a84eb5fe714
-  data.tar.gz: 7f438c26d4974cb273241ec6bd72a9521eef562283cea9f64ba5f4521c34cf40
+  metadata.gz: 584212a83456feefa7f2a08d3f1522093515767e5ca1e61a00335d0141c370fe
+  data.tar.gz: 0b73315cb10ee4b87d476ebba60ca3021a5d81080175d9b954bef88daaee047a
 SHA512:
-  metadata.gz: 2b2cc84027b9a9af0fc4619d1ba5d564700043207e5ee96be50a69f248b5b4644605b5de569cb9906ec6b71c3d7ee322041bfe4395187cdcce06bcacf9b2d099
-  data.tar.gz: 344224658c124b01d6caa0b175ef64e3e200618335224119efb2d5430a38e178d15bba1878282ee16908c51c9979d5dbadbcd02da8aa293812ac22a1a4d32598
+  metadata.gz: f3fdc24942ff7f08bbe1205c19823359be852cc240f3ab818ea6b44a59d7c7fdeb3a207527d26a20dd4d9e2eab1fd5fd9547e93350be1c14c7e5f6d6b4eee3e1
+  data.tar.gz: f800c804e3fe669a99f4e51e2a36e8a5dd3393479094387f8998bec0c9d4ed320a2f7486569f31225f60823722835dd4854cf5d7be4f2ee6a30376eb6f30af4d

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

@@ -726,6 +726,25 @@ module Xolo
             ENDDESC
           },
 
+          # @!attribute deprecated_lifetime
+          #   @return [Integer] How many days after deprecation before a version is automatically deleted from Xolo?
+          #
+          deprecated_lifetime: {
+            label: 'Deprecated Lifetime',
+            cli: :L,
+            validate: true,
+            type: :string,
+            changelog: true,
+            invalid_msg: "Invalid value. Must be a positive integer or 'none'",
+            desc: <<~ENDDESC
+               When a version is deprecated, it will be automatically deleted by the nightly maintenance this many days later. If set to 'none', deprecated versions will be auto-deleted based on the Xolo server settings.
+
+               Deprecated versions are those that have been released, but a newer version has been released since then.
+
+               This setting is especially useful for titles that have frequent versions, to avoid cluttering the xolo and Jamf servers with old versions.
+            ENDDESC
+          },
+
           # @!attribute self_service
           #   @return [Boolean] Does this title appear in Self Service?
           self_service: {

data/lib/xolo/core/version.rb

@@ -12,7 +12,7 @@ module Xolo
 
     module Version
 
-      VERSION = '2.5.0'.freeze
+      VERSION = '2.6.0'.freeze
 
     end
 

data/lib/xolo/server/constants.rb

@@ -44,11 +44,16 @@ module Xolo
       PROGRESS_COMPLETE = 'PROGRESS_COMPLETE'
 
       # The max time (in seconds) to wait for a the Jamf server to
-      # see a change in the Title Editor, e.g.
-      # a new version appearing or an EA needing acceptance.
+      # see a change in the Title Editor, e.g. an EA needing acceptance.
       # Normally the Jamf server will check in with the Title Editor
       # every 5 minutes.
-      MAX_JAMF_WAIT_FOR_TITLE_EDITOR = 3600
+      #
+      # TEMPORARY: Checks for new versions/patches and Patch EAs happen
+      # over 9+ hours.
+      # See the method activate_managed_patch_version_in_jamf in
+      # version_jamf_access.rb
+      # and method auto_accept_patch_ea_in_thread in title_jamf_access.rb.
+      MAX_JAMF_WAIT_FOR_TITLE_EDITOR = 3600 * 9
 
       # The max time (in seconds) to wait for a the Jamf server to
       # stop the pkg deletion thread pool. It will wait until the

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

@@ -457,7 +457,7 @@ module Xolo
           title_objects.each do |title_obj|
             title_obj.version_objects.each do |version|
               if version.deprecated?
-                cleanup_deprecated_version version
+                cleanup_deprecated_version title_obj, version
               elsif version.skipped?
                 cleanup_skipped_version version
               end # case
@@ -470,13 +470,21 @@ module Xolo
         # @param version [Xolo::Server::Version] the version to cleanup
         # @return [void]
         ################################
-        def cleanup_deprecated_version(version)
-          # do nothing if the deprecated_lifetime_days is 0 or less
-          return unless deprecated_lifetime_days.positive?
+        def cleanup_deprecated_version(title_obj, version)
+          # does this version's title have a custom deprecated lifetime?
+          # title_obj.deprecated_lifetime should be a positive integer or nil
+          # if nil, use the server's setting
+          deprecated_lifetime_to_use = title_obj.deprecated_lifetime || server_deprecated_lifetime_days
+
+          # do nothing if the deprecated_lifetime_to_use is 0 or less
+          # which will only come from the server.
+          return unless deprecated_lifetime_to_use.positive?
+
+          # deprecation_lifetime_to_use is now a positive integer
 
           # how many days has this version been deprecated?
           days_deprecated = (Time.now - version.deprecation_date) / 86_400
-          return unless days_deprecated > deprecated_lifetime_days
+          return unless days_deprecated > deprecated_lifetime_to_use
 
           log_info "Maint: Deleting deprecated version '#{version.version}' of title '#{version.title}'"
           version.delete
@@ -538,8 +546,8 @@ module Xolo
         # how many days can a version be deprecated?
         # @return [Integer] the number of days a version can be deprecated
         ################################
-        def deprecated_lifetime_days
-          @deprecated_lifetime_days ||= Xolo::Server.config.deprecated_lifetime_days || DFT_DEPRECATED_LIFETIME_DAYS
+        def server_deprecated_lifetime_days
+          @server_deprecated_lifetime_days ||= Xolo::Server.config.deprecated_lifetime_days || DFT_DEPRECATED_LIFETIME_DAYS
         end
 
         # Notify the admins about unreleased pilots when the newest one is older than

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

@@ -418,8 +418,21 @@ module Xolo
           auto_accept_patch_ea_in_thread
         end
 
-        # Wait for up to an hour for Jamf to notice that our TEd EA needs to be
-        # accepted, and then do it
+        # Wait for up to 9 hours for Jamf to notice that our TEd EA needs to be
+        # accepted, and then do it.
+        #
+        # Normally we'd wait only 1 hour (Xolo::Server::MAX_JAMF_WAIT_FOR_TITLE_EDITOR)
+        # But Jamf Cloud instances have a bug where sometimes they'll stop being
+        # able to talk to Patch Sources for many hours.
+        #
+        # We start by checking every 30 seconds
+        # After 10 min we check every 2 minutes
+        # After an hour, we check every 5 minutes
+        # After 3 hours we check every 15 minutes
+        #
+        # The activate_managed_patch_version_in_jamf method (in version_jamf_access.rb)
+        # has also been modified to wait up to 9+hrs.
+        #
         #####################
         def auto_accept_patch_ea_in_thread
           # don't do this if there's already one running for this instance
@@ -438,20 +451,52 @@ module Xolo
             start_time = start_time.strftime '%F %T'
             did_it = false
 
-            while Time.now < max_time
-              sleep 30
+            # start at 30 secs
+            sleep_time = 30
+            loop_start = Time.now
+
+            while loop_start < max_time
+              sleep sleep_time
 
               # refresh our jamf connection cuz it might expire if this takes a while, esp if using
               # an APIClient
               jamf_cnx(refresh: true) if jamf_cnx.token.secs_remaining < 90
 
               log_debug "Jamf: checking for expected (re)acceptance of version-script ExtensionAttribute '#{ted_ea_key}' since #{start_time}"
-              next unless jamf_patch_ea_awaiting_acceptance?
 
-              accept_jamf_patch_ea_via_api
-              log_info "Jamf: Auto-accepted use of version-script ExtensionAttribute '#{ted_ea_key}'"
-              did_it = true
-              break
+              if jamf_patch_ea_awaiting_acceptance?
+                accept_jamf_patch_ea_via_api
+                log_info "Jamf: Auto-accepted use of version-script ExtensionAttribute '#{ted_ea_key}'"
+                did_it = true
+                break
+
+              end # if jamf_patch_ea_awaiting_acceptance?
+
+              # prep for the next loop
+              loop_start = Time.now
+              waiting_time = loop_start - start_time
+
+              sleep_time =
+                # if we've been waiting 10 min or less,
+                # sleep 30 secs between checks
+                if waiting_time <= 600
+                  30
+
+                # if we've been waiting an hour or less
+                # sleep 2 min between checks
+                elsif waiting_time <= 3600
+                  120
+
+                # if we've been waiting 3 hours or less
+                # sleep 5 min between checks
+                elsif waiting_time <= 10_800
+                  300
+
+                # if longer than 3 hours, sleep 15 min between checks
+                else
+                  900
+                end # sleep_time = if waiting_time
+
             end # while
 
             unless did_it

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

@@ -315,11 +315,14 @@ module Xolo
         # The key is jamf_obj_name_pfx on the title
         # so for title 'foobar', it is 'xolo-foobar' or 'xolotest-foobar' for test servers
         # That value is also used as the display name
-        # @return [String] The key and display name of a version script stored
-        #   in the title editor as the ExtAttr for this title
+        #
+        # @return [String, nil] The key and display name of a version script stored
+        #   in the title editor as the ExtAttr for this title, IF the title uses an ExtAttr
         #####################
         def ted_ea_key
-          @ted_ea_key ||= "#{jamf_obj_name_pfx_base}#{title}"
+          return @ted_ea_key if defined? @ted_ea_key
+
+          @ted_ea_key = version_script.pix_empty? ? nil : "#{jamf_obj_name_pfx_base}#{title}"
         end
 
         # Create the EA in the Title Editor
@@ -566,11 +569,26 @@ module Xolo
               # we've already done the known version objects, above
               next if version_order.include? ted_patch.version
 
+              # progress "DEBUG: app_name: #{app_name}... app_bundle_id: #{app_bundle_id}.... ted_ea_key: #{ted_ea_key}", log: :debug
+              # progress "DEBUG: version_script: #{version_script}", log: :debug
+
+              # ea_name/ted_ea_key was getting passed
+              # even when no ea was used, causing windoo errors.
+              if app_name
+                aname = app_name
+                aid = app_bundle_id
+                ea_name = nil
+              else
+                aname = nil
+                aid = nil
+                ea_name = ted_ea_key
+              end
+
               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
+                app_name: aname,
+                app_bundle_id: aid,
+                ea_name: ea_name
               )
               ted_patch.enable
             end

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

@@ -356,6 +356,9 @@ module Xolo
           self.jamf_pkg_id = pkg.save
           # save the data now so the pkg_id is available for immeadiate use, e.g. by pkg upload
           save_local_data
+          log_debug 'TEMP: Pausing 65 secs for server cluster to see new pkg'
+          sleep 65
+
           pkg
         rescue => e
           msg = "Jamf: Failed to create Jamf::JPackage '#{jamf_pkg_name}': #{e.class}: #{e}"
@@ -1378,11 +1381,29 @@ module Xolo
           raise Xolo::NoSuchItemError, msg
         end
 
-        # Wait until the version is visible from the title editor
-        # then assign the pkg to it in Jamf Patch,
-        # and create the patch policy.
+        # Pkg assignment and patch pol. creation cannot happen until the version
+        # becomes visible from the Title Editor.
+        #
+        # This method starts a thread that waits until then, then assigns the pkg to it
+        # in Jamf Patch, and creates the patch policy.
+        #
+        # Normally Jamf Pro will poll its Patch Sources every 5 minutes, so it _shouldn't_
+        # take more than that for a new version to appear.
+        # But sometime, esp. in Jamf Cloud instances, it may be hours before the version
+        # shows up.
+        #
+        # To deal with this, we check to see if it has appeared every minute for the first 10 min.
+        #
+        # If it hasn't happened by then, we send a notification that we're still waiting
+        # and will check every 10 min for the next 3 hrs.
+        #
+        # If still nothing, send another notification that we'll check every 30 min for
+        # the next 6 hrs
+        #
+        # If still nothing after 9hrs and 10 min, send a final notification that we
+        # are giving up, and please investigate manually. Once Jamf actually sees the version
+        # from the title editor,
         #
-        # Do this in a thread so the xadm user doesn't wait up to ?? minutes.
         #
         # @return [void]
         #########################
@@ -1399,36 +1420,80 @@ module Xolo
           @activate_patch_version_thread = Thread.new do
             log_debug "Jamf: Starting activate_patch_version_thread waiting for version #{version} of title #{title} to become visible from the title editor"
 
-            start_time = Time.now
-            max_time = start_time + Xolo::Server::MAX_JAMF_WAIT_FOR_TITLE_EDITOR
-            start_time = start_time.strftime '%F %T'
-
-            did_it = false
+            start_time = Time.now.strftime '%F %T'
+            version_visible = false
 
-            while Time.now < max_time
-              sleep 15
-              log_debug "Jamf: checking for version #{version} of title #{title} to become visible from the title editor since #{start_time}"
+            # Check every minute for the first 10 minutes
+            #####
+            10.times do
+              sleep 60
+              log_debug "Jamf: checking for version #{version} of title #{title} to become visible from the Title Editor since #{start_time}"
+              next unless patch_version_visible_in_jamf?(title_object, version)
 
-              # check for the existence of the jamf_patch_title every time, since it might have gone away
-              # if the title was deleted while this was happening.
-              next unless title_object.jamf_patch_title(refresh: true) && title_object.jamf_patch_title.versions.key?(version)
-
-              did_it = true
+              version_visible = true
               break
+            end # 10 times
+
+            # warn, and then check every 10 min for the next 3 hours
+            #####
+            unless version_visible
+              msg = "Jamf: Version '#{version}' of title '#{title}' is still NOT visible from the Title Editor since #{start_time}. Will check every 10 minutes for the next 3 hours."
+              log_warn msg, alert: true
+
+              # every 10 min for 3 hrs = 18 times
+              18.times do
+                sleep 600
+                log_debug "Jamf: Still checking for version #{version} of title #{title} to become visible from the Title Editor since #{start_time}"
+                next unless patch_version_visible_in_jamf?(title_object, version)
+
+                version_visible = true
+                break
+              end # 18 times
+            end
+
+            # warn, and then check every 30 min for the next 6 hours
+            #####
+            unless version_visible
+              msg = "Jamf: Version '#{version}' of title '#{title}' is STILL NOT visible from the Title Editor since #{start_time}. Will check every 30 minutes for the next 6 hours before giving up."
+              log_warn msg, alert: true
+
+              # every 30 min for 6 hrs = 12 times
+              12.times do
+                sleep 1800
+                log_debug "Jamf: STILL checking for version #{version} of title #{title} to become visible from the Title Editor since #{start_time}"
+                next unless patch_version_visible_in_jamf?(title_object, version)
+
+                version_visible = true
+                break
+              end # 12 times
             end
 
-            if did_it
+            #### did we do it?
+            if version_visible
               activate_patch_version_in_jamf
               msg = "Jamf: Version '#{version}' of title '#{title}' is now visible in Jamf Pro. Package assigned and Patch policy created."
               log_info msg, alert: true
             else
-              msg = "Jamf: ERROR: Version '#{version}' of title '#{title}' has not become visible from the Title Editor in over #{Xolo::Server::MAX_JAMF_WAIT_FOR_TITLE_EDITOR} seconds. The package has not been assigned, and no patch policy was created."
+              msg = "Jamf: ERROR: Version '#{version}' of title '#{title}' has not become visible from the Title Editor in over 9 hours. The package has not been assigned, and no patch policy was created. When the version appears in Jamf Patch, run \"xadm repair #{title} '#{version}'\" to assign the pkg and create the patch policy."
               log_error msg, alert: true
             end
+          rescue => e
+            msg = "Error in thread while waiting for version '#{version}' of title '#{title}' to appear from the Title Editor: #{e.class}: #{e}"
+            log_error msg, alert: true
+            e.backtrace.each { |l| log_error "...#{l}" }
           end # thread
+
           @activate_patch_version_thread.name = "activate_patch_version_thread-#{title}-#{version}"
         end
 
+        # @return [Boolean] is a given version/patch of a title visible in Jamf Patch from
+        #   its patch source?
+        #################################
+        def patch_version_visible_in_jamf?(title_object, version)
+          title_object.jamf_patch_title(refresh: true) && \
+            title_object.jamf_patch_title.versions.key?(version)
+        end
+
         # Patches for subscribed titles are already visible in Jamf Patch Management
         # So we just need to assign the pkg to the patch version, and create the patch policy.
         ##########################

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xolo-server
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Chris Lasell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-23 00:00:00.000000000 Z
+date: 2026-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday