cabal-api 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f688c08e5f4980a83b4aafcc40a8d17bc380207
-  data.tar.gz: ac046c92c6b2abff293cae3e6acd664b055ec003
+  metadata.gz: 633175e3c38cc1c65baddaedcd27f2759e89a1af
+  data.tar.gz: b547ecf19c5443809c21be14cc22fe1466055962
 SHA512:
-  metadata.gz: b8cc784a699804d19c30a8b6dc5d9adab2c5e805ed6d6ca6054979a6396ee8495e6616b7110f2f1c3dca553ecdb0e615da70b4fb9920fc0d17b5a2c6faf03cf5
-  data.tar.gz: ae0cbe3a2d79b6882498f5a5dccb3aa9bf3a1f28702dbf288b077e33be547374eefbe2719e68f676bf456c3ffc9d865d3350e29271766c29a35926e2577c0b6b
+  metadata.gz: d5d78bb2f96f4d25a08d85edbb72cb376ddfb008d838364d61c4ed2be0a0c9859876072ddfc06f58888df3b9cacb355af26a2cd9bd7e53788123ecbc79d6ec4c
+  data.tar.gz: a3c43b4d082fb850033607e999467e214cdc557641145ac41b356606bbae08843c5e5cec6939dca697ab9c02b4af63b9d2a502d538482cbe1aeaefe2268b60f0

data/cabal-api.gemspec

@@ -24,8 +24,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rack-test", '~> 0.6'
   spec.add_development_dependency "rspec", '~> 3.3'
   spec.add_development_dependency "factis", '~> 1.0'
-  spec.add_development_dependency "fakeredis", '~> 0.5'
   spec.add_development_dependency "simplecov", '~> 0.10'
+  spec.add_development_dependency "redis"
+  spec.add_development_dependency "database_cleaner"
   spec.add_runtime_dependency "cabal", '~> 0.2'
   spec.add_runtime_dependency "grape", '~> 0.13'
+  spec.add_runtime_dependency "ohm"
+  spec.add_runtime_dependency "ohm-contrib"
+  spec.add_runtime_dependency "bcrypt"
+  spec.add_runtime_dependency "sshkey"
 end

data/lib/cabal/api/base.rb

@@ -1,10 +1,12 @@
 require 'grape'
 require 'cabal/api/v1/base'
+require 'cabal/api/v2/base'
 
 module Cabal
   module API
     class Base < Grape::API
       mount Cabal::API::V1::Base
+      mount Cabal::API::V2::Base
     end
   end
 end

data/lib/cabal/api/cluster.rb

@@ -0,0 +1,39 @@
+require 'ohm'
+require 'ohm/contrib'
+require 'sshkey'
+require 'cabal/util'
+
+module Cabal
+  module API
+    class Cluster < Ohm::Model
+      include Ohm::Callbacks
+
+      # The secret key should not be saved plain, but we want to access it
+      # immediately after creation
+      attr_accessor :secret_key
+
+      attribute :name
+      attribute :private_key
+      attribute :public_key
+
+      # Enable lookups via cluster name
+      index :name
+
+      # Ensure that cluster name is unique
+      unique :name
+
+      def before_create
+        self.name = Cabal::Util.normalize(name)
+
+        sshkey = SSHKey.generate(type: 'RSA', bits: 2048, comment: "#{name}-cabal")
+        self.private_key = sshkey.private_key
+        self.public_key = sshkey.ssh_public_key
+      end
+
+      def self.by_cluster_name(name)
+        name = Cabal::Util.normalize(name)
+        find(name: name).first || create(name: name)
+      end
+    end
+  end
+end

data/lib/cabal/api/common/authenticated.rb

@@ -0,0 +1,30 @@
+require 'cabal/api/user'
+
+module Cabal
+  module API
+    module Common
+      module Authenticated
+        def self.included(base)
+          base.class_eval do
+            helpers do
+              def current_user
+                authorization = headers['Authorization'].to_s
+                access_key, signature = authorization.split(':')
+                user = Cabal::API::User.find(access_key: access_key).first
+                if user && user.authenticated_with?(signature)
+                  user
+                else
+                  nil
+                end
+              end
+
+              def authenticate!
+                error!({message: 'Unauthorized.'}, 401) unless current_user
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cabal/api/common/mistakes.rb

@@ -0,0 +1,21 @@
+module Cabal
+  module API
+    module Common
+      module Mistakes
+        def self.included(base)
+          base.class_eval do
+            error_formatter :txt, ->(message, backtrace, options, env) {
+              message[:message]
+            }
+
+            helpers do
+              def messagify(message)
+                {message: message}
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cabal/api/common/public_key.rb

@@ -0,0 +1,26 @@
+require 'cabal/util'
+require 'cabal/api/cluster'
+
+module Cabal
+  module API
+    module Common
+      module PublicKey
+        def self.included(base)
+          base.class_eval do
+            formatter :txt, ->(object, env) {
+              object[:public_ssh_key]
+            }
+
+            get '/key/:name' do
+              cluster = Cabal::API::Cluster.by_cluster_name(params[:name])
+              {
+                name: cluster.name,
+                public_ssh_key: cluster.public_key
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cabal/api/common.rb

@@ -0,0 +1 @@
+require 'cabal/api/common/public_key'

data/lib/cabal/api/user.rb

@@ -0,0 +1,49 @@
+require 'ohm'
+require 'ohm/contrib'
+require 'bcrypt'
+require 'securerandom'
+
+module Cabal
+  module API
+    class User < Ohm::Model
+      include Ohm::Callbacks
+
+      # The secret key should not be saved plain, but we want to access it
+      # immediately after creation
+      attr_accessor :secret_key
+
+      attribute :email
+      attribute :access_key
+      attribute :crypted_secret_key
+
+      # Enable lookups via either the user's email or their access key.
+      index :email
+      index :access_key
+
+      # Ensure that email and access keys are unique
+      unique :email
+      unique :access_key
+
+      def before_create
+        set_access_key
+        set_secret_key
+      end
+
+      def authenticated_with?(secret_key)
+        return false unless crypted_secret_key
+
+        BCrypt::Password.new(crypted_secret_key) == secret_key
+      end
+
+      private
+      def set_access_key
+        self.access_key = SecureRandom.hex(16)
+      end
+
+      def set_secret_key
+        self.secret_key = SecureRandom.hex(32)
+        self.crypted_secret_key = BCrypt::Password.create(secret_key)
+      end
+    end
+  end
+end

data/lib/cabal/api/v1/base.rb

@@ -1,6 +1,5 @@
 require 'grape'
 require 'cabal/api/v1/public_key'
-#require 'cabal/api/v1/keys'
 
 module Cabal
   module API

data/lib/cabal/api/v1/public_key.rb

@@ -1,22 +1,12 @@
 require 'grape'
-require 'cabal/cluster'
 require 'cabal/util'
+require 'cabal/api/common'
 
 module Cabal
   module API
     module V1
       class PublicKey < Grape::API
-        formatter :txt, ->(object, env) {
-          object[:public_ssh_key]
-        }
-
-        get '/key/:name' do
-          name = Cabal::Util.normalize(params[:name])
-          {
-            name: name,
-            public_ssh_key: Cabal::Cluster.new(name).public_ssh_key
-          }
-        end
+        include Cabal::API::Common::PublicKey
       end
     end
   end

data/lib/cabal/api/v2/base.rb

@@ -0,0 +1,16 @@
+require 'grape'
+require 'cabal/api/v2/public_key'
+require 'cabal/api/v2/private_key'
+
+module Cabal
+  module API
+    module V2
+      class Base < Grape::API
+        version 'v2', using: :path
+
+        mount Cabal::API::V2::PublicKey
+        mount Cabal::API::V2::PrivateKey
+      end
+    end
+  end
+end

data/lib/cabal/api/v2/private_key.rb

@@ -0,0 +1,46 @@
+require 'grape'
+require 'cabal/util'
+require 'cabal/api/cluster'
+require 'cabal/api/user'
+require 'cabal/api/common/authenticated'
+require 'cabal/api/common/mistakes'
+
+module Cabal
+  module API
+    module V2
+      class PrivateKey < Grape::API
+        include Cabal::API::Common::Authenticated
+        include Cabal::API::Common::Mistakes
+
+        formatter :txt, ->(object, env) {
+          object[:private_ssh_key]
+        }
+
+        helpers do
+          def error_if_not_found!(cluster, name)
+            unless cluster
+              error!(
+                messagify("The cluster '#{name}' could not be found."),
+                404
+              )
+            end
+          end
+        end
+
+        get '/private-key/:name' do
+          authenticate!
+
+          cluster_name = Cabal::Util.normalize(params[:name])
+          cluster = Cabal::API::Cluster.find(name: cluster_name).first
+
+          error_if_not_found!(cluster, cluster_name)
+
+          {
+            name: cluster.name,
+            private_ssh_key: cluster.private_key
+          }
+        end
+      end
+    end
+  end
+end

data/lib/cabal/api/v2/public_key.rb

@@ -0,0 +1,13 @@
+require 'grape'
+require 'cabal/util'
+require 'cabal/api/common'
+
+module Cabal
+  module API
+    module V2
+      class PublicKey < Grape::API
+        include Cabal::API::Common::PublicKey
+      end
+    end
+  end
+end

data/lib/cabal/api/version.rb

@@ -1,5 +1,5 @@
 module Cabal
   module Api
-    VERSION = "0.0.1"
+    VERSION = "0.0.3"
   end
 end

data/lib/cabal/api.rb

@@ -1,7 +1,11 @@
-require "cabal/api/version"
-require "cabal/api/base"
+require 'ohm'
+require 'cabal/api/version'
+require 'cabal/api/base'
+require 'cabal/api/cluster'
+require 'cabal/api/user'
 
 module Cabal
   module Api
+    Ohm.redis = Redic.new(ENV['REDIS_URL'] || 'redis://localhost:6379')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cabal-api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Dennis Walters
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,33 +95,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: fakeredis
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cabal
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
+- !ruby/object:Gem::Dependency
+  name: ohm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ohm-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bcrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sshkey
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - dwalters@engineyard.com
@@ -172,8 +242,17 @@ files:
 - config/cucumber.yml
 - lib/cabal/api.rb
 - lib/cabal/api/base.rb
+- lib/cabal/api/cluster.rb
+- lib/cabal/api/common.rb
+- lib/cabal/api/common/authenticated.rb
+- lib/cabal/api/common/mistakes.rb
+- lib/cabal/api/common/public_key.rb
+- lib/cabal/api/user.rb
 - lib/cabal/api/v1/base.rb
 - lib/cabal/api/v1/public_key.rb
+- lib/cabal/api/v2/base.rb
+- lib/cabal/api/v2/private_key.rb
+- lib/cabal/api/v2/public_key.rb
 - lib/cabal/api/version.rb
 homepage: http://github.com/ess/cabal-api
 licenses: