ruby-jss 2.1.0b5 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e4edfd42bf486020f780c565948d0b6de6db11413eaaf2f5a486243d8137a76
-  data.tar.gz: 0c3b1e370c9f1ffdcf97f7174b0dbc508f3c414efc5a86a0b5b09e0c42ba4e3f
+  metadata.gz: 970c4289986bb3f0b3ea9a60b31777a29b4c927879a3204d28c3f9bdd46a2a9f
+  data.tar.gz: f75ae4ae8ba5bd0cfadb065c62f495fcb4eea86b2473aa5d8357569e9ce49059
 SHA512:
-  metadata.gz: 7fd967954cc7642ec10054fff0c2d75f3dd30bce1836baf158a1fb4abe4f5d8a95ca493e9c1ef2b03fe1490874fdbf3f42b81af46389c7a86a6a73bdaeb867c2
-  data.tar.gz: f806304ae8b9fad9fae2ffc35b77681a26cf2bfd63dc202b5a52f25b43e2e278fda62321f05e0c3f47a6e063238b5eda86ec870814a971fb13e7631ecfa04f5a
+  metadata.gz: b86acc435cc02cdd0976361305331b4bf98b176fd25c8accb791cfba794c7bdf6d42d94d62cc76b11cb510e9c3ac23495ac99aa244e76a39e5e6e061aeeae4a8
+  data.tar.gz: 31f95548e2cb64bedb1781977222c705183c3e866ce8c8a9fb5532dfdbdeabe11d59faa92818c8506d5235d2fc868d1eb58d949b17ecc5f6c3d66bafde910750

data/CHANGES.md

@@ -14,7 +14,7 @@ __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
 
@@ -34,6 +34,8 @@ Many many thanks to actae0n of Blacksun Hackers Club for reporting this issue an
   - 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

@@ -55,7 +55,7 @@ class App
   ###
   ### set up
   ###
-  def initialize(**_args)
+  def initialize
     @debug = false
 
     # define the options
@@ -207,7 +207,7 @@ class App
 
     # smart groups can't have some things done to them
     if ACTIONS_FOR_STATIC_GROUPS_ONLY.include? @options.action and @group.smart?
-      raise InvalidTypeError, 
+      raise InvalidTypeError,
             "You can't do that to a smart group. Use the JSS WebApp if needed."
     end
 
@@ -384,7 +384,6 @@ Notes:
     return unless @options.action == :create_group or confirm "add computers to group '#{@group.name}'"
 
     @options.computers.each do |c|
-      
       @group.add_member c
     rescue JSS::NoSuchItemError
       puts "#{$!} - skipping"
@@ -404,11 +403,9 @@ Notes:
     return unless confirm "remove computers from group '#{@group.name}'"
 
     @options.computers.each do |c|
-      
       @group.remove_member c
     rescue JSS::NoSuchItemError
       puts "#{$!} - skipping"
-      
     end
     @group.update
   end
@@ -459,7 +456,7 @@ end # class App
 
 #######################################
 begin
-  app = App.new(ARGV)
+  app = App.new
   app.run
 rescue
   # handle exceptions not handled elsewhere

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/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.0b5'.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.0b5
+  version: 2.1.0
 platform: ruby
 authors:
 - Chris Lasell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-23 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: