ruby-jss 1.2.9 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44439acce68bb49aeb3da5c4cf4505a3e5bf7b36ca41de4bfd757c529aef15b4
-  data.tar.gz: 75596bf86aa714f16c8dd84bfa28e6f4f2e06371e681c898f28ad8f27cfbbdfb
+  metadata.gz: 0734256ff4d9e553418ff9e0189e85cbb455751e682af0278dfff3f85f9a6070
+  data.tar.gz: 40fde852a9d6f4cc22a804b0240038bdb17d319e1d51edaa8c974ad50d05861d
 SHA512:
-  metadata.gz: 7dd80d0809c30e843cc52d408ca0586f1499e58ca11c73f3a5ffa596472c24e9f7058a9c04cc64dcad5b34e4578ab7436fe58e08c119bb2c095a0d07dc8ad8db
-  data.tar.gz: 26fea8c492531bbf6f5138617837776657a8b0e1193192c7c04b5dcef49ada7fb237b44142e05914a02bdaf4aa79a94006f4be0d7b34af86a1e76216246b84cb
+  metadata.gz: 721bc4ef63c7c1114a66bb772a609c4589879977e65922eb008dacf478ea17cc09a78e367e4a8297b46139b9d08f5d16fa6ffa7e0516af6c7ccc571ab37e39da
+  data.tar.gz: 0d8788ff29178d488fc11da8fa4c77c3ca5b40c8a770979cc7bf11bb8ab727f43315e2632ed74c8ae9685d79142e2536e1239624c236ba218fc2de5c70adddd4

data/CHANGES.md

@@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## \[1.2.10] - 2020-04-25
+
+### Added
+
+  - Computer#reported_ip_address. This value is collected in newer versions of Jamf Pro. While the #ip_address is the client's IP address from the Jamf Server's perspective, the #reported_ip_address is the IP from the client's perspective, which may be different on a NATted network like a home network.
+
+### Fixed
+
+  - MobileDevice#upload now works like Computer#upload
+
+### Changed
+
+  - Validation of Ext. Attribute values is improved, namely for EAs with integer values, integer-strings like "12" are accepted and converted to real integers as needed.
+
 ## \[1.2.9] - 2020-04-13
 
 ### Fixed

data/lib/jss/api_object/computer.rb

@@ -529,9 +529,12 @@ module JSS
     # @return [Time] when was it added to the JSS
     attr_reader :initial_entry_date
 
-    # @return [IPAddr] the last known IP address
+    # @return [IPAddr] the last known IP address from the server's perspective
     attr_reader :ip_address
 
+    # @return [IPAddr] the last known IP address from the client's perspecive
+    attr_reader :reported_ip_address
+
     # @return [Boolean]
     attr_reader :itunes_store_account_is_active
 
@@ -784,6 +787,7 @@ module JSS
         @initial_entry_date = JSS.epoch_to_time @init_data[:general][:initial_entry_date_epoch]
         @last_enrolled = JSS.epoch_to_time @init_data[:general][:last_enrolled_date_epoch]
         @ip_address = @init_data[:general][:ip_address]
+        @reported_ip_address = @init_data[:general][:last_reported_ip]
         @itunes_store_account_is_active = @init_data[:general][:itunes_store_account_is_active]
         @jamf_version = @init_data[:general][:jamf_version]
         @last_contact_time = JSS.epoch_to_time @init_data[:general][:last_contact_time_epoch]

data/lib/jss/api_object/extendable.rb

@@ -180,34 +180,21 @@ module JSS
     #
     # @return [void]
     #
-    def set_ext_attr(name, value, validate_popup_choice: true, refresh: false)
-      raise ArgumentError, "Unknown Extension Attribute Name: '#{name}'" unless ea_types.key? name
+    def set_ext_attr(ea_name, value, validate_popup_choice: true, refresh: false)
+      raise ArgumentError, "Unknown Extension Attribute Name: '#{ea_name}'" unless ea_types.key? ea_name
 
-      value ||= JSS::BLANK
-      validate_popup_value(name, value, refresh) if validate_popup_choice
-
-      value =
-        case ea_types[name]
-        when JSS::ExtensionAttribute::DATA_TYPE_DATE # date
-          JSS.parse_datetime(value).to_s
-        when *JSS::ExtensionAttribute::NUMERIC_TYPES # integer
-          if value.is_a? Integer
-            value
-          elsif value.to_s.jss_integer?
-            value.to_s.to_i
-          else
-            raise JSS::InvalidDataError, "The value for #{name} must be an integer"
-          end # if
-        else # string
-          value.to_s
-        end # case
+      value = validate_ea_value(ea_name, value, validate_popup_choice, refresh)
 
       # update this ea hash in the @extension_attributes array
