opener-webservice 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3c9e68800786848df8f2c1310b2063edbf58939
-  data.tar.gz: e3b445eb8a225c5811663fc7dc5b0077c9e16077
+  metadata.gz: 2f0bbd6c49b5e68d01232c20dc174073ac66997b
+  data.tar.gz: 236c4398bfd4c39c509aca78844f6ffa293f8401
 SHA512:
-  metadata.gz: 2f8b4978233d0f11a62828388c425e535be83c4dd8de2a78b06d1fec9b74c322a752dcf0ad5a65a3f365cf318837e0b7fa49d95eac38c10dcf1672c4658e946b
-  data.tar.gz: 7980a3858ddfaf44d0c24c89097ee025352dbea0108b06085634f7df316d04e90c0fb5128705126919d8fb53e8cdff8fcb54b2abc93d7d12eb6b491ed2c951ee
+  metadata.gz: 86c9a155b512a6a682e8ecea0a646be4ed7f83fee8ca6805c98a2b71f134144474a4e8046267a433a323e5846fa7827934196245d1c397a9edb5651aeefd749b
+  data.tar.gz: 8d2725e610d1ecb603e64a3225a05d43db5de10e62cc3e2bf7cc4ee029579385b15ceb44e4d78c445d9fa586cd5cbbc9bcc24c09c4b750a2763380b6a7e20a9c

data/lib/opener/webservice/opt_parser.rb

@@ -0,0 +1,103 @@
+require 'sinatra/base'
+require 'optparse'
+
+module Opener
+  class Webservice < Sinatra::Base
+    class OptParser
+      attr_accessor :option_parser, :options
+
+      def initialize(&block)
+        @options = {}
+        @option_parser = construct_option_parser(options, &block)
+      end
+
+      def parse(args)
+        process(:parse, args)
+      end
+
+      def parse!(args)
+        process(:parse!, args)
+      end
+
+      def pre_parse!(args)
+        delete_double_dash = false
+        process(:parse!, args, delete_double_dash)
+      end
+
+      def pre_parse(args)
+        delete_double_dash = false
+        process(:parse, args, delete_double_dash)
+      end
+
+      def self.parse(args)
+        new.parse(args)
+      end
+
+      def self.parse!(args)
+        new.parse!(args)
+      end
+
+      def self.pre_parse!(args)
+        new.pre_parse!(args)
+      end
+
+      def self.pre_parse(args)
+        new.pre_parse(args)
+      end
+
+      private
+
+      def process(call, args, delete_double_dash=true)
+        args.delete("--") if delete_double_dash
+        option_parser.send(call, args)
+        return options
+      end
+
+      def construct_option_parser(options, &block)
+        script_name = File.basename($0, ".rb")
+
+        OptionParser.new do |opts|
+          if block_given?
+            opts.banner = "Usage: #{script_name} <start> [server_options] -- [authentication_options]"
+          else
+            opts.banner = "Usage: #{script_name} <start> [options]"
+          end
+
+          opts.separator ""
+
+          if block_given?
+            opts.separator "Component Specific options:"
+            opts.separator ""
+            yield opts, options
+            opts.separator ""
+          end
+
+          opts.separator "Authentication options:"
+
+          opts.on("--authentication", "--authentication AUTHENTICATION_ENDPOINT", "Endpoint for authenticating requests") do |v|
+            options[:authentication] = v
+          end
+          
+          opts.on("--secret", "--secret SECRET_VARIABLE", "Accepted parameter variable for secret.") do |v|
+            options[:secret] = v
+          end
+          
+          opts.on("--token", "--secret TOKEN_VARIABLE", "Accepted parameter variable for token.") do |v|
+            options[:token] = v
+          end
+
+          opts.separator ""
+
+          opts.separator "Common options:"
+
+          # No argument, shows at tail.  This will print an options summary.
+          # Try it and see!
+          opts.on_tail("-h", "--help", "Show this message. Usage: #{script_name} -h") do
+            puts opts
+            exit
+          end
+        end
+      end
+    end
+  end
+end

data/lib/opener/webservice/version.rb

@@ -2,6 +2,6 @@ require 'sinatra/base'
 
 module Opener
   class Webservice < Sinatra::Base
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/lib/opener/webservice.rb

@@ -2,17 +2,33 @@ require "uuidtools"
 require "sinatra/base"
 require "json"
 require "opener/webservice/version"
+require "opener/webservice/opt_parser"
 
 module Opener
   class Webservice < Sinatra::Base
     configure do
       enable :logging
+      if ARGV && pos = ARGV.index("--")
+        ws_options = ARGV[pos..-1]
+      else
+        ws_options = []
+      end
+      options = OptParser.parse!(ws_options)
+
+      options.each do |k,v|
+        Sinatra::Application.set k.to_sym, v
+      end
     end
 
     configure :development do
       set :raise_errors, true
       set :dump_errors, true
     end
+    
+    before %r{^((?!.css|.jpg|.png|.js|.ico).)+$} do
+      extract_params
+      authenticate! if Sinatra::Application.respond_to?(:authentication)
+    end
 
     ##
     # Presents a simple form that can be used for getting the NER of a KAF
@@ -94,6 +110,7 @@ module Opener
       else
         @accepted_params = array
       end
+      @accepted_params.concat([secret_symbol, token_symbol]) if Sinatra::Application.respond_to?(:authentication)
     end
 
     ##
@@ -221,14 +238,16 @@ module Opener
       # Airbrake during the hackathon. For whatever reason somebody is posting
       # internal server errors from *somewhere*. Validation? What's that?
       return if text =~ /^internal server error/i
-
+      
       output = {
         :input          => text,
         :request_id     => request_id,
         :'callbacks[]'  => callbacks,
         :error_callback => error_callback
       }
-
+      
+      extract_params
+      
       http_client.post_async(
         url,
         :body => filtered_params.merge(output)
@@ -270,5 +289,38 @@ module Opener
     def http_client
       return self.class.http_client
     end
+    
+    def authenticate!
+      credentials = {
+        secret_symbol => params[secret_symbol.to_s],
+        token_symbol => params[token_symbol.to_s]
+      }
+      response = http_client.get(Sinatra::Application.authentication, credentials)
+      halt response.body unless response.ok?
+    end
+    
+    def extract_params
+      if request.referrer
+        uri = URI.parse(request.referrer)
+        extracted = Rack::Utils.parse_nested_query(uri.query)
+        params.merge!(extracted)
+      end
+    end
+    
+    def self.secret_symbol
+      Sinatra::Application.respond_to?(:secret)? Sinatra::Application.secret.to_sym : :secret 
+    end
+    
+    def self.token_symbol
+      Sinatra::Application.respond_to?(:token)? Sinatra::Application.token.to_sym : :token 
+    end
+    
+    def secret_symbol
+      return self.class.secret_symbol
+    end
+    
+    def token_symbol
+      return self.class.token_symbol
+    end
   end
 end

metadata

@@ -1,131 +1,131 @@
 --- !ruby/object:Gem::Specification
 name: opener-webservice
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - development@olery.com
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: pry
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: sinatra
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinatra
+        version: 1.4.3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.3
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: uuidtools
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.3
-- !ruby/object:Gem::Dependency
-  name: uuidtools
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
   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'
+  type: :runtime
 description: Basic webservice hooks for the opener toolchain
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
 - lib/opener/webservice.rb
+- lib/opener/webservice/opt_parser.rb
 - lib/opener/webservice/version.rb
 - opener-webservice.gemspec
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.2.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Basic webservice hooks for the opener toolchain
 test_files: []
-has_rdoc: