authify-api 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7722ad1f79781ba027cff0bfc6f174d194fb24de
-  data.tar.gz: bf8817c6c7b784ee76cfe3e4665540fc3e3b59eb
+  metadata.gz: 034407bd9058f89a81db15e6d658f16f5d5a5365
+  data.tar.gz: af8a965cc5f481ba754ccd2c5fe79168e35daf68
 SHA512:
-  metadata.gz: 7aec0faa2c66766a5f3b2570a52198598ee9ab42605581f964841531637954ab69ee255e2fe85747227b7a9c8fc9fbe15bc6c12b8ad91579670098089142ea83
-  data.tar.gz: faddeefb5815e21c5c7d991f123ab1f71cb802792183fdf2af43f135d82b1e7b1f25e0143703d000fbe5fdc21d7e898eb3bd36279fcfb4adc4c2e56e8c4fd248
+  metadata.gz: 3fb4dd7817c46abf6dc0a2342b48281a9f1862123e990f7c9f4af11baa6d408533fad7376eca7740f3fff865c6052ef63efc88f5b4059abdeb0b8c04f25a8375
+  data.tar.gz: ffafbf61deae31c0ae88c4d8d1333fca27464fd557b5876ddab461304f5fe50a84b31a645da7b948ba55925f9e43a0ce213a0957c77e08542b7e785455f81eb1

data/README.md

@@ -83,7 +83,7 @@ File.write(File.expand_path('/path/to/keys/private.pem'), secret_key.to_pem)
 public_key = secret_key
 public_key.private_key = nil
 # write out the public key to a file...
