lmcadm 0.11.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 745a5304645376df76004e6c5130341aba234243
-  data.tar.gz: 9ace3654a56c6d756417317fc1a5ebcf07edb1eb
+SHA256:
+  metadata.gz: 44c6d0a6cd45c6c772311396c13646899f7db20675004254fc70cb1821620d3c
+  data.tar.gz: 93484873efe2767cb5c7911d00e72be3937cc7fbed2e29dfd3cbaeeb4d634d1d
 SHA512:
-  metadata.gz: f350bbb06491ffc16d75be0e6e47987882f7c9fd1e3c8211f340c417bc1e04558fe778891f20738ac0f136a9236f455742317a33c27d501c164280f740a1061a
-  data.tar.gz: 1bb9baf23b511dff5df7424b694fd080723face9035bcb2ebfb1853e484b75c8cb46e926bfe8514e3489f9b98fa38d8c636bd42687856c463f9f28a4bc00634d
+  metadata.gz: d9790f5e3e28fcd2fc3b4a8633b47019b3190e166bc15e9e926ee552620a6ad9a1edb4364f2355c9c4a0cc523db6997f042bccbcdf8f07d781611d1fdf4759ee
+  data.tar.gz: 92ed71b779d0bb817035a51965f4c308ce76cff89c4ddc86f8b06faf940766242e513260164eec6fb62b9c198fbb1e722072a8dc9c65e1be2f475070221d01f8

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/README.md

@@ -8,6 +8,12 @@ Install via rubygems:
 
     $ gem install lmcadm
 
+### Requirements
+Building native extensions for certain dependencies require ruby headers or source code to be present.
+These can usually be installed the same way ruby was installed.
+
+On Ubuntu for example, installing the `ruby-dev` via the package manager is sufficient.
+
 ## Usage
 
 The primary usage documentation is in the help output of lmcadm:

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/exe/lmcadm

@@ -25,7 +25,7 @@ module LMCAdm
   commands_from "lmcadm/commands"
 
   desc 'Be verbose'
-  switch [:v, :verbose]
+  switch :verbose, :v
 
   desc 'debug'
   switch [:debug]
@@ -33,9 +33,9 @@ module LMCAdm
   desc 'Measure time taken for operations'
   switch "take-time"
 
-  desc 'cloud host'
+  desc 'LMC host, may include a port number'
   default_value "cloud.lancom.de"
-  flag :C, :cloud_host
+  flag :cloud_host, :C
 
   desc 'Use encrypted connection'
   default_value true
@@ -46,13 +46,16 @@ module LMCAdm
   switch "verify-tls"
 
   desc 'username'
-  default_value "admin"
-  flag :U, :user
+  default_value ""
+  flag :user, :U
 
   desc 'password'
   default_value ""
-  flag [:P, :password], :mask => true
+  flag [:password, :P], :mask => true
 
+  desc 'Use 2FA code'
+  default_value false
+  switch [:code, 'F']
 
   pre do |global, command, options, args|
     # Pre logic here
@@ -60,12 +63,23 @@ module LMCAdm
     # chosen command
     # Use skips_pre before a command to skip this block
     # on that command only
-    if command.name != :completion && global[:password] == ""
-      global[:password] = Helpers::read_pw "Enter password for #{global[:user]}:"
+    if command.name != :completion
+      if global[:user] == ""
+        print "Enter user:"
+        global[:user] = STDIN.gets.chomp
+      end
+      if global[:password] == ""
+        global[:password] = Helpers::read_pw "Enter password for #{global[:user]}:"
+      end
+      twofactor_code = nil
+      if global[:code]
+        twofactor_code = Helpers::read_pw "Enter 2FA code:"
+      end
     end
     ::LMC::Cloud.cloud_host = global[:cloud_host]
     ::LMC::Cloud.user = global[:user]
     ::LMC::Cloud.password = global[:password]
+    ::LMC::Cloud.code = twofactor_code
     ::LMC::Cloud.verbose = global[:verbose]
     ::LMC::Cloud.debug = global[:debug]
     ::LMC::Cloud.verify_tls = global["verify-tls"]

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

@@ -16,7 +16,7 @@ module LMCAdm
       account_list.switch :l, :long
       account_list.action do |global_options, options, args|
         t = ProgressVisualizer.new "Cloud login"
-        lmcen = LMC::Cloud.new(global_options[:cloud_host], global_options[:user], global_options[:password])
+        lmcen = LMC::Cloud.instance
         t.done
         t = ProgressVisualizer.new "Getting accounts"
         accounts = lmcen.get_accounts_objects
@@ -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

@@ -8,13 +8,15 @@ module LMCAdm
   command :cloud do |c|
     c.desc 'Check cloud connectivity'
     c.action do |global_options|
-      lmcen = LMC::Cloud.new(global_options[:cloud_host], global_options[:user], global_options[:password])
+      lmcen = LMC::Cloud.instance
       puts "Base URL: #{lmcen.build_url}"
       puts "Cloud connection OK" if lmcen.auth_ok
       if global_options[:v]
         puts "authentication token: " + lmcen.session_token
       end
     end
+
+    c.desc 'Display cloud version information'
     c.command :about do |cloud_about|
       cloud_about.action do |global_options|
         cloud = LMC::Cloud.instance
@@ -27,6 +29,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,7 +7,7 @@ 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
 
@@ -33,10 +33,11 @@ module LMCAdm
       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
@@ -45,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.instance
+        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.11.0'
+  VERSION = '0.15.0'
 end

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.13.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.11.0
+  version: 0.15.0
 platform: ruby
 authors:
 - erpel
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-10 00:00:00.000000000 Z
+date: 2021-01-15 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.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,21 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-description: 
+- !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
 executables:
@@ -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,21 +168,25 @@ 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
 - lmcadm
 - lmcadm.gemspec
-homepage: 
+homepage:
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -181,9 +201,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: lmcadm is a command line client for LMC
 test_files: []