xolo-server 2.1.0 → 2.2.2

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

@@ -51,6 +51,7 @@ module Xolo
             start_time: Xolo::Server.start_time,
             uptime: uptime_secs.pix_humanize_secs,
             uptime_secs: uptime_secs,
+            last_maint: Xolo::Server::Helpers::Maintenance.last_maint,
             app_env: Xolo::Server.app_env,
             test_server: Xolo::Server.test_server?,
             data_dir: Xolo::Server::DATA_DIR,
@@ -80,29 +81,29 @@ module Xolo
           body state
         end
 
-        # run the cleanup process from the internal timer task
+        # run the maint process from the internal timer task
         # The before filter will ensure the request came from the server itself.
         # with a valid internal auth token.
         ################
-        post '/maint/cleanup-internal' do
-          log_info 'Starting internal cleanup'
-          session[:admin] = 'Automated Cleanup'
+        post '/maint/maint-internal' do
+          log_info 'Starting internal maint'
+          session[:admin] = 'Automated Maintenance'
 
-          thr = Thread.new { run_cleanup }
-          thr.name = 'Internal Cleanup Thread'
-          result = { result: 'Internal Cleanup Underway' }
+          thr = Thread.new { run_maint }
+          thr.name = 'Internal Maintenance Thread'
+          result = { result: 'Internal Maintenance Underway' }
           body result
         end
 
-        # run the cleanup process manually from a server admin via xadm
+        # run the maintenance process manually from a server admin via xadm
         ################
-        post '/maint/cleanup' do
-          log_info "Starting manual server cleanup by #{session[:admin]}"
+        post '/maint/maint-start' do
+          log_info "Starting manual server maintenance by #{session[:admin]}"
 
-          session[:admin] = "Cleanup by #{session[:admin]}"
-          thr = Thread.new { run_cleanup }
-          thr.name = 'Manual Cleanup Thread'
-          result = { result: 'Manual Cleanup Underway' }
+          session[:admin] = "Maintenance by #{session[:admin]}"
+          thr = Thread.new { run_maint }
+          thr.name = 'Manual Maintenance Thread'
+          result = { result: 'Manual Maintenance Underway' }
           body result
         end
 
@@ -146,7 +147,7 @@ module Xolo
         # Shutdown the server gracefully
         # stop accepting new requests
         # wait for all queues and threads to finish, including:
-        #  the cleanup timer task & mutex
+        #  the maintenance timer task & mutex
         #  the log rotation timer task & mutex
         #  the pkg deletion pool
         #  the object locks

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

@@ -263,6 +263,9 @@ module Xolo
           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
+
+            data[:jamf_target_groups_exclusion_group_url] = title.jamf_target_groups_exclusion_group_url if title.jamf_target_groups_exclusion_group_exist?
+
           end
 
           body data

data/lib/xolo/server/routes.rb

@@ -127,7 +127,7 @@ module Xolo
         @no_json = true
         stream_file = Pathname.new params[:stream_file]
 
-        stream do |stream_out|
+        stream :keep_open do |stream_out|
           stream_progress(stream_file: stream_file, stream: stream_out)
         rescue => e
           stream_out << "ERROR DURING PROGRESS STREAM: #{e.class}: #{e}"

data/lib/xolo/server/title.rb

@@ -77,6 +77,7 @@ module Xolo
       JAMF_MANUAL_INSTALL_RELEASED_POL_SUFFIX = 'install'
       JAMF_UNINSTALL_SUFFIX = 'uninstall'
       JAMF_EXPIRE_SUFFIX = 'expire'
+      JAMF_TGT_GRP_EXCL_GRP_NAME_SUFFIX = 'target-group-exclusions'
 
       # the expire policy will run this client command,
       # appending the title
@@ -257,6 +258,20 @@ module Xolo
       # @return [String] the name of the smart group
       attr_reader :jamf_frozen_group_name
 
+      # If a title has 'target_groups', they act as the opposite of
+      # excluded groups - macs NOT in the target groups can't see the title.
+      #
+      # We implement this by maintaining a smart group
+      # named 'xolo-<title>-target-group-exclusions', which has the criteria:
+      #   computerGroup...not a member of...<target-group>
+      # ANDed together for each target-group
+      # and then we use that smart group as an exclusion.
+      #
+      # This is the name of that smart group.
+      #
+      # @return [String] the name of the smart group
+      attr_reader :jamf_target_groups_exclusion_group_name
+
       # The name of the policy that does initial manual or self-service
       # installs of the currently-released version of this title.
       # It will be named 'xolo-<title>-install'
@@ -354,6 +369,7 @@ module Xolo
         @jamf_obj_name_pfx = "#{jamf_obj_name_pfx_base}#{data_hash[:title]}"
         @jamf_installed_group_name = "#{jamf_obj_name_pfx}-#{JAMF_INSTALLED_GROUP_NAME_SUFFIX}"
         @jamf_frozen_group_name = "#{jamf_obj_name_pfx}-#{JAMF_FROZEN_GROUP_NAME_SUFFIX}"
