lmc 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e239ac693f1144e6391c0aad69e68657ad5498ae51e3b0c92dcc9e163abb15de
-  data.tar.gz: d98d01d4b424db42dc6fb581d763f4b60e20d4e283a87f1b771bd786c8c1a34e
+  metadata.gz: 96d4cb0e5c48a388b0fcaed6aa9bbbfe43275dfa4e5f8de31ed9f22973cd002d
+  data.tar.gz: fcb70677fc2ef666fc28d5e1dd6ca69d6de053fbe9f1a8fbd825d973d32643c4
 SHA512:
-  metadata.gz: abb83a783cfe4247cb3952cdd10df18fd36c4d9ad91d4196783e90aaf5bb39f5be51ee6b65ee1b11c4421077d3479e16f7c10359b83e39e361e90e586c3aee7c
-  data.tar.gz: 778005cf105deaf7fbd4bfd9ba60bb595ffb747e14e924a89dc1e56c5e8790518c9f386770ad36c3876280ed72f08e61bc6f081f0e15fbd8123fd570d4fc9b7b
+  metadata.gz: f94290c326379b14fb128e595a27713af19d14cbcb5eeb9cc59abd193ad6cd5894a85debcf7b22812b6c1ca570a6af0e49bbd0745c5708805b202ca47836c324
+  data.tar.gz: 79751ea5bdbd51b6d1cf9fa76ad0fdadd1c8b070fda7a68b3a7b683b82ddd18f49b006ef0c862526e09ef60286169df6459be55eaedc40bf45728027481e0beb

data/.rubocop.yml

@@ -5,4 +5,64 @@ Layout/FirstHashElementIndentation:
 Layout/LineLength:
   Max: 110
 Style/IfUnlessModifier:
-  Enabled: false
+  Enabled: false
+Gemspec/DateAssignment: # (new in 1.10)
+  Enabled: true
+Layout/SpaceBeforeBrackets: # (new in 1.7)
+  Enabled: true
+Lint/AmbiguousAssignment: # (new in 1.7)
+  Enabled: true
+Lint/DeprecatedConstants: # (new in 1.8)
+  Enabled: true
+Lint/DuplicateBranch: # (new in 1.3)
+  Enabled: true
+Lint/DuplicateRegexpCharacterClassElement: # (new in 1.1)
+  Enabled: true
+Lint/EmptyBlock: # (new in 1.1)
+  Enabled: true
+Lint/EmptyClass: # (new in 1.3)
+  Enabled: true
+Lint/LambdaWithoutLiteralBlock: # (new in 1.8)
+  Enabled: true
+Lint/NoReturnInBeginEndBlocks: # (new in 1.2)
+  Enabled: true
+Lint/NumberedParameterAssignment: # (new in 1.9)
+  Enabled: true
+Lint/OrAssignmentToConstant: # (new in 1.9)
+  Enabled: true
+Lint/RedundantDirGlobSort: # (new in 1.8)
+  Enabled: true
+Lint/SymbolConversion: # (new in 1.9)
+  Enabled: true
+Lint/ToEnumArguments: # (new in 1.1)
+  Enabled: true
+Lint/TripleQuotes: # (new in 1.9)
+  Enabled: true
+Lint/UnexpectedBlockArity: # (new in 1.5)
+  Enabled: true
+Lint/UnmodifiedReduceAccumulator: # (new in 1.1)
+  Enabled: true
+Style/ArgumentsForwarding: # (new in 1.1)
+  Enabled: true
+Style/CollectionCompact: # (new in 1.2)
+  Enabled: true
+Style/DocumentDynamicEvalDefinition: # (new in 1.1)
+  Enabled: true
+Style/EndlessMethod: # (new in 1.8)
+  Enabled: true
+Style/HashConversion: # (new in 1.10)
+  Enabled: true
+Style/HashExcept: # (new in 1.7)
+  Enabled: true
+Style/IfWithBooleanLiteralBranches: # (new in 1.9)
+  Enabled: true
+Style/NegatedIfElseCondition: # (new in 1.2)
+  Enabled: true
+Style/NilLambda: # (new in 1.3)
+  Enabled: true
+Style/RedundantArgument: # (new in 1.4)
+  Enabled: true
+Style/StringChars: # (new in 1.12)
+  Enabled: true
+Style/SwapValues: # (new in 1.1)
+  Enabled: true

data/Rakefile

@@ -13,23 +13,28 @@ end
 
 RuboCop::RakeTask.new(:autocop) do |t|
   autofix = [
+      'Gemspec/OrderedDependencies',
+      'Layout/EmptyLineBetweenDefs',
       'Layout/EmptyLines',
       'Layout/EmptyLinesAroundClassBody',
+      'Layout/EmptyLinesAroundMethodBody',
       'Layout/EmptyLinesAroundModuleBody',
-      'Layout/EmptyLineBetweenDefs',
       'Layout/LeadingCommentSpace',
+      'Layout/SpaceAfterComma',
       'Layout/SpaceAroundOperators',
       'Layout/SpaceInsideBlockBraces',
       'Layout/SpaceInsideHashLiteralBraces',
       'Layout/TrailingEmptyLines',
+      'Lint/RedundantStringCoercion',
+      'Lint/UnusedBlockArgument',
       'Style/CommentAnnotation',
       'Style/FrozenStringLiteralComment',
       'Style/MethodDefParentheses',
-      'Style/RedundantSelf',
       'Style/RedundantReturn',
-      'Style/StringLiterals',
-      'Style/StringLiteralsInInterpolation',
+      'Style/RedundantSelf',
       'Style/StabbyLambdaParentheses',
+      'Style/StringLiterals',
+      'Style/StringLiteralsInInterpolation'
   ]
   t.options = ['--only', autofix.join(','), '--auto-correct', 'lib', 'test', 'Rakefile', 'lmc.gemspec']
 end

data/coverage/.last_run.json

@@ -1,5 +1,5 @@
 {
   "result": {
-    "covered_percent": 92.33
+    "covered_percent": 92.44
   }
 }

data/lib/lmc/Cloud.rb

@@ -30,7 +30,7 @@ module LMC
       @logger ||= ::LMC::Logger.new(STDOUT) if Cloud.debug
       @logger.cloud = self if Cloud.debug
       RestClient.log = @logger if Cloud.debug
-      authorize if auth
+      login if auth
     end
 
     # hide secret fields from being displayed in dumps
@@ -74,9 +74,9 @@ module LMC
       prepared_headers = headers
       prepared_headers[:params] = params
       args = {
-          :method => :get,
-          :url => build_url(path),
-          :headers => prepared_headers
+        :method => :get,
+        :url => build_url(path),
+        :headers => prepared_headers
       }
       execute_request args
     end
@@ -85,22 +85,22 @@ module LMC
       prepared_headers = headers
       prepared_headers[:params] = params
       args = {
-          :method => :put,
-          :url => build_url(path),
-          :payload => body_object.to_json,
-          :headers => prepared_headers
+        :method => :put,
+        :url => build_url(path),
+        :payload => body_object.to_json,
+        :headers => prepared_headers
       }
       execute_request args
     end
 
-    def post(path, body_object, params=nil )
+    def post(path, body_object, params = nil)
       prepared_headers = headers
       prepared_headers[:params] = params
       args = {
-          :method => :post,
-          :url => build_url(path),
-          :payload => body_object.to_json,
-          :headers => prepared_headers
+        :method => :post,
+        :url => build_url(path),
+        :payload => body_object.to_json,
+        :headers => prepared_headers
       }
       execute_request args
     end
@@ -109,9 +109,9 @@ module LMC
       prepared_headers = headers
       prepared_headers[:params] = params
       args = {
-          :method => :delete,
-          :url => build_url(path),
-          :headers => prepared_headers
+        :method => :delete,
+        :url => build_url(path),
+        :headers => prepared_headers
       }
       execute_request args
     end
@@ -145,7 +145,7 @@ module LMC
 
     private
 
-    def authorize(accounts = [], tos = [])
+    def authorize(accounts = [])
       account_ids = accounts.map { |a|
         if a.respond_to? :id
           a.id
@@ -160,20 +160,34 @@ module LMC
                        password: @password,
                        code: @code,
                        accountIds: account_ids,
-                       termsOfUse: tos)
+          )
           @last_authorized_account_ids = account_ids
           @auth_token = reply
           @auth_ok = true
-        rescue ::RestClient::ExceptionWithResponse => e
-          response = JSON.parse(e.response.body)
-          if response['code'] == 100
-            raise LMC::OutdatedTermsOfUseException.new(response)
-          end
-          raise e
         end
       end
     end
 
+    def login(tos = [])
+      begin
+        reply = post(['cloud-service-auth', 'userlogin'],
+                     name: @user,
+                     password: @password,
+                     code: @code,
+                     termsOfUse: tos)
+        @auth_token = reply
+        @auth_ok = true
+      rescue ResponseException => e
+        if e.response['code'] == 104
+          raise LMC::MissingCodeException.new e.response
+        end
+        if e.response['code'] == 100
+          raise LMC::OutdatedTermsOfUseException.new e.response
+        end
+        raise e
+      end
+    end
+
     def auth_bearer
       "Bearer #{session_token}"
     end
@@ -206,7 +220,7 @@ module LMC
           puts 'EX.response: ' + e.response.to_s
           puts JSON.parse(e.response)['message']
         end
-        raise e
+        raise ResponseException.new e.response
       end
     end
   end

data/lib/lmc/Response.rb

@@ -52,7 +52,7 @@ module LMC
     end
 
     def to_s
-      "Response: Code: #{@code}, Body: #{@body_object.to_s}"
+      "Response: Code: #{@code}, Body: #{@body_object}"
     end
 
     def empty?

data/lib/lmc/Site.rb

@@ -14,7 +14,6 @@ module LMC
       @id = data['id']
       @name = data['name']
       @subnet_group_id = data['subnetGroupId']
-
     end
 
     def to_s

data/lib/lmc/User.rb

@@ -22,12 +22,7 @@ module LMC
 
     def update(old_pw)
       cloud = Cloud.instance
-      begin
-        cloud.post ['cloud-service-auth', 'users', 'self', 'password'], 'password' => @password, 'verification' => old_pw
-      rescue RestClient::BadRequest => e
-        response_body = JSON.parse(e.response)
-        raise "#{e.message} - #{response_body['message']}"
-      end
+      cloud.post ['cloud-service-auth', 'users', 'self', 'password'], 'password' => @password, 'verification' => old_pw
     end
 
     def request_pw_reset

data/lib/lmc/config/device_config.rb

@@ -75,12 +75,12 @@ module LMC
 
       result = ''
       result += lcf_header
-      items.each do |key, value|
+      items.to_h.each do |key, value|
         if value.instance_of? String
           result += "#{key} = #{value}\n"
         elsif value.instance_of? Hash