-      @extension_attributes.each { |ea| ea[:value] = value if ea[:name] == name }
+      ea_hash = @extension_attributes.find { |ea| ea[:name] == ea_name }
+
+      raise JSS::NoSuchItemError, "#{self.class} '#{name}'(id #{id}) does not know about ExtAttr '#{ea_name}'. Please re-fetch and try again." unless ea_hash
+
+      ea_hash[:value] = value
 
       # update the shortcut hash too
-      @ext_attrs[name] = value if @ext_attrs
-      @changed_eas << name
+      @ext_attrs[ea_name] = value if @ext_attrs
+      @changed_eas << ea_name
       @need_to_update = true
     end
 
@@ -251,22 +238,71 @@ module JSS
       eaxml
     end
 
-    # Used by set_ext_attr
-    def validate_popup_value(name, value, refresh)
-      # all popups can take blanks
-      return if value == JSS::BLANK
+    # is the value being passed to set_ext_attr valid?
+    # Converts values as needed (e.g. strings to integers or Times)
+    #
+    # If the EA is defined to hold a string, any value is accepted and
+    # converted with #to_s
+    #
+    # Note: All EAs can be blank
+    #
+    # @param name[String] the name of the extension attribute to set
+    #
+    # @param value[String,Time,Integer] the new value for the extension
+    #   attribute for this user
+    #
+    # @param validate_popup_choice[Boolean] validate the new value against the E.A. definition.
+    #   Defaults to true.
+    #
+    # @param refresh[Boolean] Re-read the ext. attrib definition from the API,
+    #   for popup validation.
+    #
+    # @return [Object] the possibly modified valid value
+    #
+    def validate_ea_value(ea_name, value, validate_popup_choice, refresh)
+      return JSS::BLANK if value.to_s == JSS::BLANK
+
+      value =
+        case ea_types[ea_name]
+        when JSS::ExtensionAttribute::DATA_TYPE_DATE
+          JSS.parse_datetime(value).to_s
+        when *JSS::ExtensionAttribute::NUMERIC_TYPES
+          validate_integer_ea_value ea_name, value
+        else
+          value.to_s
+        end # case
+
+      validate_popup_value(ea_name, value, refresh) if validate_popup_choice
+
+      value
+    end
+
+    # raise error if the value isn't an integer
+    def validate_integer_ea_value(ea_name, value)
+      if value.is_a? Integer
+        value
+      elsif value.to_s.jss_integer?
+        value.to_s.to_i
+      else
+        raise JSS::InvalidDataError, "The value for #{ea_name} must be an integer"
+      end # if
+    end
 
+    # Raise an error if the named EA has a popup menu,
+    # but the provided value isn't one of the menu items
+    #
+    def validate_popup_value(ea_name, value, refresh)
       # get the ea def. instance from the api cache, or the api
       api.ext_attr_definition_cache[self.class] ||= {}
-      api.ext_attr_definition_cache[self.class][name] = nil if refresh
-      api.ext_attr_definition_cache[self.class][name] ||= self.class::EXT_ATTRIB_CLASS.fetch name: name, api: api
+      api.ext_attr_definition_cache[self.class][ea_name] = nil if refresh
+      api.ext_attr_definition_cache[self.class][ea_name] ||= self.class::EXT_ATTRIB_CLASS.fetch name: ea_name, api: api
 
-      ea_def = api.ext_attr_definition_cache[self.class][name]
+      ea_def = api.ext_attr_definition_cache[self.class][ea_name]
       return unless ea_def.from_popup_menu?
 
       return if ea_def.popup_choices.include? value.to_s
 
-      raise JSS::UnsupportedError, "The value for #{name} must be one of: '#{ea_def.popup_choices.join("' '")}'"
+      raise JSS::UnsupportedError, "The value for #{ea_name} must be one of: '#{ea_def.popup_choices.join("' '")}'"
     end
 
   end # module extendable

data/lib/jss/api_object/mobile_device.rb

@@ -132,6 +132,9 @@ module JSS
 
     NON_UNIQUE_NAMES = true
 
+    # file uploads can send attachments to the JSS using :mobiledevices as the sub-resource.
+    UPLOAD_TYPES = { attachment: :mobiledevices }.freeze
+
     # This class lets us seach for computers
     SEARCH_CLASS = JSS::AdvancedMobileDeviceSearch
 

data/lib/jss/version.rb

@@ -27,6 +27,6 @@
 module JSS
 
   ### The version of ruby-jss
-  VERSION = '1.2.9'.freeze
+  VERSION = '1.2.10'.freeze
 
 end # module

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jss
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.10
 platform: ruby
 authors:
 - Chris Lasell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2020-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist