ruby-jss 2.1.0b4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a00af3813560fa65f8597fc6a516d1b9933eb333f2aee3478646df1f93a45b9
-  data.tar.gz: 892e4f5ed6b7271c55377671ff13ccb7778a51b34d57b9da67086cd95ec7d0ca
+  metadata.gz: 970c4289986bb3f0b3ea9a60b31777a29b4c927879a3204d28c3f9bdd46a2a9f
+  data.tar.gz: f75ae4ae8ba5bd0cfadb065c62f495fcb4eea86b2473aa5d8357569e9ce49059
 SHA512:
-  metadata.gz: 6461d576566cfd365c77ff36758a8c9558deb2bad8936b87be03f12dd3c7f7662734ec2eaaa7f1f4b5b83c9bb0264c9e06609c2f8f0ef20106d3c8db8be45484
-  data.tar.gz: 30a9a4dcf60a9aa0a25c4a64429e34f1f8cf6cf9609f80c94b675c0e498f74f46f3fc0842fab2d20ed248f0a792c2349a7373a273905ec45c3994b3b6f4fc3eb
+  metadata.gz: b86acc435cc02cdd0976361305331b4bf98b176fd25c8accb791cfba794c7bdf6d42d94d62cc76b11cb510e9c3ac23495ac99aa244e76a39e5e6e061aeeae4a8
+  data.tar.gz: 31f95548e2cb64bedb1781977222c705183c3e866ce8c8a9fb5532dfdbdeabe11d59faa92818c8506d5235d2fc868d1eb58d949b17ecc5f6c3d66bafde910750

data/CHANGES.md

@@ -14,25 +14,28 @@ __Please update all installations of ruby-jss to at least v1.6.0.__
 
 Many many thanks to actae0n of Blacksun Hackers Club for reporting this issue and providing examples of how it could be exploited.
 
-## \[2.1.0] - unreleased
+## \[2.1.0] - 2022-10-10
 
 ### Added
 
-  - Support for the `/v1/jamf-management-framework/redeploy/{id}` Jamf Pro API endpoint in `Jamf::Computer` and 
+  - Support for the `/v1/jamf-management-framework/redeploy/{id}` Jamf Pro API endpoint in `Jamf::Computer` and
   `Jamf::ComputerGroup`. The method `redeploy_mgmt_framework` is both a Class and an Instance method for those classes
     - The instance method sends the redeployment to the single computer or all the members of the single computer group.
-    - The class method accepts a single id, or an array of ids.  
+    - The class method accepts a single id, or an array of ids.
       - When using `Jamf::Computer.redeploy_mgmt_framework` provide computer ids
       - When using `Jamf::ComputerGroup.redeploy_mgmt_framework` provide group ids, and all members of all groups will get
         the redeployment
