lmcadm 0.10.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 938d019f4b6505f37a438e3067e6a6e1dcf7fea9
-  data.tar.gz: a95c69c72ba3a0c9a49662bd234cedfaf7b40528
+SHA256:
+  metadata.gz: '0925f20d360b3e8e6740c298a99c12b67474ae9d8d0c1ff6a426109cc9810ef7'
+  data.tar.gz: a3be3188b433d777bce80b5807c497ca41d15c9fa65037eaec5421abd2c6490b
 SHA512:
-  metadata.gz: ebdf152550d92de31951c1dc9cd01275bf82463fc483e995804042429a4e0b067396d2c6231e02193fa94644f961c8bb274ae209acce85627dc1848ec506839e
-  data.tar.gz: 7a9a3f51b97d8a6c8396e4ad247880087dcb7f8829c1e9f6ae61599fa2ec810de60d9685a4cc4876c1b681230af9050e57f66d80c4685070736f07139a02b6ae
+  metadata.gz: 1958b20290dcad4adcddfbb87de3e0352f9e6efa8f5ddd8e343bf1bb3ac5b757ec6cffb61081402fdff986a7d454210ad64d1662f4ac8519e3b9c406e53b5a08
+  data.tar.gz: 3398cb285de12bb7a2211a609fea72cd7f421827e45133c751482f072fa370509d860707c94a7ff1042d2a243ebe0553086cb09da316e24b837b4a46e3a80b15

data/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Rubocop" enabled="false" level="WARNING" enabled_by_default="false" />
+  </profile>
+</component>

data/.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.7.1

data/Rakefile

@@ -1,10 +1,15 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
+require 'rdoc/task'
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
   t.test_files = FileList["test/**/*_test.rb"]
 end
-
+RDoc::Task.new do |rdoc|
+  rdoc.rdoc_dir = 'doc'
+  #rdoc.main = "README.rdoc"
+  #rdoc.rdoc_files.include("lib/lmcadm/helpers/args_helpers.rb")
+end
 task :default => :test

data/dev_lmcadm

@@ -0,0 +1,4 @@
+#!/bin/sh
+#wrapper script
+#set -x
+LMCADM_PATH_DEP=1 GLI_DEBUG=false bundle exec exe/lmcadm "$@"

data/lib/lmcadm.rb

@@ -1,7 +1,3 @@
-#require "lmcadm/version"
-#require 'lmcadm/account_commands'
-#require 'lmcadm/test_command_container'
-
 Dir.glob(File.expand_path("../lmcadm/*.rb", __FILE__)).each do |file|
   require file
 end

data/lib/lmcadm/account_commands.rb

@@ -29,9 +29,9 @@ module LMCAdm
         accounts.sort {|a, b| a["name"] <=> b["name"]}.each do |account|
           puts account.inspect if global_options[:v]
           if options[:l]
-            puts account["name"] + " (" + account["type"] + ") ID: " + account["id"]
+            puts account.summary
           else
-            puts account["name"] + " (" + account["type"] + ")"
+            puts "\"#{account}\" (#{account["type"]})"
           end
         end
         puts accounts.length.to_s + " Accounts found"

data/lib/lmcadm/cloud_commands.rb

@@ -27,6 +27,7 @@ module LMCAdm
         }}
         tp backstage_infos
         puts '---'
+        puts "Base URL: #{cloud.build_url}"
         puts "Principal: #{LMC::Principal.get_self(cloud)}"
 
       end

data/lib/lmcadm/commands/maintenance.rb

@@ -7,27 +7,37 @@ module LMCAdm
         root_account = LMC::Account.get LMC::Account::ROOT_ACCOUNT_UUID
         cloud = LMC::Cloud.instance
         cloud.auth_for_account root_account
-        result = cloud.post ['cloud-service-devices', 'maintenance', 'licenses', 'resync'], { 'accountId' => args[0] }
+        result = cloud.post ['cloud-service-devices', 'maintenance', 'licenses', 'resync'], {'accountId' => args[0]}
       end
     end
 
-    maintenance.arg_name 'UUID'
+    maintenance.arg_name 'UUID', [:required]
     maintenance.desc 'Enable scripting for an account'
     maintenance.command :scripting do |scr|
+      scr.desc 'Change the state of scripting'
       scr.switch :enable
+      scr.desc 'Get the state of scripting'
+      scr.switch :get
       scr.action do |global_options, options, args|
+        raise "No account UUID specified" if args.length < 1
         root_account = LMC::Account.get LMC::Account::ROOT_ACCOUNT_UUID
         cloud = LMC::Cloud.instance
         cloud.auth_for_account root_account
-        result = cloud.put ['cloud-service-config', 'configroot', 'accounts', args.first, 'scriptauthority'], options[:enable]
-        raise "error - unexpected result" unless result.body == options[:enable]
+        if options[:get]
+          result = cloud.get ['cloud-service-config', 'configroot', 'accounts', args.first, 'scriptauthority']
+          puts result.body
+        else
+          result = cloud.put ['cloud-service-config', 'configroot', 'accounts', args.first, 'scriptauthority'], options[:enable]
+          raise "error - unexpected result" unless result.body == options[:enable]
+        end
       end
     end
 
