xolo-server 2.2.3 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b12ee4495ec1ef8ad6ff15963a47b8c5c960fbfc66c447355d9205a821945d5
-  data.tar.gz: b5223966d5f2d32298cbd74fceb3bc9bd86377249f05cf7ff0cdcee7d892a0ef
+  metadata.gz: e78577a11f1d65aba560ec5540c3a79acdfc7d6a491060e256bb9e2da5a057d9
+  data.tar.gz: 9e7e776f48e8e9e260bc41a9090603bbfc41d1dad7dd62fc00396ce9914450cb
 SHA512:
-  metadata.gz: 6891dc7666891af24efb6c3b2842154dedc0fb94652203ac7cdbce21b2f5cbf38e69dbbd54630f7c5c4f5dabdc3b717ade26c26ce1fcfbb94fc318669a2704c7
-  data.tar.gz: faf5eb9e5a6ce4e63989070bece99e9916fe44fe14a40d6e25a04a16ddeabd5d45641cf6cce380827fa0d06901bccfc345a99ea5983b2f2509223eaf816467b6
+  metadata.gz: b83f99bda3666a2fd124241a26882499c393a75b3289fb503bdcb6ac994827228b5f813acc79a7a81f437f879b2e9aaca727800ddd711f17b2713d7a45a98738
+  data.tar.gz: 05bb86ec68010bf2258853983f093936ffa735c52144b6760c64177621a971bdf93823a46562a4b347c5a080d5206900a39ff8b6019e7fb1fa0cf0b400e4336e

data/data/client/xolo

@@ -27,6 +27,9 @@ zmodload zsh/zutil
 ###############################
 ###############################
 
+# just in case
+export PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/usr/libexec:$PATH"
+
 # Needed for the UTF-8 chars in the lsreg output
 export LANG="en_US.UTF-8"
 export LC_ALL="en_US.UTF-8"
@@ -356,42 +359,43 @@ function debug() {
   debugging_on && echo "DEBUG: $*" 1>&2
 }
 
