lmcadm 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 745a5304645376df76004e6c5130341aba234243
-  data.tar.gz: 9ace3654a56c6d756417317fc1a5ebcf07edb1eb
+SHA256:
+  metadata.gz: 77cf9b8cd93328770c7b0c0972ccd1dc3883caba497eee0f97ed26bbe5976680
+  data.tar.gz: cd5023a45af514136f7d82162e07e9901016aebd01f1ccf9762dfb530e609ac9
 SHA512:
-  metadata.gz: f350bbb06491ffc16d75be0e6e47987882f7c9fd1e3c8211f340c417bc1e04558fe778891f20738ac0f136a9236f455742317a33c27d501c164280f740a1061a
-  data.tar.gz: 1bb9baf23b511dff5df7424b694fd080723face9035bcb2ebfb1853e484b75c8cb46e926bfe8514e3489f9b98fa38d8c636bd42687856c463f9f28a4bc00634d
+  metadata.gz: b29cf69f6ff585537667174b14164f3dfdad88016ef724242e4dcbc7876a22b75a17953d3860b50d36dc7a49295797127215fca6572bd7f1dda3920185190926
+  data.tar.gz: 5d0a07f656a6bb3c0c1dc7b9b410c340f2256294ac14fdece08cd417c4979b9742eb064dfefd48aaeef7b0604e7f0a935431fe396d7481321c74b4ba23b34fe3

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/lib/lmcadm/commands/terminal.rb

@@ -0,0 +1,110 @@
+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 = account.devices.find { |d| d.name == 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
+            puts "Connected"
+          end
+
+          @ws.onmessage do |msg, type|
+            print "##{msg.length}##{msg.inspect}#" if g[:debug]
+            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/version.rb

@@ -1,3 +1,3 @@
 module LMCAdm
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 end

data/lmcadm.gemspec

@@ -24,8 +24,9 @@ Gem::Specification.new do |spec|
   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.11.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.12.0
 platform: ruby
 authors:
 - erpel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-10 00:00:00.000000000 Z
+date: 2020-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.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
@@ -155,6 +170,7 @@ files:
 - 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/password_helper.rb
@@ -181,8 +197,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