+        @jamf_target_groups_exclusion_group_name =  "#{jamf_obj_name_pfx}-#{JAMF_TGT_GRP_EXCL_GRP_NAME_SUFFIX}"
 
         @jamf_manual_install_released_policy_name = "#{jamf_obj_name_pfx}-#{JAMF_MANUAL_INSTALL_RELEASED_POL_SUFFIX}"
 
@@ -419,7 +435,7 @@ module Xolo
       def jamf_patch_title_id
         return @jamf_patch_title_id if @jamf_patch_title_id
 
-        log_debug "Getting jamf_patch_title_id for title '#{title}'"
+        log_debug "Jamf: Getting jamf_patch_title_id for title '#{title}'"
 
         self.jamf_patch_title_id =
           if managed?
@@ -615,7 +631,7 @@ module Xolo
       end
 
       # @return [Array<Xolo::Server::Version>] An array of all current version objects
-      #   NOTE: This might not be wise if hundreds of versions, but automated cleanup should
+      #   NOTE: This might not be wise if hundreds of versions, but automated maintenance should
       #   help with that.
       ########################
       def version_objects(refresh: false)
@@ -973,10 +989,16 @@ module Xolo
                 "Version '#{version_to_release}' of title '#{title}' is already released"
         end
 
-        return if versions.include? version_to_release
+        unless versions.include? version_to_release
+          raise Xolo::NoSuchItemError,
+                "No version '#{version_to_release}' for title '#{title}'"
+        end
+
+        jamf_patch_title(refresh: true)
+        return if jamf_patch_title.versions.key?(version_to_release)
 
-        raise Xolo::NoSuchItemError,
-              "No version '#{version_to_release}' for title '#{title}'"
+        raise Xolo::TooSoonError,
+              "Version '#{version_to_release}' of title '#{title}' is not yet visible to Jamf Pro. Please wait at least 10 minutes after adding it before releasing it. An alert notification will be sent when it is ready."
       end
 
       # Update all versions when releasing one
@@ -1106,6 +1128,7 @@ module Xolo
 
         progress "Starting repair of title '#{title}'"
         repair_ted_title
+        set_subscribed_display_name_and_publisher
         repair_jamf_title_objects
         save_local_data
         return unless repair_versions

data/lib/xolo/server/version.rb

@@ -234,14 +234,38 @@ module Xolo
       def self.add_version_via_subscription(title_object:, new_version:)
         title_object.log_info "Adding new version '#{new_version}' for subscribed title '#{title_object.title}'"
 
-        # get more details about this version from the JPAPI
-        patch_version_data = title_object.patch_versions(version: new_version).first
-        unless patch_version_data
+        vobj_data = new_subscribed_version_data(title_object: title_object, new_version: new_version)
+
+        unless vobj_data
           msg = "Could not get patch version data from JPAPI for version '#{new_version}' of subscribed title '#{title_object.title}'. Cannot create new version in Xolo without this data. Aborting."
           title_object.log_error msg, alert: true
           return
         end
 
+        # instantiate the version object
+        title_object.log_debug "Instantiating version via subscription '#{new_version}' of title '#{title_object.title}' (#{title_object.class}) with data: #{vobj_data}"
+
+        vobj = title_object.server_app_instance.instantiate_version(
+          title: title_object,
+          version: new_version,
+          **vobj_data
+        )
+
+        # create it in xolo
+        vobj.create
+
+        # tell someone
+        send_alerts_about_new_subscribed_version(title_object: title_object, vobj: vobj)
+      end
+
+      # Gather the data needed to create a new xolo version from a subscription
+      # @return [Hash] the data needed to create the version object
+      ################
+      def self.new_subscribed_version_data(title_object:, new_version:)
+        patch_version_data = title_object.patch_versions(version: new_version).first
+        # return nil if not found - will send error alert
+        return unless patch_version_data
+
         title_object.log_debug "Got patch version data from JPAPI for version '#{new_version}': #{patch_version_data}"
 
         # put the data into a hash for creating a new version object
@@ -269,34 +293,47 @@ module Xolo
           end
         end
 
-        # instantiate the version object
-        title_object.log_debug "Instantiating version via subscription '#{new_version}' of title '#{title_object.title}' (#{title_object.class}) with data: #{vobj_data}"
-
-        vobj = title_object.server_app_instance.instantiate_version(
-          title: title_object,
-          version: new_version,
-          **vobj_data
-        )
-
-        # create it in xolo
-        vobj.create
-
-        # moved to vobj.create:
-        # vobj.server_app_instance.update_client_data
+        vobj_data
+      end
 
