xolo-admin 1.0.1 → 2.0.3

data/lib/xolo/admin/processing.rb

@@ -26,7 +26,7 @@ module Xolo
       # Routes for server admins
 
       SERVER_STATUS_ROUTE = '/maint/state'
-      SERVER_CLENUP_ROUTE = '/maint/cleanup'
+      SERVER_CLEANUP_ROUTE = '/maint/cleanup'
       SERVER_ROTATE_LOGS_ROUTE = '/maint/rotate-logs'
       SERVER_UPDATE_CLIENT_DATA_ROUTE = '/maint/update-client-data'
       SERVER_LOG_LEVEL_ROUTE = '/maint/set-log-level'
@@ -72,6 +72,14 @@ module Xolo
         puts msg unless quiet?
       end
 
+      # TODO: Use this everywhere in admin
+      ##########################
+      def show_debug(msg)
+        return unless debug?
+
+        puts "DEBUG: #{msg}"
+      end
+
       # Search for a title in Xolo
       # Looks for the search string (case insensitive) in these attributes:
       #  - title
@@ -234,19 +242,30 @@ module Xolo
 
         new_title = Xolo::Admin::Title.new opts_to_process
 
+        # TMP TESTING
+        # puts 'DEBUG: opts_to_process:'
+        # opts_to_process.to_h.each do |k, v|
+        #   puts "  #{k}: #{v}"
+        # end
+        # return
+
         response_data = new_title.add(server_cnx)
 
         if debug?
           puts "DEBUG: response_data: #{response_data}"
           puts
         end
-
-        display_progress response_data[:progress_stream_url_path]
+        if response_data[:progress_stream_url_path]
+          display_progress response_data[:progress_stream_url_path]
+        else
+          puts '# No progress stream URL returned'
+          return
+        end
 
         # Upload the ssvc icon, if any?
         upload_ssvc_icon new_title
 
-        speak "Title '#{cli_cmd.title}' has been added to Xolo.\nAdd at least one version to enable piloting and deployment"
+        speak "Title '#{cli_cmd.title}' has been added to Xolo.\nEnsure there's at least one version to enable piloting and deployment"
       rescue StandardError => e
         handle_processing_error e
       end
@@ -307,9 +326,26 @@ module Xolo
       def upload_ssvc_icon(title)
         return unless title.self_service_icon.is_a? Pathname
 
+        speak 'Pausing to let jamf server catch up before uploading self-service icon...'
+        sleep 30
         speak "Uploading self-service icon #{title.self_service_icon.basename}, #{title.self_service_icon.pix_humanize_size} to Xolo."
 
-        title.upload_self_service_icon(upload_cnx)
+        wait_for_title_timer = 0
+        begin
+          title.upload_self_service_icon(upload_cnx)
+        rescue Xolo::ConnectionError => e
+          speak "Error uploading self-service icon: #{e.message}, trying again in 5 secs"
+          # If we get a 404, it might be because the title isn't fully created yet.
+          # Wait a bit and try again, up to a certain number of seconds.
+          if wait_for_title_timer < 90
+            sleep 5
+            wait_for_title_timer += 5
+            retry
+          else
+            msg = "Failed to upload icon for Title '#{title}' after retrying for #{wait_for_title_timer} seconds."
+            raise Xolo::NoSuchItemError, msg
+          end # if
+        end # begin
 
         speak 'Self-service icon uploaded. Will be added to Self Service policies as needed'
       rescue StandardError => e
@@ -478,6 +514,7 @@ module Xolo
         opts_to_process.title = cli_cmd.title
         opts_to_process.version = cli_cmd.version
 
+        title_obj = Xolo::Admin::Title.fetch cli_cmd.title, server_cnx
         new_vers = Xolo::Admin::Version.new opts_to_process
         response_data = new_vers.add(server_cnx)
 
@@ -489,7 +526,8 @@ module Xolo
         display_progress response_data[:progress_stream_url_path]
 
         # Upload the pkg, if any?
-        upload_pkg(new_vers)
+        upload_pkg(new_vers) unless title_obj.autopkg_enabled?
+
         speak 'It can take up to 15 minutes for the version to be available via Jamf and Self Service.'
       rescue StandardError => e
         handle_processing_error e
@@ -510,6 +548,8 @@ module Xolo
       def upload_pkg(version)
         return unless version.pkg_to_upload.is_a? Pathname
 
+        # TODO: deal with autopkg pkgs, should we be able to do this?
+
         speak "Uploading #{version.pkg_to_upload.basename}, #{version.pkg_to_upload.pix_humanize_size} to Xolo"
         # start the upload in a thread
         upload_thr = Thread.new { version.upload_pkg(upload_cnx) }
