mais-access 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f88002e1195c7f1187c27fa7a244619fa3101a2ab91a650260dfcd9acb9d9912
-  data.tar.gz: fdc4e863615ef1ff267d989a0bdd2696ffa2bdbd876695cf4a15b484c4949aaf
+  metadata.gz: bc9907ad2cf934f7a61fc086c1b92a75239a76d3f31dd460c27610a33507721f
+  data.tar.gz: 1ec26dfefef621b95ba1234e9f925905bd4231b358372e143e01720bc8215d46
 SHA512:
-  metadata.gz: 59f48ae598a636cfcaa9b82acb728e70977d7dbd384cf85404d3d11179db9ec46b79ce0c479790e4c05e1e13dd12f98f1d3bcd54a4bfa04f53cd662528d69dd9
-  data.tar.gz: e350a1b236ecefb20a7184d301c94c3be458c5ec4a8e1b81c986a17ef59257467c4fe89e324f1de48a5a699318073a0981800f4f8e6d33c90a1e9a58eb1df53c
+  metadata.gz: ccead31f66c557e86aa9e4d718159e1928d8f8785fb2221d44e9997c010a840fa418b3cac28a3f00915660eae173a284500a328c404028cbafe81e10b773aa45
+  data.tar.gz: 398360da3a38d578c41d0441d36f6f71ea0e6a0ca59b323d4bd97415d66fd17a5594b0683b36c5bf3cfbfb39b73f593d0ed6aedc90c3420c635cffeede4a6298

data/lib/mais-access.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MaisAccess
 	class Railtie < ::Rails::Railtie
 		initializer('mais.middleware') do |app|

data/lib/mais-access/dispatcher.rb

@@ -1,44 +1,61 @@
+# frozen_string_literal: true
+
 module MaisAccess
-    module Dispatcher
-        require 'net/https'
-        require 'uri'
-        require 'json'
-        require 'mais-access/user'
-
-        attr_reader :mais_user
-
-        MAIS_CLIENT = ENV['MAIS_CLIENT']
-
-        def authenticate_mais_user!
-            # Prompt the user for HTTP Basic credentials, or authenticate if they are cached in the session
-            authenticate_or_request_with_http_basic("access - MAIS - #{MAIS_CLIENT}") do |login, password|
-                begin
-                    # Setup https connection and specify certificate bundle
-                    url = URI("#{ENV['MAIS_ACCOUNTS_HOSTNAME']}/authenticate")
-                    http = Net::HTTP.new(url.host, 443)
-                    http.use_ssl = true
-                    http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-                    http.cert_store = OpenSSL::X509::Store.new
-                    http.cert_store.set_default_paths
-                    http.cert_store.add_file("/etc/pki/tls/certs/server.crt")
-
-                    # Get the credentials and POST them to `accounts.scenycwork.net/authenticate`
-                    request = Net::HTTP::Post.new(url.path, {'Content-Type' => 'application/json'})
-                    request.set_form_data({ "username" => login, "password" => password })
-                    response = http.request(request)
-
-                    # Parse the response body as JSON
-                    body = JSON.parse(response.body)
-
-                    # If the user is valid, set the current mais user and passes the filter action
-                    if response.code == '200' && body["authenticated"]
-                        @mais_user = MaisAccess::User.new(body["user"])
-                        return true
-                    end
-                rescue => e
-                    # Something went wrong, so save our butts and don't them in.
-                end
-            end
+  module Dispatcher
+    require 'net/https'
+    require 'uri'
+    require 'json'
+    require 'mais-access/user'
+
+    attr_reader :mais_user
+
+    MAIS_CLIENT = ENV['MAIS_CLIENT']
+    APP_TITLE = "access - MAIS - #{MAIS_CLIENT}"
+
+    def authenticate_mais_user!
+      # Prompt the user for HTTP Basic credentials or authenticate if they are
+      # cached in the browser session
+      authenticate_or_request_with_http_basic(APP_TITLE) { |l, p| user?(l, p) }
+    end
+
+    private
+
+    def user?(login, password)
+      begin
+        url = URI("#{ENV['MAIS_ACCOUNTS_HOSTNAME']}/authenticate")
+
+        # Setup https connection and specify certificate bundle if enabled
+        if (ENV.fetch("USE_HTTPS") { false })
+          http = Net::HTTP.new(url.host, 443)
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+          http.cert_store = OpenSSL::X509::Store.new
+          http.cert_store.set_default_paths
+          http.cert_store.add_file("/etc/pki/tls/certs/server.crt")
+        else
+          http = Net::HTTP.new(url.host, url.port)
+        end
+
+        # Get the credentials and POST them to `accounts.scenycwork.net/authenticate`
+        request = Net::HTTP::Post.new(url.path, {'Content-Type' => 'application/json'})
+        request.set_form_data({ "username" => login, "password" => password })
+        response = http.request(request)
+
+        # Parse the response body as JSON
+        body = JSON.parse(response.body)
+
+        # If the user is valid, set the current mais user
+        if response.code == '200' && body["authenticated"]
+          @mais_user = MaisAccess::User.new(body["user"])
+          # let them in
+          return true
         end
+      rescue => e
+        Rails.logger.error(e)
+      end
+
+      # Something went wrong, so save our butts and don't them in.
+      return false
     end
+  end
 end

data/lib/mais-access/user.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
 module MaisAccess
-    # An abstract class used to store the currently authenticated MAIS user. An instance of
-    # this class is initialized everytime `authenticate_mais_user!` completes successfully.
-    # The current MAIS user can be accessed anytime via the `mais_user` method.
-    class User
-        attr_reader :username, :full_name
+  # An abstract class used to store the currently authenticated MAIS user. An instance of
+  # this class is initialized every time `authenticate_mais_user!` completes successfully.
+  # The current MAIS user can be accessed anytime via the `mais_user` method.
+  class User
+    attr_reader :username, :full_name
 
-        def initialize(*params)
-            params = params[0]
-            @username = params["username"]
-            @full_name = params["full_name"]
-        end
+    def initialize(*params)
+      params = params[0]
+      @username = params["username"]
+      @full_name = params["full_name"]
     end
+  end
 end

data/mais-access.gemspec

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
 	spec.name          = "mais-access"
-	spec.version       = "1.1.1"
-	spec.platform      = Gem::Platform::RUBY
+	spec.version       = "1.1.2"
 	spec.author        = "Elias Gabriel"
 	spec.email         = "me@eliasfgabriel.com"
 	spec.summary       = "A MAIS(tm) authentication middleware."
@@ -23,5 +24,5 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "rails", '>= 4.0.2'
 
 	spec.add_development_dependency "bundler", '~> 2.0'
-	spec.add_development_dependency "rake", '~> 10.0'
+  spec.add_development_dependency "rake", '~> 10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mais-access
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Elias Gabriel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-18 00:00:00.000000000 Z
+date: 2020-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -89,8 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: A MAIS(tm) authentication middleware.