-          rows = value['rows']
-          col_ids = value['colIds']
+          rows = value[:rows]
+          col_ids = value[:colIds]
           if rows.length > 0
             result += "<#{key}>\n"
             rows.each_with_index { |row, index|
@@ -92,7 +92,7 @@ module LMC
           raise 'Unexpected value in config items: ' + value.class.to_s
         end
       end
-      result += lcf_footer
+      result + lcf_footer
     end
 
     def current_device_type
@@ -127,6 +127,7 @@ module LMC
     # @return [String]
     def lcf_feature_id_string
       hex_features = current_device_type.features.map { |feature| feature.to_s 16 }
+      hex_features << '80000800' # Magic feature to cause lanconfig to show the password
       "IDs:#{hex_features.join(',')}"
     end
 
@@ -161,7 +162,8 @@ module LMC
     end
 
     def fetch_result
-      response_or_ticket = @cloud.get(url_configbuilder).body
+      # TODO: Make parameters settable
+      response_or_ticket = @cloud.get(url_configbuilder, { includePasswords: 'TRUE', includeSmartApps: 'FALSE' }).body
       if response_or_ticket.respond_to? 'ticketId'
         @ticket_id = response_or_ticket.ticketId
         redeem_ticket 5

data/lib/lmc/config/device_dsc_ui.rb

@@ -32,7 +32,6 @@ module LMC
         raise('More than one version key contained in dscui.') if keys.length > 1
         @version_string = keys.first
         @sections = v_hash[@version_string].map { |section_wrapper| Section.new section_wrapper }
-
       end
 
       def items
@@ -54,7 +53,6 @@ module LMC
         @groups = members.map { |group_wrapper|
           Group.new group_wrapper unless group_wrapper['group'].nil?
         }.compact
-
       end
     end
 

data/lib/lmc/entity.rb

@@ -6,7 +6,7 @@ module LMC
       raise 'Missing argument' if term.nil?
       begin
         get_by_uuid term
-      rescue RestClient::BadRequest, URI::InvalidURIError
+      rescue RestClient::BadRequest, URI::InvalidURIError, LMC::ResponseException
         get_by_name term
       end
     end

data/lib/lmc/exceptions/lmc_outdated_terms_of_use_exception.rb

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
 module LMC
-  class OutdatedTermsOfUseException < Exception
-    def initialize(response = {})
-      @response = response
-    end
-
+  class OutdatedTermsOfUseException < ResponseException
     def response
       r = "Terms of use must be accepted before using this LMC instance:\n"
       missing.each do |tos|

data/lib/lmc/exceptions/lmc_two_factor_required_exception.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module LMC
+  # Exception representing a missing 2FA code. (2fa enabled but code not sent)
+  class MissingCodeException < ResponseException
+  end
+end
+

data/lib/lmc/exceptions/response_exception.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+module LMC
+  class ResponseException < RuntimeError
+    attr_reader :response
+
+    # Initialize a ResponseException.
+    #
+    # @param [Object] response restclient Response
+    def initialize(response)
+      if response.is_a? LMCResponse
+        @response = response
+      else
+        @response = LMCResponse.new response
+      end
+    end
+
+    def message
+      cause.message
+    end
+  end
+end
+

data/lib/lmc/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module LMC
-  VERSION = '0.14.0'
+  VERSION = '0.15.0'
 end
 

data/lmc.gemspec

@@ -33,13 +33,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'minitest', '~> 5.11'
   spec.add_development_dependency 'minitest-reporters', '~> 1'
+  spec.add_development_dependency 'pry-nav', '~> 0.2.4'
   spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rubocop', '~> 1.14'
   spec.add_development_dependency 'simplecov', '~> 0.15'
-  spec.add_development_dependency 'pry-nav', '~> 0.2.4'
-  spec.add_development_dependency 'rubocop', '~> 0.58.1'
 
   spec.add_runtime_dependency 'json', '~> 2.3'
-  spec.add_runtime_dependency 'rest-client', '~> 2.0'
   spec.add_runtime_dependency 'recursive-open-struct', '~> 1.1'
+  spec.add_runtime_dependency 'rest-client', '~> 2.0'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lmc
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - erpel
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,61 +53,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: 0.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: pry-nav
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '1.14'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.58.1
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.58.1
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -123,33 +123,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: recursive-open-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: recursive-open-struct
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 description:
 email:
 - philipp@copythat.de
@@ -190,6 +190,8 @@ files:
 - lib/lmc/device_config_state.rb
 - lib/lmc/entity.rb
 - lib/lmc/exceptions/lmc_outdated_terms_of_use_exception.rb
+- lib/lmc/exceptions/lmc_two_factor_required_exception.rb
+- lib/lmc/exceptions/response_exception.rb
 - lib/lmc/logger.rb
 - lib/lmc/membership.rb
 - lib/lmc/mixins/json_able.rb