-    maintenance.arg_name 'UUID', required: true
+    maintenance.arg_name 'UUID'
     maintenance.desc 'Exempt user from brute force blocking'
     maintenance.command :whitelist do |wl|
       wl.action do |_g, _o, args|
+        Helpers.ensure_arg args, kind: 'user uuid'
         cloud = LMC::Cloud.instance
         root_account = LMC::Account.get LMC::Account::ROOT_ACCOUNT_UUID
         cloud.auth_for_account root_account
@@ -36,5 +46,20 @@ module LMCAdm
         cloud.post url_components, {}
       end
     end
+
+    maintenance.arg_name 'UUID', required: true
+    maintenance.desc 'Remove entity from blacklist'
+    maintenance.command :unblacklist do |unbl|
+      unbl.flag 'entity-type', :t, desc: 'Entity type. Choose "principals" or "accounts".', required: true
+      unbl.flag 'process-type', :p, desc: 'Process type', default_value: 'CLAIMING'
+      unbl.action do |_g, o, args|
+        Helpers.ensure_arg args, kind: 'entity uuid'
+        cloud = LMC::Cloud.instance
+        root_account = LMC::Account.get LMC::Account::ROOT_ACCOUNT_UUID
+        cloud.auth_for_account root_account
+        url_components = ['cloud-service-devices', 'accesscontrol', o['process-type'], o['entity-type'], args.first]
+        cloud.delete url_components
+      end
+    end
   end
 end

data/lib/lmcadm/commands/preferences.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module LMCAdm #:nodoc:
+  desc 'Manipulate preferences'
+  command :preferences do |preferences|
+    preferences.desc 'Get last account data'
+    preferences.arg_name 'accounts'
+    preferences.command :lastaccounts do |la|
+      la.action do |g, _o, args|
+        cloud = LMC::Cloud.new(g[:cloud_host], g[:user], g[:password])
+        self_ui = cloud.preferences [:principals, :self, :ui]
+        if args.empty?
+          ids = self_ui.get 'lastAccountIds'
+          accounts = ids.map do |id|
+            LMC::Account.get id
+          end
+          accounts.each { |a|
+            puts a.summary
+          }
+        else
+          account_ids = args.map { |arg|
+            LMC::Account.get_by_uuid_or_name(arg).id
+          }
+          puts account_ids
+          puts self_ui.put 'lastAccountIds', account_ids
+        end
+      end
+    end
+  end
+end
+

data/lib/lmcadm/commands/terminal.rb

@@ -0,0 +1,118 @@
+require 'websocket-eventmachine-client'
+require 'io/console'
+require 'date'
+module LMCAdm
+
+  class KeyboardHandler < EM::Connection
+    def receive_data(data)
+      if data == "\C-c"
+        EventMachine::stop_event_loop
+      end
+      LMCAdm::getWS.send '1' + data, type: 'binary'
+
+    end
+    #include EM::Protocols::LineText2
+
+    #def receive_line(data)
+    #  LMCAdm::getWS.send '1' + data.strip + "\r", type: 'binary'
+    #end
+  end
+
+  def self.getWS
+    @ws
+  end
+
+  arg_name "device"
+  desc "Open terminal"
+  command :terminal do |t|
+    t.desc "Account name|UUID"
+    t.flag :account, :A, :required => true
+
+    t.action do |g, o, args|
+      account = LMC::Account.get_by_uuid_or_name o[:account]
+      device = Helpers::find_device account.devices, name: args.first, id: args.first
+      account.cloud.auth_for_account account
+      payload = {type: 'TERMINAL',
+                 deviceIds: [device.id]}
+      sessionInfo = account.cloud.post ['cloud-service-devicetunnel', 'accounts', account.id, 'terminal'], payload
+
+
+      if g['use-tls']
+        url = 'wss://'
+      else
+        url = 'ws://'
+      end
+      url += g[:cloud_host]
+      url += '/cloud-service-devicetunnel/session'
+      headers_hash = {
+          'Sec-WebSocket-Protocol' => "TYPE_TERMINAL, REQU_USER, IDEN_#{sessionInfo.body.first['id']}, ACCT_#{account.id}, DEVC_#{device.id}"
+      }
+      begin
+        EventMachine.epoll
+        EventMachine.run do
+          trap("TERM") { stop g[:debug] }
+          trap("INT") { stop g[:debug] }
+          IO.console.raw!
+          EventMachine.open_keyboard(LMCAdm::KeyboardHandler)
+          @ws = WebSocket::EventMachine::Client.connect({uri: url, headers: headers_hash})
+          closing = false
+
+          @ws.onopen do
+            print "Connected to #{device.name} (#{device.id}):\r\n"
+            remaining_args = args.drop(1)
+            if remaining_args.length > 0
+              @ws.send '1' + remaining_args.join(' ') + "\r", type: 'binary'
+            end
+          end
+
+          @ws.onmessage do |msg, type|
+            print "##{msg.length}##{msg.inspect}#" if g[:debug]
+            # respond to custom keepalive
+            if msg.start_with? '0'
+              @ws.send '0', type: 'binary'
+            end
+            if msg.start_with? "1"
+              print msg[1..-1].gsub("\n", "\r\n")
+            else
+              print msg if g[:debug]
+            end
+            print DateTime.now.to_s if g[:debug]
+            if msg.include? "\n\nGoodbye\n\n"
+              stop g[:debug]
+              closing = true
+            end
+          end
+
+          @ws.onclose do
+            print DateTime.now.to_s if g[:debug]
+            print "Disconnected\r\n"
+            stop g[:debug] unless closing
+          end
+
+          @ws.onerror do |e|
+            puts "Error: #{e}"
+          end
+
+          @ws.onping do |msg|
+            puts "Received ping: #{msg}" if g[:verbose]
+          end
+
+          @ws.onpong do |msg|
+            puts "Received pong: #{msg}" if g[:verbose]
+          end
+
+          def stop(debug = false)
+            print DateTime.now.to_s if debug
+            print "Terminating connection\r\n"
+            EventMachine.stop
+          end
+        end
+      ensure
+        IO.console.cooked!
+      end
+      # disabled, getting 401 anyways
+      #account.cloud.auth_for_account account
+      #account.cloud.delete ['cloud-service-devicetunnel', 'accounts', account.id, "terminal?ids=#{sessionInfo.body.first['id']}"]
+    end
+  end
+end

data/lib/lmcadm/helpers/args_helpers.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+module LMCAdm
+  module Helpers
+    # Verifies that args contains at least one object.
+    # Raises RuntimeError with either the given message or an error explaining that kind is expected.
+    #
+    # @param [Object] args
+    # @param [String (frozen)] kind optional
+    # @param [Object] message optional
+    def self.ensure_arg(args, kind: 'argument', message: nil)
+      error = ""
+      if args.length < 1
+        error = "Argument missing: No #{kind} specified."
+        error = message if message
+      end
+      raise error unless error.empty?
+      return args
+    end
+  end
+end
+

data/lib/lmcadm/helpers/device_helpers.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+module LMCAdm
+  module Helpers
+    def self.find_device(devices, name: '', id: '')
+      found = devices.select do |device|
+        (id == device.id) || (name == device.name)
+      end
+      raise "More than one device found for: #{name} #{id}" if found.length > 1
+      raise "Device not found: #{name} #{id}" if found.length < 1
+      return found.first
+    end
+  end
+end
+

data/lib/lmcadm/helpers/password_helper.rb

@@ -1,5 +1,5 @@
-require 'io/console'
 # frozen_string_literal: true
+require 'io/console'
 
 module LMCAdm
   # This module includes helpers for shared functionality across the

data/lib/lmcadm/version.rb

@@ -1,3 +1,3 @@
 module LMCAdm
-  VERSION = '0.10.0'
+  VERSION = '0.14.0'
 end

data/lmcadm

@@ -1,4 +1,4 @@
 #!/bin/sh
 #wrapper script
 #set -x
-GLI_DEBUG=true bundle exec exe/lmcadm "$@"
+GLI_DEBUG=false bundle exec exe/lmcadm "$@"

data/lmcadm.gemspec

@@ -20,12 +20,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "pry-nav", "0.2.4"
 
-  spec.add_runtime_dependency 'lmc', '~> 0.10.1'
+  spec.add_runtime_dependency 'lmc', '~> 0.12.0'
   spec.add_runtime_dependency 'gli', '~> 2.17'
   spec.add_runtime_dependency 'table_print', '~> 1.5'
   spec.add_runtime_dependency 'colorize', '~> 0.8'
+  spec.add_runtime_dependency 'websocket-eventmachine-client', '~> 1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lmcadm
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.14.0
 platform: ruby
 authors:
 - erpel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2020-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: websocket-eventmachine-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 description: 
 email:
 - philipp@copythat.de
@@ -132,6 +146,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".idea/encodings.xml"
+- ".idea/inspectionProfiles/Project_Default.xml"
 - ".idea/vcs.xml"
 - ".ruby-version"
 - Gemfile
@@ -140,6 +155,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- dev_lmcadm
 - exe/lmcadm
 - lib/lmcadm.rb
 - lib/lmcadm/ColoredProgressVisualizer.rb
@@ -152,11 +168,15 @@ files:
 - lib/lmcadm/commands/completion.rb
 - lib/lmcadm/commands/maintenance.rb
 - lib/lmcadm/commands/monitor.rb
+- lib/lmcadm/commands/preferences.rb
 - lib/lmcadm/commands/principal.rb
 - lib/lmcadm/commands/privatecloud.rb
 - lib/lmcadm/commands/rights.rb
+- lib/lmcadm/commands/terminal.rb
 - lib/lmcadm/config_commands.rb
 - lib/lmcadm/device_commands.rb
+- lib/lmcadm/helpers/args_helpers.rb
+- lib/lmcadm/helpers/device_helpers.rb
 - lib/lmcadm/helpers/password_helper.rb
 - lib/lmcadm/helpers/string_helpers.rb
 - lib/lmcadm/version.rb
@@ -181,8 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: lmcadm is a command line client for LMC