-# Gather all installed bundle ids and installed versions from lsreg
+# Gather all installed bundle ids and installed versions from system_profiler
 # store them in an associative array in $installed_apps.
 # keys are bundle ids, values are app name & installed version
 # separated by a semicolon
 # e.g. 'com.apple.Safari => Safari.app;14.0.3'
 ###############################
 function get_installed_apps() {
+  # debug "PATH is $PATH"
   debug "Getting all installed .apps on this Mac..."
   local app_name
   local app_bundle_id
   local app_vers
+  local app_plist
 
-  # loop thru lsreg output
-  "$LSREG" -dump Bundle | while IFS= read -r line ; do
-    # a line if ------ starts a new record
-    if [[ "$line" =~ '^-+$' ]] ; then
-      unset app_name
-      unset app_bundle_id
-      unset app_vers
-      continue
-    fi
+  json_app_data=$(/usr/sbin/system_profiler -json SPApplicationsDataType )
+
+  apps_to_look_at=$(echo "$json_app_data" | grep '"path"' | cut -d'"' -f4 | grep -v '^/System/')
+
+  for app_path in ${(f)apps_to_look_at} ; do
+    app_name=$(/usr/bin/basename "$app_path")
+    app_plist="$app_path/Contents/Info.plist"
 
-    # $MATCH is the whole matched string, $match is the array of captures
-    # NOTE this only works if the path is listed before the CFBundleIdentifier
-    # which seems to be the case in the lsreg output
-    [[ "$line" =~ '^path:[[:space:]]+/.*/(.+\.app) \(' ]] && app_name=$match[1]
-    [[ "$line" =~ '^[[:space:]]+CFBundleIdentifier = \"(.+)\";' ]] && app_bundle_id=$match[1]
-    [[ "$line" =~ '^[[:space:]]+CFBundleShortVersionString = \"(.+)\";' ]] && app_vers=$match[1]
+    if [[ -f "$app_plist" ]] ; then
+      app_bundle_id=$(/usr/bin/plutil -extract CFBundleIdentifier raw "$app_plist" 2>/dev/null)
+
+      app_vers=$(/usr/bin/plutil -extract CFBundleShortVersionString raw "$app_plist" 2>/dev/null)
+
+      # Use CFBundleVersion if no CFBundleShortVersionString
+      [[ -z "$app_vers" ]] && \
+        app_vers=$(/usr/bin/plutil -extract CFBundleVersion raw "$app_plist" 2>/dev/null)
 
-    if [[ -n "$app_name" && -n "$app_bundle_id" && -n "$app_vers" ]] ; then
       installed_apps[$app_bundle_id]="$app_name;$app_vers"
-      unset app_name
-      unset app_bundle_id
-      unset app_vers
+    else
+      debug "App Path '$app_path' has no Info.plist"
     fi
   done
+
   # installed_apps is now an associative array with bundle ids as keys and app names as values
 
   # print the installed apps - this is a long list
@@ -402,8 +406,70 @@ function get_installed_apps() {
     done
   fi
 
+# debug "PATH is $PATH"
 } # end installed_apps
 
+########################################
+########################################
+########################################
+########################################
+########################################
+########################################
+# Gather all installed bundle ids and installed versions from lsreg
+# store them in an associative array in $installed_apps.
+# keys are bundle ids, values are app name & installed version
+# separated by a semicolon
+# e.g. 'com.apple.Safari => Safari.app;14.0.3'
+###############################
+# function get_installed_apps() {
+#   debug "Getting all installed .apps on this Mac..."
+#   local app_name
+#   local app_bundle_id
+#   local app_vers
+
+#   # loop thru lsreg output
+#   "$LSREG" -dump Bundle | while IFS= read -r line ; do
+#     # a line if ------ starts a new record
+#     if [[ "$line" =~ '^-+$' ]] ; then
+#       unset app_name
+#       unset app_bundle_id
+#       unset app_vers
+#       continue
+#     fi
+
+#     # $MATCH is the whole matched string, $match is the array of captures
+#     # NOTE this only works if the path is listed before the CFBundleIdentifier
+#     # which seems to be the case in the lsreg output
+#     [[ "$line" =~ '^path:[[:space:]]+/.*/(.+\.app) \(' ]] && app_name=$match[1]
+#     [[ "$line" =~ '^[[:space:]]+CFBundleIdentifier = \"(.+)\";' ]] && app_bundle_id=$match[1]
+#     [[ "$line" =~ '^[[:space:]]+CFBundleShortVersionString = \"(.+)\";' ]] && app_vers=$match[1]
+
+#     if [[ -n "$app_name" && -n "$app_bundle_id" && -n "$app_vers" ]] ; then
+#       installed_apps[$app_bundle_id]="$app_name;$app_vers"
+#       unset app_name
+#       unset app_bundle_id
+#       unset app_vers
+#     fi
+#   done
+#   # installed_apps is now an associative array with bundle ids as keys and app names as values
+
+#   # print the installed apps - this is a long list
+#   if debugging_on ; then
+#     debug "All installed .apps on this Mac:"
+#     for bundle app in ${(kv)installed_apps}; do
+#           debug "'$bundle' -> '$app'"
+#     done
+#   fi
+
+# } # end installed_apps
+########################################
+########################################
+########################################
+########################################
+########################################
+########################################
+########################################
+
 # Extract data from the client-data.json file
 #
 # TODO: Once we only support macOS 15 (Sequoia) and higher, we
@@ -463,7 +529,7 @@ function all_xolo_titles() {
   read -r -d '' jscode <<ENDJAVASCRIPT
     result = Object.keys(parsed_data.titles).join('\n');
 ENDJAVASCRIPT
-  extract_json_data "$jscode" | sort
+  extract_json_data "$jscode" | /usr/bin/sort
 }
 
 # Outputs all known titles, one per line, with versions and statuses
@@ -1020,12 +1086,15 @@ function list_installed_titles() {
   local ttl
   local app_data
 
-
   verbose "Locating installed titles..."
 
   # populate the installed_apps associative array
   get_installed_apps
 
+  # gather output here, display it at the end
+  # rather than interspersed with debug lines
+  installed_titles_report=""
+
   while IFS= read -r ttl; do
     app_data=$(app_data_for_title $ttl)
 
@@ -1036,6 +1105,8 @@ function list_installed_titles() {
       display_title_if_installed_by_version_script $ttl
     fi
   done <<<"$(all_xolo_titles)"
+
+  say "$installed_titles_report"
   return 0
 }
 
@@ -1075,9 +1146,9 @@ function display_title_if_installed_by_app_data() {
   [[ "$inst_app_name" == "$app_name" ]] || return
 
   if [[ -n "$no_versions" ]] ; then
-    echo $ttl
+    installed_titles_report="$installed_titles_report\n$ttl"
   else
-    echo "$ttl ($inst_app_vers)"
+    installed_titles_report="$installed_titles_report\n$ttl ($inst_app_vers)"
   fi
 }
 
@@ -1114,9 +1185,9 @@ function display_title_if_installed_by_version_script() {
   [[ -n "$app_vers" ]] || return
 
   if [[ -n "$no_versions" ]] ; then
-    echo $ttl
+    installed_titles_report="$installed_titles_report\n$ttl"
   else
-    echo "$ttl ($app_vers)"
+    installed_titles_report="$installed_titles_report\n$ttl ($inst_app_vers)"
   fi
 }
 

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.
@@ -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.3'.freeze
+      VERSION = '2.3.0'.freeze
 
     end
 

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

@@ -108,14 +108,14 @@ module Xolo
           @maint_timer_task
         end
 
-        # When was our last maint?
+        # When was our last automated maint?
         # @return [Time] the time of the last maint, or the epoch if never
         ######################################
         def self.last_maint
           @last_maint ||= Time.at(0)
         end
 
-        # Set the time of the last maint
+        # Set the time of the last maint, if it was automated
         # @param time [Time] the time of the last maint
         # @return [Time] the time of the last maint
         ######################################
@@ -153,7 +153,7 @@ module Xolo
             Xolo::Server.logger.info 'Maint: Starting nightly run now'
 
           else
-            Xolo::Server.logger.info "Maint: Not starting, it isn't time"
+            Xolo::Server.logger.debug "Maint: Not starting, it isn't time"
             return
           end
 
@@ -195,13 +195,16 @@ module Xolo
 
           # add new maintenance tasks/methods here
           ######
+          update_ssl_cert_and_key
           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
+          # make note of the time, but only for automated runs.
+          # Manual runs don't affect this.
+          Xolo::Server::Helpers::Maintenance.last_maint = Time.now unless @manual_maintenance
+
           log_info 'Maint: complete'
 
           log_debug 'Maint: running update_client_data after all tasks'
@@ -210,6 +213,51 @@ module Xolo
           mutex&.unlock
         end
 
+        # Re-fetch the SSL certificate and key, as defined in the server config,
+        # and compare to the current values. If they are different, save and activate
+        # the new ones.
+        #
+        # NOTE, to get the current values we read the active files from disk,
+        # not the value in memory in the Xolo::Server.config object.
+        # In other words we use this:
+        #     curr_crt = Xolo::Server::Configuration::SSL_CERT_FILE.read.strip
+        # Not this:
+        #     curr_crt = Xolo::Server.config.ssl_cert
+        # This is because the file contents are what get sent to the https clients,
+        # so that's what matters.
+        # We do however update the in-memory value if an update is needed, just in case.
+        ######################################
+        def update_ssl_cert_and_key
+          log_info 'Maint: Checking if SSL Certificate & Key need updating.'
+          update = false
+
+          # check the cert
+          new_crt_src = Xolo::Server.config.raw_data[:ssl_cert]
+          log_debug "Maint: Re-fetching SSL Certificate from: #{new_crt_src}"
+          new_crt = Xolo::Server.config.data_from_command_file_or_string(new_crt_src).strip
+          curr_crt = Xolo::Server::Configuration::SSL_CERT_FILE.read.strip
+          update = true unless new_crt == curr_crt
+
+          # check the key
+          new_key_src = Xolo::Server.config.raw_data[:ssl_key]
+          log_debug "Maint: Re-fetching SSL Private Key from: #{new_key_src}"
+          new_key = Xolo::Server.config.data_from_command_file_or_string(new_key_src).strip
+          curr_key = Xolo::Server::Configuration::SSL_KEY_FILE.read.strip
+          update = true unless new_key == curr_key
+
+          if update
+            log_info 'Maint: SSL Certificate or Key has been updated, installing...'
+            Xolo::Server.config.ssl_cert = new_crt
+            Xolo::Server.config.ssl_key = new_key
+            Xolo::Server::Configuration::SSL_CERT_FILE.pix_save new_crt
+            Xolo::Server::Configuration::SSL_KEY_FILE.pix_save new_key
+          else
+            log_debug 'Maint: SSL Certificate and Private Key are unchanged.'
+          end
+
+          log_info 'Maint: Done Checking if SSL Certificate & Key.'
+        end
+
         # look for any titles that need their Title Editor EA's accepted,
         # and auto accept them if we need to
         # @return [void]

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?
@@ -86,30 +91,16 @@ module Xolo
                 new_version: new_version
               )
             else
-              log_debug "Title '#{title_name}' ID #{title_id} is not a subscribed title in Xolo. Ignoring webhook."
+              log_debug "Title '#{title_name}' ID #{title_id} is not a subscribed title. Ignoring webhook."
             end
           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
 
-        # TODO: Delete this method after confirming we don't want it
-        # It wasn't in use when it was commented out.
-        #
-        # Subscribe to a title on a given patch source.
-        # @param source_id [Integer] the id or name of the patch source in Jamf
-        # @param name_id [Integer] the name_id of the title on that patch source
-        # @param display_name [String] an display name for the title
-        # @return [Integer] the id of the new subscribed title, or false on failure
-        #####################################
-        # def subscribe_to_title(source_id:, name_id:, display_name:)
-        #   new_sub = Jamf::PatchTitle.create name: display_name, source_id: source_id, name_id: name_id, cnx: jamf_cnx
-
-        #   new_sub.save
-        # end
-
       end # Subscriptions
 
     end # Helpers

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_ted_access.rb

@@ -126,7 +126,10 @@ module Xolo
 
           # the component
           stub_patch.add_component(
-            name: Xolo::Server::Version::STUB_PATCH_COMPONENT_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_COMPONENT_NAME,
+            name: title,
             version: Xolo::Server::Version::STUB_PATCH_VERSION
           )
 
@@ -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
@@ -982,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]
         # ###############################