-  - In all cases the result is a Hash of target computer ids (keys) and result value for each (Strings).
-    -  The result is either the UUID of the sent MDM command, or an error message if the MDM command couldn't be sent.
-  - All the code is in the `Jamf::MacOSRedeployMgmtFramework` module, q.v. in the [rubydoc documentation](https://www.rubydoc.info/gems/ruby-jss/Jamf/MacOSRedeployMgmtFramework)
+    - In all cases the result is a Hash of target computer ids (keys) and result value for each (Strings).
+      -  The result is either the UUID of the sent MDM command, or an error message if the MDM command couldn't be sent.
+    - All the code is in the `Jamf::MacOSRedeployMgmtFramework` module, q.v. in the [rubydoc documentation](https://www.rubydoc.info/gems/ruby-jss/Jamf/MacOSRedeployMgmtFramework)
 
 ### Fixed
 
   - A few internal rescues of a deprecated exception class
   - Removed auto-loading of deprecation files; now explicitly loaded.
+  - A few Ruby 2 => Ruby 3 bugs - method params needing double-splats (Thanks to @Timelost for reporting this one)
+  - Ensure resource paths don't start with a slash
+  - Setting the timeouts on an existing API connection object now works.
 
 ## \[2.0.0] - 2022-09-12
 

data/bin/cgrouper

@@ -23,10 +23,8 @@
 ###    KIND, either express or implied. See the Apache License for the specific
 ###    language governing permissions and limitations under the Apache License.
 
-
 # Create or change the membership of a computer group in the JSS
 
-
 # Load in the JSS library
 require 'jss-api'
 
@@ -44,9 +42,9 @@ class App
        [-S server] [-U user] [-T timeout] [-V] [--debug]
        group [-f /file/path ] [computer [computer ...]]"
 
-  ACTIONS_NEEDING_GROUP = [ :create_group, :rename_group, :delete_group, :add_members, :remove_members, :remove_all, :list_members]
+  ACTIONS_NEEDING_GROUP = %i[create_group rename_group delete_group add_members remove_members remove_all list_members]
 
-  ACTIONS_FOR_STATIC_GROUPS_ONLY = [:create_group, :add_members, :remove_members, :remove_all]
+  ACTIONS_FOR_STATIC_GROUPS_ONLY = %i[create_group add_members remove_members remove_all]
 
   #####################################
   ### Attributes
@@ -57,31 +55,30 @@ class App
   ###
   ### set up
   ###
-  def initialize(args)
-
+  def initialize
     @debug = false
 
     # define the options
     cli_opts = GetoptLong.new(
-      [ '--help', '-h', '-H', GetoptLong::NO_ARGUMENT ],
-      [ '--list-groups', '-L',  GetoptLong::NO_ARGUMENT ],
-      [ '--list-static', '-s',  GetoptLong::NO_ARGUMENT ],
-      [ '--list-smart', '-m',  GetoptLong::NO_ARGUMENT ],
-      [ '--create-group', '--create', '-c', GetoptLong::NO_ARGUMENT ],
-      [ '--rename-group', '--rename', '-n', GetoptLong::REQUIRED_ARGUMENT ],
-      [ '--delete-group', '--delete', '-d', GetoptLong::NO_ARGUMENT ],
-      [ '--list-members', '--list-computers', '-l', GetoptLong::NO_ARGUMENT ],
-      [ '--add-members', '--add', '-a', GetoptLong::NO_ARGUMENT ],
-      [ '--remove-members', '--remove', '-r', GetoptLong::NO_ARGUMENT ],
-      [ '--remove-all-members', '-R', GetoptLong::NO_ARGUMENT ],
-      [ '--file', '-f', GetoptLong::REQUIRED_ARGUMENT ],
-      [ '--server', '-S', GetoptLong::OPTIONAL_ARGUMENT],
-      [ '--port', '-P', GetoptLong::OPTIONAL_ARGUMENT],
-      [ '--user', '-U', GetoptLong::OPTIONAL_ARGUMENT],
-      [ '--no-verify-cert', '-V', GetoptLong::NO_ARGUMENT],
-      [ '--timeout', '-T', GetoptLong::OPTIONAL_ARGUMENT],
-      [ '--no-confirm', '-C', GetoptLong::NO_ARGUMENT],
-      [ '--debug', GetoptLong::NO_ARGUMENT]
+      ['--help', '-h', '-H', GetoptLong::NO_ARGUMENT],
+      ['--list-groups', '-L',  GetoptLong::NO_ARGUMENT],
+      ['--list-static', '-s',  GetoptLong::NO_ARGUMENT],
+      ['--list-smart', '-m', GetoptLong::NO_ARGUMENT],
+      ['--create-group', '--create', '-c', GetoptLong::NO_ARGUMENT],
+      ['--rename-group', '--rename', '-n', GetoptLong::REQUIRED_ARGUMENT],
+      ['--delete-group', '--delete', '-d', GetoptLong::NO_ARGUMENT],
+      ['--list-members', '--list-computers', '-l', GetoptLong::NO_ARGUMENT],
+      ['--add-members', '--add', '-a', GetoptLong::NO_ARGUMENT],
+      ['--remove-members', '--remove', '-r', GetoptLong::NO_ARGUMENT],
+      ['--remove-all-members', '-R', GetoptLong::NO_ARGUMENT],
+      ['--file', '-f', GetoptLong::REQUIRED_ARGUMENT],
+      ['--server', '-S', GetoptLong::OPTIONAL_ARGUMENT],
+      ['--port', '-P', GetoptLong::OPTIONAL_ARGUMENT],
+      ['--user', '-U', GetoptLong::OPTIONAL_ARGUMENT],
+      ['--no-verify-cert', '-V', GetoptLong::NO_ARGUMENT],
+      ['--timeout', '-T', GetoptLong::OPTIONAL_ARGUMENT],
+      ['--no-confirm', '-C', GetoptLong::NO_ARGUMENT],
+      ['--debug', GetoptLong::NO_ARGUMENT]
     )
 
     # here's where we hold cmdline args and other user options
@@ -92,68 +89,68 @@ class App
 
     # if stdin is not a tty, then we must assume
     # we're being passed a password
-    @options.getpass =  $stdin.tty? ? :prompt : :stdin
+    @options.getpass = $stdin.tty? ? :prompt : :stdin
 
     # parse the options
     cli_opts.each do |opt, arg|
       case opt
-        when '--help'
-          show_help
+      when '--help'
+        show_help
 
-        when '--list-groups'
-          @options.action = :list_groups
+      when '--list-groups'
+        @options.action = :list_groups
 
-        when '--list-static'
-          @options.action = :list_static
+      when '--list-static'
+        @options.action = :list_static
 
-        when '--list-smart'
-          @options.action = :list_smart
+      when '--list-smart'
+        @options.action = :list_smart
 
-        when '--list-members'
-          @options.action = :list_members
+      when '--list-members'
+        @options.action = :list_members
 
-        when '--create-group'
-          @options.action = :create_group
+      when '--create-group'
+        @options.action = :create_group
 
-        when '--rename-group'
-          @options.action = :rename_group
-          @options.new_name = arg
+      when '--rename-group'
+        @options.action = :rename_group
+        @options.new_name = arg
 
-        when '--delete-group'
-          @options.action = :delete_group
+      when '--delete-group'
+        @options.action = :delete_group
 
-        when '--add-members'
-          @options.action = :add_members
+      when '--add-members'
+        @options.action = :add_members
 
-        when '--remove-members'
-          @options.action = :remove_members
+      when '--remove-members'
+        @options.action = :remove_members
 
-        when '--remove-all-members'
-          @options.action = :remove_all
+      when '--remove-all-members'
+        @options.action = :remove_all
 
-        when '--file'
-          @options.input_file = Pathname.new arg
+      when '--file'
+        @options.input_file = Pathname.new arg
 
-        when '--server'
-          @options.server = arg
+      when '--server'
+        @options.server = arg
 
-        when '--port'
-          @options.port = arg
+      when '--port'
+        @options.port = arg
 
-        when '--user'
-          @options.user = arg
+      when '--user'
+        @options.user = arg
 
-        when '--no-verify-cert'
-          @options.verify_cert = false
+      when '--no-verify-cert'
+        @options.verify_cert = false
 
-        when '--timeout'
-          @options.timeout = arg
+      when '--timeout'
+        @options.timeout = arg
 
-        when '--no-confirm'
-          @options.no_confirm = true
+      when '--no-confirm'
+        @options.no_confirm = true
 
-        when '--debug'
-          @debug = true
+      when '--debug'
+        @debug = true
 
       end # case
     end # opts.each
@@ -168,17 +165,13 @@ class App
 
     # will we say anything when finished?
     @done_msg = nil
-
   end # init
 
-
-
   #####################################
   ###
   ### Do It
   ###
   def run
-
     if @options.action == :none
       puts USAGE
       return
@@ -188,75 +181,73 @@ class App
     @options.user ||= JSS::CONFIG.api_username
     @options.server ||= JSS::CONFIG.api_server_name
 
-    raise JSS::MissingDataError, "No JSS Username provided or found in the JSS gem config." unless @options.user
-    raise JSS::MissingDataError, "No JSS Server provided or found in the JSS gem config." unless @options.server
-
-    Jamf.cnx.connect( :server => @options.server,
-      :port => @options.port,
-      :verify_cert => @options.verify_cert,
-      :user => @options.user,
-      :pw => @options.getpass,
-      :stdin_line => 1,
-      :timeout => @options.timeout
-    )
+    raise JSS::MissingDataError, 'No JSS Username provided or found in the JSS gem config.' unless @options.user
+    raise JSS::MissingDataError, 'No JSS Server provided or found in the JSS gem config.' unless @options.server
 
+    Jamf.cnx.connect(server: @options.server,
+                     port: @options.port,
+                     verify_cert: @options.verify_cert,
+                     user: @options.user,
+                     pw: @options.getpass,
+                     stdin_line: 1,
+                     timeout: @options.timeout)
 
     if ACTIONS_NEEDING_GROUP.include? @options.action
 
-      raise JSS::MissingDataError, "Please specify a group name" unless @options.group
+      raise JSS::MissingDataError, 'Please specify a group name' unless @options.group
 
-     # get the group from the API
-      if @options.action == :create_group
-        @group = JSS::ComputerGroup.make :name => @options.group, :type => :static
-      else
-        @group = JSS::ComputerGroup.fetch :name => @options.group
-      end
+      # get the group from the API
+      @group = if @options.action == :create_group
+                 JSS::ComputerGroup.make name: @options.group, type: :static
+               else
+                 JSS::ComputerGroup.fetch name: @options.group
+               end
 
     end # if ACTIONS_NEEDING_GROUP
 
     # smart groups can't have some things done to them
-    raise InvalidTypeError, "You can't do that to a smart group. Use the JSS WebApp if needed." if ACTIONS_FOR_STATIC_GROUPS_ONLY.include? @options.action and @group.smart?
-
+    if ACTIONS_FOR_STATIC_GROUPS_ONLY.include? @options.action and @group.smart?
+      raise InvalidTypeError,
+            "You can't do that to a smart group. Use the JSS WebApp if needed."
+    end
 
     case @options.action
 
-      when :list_groups
-        list_groups
+    when :list_groups
+      list_groups
 
-      when :list_static
-        list_groups :static
+    when :list_static
+      list_groups :static
 
-      when :list_smart
-        list_groups :smart
+    when :list_smart
+      list_groups :smart
 
-      when :list_members
-        list_members
+    when :list_members
+      list_members
 
-      when :create_group
-        create_group
+    when :create_group
+      create_group
 
-      when :rename_group
-        rename_group
+    when :rename_group
+      rename_group
 
-      when :delete_group
-        delete_group
+    when :delete_group
+      delete_group
 
-      when :add_members
-        add_members
+    when :add_members
+      add_members
 
-      when :remove_members
-        remove_members
+    when :remove_members
+      remove_members
 
-      when :remove_all
-        remove_all
+    when :remove_all
+      remove_all
 
     end # case @options.action
 
     puts "Done! #{@done_msg}" if @done_msg
-
   end # run
 
-
   #####################################
   ###
   ### Show Help
@@ -307,7 +298,6 @@ Notes:
    (spaces, tabs, & returns in any number or combination)
 
     FULLHELP
-
   end
 
   #####################################
@@ -316,21 +306,21 @@ Notes:
   ###
   def list_groups(show = :all)
     case show
-      when :all
-        label = "All"
-        groups_to_show = JSS::ComputerGroup.all
-      when :static
-        label = "Static"
-        groups_to_show = JSS::ComputerGroup.all_static
-      when :smart
-        label = "Smart"
-        groups_to_show = JSS::ComputerGroup.all_smart
-    end #case
+    when :all
+      label = 'All'
+      groups_to_show = JSS::ComputerGroup.all
+    when :static
+      label = 'Static'
+      groups_to_show = JSS::ComputerGroup.all_static
+    when :smart
+      label = 'Smart'
+      groups_to_show = JSS::ComputerGroup.all_smart
+    end # case
 
     puts "# #{label} computer groups in the JSS"
-    puts "#---------------------------------------------"
+    puts '#---------------------------------------------'
 
-    groups_to_show.sort{|a,b| a[:name].downcase <=> b[:name].downcase}.each do |grp|
+    groups_to_show.sort { |a, b| a[:name].downcase <=> b[:name].downcase }.each do |grp|
       puts grp[:name]
     end
   end
@@ -341,30 +331,26 @@ Notes:
   ###
   def list_members
     puts "# All members of JSS #{@group.smart? ? 'smart' : 'static'} computer group '#{@options.group}'"
-    puts "#--- name (id) ---------------------------------"
+    puts '#--- name (id) ---------------------------------'
 
     # put them into a tmp array, so that
     # we can sort by computer name, remembering that
     # there can be duplicate names.
     list = []
-    @group.members.each{|mem| list << "#{mem[:name]} (#{mem[:id]})" }
-    puts list.sort #.join("\n")
+    @group.members.each { |mem| list << "#{mem[:name]} (#{mem[:id]})" }
+    puts list.sort # .join("\n")
   end
 
-
   #####################################
   ###
   ### Create a new group
   ###
   def create_group
-
     return unless confirm "create a new static group named '#{@options.group}'"
-    @group.create
 
-    unless @options.computers.empty?
-      add_members
-    end
+    @group.create
 
+    add_members unless @options.computers.empty?
   end
 
   #####################################
@@ -373,36 +359,35 @@ Notes:
   ###
   def rename_group
     return unless confirm "rename group '#{@group.name}' to '#{@options.new_name}'"
+
     @group.name = @options.new_name
     @group.update
   end
 
-
   #####################################
   ###
   ### delete a group
   ###
   def delete_group
     return unless confirm "DELETE group '#{@group.name}'"
+
     @group.delete
   end
 
-
   #####################################
   ###
   ### add members to a group
   ###
   def add_members
-    raise JSS::MissingDataError, "No computer names provided" if @options.computers.empty?
+    raise JSS::MissingDataError, 'No computer names provided' if @options.computers.empty?
     raise JSS::UnsupportedError, "Smart group members can't be changed." if @group.smart?
     return unless @options.action == :create_group or confirm "add computers to group '#{@group.name}'"
 
     @options.computers.each do |c|
-      begin
-        @group.add_member c
-      rescue JSS::NoSuchItemError
-        puts "#{$!} - skipping"
-      end # begin
+      @group.add_member c
+    rescue JSS::NoSuchItemError
+      puts "#{$!} - skipping"
+      # begin
     end # each
 
     @group.update
@@ -413,15 +398,14 @@ Notes:
   ### remove members from a group
   ###
   def remove_members
-    raise JSS::MissingDataError, "No computer names provided" if @options.computers.empty?
+    raise JSS::MissingDataError, 'No computer names provided' if @options.computers.empty?
     raise JSS::UnsupportedError, "Smart group members can't be changed." if @group.smart?
     return unless confirm "remove computers from group '#{@group.name}'"
+
     @options.computers.each do |c|
-      begin
-        @group.remove_member c
-      rescue JSS::NoSuchItemError
-        puts "#{$!} - skipping"
-      end
+      @group.remove_member c
+    rescue JSS::NoSuchItemError
+      puts "#{$!} - skipping"
     end
     @group.update
   end
@@ -433,11 +417,11 @@ Notes:
   def remove_all
     raise JSS::UnsupportedError, "Smart group members can't be changed." if @group.smart?
     return unless confirm "remove ALL computers from group '#{@group.name}'"
+
     @group.clear
     @group.update
   end
 
-
   #####################################
   ###
   ### Read computer names from a file
@@ -448,6 +432,7 @@ Notes:
   def get_computers_from_file
     raise JSS::NoSuchItemError "File #{@options.input_file} isn't a file or isn't readable." unless \
       @options.input_file.file? and @options.input_file.readable?
+
     @options.input_file.read.split(/\s+/)
   end
 
@@ -456,31 +441,26 @@ Notes:
   ### Get confirmation before doing something
   ### Returns true or false
   ###
-  def confirm (action)
-      return true if @options.no_confirm
+  def confirm(action)
+    return true if @options.no_confirm
 
-      print "Really #{action}? (y/n): "
-      $stdin.reopen '/dev/tty'
-      reply = $stdin.gets.strip
-      return true if reply =~ /^y/i
-      return false
+    print "Really #{action}? (y/n): "
+    $stdin.reopen '/dev/tty'
+    reply = $stdin.gets.strip
+    return true if reply =~ /^y/i
 
+    false
   end # confirm
 
-
 end # class App
 
 #######################################
 begin
-  app = App.new(ARGV)
+  app = App.new
   app.run
-
 rescue
   # handle exceptions not handled elsewhere
   puts "An error occurred: #{$!}"
-  puts "Backtrace:" if app.debug
+  puts 'Backtrace:' if app.debug
   puts $@ if app.debug
-
-ensure
-
 end

data/bin/jamfHelperBackgrounder

@@ -53,7 +53,7 @@ class App
 
   # Set up
   #
-  def initialize(args)
+  def initialize(**args)
     if args.include? '-help'
       @help = true
       return
@@ -66,6 +66,7 @@ class App
 
       wintype_idx = args.index { |a| a == WIN_TYPE_PARAM }
       raise 'missing option: -windowType' unless wintype_idx
+
       args.delete_at wintype_idx
       @window_type = args.delete_at(wintype_idx).to_sym
 
@@ -93,6 +94,7 @@ class App
 
     if @as_user
       raise 'Only root can do things as another user' unless JSS.superuser?
+
       cmd = ['su', '-l', @as_user, '-c', "#{Shellwords.escape __FILE__} #{@arg_string}"]
       exec(*cmd)
     end
@@ -134,7 +136,7 @@ This command takes all the same commandline options as jamfHelper, plus these:
 WARNING: You shouldn't run this command directly as a launchd job. Rather
 you should write a small script that runs this command, and use launchd
 to run that.
-ENDHELP
+    ENDHELP
   end # show help
 
 end # app

data/bin/netseg-update

@@ -55,13 +55,13 @@ class App
 
   USAGE = "Usage: #{PROG_NAME} [options] [--help] /path/to/file".freeze
 
-  POTENTIAL_COLUMNS = %i(name starting ending cidr mask).freeze
+  POTENTIAL_COLUMNS = %i[name starting ending cidr mask].freeze
 
   DEFAULT_CACHE_FILE = Pathname.new('~/.last_subnet_update').expand_path
 
   DEFAULT_DELIMITER = "\t".freeze
 
-  DEFAULT_COLUMNS = [:name, :starting, :ending].freeze
+  DEFAULT_COLUMNS = %i[name starting ending].freeze
 
   DEFAULT_MANUAL_PREFIX = 'Manual-'.freeze
 
@@ -84,7 +84,7 @@ class App
 
   attr_reader :debug
 
-  def initialize(_args)
+  def initialize
     @getpass = $stdin.tty? ? :prompt : :stdin
     set_defaults
     parse_cli
@@ -183,7 +183,7 @@ Options:
  -V, --no-verify-cert   - Allow self-signed, unverified SSL certificate
  -T, --timeout secs     - specify the JSS API timeout
  -N, --no-op            - Don't make any changes in the JSS, just report what would
-                          have be changed.
+                          have been changed.
  -H, --help             - show this help
  --debug                - show the ruby backtrace when errors occur
 
@@ -254,6 +254,7 @@ Notes:
     lines.each do |line|
       parsed_line = parse_a_data_line line
       next unless parsed_line
+
       name = parsed_line.delete :name
       parsed_data[name] = parsed_line
     end
@@ -273,6 +274,7 @@ Notes:
       @columns.include?(:ending) || \
       @columns.include?(:cidr) || \
       @columns.include?(:mask)
+
     @use_cidr = (@columns.include?(:cidr) || @columns.include?(:mask))
   end
 
@@ -296,11 +298,13 @@ Notes:
     # read in the file
     @raw_data = @file.read
     return true unless @cache_file.exist?
+
     @raw_data != @cache_file.read
   end
 
   def cache_latest_data
     return if @noop
+
     @cache_file.jss_save @raw_data
   end
 
@@ -375,7 +379,7 @@ end # app
 # create the app and go
 begin
   debug = ARGV.include? '--debug'
-  app = App.new(ARGV)
+  app = App.new
   app.run
 rescue
   # handle exceptions not handled elsewhere

data/lib/jamf/api/classic/api_objects/computer.rb

@@ -440,7 +440,7 @@ module Jamf
       cnx = api if api
 
       id = valid_id ident, cnx: cnx
-      raise "No computer matches identifier: #{ident}" unless id
+      raise Jamf::NoSuchItemError, "No computer matches identifier: #{ident}" unless id
 
       end_date ||= start_date
       start_date = Jamf.parse_time start_date

data/lib/jamf/api/classic/api_objects/mobile_device_application.rb

@@ -194,7 +194,7 @@ module Jamf
     #
     # See Jamf::APIObject#initialize
     #
-    def initialize(args)
+    def initialize(**args)
       super
       general = @init_data[:general]
       @display_name = general[:display_name]

data/lib/jamf/api/classic/api_objects/patch_title.rb

@@ -154,7 +154,7 @@ module Jamf
     # when fetching a specific version, this is a valid version
     UNKNOWN_VERSION_ID = 'Unknown'.freeze
 
-    REPORTS_RSRC_BASE = '/patchreports/patchsoftwaretitleid'.freeze
+    REPORTS_RSRC_BASE = 'patchreports/patchsoftwaretitleid'.freeze
 
     # Class Methods
     #######################################
@@ -233,7 +233,7 @@ module Jamf
       all(refresh, cnx: cnx).map { |i| i[:source_name_id] }
     end
 
-    # Get a patch report for a softwaretitle, withouth fetching an instance.
+    # Get a patch report for a softwaretitle, without fetching an instance.
     # Defaults to reporting all versions. Specifiying a version will be faster.
     #
     # The Hash returned has 3 keys:
@@ -269,6 +269,7 @@ module Jamf
 
       # TODO: remove this and adjust parsing when jamf fixes the JSON
       raw_report = XMLWorkaround.data_via_xml(rsrc, PATCH_REPORT_DATA_MAP, cnx)[:patch_report]
+
       report = {}
       report[:total_computers] = raw_report[:total_computers]
       report[:total_versions] = raw_report[:total_versions]
@@ -312,7 +313,7 @@ module Jamf
     # so all other lookup values have to be converted to ID before
     # the call to super
     #
-    def self.fetch(identifier = nil, **params)      
+    def self.fetch(identifier = nil, **params)
       # default connection if unspecified
       cnx = params.delete :cnx
       cnx ||= params.delete :api # backward compatibility, deprecated
@@ -472,7 +473,6 @@ module Jamf
     # wrapper to fetch versions after creating
     def create
       super
-      
     end
 
     # wrapper to clear @changed_pkgs after updating

data/lib/jamf/api/classic/xml_workaround.rb

@@ -150,7 +150,8 @@ module Jamf
         element ? element.text.to_f : model
       when nil
         return nil unless element
-        element.text.downcase == TRUE_STRING ? true : false
+
+        element.text.downcase == TRUE_STRING
       when Array
         element ? elem_as_array(model.first, element) : []
       when Hash
@@ -176,6 +177,7 @@ module Jamf
       return unless size_elems.count == 1
       return if size_elem.has_elements?
       return unless size_elem.text.jss_integer?
+
       elem.delete_element size_elem
     end
 

data/lib/jamf/api/connection/attributes.rb

@@ -74,15 +74,15 @@ module Jamf
       attr_reader :sticky_session
       alias sticky_session? sticky_session
       alias sticky? sticky_session
-      
+
       # @return [String, nil] The current sticky_session cookie. nil unless
       #   sticky_session is set to true, either as a param to 'connect' or via
       #   #sticky_session=
       #
-      #   When set via .connect, the cookie is gleaned from the token creation 
+      #   When set via .connect, the cookie is gleaned from the token creation
       #   reponse. When set via #sticky_session=, a HEAD request is made, and the
       #   cookie will be in the response.
-      #   
+      #
       #    Only valid when the connection is to a Jamf Cloud server.
       attr_reader :sticky_session_cookie
 
@@ -100,7 +100,7 @@ module Jamf
 
         # convert boolean-y to boolean
         value = value ? true : false
-        
+
         return if @sticky_session == value
 
         if value
@@ -125,8 +125,8 @@ module Jamf
       #
       def timeout=(new_timeout)
         @timeout = new_timeout.to_i
-        @c_cnx&.options[:timeout] = @timeout 
-        @jp_cnx&.options[:timeout] = @timeout 
+        @c_cnx.options.timeout = @timeout if @c_cnx
+        @jp_cnx.options.timeout = @timeout if @jp_cnx
       end
 
       # Reset the open-connection timeout for the rest connection
@@ -137,8 +137,8 @@ module Jamf
       #
       def open_timeout=(new_timeout)
         @open_timeout = new_timeout.to_i
-        @c_cnx&.options[:open_timeout] = @open_timeout
-        @jp_cnx&.options[:open_timeout] = @open_timeout 
+        @c_cnx.options.open_timeout = @open_timeout if @c_cnx
+        @jp_cnx.options.open_timeout = @open_timeout if @jp_cnx
       end
 
       # @return [URI::HTTPS] the base URL to the server

data/lib/jamf/api/connection/classic_api.rb

@@ -59,6 +59,8 @@ module Jamf
       # @return [Hash,String] the result of the get
       #
       def c_get(rsrc, format = :json, raw_json: false)
+        rsrc = rsrc.delete_prefix Jamf::Connection::SLASH
+
         validate_connected @c_cnx
         raise Jamf::InvalidDataError, 'format must be :json or :xml' unless Jamf::Connection::GET_FORMATS.include?(format)
 
@@ -92,6 +94,8 @@ module Jamf
       def c_post(rsrc, xml)
         validate_connected @c_cnx
 
+        rsrc = rsrc.delete_prefix Jamf::Connection::SLASH
+
         # convert CRs & to 
         xml&.gsub!(/\r/, '
')
 
@@ -125,6 +129,8 @@ module Jamf
       def c_put(rsrc, xml)
         validate_connected @c_cnx
 
+        rsrc = rsrc.delete_prefix Jamf::Connection::SLASH
+
         # convert CRs & to 
         xml.gsub!(/\r/, '
')
 
@@ -157,6 +163,8 @@ module Jamf
         validate_connected @c_cnx
         raise MissingDataError, 'Missing :rsrc' if rsrc.nil?
 
+        rsrc = rsrc.delete_prefix Jamf::Connection::SLASH
+
         # delete the resource
         resp =
           @c_cnx.delete(rsrc) do |req|
@@ -188,6 +196,7 @@ module Jamf
       #
       def upload(rsrc, local_file)
         validate_connected @c_cnx
+        rsrc = rsrc.delete_prefix Jamf::Connection::SLASH
 
         # the upload file object for faraday
         local_file = Pathname.new local_file
@@ -223,7 +232,7 @@ module Jamf
 
           cnx.options[:timeout] = @timeout
           cnx.options[:open_timeout] = @open_timeout
-          
+
           cnx.request :multipart
           cnx.request :url_encoded
 

data/lib/jamf/api/connection/constants.rb

@@ -87,6 +87,8 @@ module Jamf
       MIME_JSON = 'application/json'.freeze
       MIME_XML = 'application/xml'.freeze
 
+      SLASH = '/'
+
       # Only these variables are displayed with PrettyPrint
       # This avoids, especially, the caches, which are available
       # as attr_readers

data/lib/jamf/api/connection/jamf_pro_api.rb

@@ -53,11 +53,12 @@ module Jamf
 
       # @param rsrc[String] the resource to get
       #   (the part of the API url after the '/api/' )
-  
+
       # @return [Hash] the result of the get
       #######################################################
       def jp_get(rsrc)
         validate_connected @jp_cnx
+        rsrc = rsrc.delete_prefix Jamf::Connection::SLASH
         resp = @jp_cnx.get(rsrc) do |req|
           # Modify the request here if needed.
           # puts "JPAPI Cookie is: #{req.headers['Cookie']}"
@@ -82,6 +83,7 @@ module Jamf
       #######################################################
       def jp_post(rsrc, data)
         validate_connected @jp_cnx
+        rsrc = rsrc.delete_prefix Jamf::Connection::SLASH
         resp = @jp_cnx.post(rsrc) do |req|
           req.body = data
         end
@@ -104,6 +106,7 @@ module Jamf
       #######################################################
       def jp_put(rsrc, data)
         validate_connected @jp_cnx
+        rsrc = rsrc.delete_prefix Jamf::Connection::SLASH
         resp = @jp_cnx.put(rsrc) do |req|
           req.body = data
         end
@@ -126,6 +129,7 @@ module Jamf
       #######################################################
       def jp_patch(rsrc, data)
         validate_connected @jp_cnx
+        rsrc = rsrc.delete_prefix Jamf::Connection::SLASH
         resp = @jp_cnx.patch(rsrc) do |req|
           req.body = data
         end
@@ -146,6 +150,7 @@ module Jamf
       #######################################################
       def jp_delete(rsrc)
         validate_connected @jp_cnx
+        rsrc = rsrc.delete_prefix Jamf::Connection::SLASH
         resp = @jp_cnx.delete rsrc
         @last_http_response = resp
         return resp.body if resp.success?
@@ -159,6 +164,7 @@ module Jamf
       # a temporary Faraday connection object
       #######################################################
       def jp_download(rsrc)
+        rsrc = rsrc.delete_prefix Jamf::Connection::SLASH
         temp_cnx = create_jp_connection(parse_json: false)
         resp = temp_cnx.get rsrc
         @last_http_response = resp

data/lib/jamf/version.rb

@@ -27,6 +27,6 @@
 module Jamf
 
   ### The version of ruby-jss
-  VERSION = '2.1.0b4'.freeze
+  VERSION = '2.1.0'.freeze
 
 end # module

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jss
 version: !ruby/object:Gem::Version
-  version: 2.1.0b4
+  version: 2.1.0
 platform: ruby
 authors:
 - Chris Lasell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-15 00:00:00.000000000 Z
+date: 2022-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
@@ -824,9 +824,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3.1
 signing_key: