adminix 0.1.31 → 0.1.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb85f4bd32b438166c08aceea4263ecce8b9e441
-  data.tar.gz: 0ce46f5fa2859c4a9e46960bddadc8a0428d5980
+  metadata.gz: 394f5bc9d28519303e33da4a2b6291c084e65114
+  data.tar.gz: 85c575b7aecf227c88540e294e30ef2f83c5ff95
 SHA512:
-  metadata.gz: 32f86bac5cf5ce86406432a34851fab03c40689bc4c51b2ad18f7b7aa6d6466878201d79b4f39408577dfe638edccf0a61c0a00f42661a9694fd6ab323851586
-  data.tar.gz: cbdbf8fe21af63db4b2c29a2b9c609535411122b0c00fbaa74afff4f121f5101648af8d6e0ecd74081e4f3cbbe3952a102a7764b8dbd83d15f35b5f7ffbc8139
+  metadata.gz: 510c728c69e178676d18dad4756faf6c058e5c687bf0bb6b76cd742ea0a6e4da83dec5c4dfbc2b80eae57e5bf5e4a9f1a480929227f81511197b971d364e0a55
+  data.tar.gz: ce4777e0982273ab8491ad99e54738169bb7ebbbb4fe7abcef2b1f8d0d9ddeac6f8b08a50f6f041889bf771214505ef06b25690ce8158d5be15f17c6035ec967

data/adminix.gemspec

@@ -4,39 +4,41 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'adminix/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "adminix"
+  spec.name          = 'adminix'
   spec.version       = Adminix::VERSION
-  spec.authors       = ["Christian Dyl"]
-  spec.email         = ["christian.dyl@outlook.com"]
+  spec.authors       = ['Christian Dyl']
+  spec.email         = ['christian@adminix.io']
 
-  spec.summary       = "Adminix"
-  spec.description   = "Adminix"
-  spec.homepage      = "http://adminix.io"
-  spec.license       = "MIT"
+  spec.summary       = 'Adminix'
+  spec.description   = 'Adminix'
+  spec.homepage      = 'https://adminix.io'
+  spec.license       = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   #if spec.respond_to?(:metadata)
-    #spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
+    #spec.metadata['allowed_push_host'] = 'TODO: Set to 'http://mygemserver.com''
   #else
-    #raise "RubyGems 2.0 or newer is required to protect against " \
-      #"public gem pushes."
+    #raise 'RubyGems 2.0 or newer is required to protect against ' \
+      #'public gem pushes.'
   #end
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "eventmachine", "1.2.5"
-  spec.add_dependency "action_cable_client", "2.0.2"
-  spec.add_dependency "sinatra", "1.4.8"
+  spec.add_dependency 'eventmachine', '1.2.5'
+  spec.add_dependency 'action_cable_client', '2.0.2'
+  spec.add_dependency 'json', '2.1.0'
+  spec.add_dependency 'openssl', '2.1.0'
+  spec.add_dependency 'airbrake-ruby', '2.8.1'
 
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "byebug", "~> 9.0", ">= 9.0.6"
-  spec.add_development_dependency "faker", "~> 1.7", ">= 1.7.2"
+  spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'byebug', '~> 9.0', '>= 9.0.6'
+  spec.add_development_dependency 'faker', '~> 1.7', '>= 1.7.2'
 end

data/exe/adminix

@@ -2,6 +2,7 @@
 # encoding: utf-8
 
 require 'optparse'
+require_relative '../lib/adminix'
 
 options = {
   action: "help",
@@ -42,7 +43,6 @@ options[:action] = ARGV[0] || "help"
 parsers[options[:action].to_sym].parse!(ARGV) rescue nil
 
 unless options[:action] == "help"
-  require'adminix'
   config = Adminix::Config.instance 
 
   config.secret_key = options[:secret_key]
@@ -60,7 +60,7 @@ case options[:action]
       puts Adminix::Watcher.run!(options)
     else
       puts 'Credentials are not defined, running setup server'
-      require 'adminix/setup'
+      require 'adminix/server_setup'
     end
   when "version"
     puts "adminix version #{Adminix::VERSION}"

data/lib/adminix/config.rb

@@ -7,12 +7,13 @@ module Adminix
 
     DEFAULT_HOST = 'https://api.adminix.io'.freeze
     DEFAULT_WEBSOCKET_HOST = 'wss://websocket.adminix.io/cable'.freeze
-    DEFAULT_SETUP_SERVER_PORT = '8080'
+    DEFAULT_SETUP_SERVER_PORT = (ENV['ADMINIX_SETUP_SERVER_PORT'] || '8080').freeze
     DEFAULT_WATCHER_SYNC_PERIOD = 10.freeze
     DEFAULT_LOGS_SYNC_PERIOD = 3.freeze
     DEFAULT_LOGS_ENABLED = true
 
-    attr_accessor :service_id, :secret_key, :host, :commands, :daemon, :setup_server_port, :scripts, :watch_log_files, :watcher_sync_period, :logs_sync_period, :logs_enabled, :websocket_path, :mode, :working_dir
+    attr_accessor :service_id, :secret_key, :host, :commands, :daemon, :setup_server_port, :scripts, :watch_log_files, :watcher_sync_period, :logs_sync_period, :logs_enabled, :websocket_path, :mode, :working_dir, :iv, :password
+    attr_reader :image_sname, :error_notifier_enabled
 
     def initialize
       @host = ENV['ADMINIX_HOST'] || DEFAULT_HOST
@@ -24,6 +25,7 @@ module Adminix
       @websocket_path = ENV['ADMINIX_WEBSOCKET_HOST'] || DEFAULT_WEBSOCKET_HOST
       @mode = 'classic'
       @working_dir = `pwd`.split("\n").first
+      @iv = ENV['DECIPHER_IV'] || 'U7yfLthY77Yjtp9z'
       @scripts = {
         watcher_start: 'sudo systemctl start adminix.service',
         watcher_stop: 'sudo systemctl stop adminix.service',
@@ -31,6 +33,7 @@ module Adminix
         process_stop: 'sudo systemctl stop adminix_process.service'
       }
       @watch_log_files = []
+      @error_notifier_enabled = ENV['ADMINIX_ERROR_NOTIFIER'].nil? ? true : ENV['ADMINIX_ERROR_NOTIFIER'] == 'true'
 
       @config_store_path = "#{ENV['HOME']}/.config"
       @root_path = "#{@config_store_path}/adminix"
@@ -64,10 +67,14 @@ module Adminix
         }
 
         @watch_log_files = data['watch_logs'] || []
+
+        @image_sname = data['image']
       end
     end
 
     def sync_remote_config
+      return if service_id.nil? || secret_key.nil?
+
       uri = URI.parse("#{@host}/v1/services/#{@service_id}/watcher_config")
       request = Net::HTTP::Get.new(uri)
       request["Authorization"] = "Bearer #{@secret_key}"
@@ -80,6 +87,12 @@ module Adminix
       data = JSON.parse(response.body)
       result = data['result'] || {}
 
+      case response.code
+      when '401'
+        puts 'Incorrect credentials'
+        exit
+      end
+
       @watcher_sync_period = result['sync_period'] || DEFAULT_WATCHER_SYNC_PERIOD
       @logs_sync_period = result['logs_sync_period'] || DEFAULT_LOGS_SYNC_PERIOD
       @logs_enables = result.key?('logs_enabled') ? result['logs_enabled'] == true : DEFAULT_LOGS_ENABLED

data/lib/adminix/errors.rb

@@ -0,0 +1,7 @@
+require 'airbrake-ruby'
+
+Airbrake.configure do |c|
+  c.host = 'http://ec2-18-217-189-42.us-east-2.compute.amazonaws.com'
+  c.project_id = 1 # required, but any positive integer works
+  c.project_key = 'efb1c025d1abb9c4ccb828ebaf9ea68f'
+end

data/lib/adminix/server_setup.rb

@@ -0,0 +1,74 @@
+require 'sinatra/base'
+require 'json'
+require 'securerandom'
+require 'base64'
+require 'openssl'
+# require 'digest'
+
+module Adminix
+  class ServerSetup < Sinatra::Base
+    get '/' do
+      %{
+        <html>
+          <head>
+            <title>Adminix start</title>
+          </head>
+          <body>
+            <script type="text/javascript">
+              var host = window.location.protocol + '//' + window.location.host;
+              var newPath = "https://beta.adminix.io/setup-server/init?host=" + host;
+              window.location.href = newPath;
+            </script>
+          </body>
+        </html>
+      }
+    end
+
+    get '/ping' do
+      'pong'
+    end
+
+    post '/data' do
+      config = Adminix::Config.instance
+      config.password = SecureRandom.hex
+
+      content_type :json
+      { password: config.password, image: config.image_sname }.to_json
+    end
+
+    post '/connect' do
+      content_type :json
+
+      data = {}
+      config = Adminix::Config.instance
+
+      begin
+        decoded = Base64.decode64 request.body.read.encode('ascii-8bit')
+        decipher = OpenSSL::Cipher::AES256.new :CBC
+        decipher.decrypt
+        decipher.key = config.password
+        decipher.iv = config.iv
+        decrypted_data = decipher.update(decoded) + decipher.final
+        data = JSON.parse(decrypted_data)['server_setup']
+      rescue
+        { success: false }.to_json
+      end
+
+      config.password = ''
+      config.service_id = data['service_id']
+      config.secret_key = data['secret_key']
+      config.export_credentials
+      
+      Thread.start do
+        sleep(2)
+        Adminix::Service.instance.restart!
+      end
+
+      { success: true }.to_json
+    end
+
+    set :bind, '0.0.0.0'
+    set :port, Adminix::Config::DEFAULT_SETUP_SERVER_PORT
+  end
+end
+

data/lib/adminix/version.rb

@@ -1,3 +1,3 @@
 module Adminix
-  VERSION = "0.1.31"
+  VERSION = '0.1.35'
 end

data/lib/adminix/watcher.rb

@@ -42,33 +42,8 @@ module Adminix
       Adminix::Service.instance.count_logs_lines
 
       EventMachine.run do
-        @ws_client = ActionCableClient.new(@ws_uri, @ws_channel)
-        @ws_client.connected do |msg|
-          puts 'Service connection established'
-        end
-        @ws_client.disconnected do
-          system.log 'Service disconnected. Reconnecting...'
-          sleep(2)
-          @ws_client.connect!
-        end
-        @ws_client.received do |msg|
-          message = msg['message'] || {}
-          case message['type']
-            when 'restart' then @service.restart!
-            when 'sync' then @service.sync(@ws_client, message['data'])
-          end
-        end
-
-        @ws_logs_client = ActionCableClient.new(@ws_uri, @ws_logs_channel)
-        @ws_logs_client.connected do |msg|
-          puts 'Logs connection established'
-        end
-        @ws_logs_client.disconnected do
-          system.log 'Logs disconnected. Reconnecting...'
-          sleep(2)
-          @ws_logs_client.connect!
-        end
-        @ws_logs_client.received { |msg| }
+        initialize_ws
+        initialize_ws_logs
 
         # Sync watcher
         EventMachine.add_periodic_timer(config.watcher_sync_period) do
@@ -91,6 +66,47 @@ module Adminix
       end
     end
 
+    def initialize_ws
+      @ws_client = ActionCableClient.new(@ws_uri, @ws_channel)
+      @ws_client.connected do |msg|
+        puts 'Service connection established'
+      end
+      @ws_client.disconnected do
+        system.log 'Service disconnected. Reconnecting...'
+        sleep(2)
+        # @ws_client.connect!
+        initialize_ws
+      end
+      @ws_client.received do |msg|
+        message = msg['message'] || {}
+        case message['type']
+          when 'restart' then @service.restart!
+          when 'sync' then @service.sync(@ws_client, message['data'])
+        end
+      end
+
+      # @ws_client.pinged do |_data|
+        # puts 'ping'
+      # end
+    end
+
+    def initialize_ws_logs
+      @ws_logs_client = ActionCableClient.new(@ws_uri, @ws_logs_channel)
+      @ws_logs_client.connected do |msg|
+        puts 'Logs connection established'
+      end
+      @ws_logs_client.disconnected do
+        system.log 'Logs disconnected. Reconnecting...'
+        sleep(2)
+        # @ws_logs_client.connect!
+        initialize_ws_logs
+      end
+      # @ws_logs_client.pinged do |_data|
+        # puts 'logs ping'
+      # end
+      @ws_logs_client.received { |msg| }
+    end
+
     def get_pid
       if File.exists?(@pid_full)
         file = File.new(@pid_full, "r")

data/lib/adminix.rb

@@ -1,9 +1,10 @@
-require 'adminix/version'
-require 'adminix/config'
-require 'adminix/service'
-require 'adminix/system'
-require 'adminix/log_watch_handler'
-require 'adminix/watcher'
+require_relative 'adminix/version'
+require_relative 'adminix/errors'
+require_relative 'adminix/config'
+require_relative 'adminix/service'
+require_relative 'adminix/system'
+require_relative 'adminix/log_watch_handler'
+require_relative 'adminix/watcher'
 
 module Adminix
   def self.root

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adminix
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.1.35
 platform: ruby
 authors:
 - Christian Dyl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -39,19 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.2
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.8
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.8
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: openssl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: airbrake-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +164,7 @@ dependencies:
         version: 1.7.2
 description: Adminix
 email:
-- christian.dyl@outlook.com
+- christian@adminix.io
 executables:
 - adminix
 extensions: []
@@ -157,7 +185,9 @@ files:
 - lib/adminix.rb
 - lib/adminix/.service.rb.swn
 - lib/adminix/config.rb
+- lib/adminix/errors.rb
 - lib/adminix/log_watch_handler.rb
+- lib/adminix/server_setup.rb
 - lib/adminix/service.rb
 - lib/adminix/setup.rb
 - lib/adminix/setup/routes.rb
@@ -167,7 +197,7 @@ files:
 - lib/adminix/version.rb
 - lib/adminix/watcher.rb
 - views/daemon_scripts/upstart.conf.erb
-homepage: http://adminix.io
+homepage: https://adminix.io
 licenses:
 - MIT
 metadata: {}
@@ -187,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Adminix