@@ -993,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
@@ -1007,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
@@ -1024,12 +1033,6 @@ module Xolo
             ppol.self_service_reminder_frequency = PATCH_POL_SSVC_REMINDER_FREQ_HRS
             ppol.deadline = PATCH_POL_SSVC_DEADLINE_DAYS
 
-            icon_id =
-              title_object.ssvc_icon_id || title_object.jamf_manual_install_released_policy.self_service_icon.id
-            return unless icon_id
-
-            set_patch_policy_ssvc_icon ppol, icon_id
-
           # Automatic deployment
           else
             progress "Jamf: Configuring Patch Policy for version '#{version}' of title '#{title}' for automatic deployment", log: :info
@@ -1049,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"?>
@@ -1063,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/maint.rb

@@ -51,7 +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,
+            last_automated_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,
@@ -71,6 +71,14 @@ module Xolo
           }
 
           if params[:extended]
+            ssl_cert_data ||= OpenSSL::X509::Certificate.new(Xolo::Server::Configuration::SSL_CERT_FILE.read)
+            state[:ssl_cert_subject] = ssl_cert_data.subject
+            state[:ssl_cert_issuer] = ssl_cert_data.issuer
+            state[:ssl_cert_valid_from] = ssl_cert_data.not_before.localtime
+            state[:ssl_cert_expires] = ssl_cert_data.not_after.localtime
+            state[:ssl_cert_serial] = ssl_cert_data.serial
+            state[:ssl_cert_signature_algorithm] = ssl_cert_data.signature_algorithm
+
             state[:gem_path] = Gem.paths.path
             state[:load_path] = $LOAD_PATH
             state[:object_locks] = Xolo::Server.object_locks
@@ -98,6 +106,8 @@ module Xolo
         # run the maintenance process manually from a server admin via xadm
         ################
         post '/maint/maint-start' do
+          @manual_maintenance = true
+
           log_info "Starting manual server maintenance by #{session[:admin]}"
 
           session[:admin] = "Maintenance by #{session[:admin]}"

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/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.3
+  version: 2.3.0
 platform: ruby
 authors:
 - Chris Lasell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-17 00:00:00.000000000 Z
+date: 2026-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday