Merge branch 'master' into fix-skip-before-filter

Author: devpost-mzheng

lib/open_sesame/configuration.rb

@@ -10,6 +10,7 @@ class Configuration
       :enabled,
       :debug,
       :full_host,
+      :vetted_github_logins,
       :auto_access_provider,
       :after_login_path,
       :after_logout_path

lib/open_sesame/member.rb

@@ -20,17 +20,21 @@ def self.find(member_login)
     def self.find_member(member_login)
       members.detect { |m| m.login == member_login } || begin
         client.user(member_login)
-      rescue Octokit::Error => ek
+      rescue Octokit::Error => e
         OpenSesame.logger.info e
       end
     end
 
     def self.member?(member_login)
-      member_logins.include?(member_login) || begin
+      member_logins.include?(member_login) ||
+        vetted_github_login?(member_login) ||
         client.organization_member?(organization_name, member_login)
-      rescue Octokit::ServerError => e
-        OpenSesame.logger.info e
-      end
+    rescue Octokit::ServerError => e
+      OpenSesame.logger.info e
+    end
+
+    def self.vetted_github_login?(member_login)
+      OpenSesame.vetted_github_logins.include?(member_login)
     end
 
     # memoized list of accepted member

opensesame.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rails", ">= 3.2"
   s.add_dependency "omniauth-github"
-  s.add_dependency "octokit", "~> 2.3"
+  s.add_dependency 'octokit', '~> 4.16'
   s.add_dependency "faraday-http-cache"
   s.add_dependency "warden"
 

spec/dummy/config/initializers/opensesame.rb

@@ -18,5 +18,6 @@
   config.organization 'challengepost'
   config.mounted_at   '/opensesame'
   config.github app_id, secret
+  config.vetted_github_logins = []
   config.debug = true
 end