@@ -710,6 +750,9 @@ module Xolo
           # description is handled specially below
           next if attr == :description
 
+          # only show patch_source and title_id if subscribed
+          next if %i[patch_source title_id].include?(attr) && !title.subscribed?
+
           value = title.send attr
           value = value.join(Xolo::COMMA_JOIN) if value.is_a? Array
           puts "- #{deets[:label]}: #{value}".pix_word_wrap
@@ -941,7 +984,7 @@ module Xolo
       def server_cleanup
         return unless confirmed? 'Run the Xolo Server cleanup process'
 
-        result = server_cnx.post(SERVER_CLENUP_ROUTE).body
+        result = server_cnx.post(SERVER_CLEANUP_ROUTE).body
         puts result[:result]
       rescue StandardError => e
         handle_processing_error e
@@ -1036,6 +1079,35 @@ module Xolo
         list_in_cols header, jamf_computer_group_names.sort_by(&:downcase)
       end
 
+      # List Available titles for subscription
+      #
+      # @return [void]
+      #############################
+      def list_available_titles
+        data = jamf_available_titles.sort_by { |t| t[:app_name].downcase }
+        data.map! do |t|
+          {
+            display_name: t[:app_name],
+            publisher: t[:publisher],
+            patch_source: t[:source_name],
+            title_id: t[:name_id],
+            current_version: t[:current_version],
+            last_modified: t[:last_modified]
+          }
+        end
+
+        if json?
+          puts JSON.pretty_generate(data)
+          return
+        end
+
+        title = 'Titles Available for Subscription'
+        header = %w[DisplayName Publisher PatchSource TitleID]
+        lines = data.map { |t| [t[:display_name], t[:publisher], t[:patch_source], t[:title_id]] }
+
+        show_text generate_report(lines, header_row: header, title: title)
+      end
+
       # List all the SSVC categories in jamf pro
       #
       # @return [void]

data/lib/xolo/admin/progress_history.rb

@@ -85,7 +85,7 @@ module Xolo
       ###################
       def progress_history
         progress_history_file.pix_touch
-        history = YAML.load progress_history_file.read
+        history = YAML.safe_load progress_history_file.read, permitted_classes: [Symbol, Time]
         history ||= {}
 
         now = Time.now

data/lib/xolo/admin/title.rb

@@ -43,10 +43,17 @@ module Xolo
       #############################
 
       # @return [Hash{Symbol: Hash}] The ATTRIBUTES that are available as CLI & walkthru options
+      ##############################
       def self.cli_opts
         @cli_opts ||= ATTRIBUTES.select { |_k, v| v[:cli] }
       end
 
+      # @return [Hash{Symbol: Hash}] The ATTRIBUTES that are available as opts for the subscribe command
+      ################################
+      # def self.subscribe_cli_opts
+      #   @subscribe_cli_opts ||= ATTRIBUTES.select { |_k, v| v[:cli_subscribe] }
+      # end
+
       # @return [Array<String>] The currently known titles names on the server
       #############################
       def self.all_titles(cnx)
@@ -77,8 +84,9 @@ module Xolo
       ####################
       def self.fetch(title, cnx)
         resp = cnx.get "#{SERVER_ROUTE}/#{title}"
-
-        new resp.body
+        title_obj = new resp.body
+        title_obj.cnx = cnx
+        title_obj
       rescue Faraday::ResourceNotFound
         raise Xolo::NoSuchItemError, "No such title '#{title}'"
       end
@@ -115,6 +123,8 @@ module Xolo
       # Attributes
       ######################
       ######################
+      # the server connection used to fetch this version
+      attr_accessor :cnx
 
       # Constructor
       ######################
@@ -139,7 +149,7 @@ module Xolo
       # @param cnx [Faraday::Connection] The connection to use, must be logged in already
       # @return [Hash] the response body from the server
       ####################
-      def add(cnx)
+      def add(cnx = self.cnx)
         resp = cnx.post SERVER_ROUTE, to_h
         resp.body
       end
@@ -148,7 +158,7 @@ module Xolo
       # @param cnx [Faraday::Connection] The connection to use, must be logged in already
       # @return [Hash] the response body from the server
       ####################
-      def update(cnx)
+      def update(cnx = self.cnx)
         resp = cnx.put "#{SERVER_ROUTE}/#{title}", to_h
         resp.body
       end
@@ -158,8 +168,11 @@ module Xolo
       # @param version [String] the version to release
       # @return [Hash] the response body from the server
       ####################
-      def release(cnx, version:)
-        resp = cnx.patch "#{SERVER_ROUTE}/#{title}/release/#{version}", {}
+      def release(cnx = self.cnx, version:)
+        resp = cnx.patch "#{SERVER_ROUTE}/#{title}/release/#{URI::Parser.new.escape version}", {}
+        ### the CGI escape one doesn't seem to work with, e.g. "7.1.5 (84650)"
+        # resp = cnx.patch "#{SERVER_ROUTE}/#{title}/release/#{CGI.escape version}", {}
+
         resp.body
       end
 