-File.write(File.expand_path('/path/to/keys/public.pem'), private_key.to_pem)
+File.write(File.expand_path('/path/to/keys/public.pem'), public_key.to_pem)
 ```
 
 Using the OpenSSL CLI tool:

data/authify-api.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |spec|
   # spec.add_runtime_dependency 'sinja', '~> 1.2', '>= 1.2.4'
   spec.add_runtime_dependency 'puma', '~> 3.7'
   spec.add_runtime_dependency 'resque', '~> 1.26'
+  spec.add_runtime_dependency 'hitimes', '~> 1.2'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 10.0'

data/config.ru

@@ -7,4 +7,5 @@ use Rack::ShowExceptions
 run Rack::URLMap.new \
   '/'              => Authify::API::Services::API.new,
   '/jwt'           => Authify::API::Services::JWTProvider.new,
-  '/registration'  => Authify::API::Services::Registration.new
+  '/registration'  => Authify::API::Services::Registration.new,
+  '/monitoring'    => Authify::API::Services::Monitoring.new

data/lib/authify/api.rb

@@ -12,6 +12,7 @@ require 'tilt/erb'
 require 'connection_pool'
 require 'moneta'
 require 'resque'
+require 'hitimes'
 
 # Internal Requirements
 module Authify
@@ -53,6 +54,9 @@ require 'authify/api/models/user'
 require 'authify/api/helpers/jwt_encryption'
 require 'authify/api/helpers/api_user'
 require 'authify/api/service'
+require 'authify/api/metrics'
+require 'authify/api/middleware/metrics'
 require 'authify/api/services/api'
 require 'authify/api/services/jwt_provider'
 require 'authify/api/services/registration'
+require 'authify/api/services/monitoring'

data/lib/authify/api/metrics.rb

@@ -0,0 +1,55 @@
+module Authify
+  module API
+    # A place to store metrics data
+    class Metrics
+      include Singleton
+
+      def update(key, value)
+        write_lock do
+          storage[key] = value
+        end
+      end
+
+      def increment(key, change = 1)
+        write_lock do
+          storage.key?(key) ? storage[key] += change : storage[key] = change
+        end
+      end
+
+      def decrement(key, change = 1)
+        increment(key, -1 * change)
+      end
+
+      def [](key)
+        storage[key]
+      end
+
+      def time(key)
+        timer = storage.key?(key) ? storage[key] : Hitimes::TimedMetric.new(key)
+        result = timer.measure do
+          yield
+        end
+        update(key, timer)
+        result
+      end
+
+      def each(&block)
+        storage.each(&block)
+      end
+
+      private
+
+      def write_lock
+        @wlock ||= Mutex.new
+        @wlock.synchronize do
+          yield
+        end
+      end
+
+      def storage
+        # While not perfectly thread-safe, this works well enough for Metrics
+        @storage ||= Concurrent::Map.new
+      end
+    end
+  end
+end

data/lib/authify/api/middleware/metrics.rb

@@ -0,0 +1,34 @@
+module Authify
+  module API
+    module Middleware
+      # A middleware for analytics of rack requests
+      class Metrics
+        def initialize(app)
+          @app     = app
+          @metrics = Authify::API::Metrics.instance
+          @key     = 'rack.action.response'
+        end
+
+        def call(env)
+          status, header, body = @metrics.time(construct_metric_key('time', env)) do
+            @app.call env
+          end
+
+          @metrics.increment construct_metric_key('count', env)
+
+          [status, header, body]
+        end
+
+        private
+
+        def construct_metric_key(type, env)
+          path = Rack::Request.new(env)
+                              .path.gsub(%r{/([0-9]+)(/?)}, '/:id\2')
+                              .gsub(%r{/}, '.')
+                              .chomp('.')
+          "#{@key}.#{type}.#{env['REQUEST_METHOD'].downcase}#{path}"
+        end
+      end
+    end
+  end
+end

data/lib/authify/api/services/api.rb

@@ -3,7 +3,9 @@ module Authify
     module Services
       # The main API Sinatra App
       class API < Service
-        use Middleware::JWTAuth
+        use Authify::API::Middleware::Metrics
+        use Authify::Middleware::JWTAuth
+
         register Sinatra::JSONAPI
 
         helpers Helpers::APIUser

data/lib/authify/api/services/jwt_provider.rb

@@ -3,6 +3,8 @@ module Authify
     module Services
       # A Sinatra App specifically for managing JWT tokens
       class JWTProvider < Service
+        use Authify::API::Middleware::Metrics
+
         helpers Helpers::APIUser
 
         configure do
@@ -16,6 +18,21 @@ module Authify
                     OPTIONS
                     GET
                     POST
+                  ],
+                  'Access-Control-Allow-Headers' => %w[
+                    Origin
+                    Accept
+                    Accept-Encoding
+                    Accept-Language
+                    Access-Control-Request-Headers
+                    Access-Control-Request-Method
+                    Connection
+                    Content-Type
+                    Host
+                    Referer
+                    User-Agent
+                    X-Requested-With
+                    X-Forwarded-For
                   ]
 
           begin
@@ -51,12 +68,17 @@ module Authify
 
           if found_user
             update_current_user found_user
+            Metrics.instance.increment('jwt.tokens.provided')
             { jwt: jwt_token(custom_data: custom_data) }.to_json
           else
             halt 401
           end
         end
 
+        options '/token' do
+          halt 200
+        end
+
         # Provide information about the JWTs generated by the server
         get '/meta' do
           {
@@ -66,12 +88,20 @@ module Authify
           }.to_json
         end
 
+        options '/meta' do
+          halt 200
+        end
+
         # Provide access to the public ECDSA key
         get '/key' do
           {
             data: public_key.export
           }.to_json
         end
+
+        options '/key' do
+          halt 200
+        end
       end
     end
   end

data/lib/authify/api/services/monitoring.rb

@@ -0,0 +1,60 @@
+module Authify
+  module API
+    module Services
+      # The monitoring application
+      class Monitoring < Service
+        configure do
+          set :protection, except: :http_origin
+        end
+
+        before '*' do
+          content_type 'application/json'
+          headers 'Access-Control-Allow-Origin' => '*',
+                  'Access-Control-Allow-Methods' => %w[
+                    OPTIONS
+                    GET
+                    POST
+                  ],
+                  'Access-Control-Allow-Headers' => %w[
+                    Origin
+                    Accept
+                    Accept-Encoding
+                    Accept-Language
+                    Access-Control-Request-Headers
+                    Access-Control-Request-Method
+                    Connection
+                    Content-Type
+                    Host
+                    Referer
+                    User-Agent
+                    X-Requested-With
+                    X-Forwarded-For
+                  ]
+
+          begin
+            unless request.get? || request.options?
+              request.body.rewind
+              @parsed_body = JSON.parse(request.body.read, symbolize_names: true)
+            end
+          rescue => e
+            halt(400, { error: "Request must be valid JSON: #{e.message}" }.to_json)
+          end
+        end
+
+        # Provide information about the JWTs generated by the server
+        get '/info' do
+          metrics = Metrics.instance
+          output = {}
+          metrics.each do |key, value|
+            output[key] = value
+          end
+          output.to_json
+        end
+
+        options '/info' do
+          halt 200
+        end
+      end
+    end
+  end
+end

data/lib/authify/api/services/registration.rb

@@ -3,6 +3,7 @@ module Authify
     module Services
       # A Sinatra App specifically for registering with the system
       class Registration < Service
+        use Authify::API::Middleware::Metrics
         helpers Helpers::APIUser
 
         configure do
@@ -16,6 +17,21 @@ module Authify
                     OPTIONS
                     GET
                     POST
+                  ],
+                  'Access-Control-Allow-Headers' => %w[
+                    Origin
+                    Accept
+                    Accept-Encoding
+                    Accept-Language
+                    Access-Control-Request-Headers
+                    Access-Control-Request-Method
+                    Connection
+                    Content-Type
+                    Host
+                    Referer
+                    User-Agent
+                    X-Requested-With
+                    X-Forwarded-For
                   ]
 
           begin
@@ -63,6 +79,10 @@ module Authify
           response.to_json
         end
 
+        options '/signup' do
+          halt 200
+        end
+
         post '/forgot_password' do
           email = @parsed_body[:email]
           token = @parsed_body[:token]
@@ -74,6 +94,7 @@ module Authify
             found_user.verified = true
             found_user.password = @parsed_body[:password]
             found_user.save
+            Metrics.instance.increment('registration.password.resets')
             {
               id: found_user.id,
               email: found_user.email,
@@ -88,6 +109,10 @@ module Authify
           end
         end
 
+        options '/forgot_password' do
+          halt 200
+        end
+
         post '/verify' do
           email = @parsed_body[:email]
           password = @parsed_body[:password]
@@ -112,6 +137,10 @@ module Authify
             jwt: jwt_token(user: found_user)
           }.to_json
         end
+
+        options '/verify' do
+          halt 200
+        end
       end
     end
   end

data/lib/authify/api/version.rb

@@ -3,7 +3,7 @@ module Authify
     VERSION = [
       0, # Major
       3, # Minor
-      1  # Patch
+      2  # Patch
     ].join('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authify-api
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: authify-core
@@ -204,6 +204,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.26'
+- !ruby/object:Gem::Dependency
+  name: hitimes
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -355,6 +369,8 @@ files:
 - lib/authify/api/helpers/api_user.rb
 - lib/authify/api/helpers/jwt_encryption.rb
 - lib/authify/api/jsonapi_utils.rb
+- lib/authify/api/metrics.rb
+- lib/authify/api/middleware/metrics.rb
 - lib/authify/api/models/apikey.rb
 - lib/authify/api/models/group.rb
 - lib/authify/api/models/identity.rb
@@ -370,6 +386,7 @@ files:
 - lib/authify/api/service.rb
 - lib/authify/api/services/api.rb
 - lib/authify/api/services/jwt_provider.rb
+- lib/authify/api/services/monitoring.rb
 - lib/authify/api/services/registration.rb
 - lib/authify/api/version.rb
 homepage: https://github.com/knuedge/authify-api