meroku 2.0.8 → 2.0.9

data/frontend/app/models/app.rb

@@ -4,27 +4,34 @@ class App < ApplicationRecord
   after_commit :make_folder, on: [:create]
 
   def make_folder
-    username = self.user.token
-    Rails.logger.debug "DB8 app.rb:def self.make_folder called"    
-    system(%Q[sudo -u #{username} mkdir /home/#{username}/#{self.name}.git])
-    system(%Q[sudo -u #{username} mkdir /home/#{username}/#{self.name}])
-    system(%Q[sudo -u #{username} sh -c "cd /home/#{username}/#{self.name}.git; git --bare init"])
+    Rails.logger.debug "DB8 app.rb:make_folder() called"
+    username = self.user.apiusername
+    Cmd.run(%Q[sudo -u #{username} mkdir /home/#{username}/#{self.name}.git])
+    Cmd.run(%Q[sudo -u #{username} mkdir /home/#{username}/#{self.name}])
 
+    Cmd.run(%Q[sudo -u postgres createuser -S -D -R -e #{username}])
+    Cmd.run(%Q[sudo -u postgres createdb #{self.name}])
+    Cmd.run(%Q[sudo -u postgres psql -c "ALTER ROLE #{username} WITH PASSWORD '#{self.user.apisecret}';"])
 
-    system(%Q[sudo -u #{username} sh -c "echo '#!/bin/bash
+    Cmd.run(%Q[sudo -u #{username} sh -c "cd /home/#{username}/#{self.name}.git; git --bare init"])
+    Cmd.run(%Q[sudo cp /sharedro/etc_nginx_sites-enabled_template /home/#{username}/#{self.name}.conf])
+    Cmd.run(%Q[sudo sed -i -e 's/REPLACEMEAPPNAME/#{self.name}/g' /home/#{username}/#{self.name}.conf])
+    Cmd.run(%Q[sudo sed -i -e 's/REPLACEMEUSERNAME/#{username}/g' /home/#{username}/#{self.name}.conf])
+    Cmd.run(%Q[sudo -u #{username} sh -c "echo '#!/bin/bash
 set -x
 : Git hook is executing
-mkdir /home/#{username}/#{self.name}
 cd /home/#{username}/#{self.name}
-cp /sharedro/etc_nginx_sites-enabled_template /home/#{username}/#{self.name}.conf
-sed -i -e 's/REPLACEMEAPPNAME/#{self.name}/g' /home/#{username}/#{self.name}.conf
-sed -i -e 's/REPLACEMEUSERNAME/#{username}/g' /home/#{username}/#{self.name}.conf
+echo 'DATABASE_URL=postgres://#{self.user.apiusername}:#{self.user.apisecret}@localhost:5432/#{self.name}'
+export DATABASE_URL="postgres://#{self.user.apiusername}:#{self.user.apisecret}@localhost:5432/#{self.name}"
 git --work-tree=/home/#{username}/#{self.name} --git-dir=/home/#{username}/#{self.name}.git checkout -f
 bundle install --path vendor/bundle
 RAILS_ENV=production bundle exec rake db:migrate
 RAILS_ENV=production bundle exec rake assets:precompile
 RAILS_ENV=production bundle exec puma -d -b unix:///home/#{username}/#{self.name}.sock
 ' > /home/#{username}/#{self.name}.git/hooks/post-receive"])
-    system(%Q[sudo -u #{username} sh -c 'chmod u+x /home/#{username}/#{self.name}.git/hooks/post-receive'])
+    Cmd.run(%Q[sudo -u #{username} sh -c 'chmod u+x /home/#{username}/#{self.name}.git/hooks/post-receive'])
+    Cmd.run(%Q[sudo ln -s /home/#{username}/#{self.name}.conf /etc/nginx/sites-enabled/#{self.name}])
+    Cmd.run(%Q[sudo /usr/sbin/nginx -s reload])
   end
+
 end

data/frontend/app/models/publickey.rb

@@ -8,7 +8,7 @@ class Publickey < ApplicationRecord
     Rails.logger.debug "DB8 publickey.rb:def self.refresh called"
     if Publickey.all.size > 0
       File.write('/tmp/authorized_keys', Publickey.pluck(:data).join("\n") )
-      system("sudo -u #{self.user.token} cp /tmp/authorized_keys /home/#{self.user.token}/.ssh/authorized_keys")
+      Cmd.run(%Q[sudo -u #{self.user.apiusername} cp /tmp/authorized_keys /home/#{self.user.apiusername}/.ssh/authorized_keys])
       File.delete('/tmp/authorized_keys')
     end
   end

data/frontend/app/models/user.rb

@@ -9,13 +9,14 @@ class User < ApplicationRecord
   after_commit :make_user, on: [:create]
   
   before_save do
-    self.token = SecureRandom.hex if !self.token
+    self.apiusername = "u#{SecureRandom.hex[0..5]}" if !self.apiusername
+    self.apisecret = "s#{SecureRandom.hex[0..5]}" if !self.apisecret
   end
 
   def make_user
     Rails.logger.debug "DB8 user.rb:.make_user() called"
-    system(%Q[sudo adduser --disabled-password  --gecos "" #{token}])
-    system(%Q[sudo -u #{token} mkdir /home/#{token}/.ssh/])
-    system(%Q[sudo -u #{token} touch /home/#{token}/.ssh/authorized_keys])
+    Cmd.run(%Q[sudo adduser --disabled-password  --gecos "" #{self.apiusername}])
+    Cmd.run(%Q[sudo -u #{self.apiusername} mkdir /home/#{self.apiusername}/.ssh/])
+    Cmd.run(%Q[sudo -u #{self.apiusername} touch /home/#{self.apiusername}/.ssh/authorized_keys])
   end
 end

data/frontend/app/policies/application_policy.rb

@@ -0,0 +1,53 @@
+class ApplicationPolicy
+  attr_reader :user, :record
+
+  def initialize(user, record)
+    @user = user
+    @record = record
+  end
+
+  def index?
+    false
+  end
+
+  def show?
+    scope.where(:id => record.id).exists?
+  end
+
+  def create?
+    false
+  end
+
+  def new?
+    create?
+  end
+
+  def update?
+    false
+  end
+
+  def edit?
+    update?
+  end
+
+  def destroy?
+    false
+  end
+
+  def scope
+    Pundit.policy_scope!(user, record.class)
+  end
+
+  class Scope
+    attr_reader :user, :scope
+
+    def initialize(user, scope)
+      @user = user
+      @scope = scope
+    end
+
+    def resolve
+      scope
+    end
+  end
+end

data/frontend/app/policies/publickey_policy.rb

@@ -0,0 +1,7 @@
+class PublickeyPolicy < ApplicationPolicy
+  class Scope < Scope
+    def resolve
+      scope
+    end
+  end
+end

data/frontend/app/serializable/serializable_user.rb

@@ -1,7 +1,8 @@
 class SerializableUser < JSONAPI::Serializable::Resource
   type 'users'
   attribute :email
-  attribute :token
+  attribute :apiusername
+  attribute :apisecret
   attribute :created_at
   attribute :updated_at
 end

data/frontend/app/views/layouts/application.html.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Frontend</title>
+    <title>www.meroku.com</title>
     <%= csrf_meta_tags %>
 
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>

data/frontend/config/database.yml

@@ -1,25 +1,87 @@
-# SQLite version 3.x
-#   gem install sqlite3
+# PostgreSQL. Versions 9.1 and up are supported.
 #
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
+# Install the pg driver:
+#   gem install pg
+# On OS X with Homebrew:
+#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
+# On OS X with MacPorts:
+#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
+# On Windows:
+#   gem install pg
+#       Choose the win32 build.
+#       Install PostgreSQL and put its /bin directory on your path.
+#
+# Configure Using Gemfile
+# gem 'pg'
 #
 default: &default
-  adapter: sqlite3
+  adapter: postgresql
+  encoding: unicode
+  # For details on connection pooling, see Rails configuration guide
+  # http://guides.rubyonrails.org/configuring.html#database-pooling
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-  timeout: 5000
 
 development:
   <<: *default
-  database: db/development.sqlite3
+  database: meroku_development
+
+  # The specified database role being used to connect to postgres.
+  # To create additional roles in postgres see `$ createuser --help`.
+  # When left blank, postgres will use the default role. This is
+  # the same name as the operating system user that initialized the database.
+  username: meroku
+
+  # The password associated with the postgres role (username).
+  password: <%= ENV['SECRET'] %>
+
+  # Connect on a TCP socket. Omitted by default since the client uses a
+  # domain socket that doesn't need configuration. Windows does not have
+  # domain sockets, so uncomment these lines.
+  #host: localhost
+
+  # The TCP port the server listens on. Defaults to 5432.
+  # If your server runs on a different port number, change accordingly.
+  #port: 5432
+
+  # Schema search path. The server defaults to $user,public
+  #schema_search_path: myapp,sharedapp,public
+
+  # Minimum log levels, in increasing order:
+  #   debug5, debug4, debug3, debug2, debug1,
+  #   log, notice, warning, error, fatal, and panic
+  # Defaults to warning.
+  #min_messages: notice
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: db/test.sqlite3
-
+  database: meroku_test
+  password: <%= ENV['SECRET'] %>
+  
+# As with config/secrets.yml, you never want to store sensitive information,
+# like your database password, in your source code. If your source code is
+# ever seen by anyone, they now have access to your database.
+#
+# Instead, provide the password as a unix environment variable when you boot
+# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database
+# for a full rundown on how to provide these environment variables in a
+# production deployment.
+#
+# On Heroku and other platform providers, you may have a full connection URL
+# available as an environment variable. For example:
+#
+#   DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase"
+#
+# You can use this database configuration with:
+#
+#   production:
+#     url: <%= ENV['DATABASE_URL'] %>
+#
 production:
   <<: *default
-  database: db/production.sqlite3
+  database: meroku
+  username: meroku
+  password: <%= ENV['SECRET'] %>
+

data/frontend/config/routes.rb

@@ -1,19 +1,11 @@
 Rails.application.routes.draw do
 
-  resources :publickeys
-  resources :apps
-  Rails.application.routes.draw do
-  resources :publickeys
-  resources :apps
-    devise_for :users, controllers: {
-      sessions: 'users/sessions',
-      registrations: 'users/registrations'
-    }
-  end
+  resources :publickeys, only: [:create]
+  resources :apps, only: [:create]
 
-  get 'pages/landing'
+  devise_for :users, controllers: {
+    sessions: 'users/sessions',
+    registrations: 'users/registrations'
+  }
 
-  # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
-
-  root 'pages#landing'
 end

data/frontend/db/migrate/20171028150506_add_apisecret_to_users.rb

@@ -0,0 +1,6 @@
+class AddApisecretToUsers < ActiveRecord::Migration[5.1]
+  def change
+    add_column :users, :apiusername, :string
+    add_column :users, :apisecret, :string
+  end
+end

data/frontend/etc_nginx_sites-enabled_default

@@ -1,6 +1,6 @@
 upstream app {
     # Path to Puma SOCK file, as defined previously
-    server unix:/tmp/meroku.sock fail_timeout=0;
+    server unix:/home/ubuntu/meroku.sock fail_timeout=0;
     #server 127.0.0.1:3000;
 }
 

data/frontend/public/Meroku.html

@@ -0,0 +1,140 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Module: Meroku
+  
+    &mdash; Documentation by YARD 0.9.9
+  
+</title>
+
+  <link rel="stylesheet" href="css/style.css" type="text/css" charset="utf-8" />
+
+  <link rel="stylesheet" href="css/common.css" type="text/css" charset="utf-8" />
+
+<script type="text/javascript" charset="utf-8">
+  pathId = "Meroku";
+  relpath = '';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="_index.html">Index (M)</a> &raquo;
+    
+    
+    <span class="title">Meroku</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="class_list_link"
+        href="class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1>Module: Meroku
+  
+  
+  
+</h1>
+<div class="box_info">
+  
+
+  
+  
+  
+  
+  
+
+  
+
+  
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>lib/meroku.rb<span class="defines">,<br />
+  lib/meroku/api.rb,<br /> lib/meroku/aws.rb,<br /> lib/meroku/cli.rb,<br /> lib/meroku/node.rb,<br /> lib/meroku/aws/ec2.rb,<br /> lib/meroku/version.rb,<br /> lib/meroku/cli/help.rb,<br /> lib/meroku/extensions.rb,<br /> lib/meroku/tunnelable.rb,<br /> lib/meroku/api/request.rb,<br /> lib/meroku/cli/secrets.rb,<br /> lib/meroku/cli/session.rb,<br /> lib/meroku/infrastructure.rb,<br /> lib/meroku/infrastructure/server.rb</span>
+</dd>
+  </dl>
+  
+</div>
+
+<h2>Overview</h2><div class="docstring">
+  <div class="discussion">
+    
+<p>My Heroku (Meroku)</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+
+</div><h2>Defined Under Namespace</h2>
+<p class="children">
+  
+    
+      <strong class="modules">Modules:</strong> <span class='object_link'><a href="Meroku/Api.html" title="Meroku::Api (module)">Api</a></span>, <span class='object_link'><a href="Meroku/Aws.html" title="Meroku::Aws (module)">Aws</a></span>, <span class='object_link'><a href="Meroku/CLI.html" title="Meroku::CLI (module)">CLI</a></span>, <span class='object_link'><a href="Meroku/Extensions.html" title="Meroku::Extensions (module)">Extensions</a></span>, <span class='object_link'><a href="Meroku/Infrastructure.html" title="Meroku::Infrastructure (module)">Infrastructure</a></span>, <span class='object_link'><a href="Meroku/Tunnelable.html" title="Meroku::Tunnelable (module)">Tunnelable</a></span>
+    
+  
+    
+      <strong class="classes">Classes:</strong> <span class='object_link'><a href="Meroku/Node.html" title="Meroku::Node (class)">Node</a></span>
+    
+  
+</p>
+
+  <h2>Constant Summary</h2>
+  <dl class="constants">
+    
+      <dt id="VERSION-constant" class="">VERSION =
+        
+      </dt>
+      <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>2.0.8</span><span class='tstring_end'>&quot;</span></span></pre></dd>
+    
+  </dl>
+
+
+
+
+
+
+
+
+
+</div>
+
+      <div id="footer">
+  Generated on Tue Oct 31 19:39:54 2017 by
+  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.9 (ruby-2.4.2).
+</div>
+
+    </div>
+  </body>
+</html>

data/frontend/public/Meroku/Api.html

@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Module: Meroku::Api
+  
+    &mdash; Documentation by YARD 0.9.9
+  
+</title>
+
+  <link rel="stylesheet" href="../css/style.css" type="text/css" charset="utf-8" />
+
+  <link rel="stylesheet" href="../css/common.css" type="text/css" charset="utf-8" />
+
+<script type="text/javascript" charset="utf-8">
+  pathId = "Meroku::Api";
+  relpath = '../';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="../js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="../js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="../class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="../_index.html">Index (A)</a> &raquo;
+    <span class='title'><span class='object_link'><a href="../Meroku.html" title="Meroku (module)">Meroku</a></span></span>
+     &raquo; 
+    <span class="title">Api</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="class_list_link"
+        href="../class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1>Module: Meroku::Api
+  
+  
+  
+</h1>
+<div class="box_info">
+  
+
+  
+  
+  
+  
+  
+
+  
+
+  
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>lib/meroku/api.rb<span class="defines">,<br />
+  lib/meroku/api/request.rb</span>
+</dd>
+  </dl>
+  
+</div>
+
+<h2>Overview</h2><div class="docstring">
+  <div class="discussion">
+    
+<p>The api is the rails app/service running on the ec2 server handling login,
+logout, keys:add etc</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+
+</div><h2>Defined Under Namespace</h2>
+<p class="children">
+  
+    
+      <strong class="modules">Modules:</strong> <span class='object_link'><a href="Api/Request.html" title="Meroku::Api::Request (module)">Request</a></span>
+    
+  
+    
+  
+</p>
+
+
+
+
+
+
+
+
+
+</div>
+
+      <div id="footer">
+  Generated on Tue Oct 31 19:39:54 2017 by
+  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.9 (ruby-2.4.2).
+</div>
+
+    </div>
+  </body>
+</html>