@@ -168,7 +181,7 @@ module Xolo
       # @param versions [Boolean] if true, repair all versions of this title
       # @return [Hash] the response body from the server
       ####################
-      def repair(cnx, versions: false)
+      def repair(cnx = self.cnx, versions: false)
         resp = cnx.post "#{SERVER_ROUTE}/#{title}/repair", { repair_versions: versions }
         resp.body
       end
@@ -177,7 +190,7 @@ module Xolo
       # @param cnx [Faraday::Connection] The connection to use, must be logged in already
       # @return [Hash] the response data
       ####################
-      def delete(cnx)
+      def delete(cnx = self.cnx)
         self.class.delete title, cnx
       end
 
@@ -186,7 +199,7 @@ module Xolo
       # @param cnx [Faraday::Connection] The connection to use, must be logged in already
       # @return [Hash] the response data
       ####################
-      def freeze(targets, users = false, cnx)
+      def freeze(targets, users = false, cnx = self.cnx)
         data = { targets: targets, users: users }
         resp = cnx.put "#{SERVER_ROUTE}/#{title}/freeze", data
         resp.body
@@ -197,7 +210,7 @@ module Xolo
       # @param cnx [Faraday::Connection] The connection to use, must be logged in already
       # @return [Hash] the response data
       ####################
-      def thaw(targets, users = false, cnx)
+      def thaw(targets, users = false, cnx = self.cnx)
         data = { targets: targets, users: users }
         resp = cnx.put "#{SERVER_ROUTE}/#{title}/thaw", data
         resp.body
@@ -207,7 +220,7 @@ module Xolo
       # @param cnx [Faraday::Connection] The connection to use, must be logged in already
       # @return [Hash{String => String}] computer name => user name
       ####################
-      def frozen(cnx)
+      def frozen(cnx = self.cnx)
         resp = cnx.get "#{SERVER_ROUTE}/#{title}/frozen"
         resp.body
       end
@@ -216,7 +229,7 @@ module Xolo
       # @param cnx [Faraday::Connection] The connection to use, must be logged in already
       # @return [Hash{String => String}] page_name => url
       ####################
-      def gui_urls(cnx)
+      def gui_urls(cnx = self.cnx)
         resp = cnx.get "#{SERVER_ROUTE}/#{title}/urls"
         resp.body
       end
@@ -227,7 +240,7 @@ module Xolo
       # @param cnx [Faraday::Connection] The connection to use, must be logged in already
       # @return [Array<Hash>] The change log for this title
       ####################
-      def changelog(cnx)
+      def changelog(cnx = self.cnx)
         resp = cnx.get "#{SERVER_ROUTE}/#{title}/changelog"
         resp.body
       end
@@ -248,19 +261,16 @@ module Xolo
                 "Can't upload self service icon '#{self_service_icon}': file doesn't exist or is not readable"
         end
 
-        # upfile = Faraday::UploadIO.new(
-        #   self_service_icon.to_s,
-        #   'application/octet-stream',
-        #   self_service_icon.basename.to_s
-        # )
-
         mimetype = `/usr/bin/file --brief --mime-type #{Shellwords.escape self_service_icon.expand_path.to_s}`.chomp
         upfile = Faraday::Multipart::FilePart.new(self_service_icon.expand_path.to_s, mimetype)
         content = { file: upfile }
-        # route =  "#{UPLOAD_ICON_ROUTE}/#{title}"
-        route = "#{SERVER_ROUTE}/#{title}/#{UPLOAD_ICON_ROUTE}"
 
+        route = "#{SERVER_ROUTE}/#{title}/#{UPLOAD_ICON_ROUTE}"
         upload_cnx.post(route) { |req| req.body = content }
+      rescue Xolo::NoSuchItemError
+        raise
+      rescue StandardError => e
+        raise Xolo::ConnectionError, "#{e.class}: #{e.message}"
       end
 
       # Get the patch report data for this title
@@ -269,16 +279,16 @@ module Xolo
       # @param cnx [Faraday::Connection] The connection to use, must be logged in already
       # @return [Array<Hash>] Data for each computer with any version of this title installed
       ##################################
-      def patch_report_data(cnx)
+      def patch_report_data(cnx = self.cnx)
         resp = cnx.get "#{SERVER_ROUTE}/#{title}/patch_report"
         resp.body
       end
 
       # Add more data to our hash
       ###########################
-      def to_h
-        super
-      end
+      # def to_h
+      #   super
+      # end
 
     end # class Title