-        # tell someone
-        msg = "ACTION REQUIRED: New pilot for subscribed title '#{title_object.title}', version '#{new_version}' has been created in Xolo via subscription."
+      # Handle alerts for newly-created subscribed version
+      ##################
+      def self.send_alerts_about_new_subscribed_version(title_object:, vobj:)
+        title = title_object.title
+        new_version = vobj.version
+
+        # if here, and auto_release_delay is zero, release it immediately
+        if title_object.autopkg_enabled?
+
+          auto_release_delay = title_object.auto_release_delay.to_i
+
+          # is auto_release_delay an integer?
+          if title_object.auto_release_delay&.pix_integer? && !auto_release_delay.negative?
+            how_soon =
+              if auto_release_delay.zero?
+                'tonight'
+              elsif auto_release_delay == 1
+                'tomorrow night'
+              else
+                "in #{auto_release_delayy} days"
+              end
+            msg = "New pilot for subscribed title '#{title}', version '#{new_version}' has been created in Xolo via subscription.\nIt will be released during nightly maintenance #{how_soon}"
+
+          # nil, empty, 'none', or negative = no auto release
+          else
+            msg = "ACTION REQUIRED: New pilot for subscribed title '#{title}', version '#{new_version}' has been created in Xolo via subscription.\nRequires manual release."
+          end
 
         # if not autopkg enabled, we need to tell someone to upload a pkg for this new version
-        unless title_object.autopkg_enabled?
+        else
           # update general alert msg
-          msg = "#{msg}\nPlease upload a .pkg for it ASAP using this command:\n   xadm edit-version #{title_object.title} #{new_version} --pkg-to-upload /path/to/installer.pkg"
+          msg = "ACTION REQUIRED: New pilot for subscribed title '#{title}', version '#{new_version}' has been created in Xolo via subscription.\nPlease upload a .pkg for it ASAP using this command:\n   xadm edit-version #{title} #{new_version} --pkg-to-upload /path/to/installer.pkg"
 
           # email to title contact
           vobj.server_app_instance.send_email to: title_object.contact_email, subject: 'Need manual upload of xolo pkg', msg: msg
         end # if title_object.autopkg_enabled?
 
-        # send general alert
+        # send alert
         vobj.log_info msg, alert: true
       end
 
@@ -488,6 +525,7 @@ module Xolo
       # this title.
       #
       # Excluded groups are defined in the title, applying to all versions, and may be augmented by:
+      # - A smart group of computers NOT in the target_groups, if any target groups are defined.
       # - Xolo::Server.config.forced_exclusion, a group excluded from ALL of xolo, defined
       #   in the server config.
       # - The title's jamf_frozen_group_name, if it exists, containing computers that have been
@@ -506,14 +544,17 @@ module Xolo
         return @excluded_groups_to_use if @excluded_groups_to_use
 
         ttl_obj ||= title_object
-        # get the excluded groups from the title
-        # Use .dup so we don't modify the original
-        @excluded_groups_to_use = ttl_obj.changes_for_update&.key?(:excluded_groups) ? ttl_obj.changes_for_update[:excluded_groups][:new].dup : ttl_obj.excluded_groups.dup
 
         # always exclude the frozen static group
         # calling ttl_obj.jamf_frozen_group will create the group if needed
-        @excluded_groups_to_use << ttl_obj.jamf_frozen_group.name
-        log_debug "Appended '#{ttl_obj.jamf_frozen_group_name}' to @excluded_groups_to_use"
+        @excluded_groups_to_use = [ttl_obj.jamf_frozen_group.name]
+        log_debug "Added '#{ttl_obj.jamf_frozen_group_name}' to @excluded_groups_to_use"
+
+        # get the excluded groups from the title
+        @excluded_groups_to_use += ttl_obj.changes_for_update&.key?(:excluded_groups) ? ttl_obj.changes_for_update[:excluded_groups][:new] : ttl_obj.excluded_groups
+
+        # add the jamf_target_groups_exclusion_group - it must have been created before now
+        @excluded_groups_to_use << ttl_obj.jamf_target_groups_exclusion_group_name if ttl_obj.use_jamf_target_groups_exclusion_group?
 
         # always exclude Xolo::Server.config.forced_exclusion if defined
         @excluded_groups_to_use << valid_forced_exclusion_group_name if valid_forced_exclusion_group_name
@@ -858,6 +899,7 @@ module Xolo
         msg = "Jamf: Version '#{version}': Setting scope targets of patch policy to all eligible computers"
         progress msg, log: :info
         ppol = jamf_patch_policy
+        ppol.enable
         ppol.scope.set_all_targets
 
         # if rollback, make sure the patch policy is set to 'allow downgrade'
@@ -1017,7 +1059,8 @@ module Xolo
         log_change msg: 'Version Deleted'
 
         progress "Version '#{version}' of Title '#{title}' has been deleted from Xolo.", log: :info
-        server_app_instance.update_client_data
+
+        server_app_instance.update_client_data unless deleting_title
       ensure
         unlock
       end

metadata

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