osso 0.0.5.pre.zeta → 0.0.5

data/lib/osso/models/authorization_code.rb

@@ -7,7 +7,7 @@ module Osso
 
       def access_token
         @access_token ||= expired! &&
-          user.access_tokens.create(oauth_client: oauth_client)
+          user.access_tokens.create(oauth_client: oauth_client, requested: requested)
       end
     end
   end
@@ -25,6 +25,7 @@ end
 #  updated_at      :datetime         not null
 #  user_id         :uuid
 #  oauth_client_id :uuid
+#  requested       :jsonb
 #
 # Indexes
 #

data/lib/osso/models/enterprise_account.rb

@@ -8,10 +8,11 @@ module Osso
     # includes fields for external IDs such that you can persist
     # your ID for an account in your Osso instance.
     class EnterpriseAccount < ActiveRecord::Base
-      belongs_to :oauth_client
       has_many :users
       has_many :identity_providers
 
+      validates_format_of :domain, with: /\A[a-z0-9]+([\-.]{1}[a-z0-9]+)*\.[a-z]{2,5}\z/
+
       def single_provider?
         identity_providers.not_pending.one?
       end
@@ -40,6 +41,7 @@ end
 #  name            :string           not null
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
+#  users_count     :integer          default(0)
 #
 # Indexes
 #

data/lib/osso/models/identity_provider.rb

@@ -6,15 +6,20 @@ module Osso
     class IdentityProvider < ActiveRecord::Base
       belongs_to :enterprise_account
       belongs_to :oauth_client
-      has_many :users
+      has_many :users, dependent: :delete_all
+      before_create :set_sso_issuer
       before_save :set_status
       validate :sso_cert_valid
 
-      enum status: { pending: "PENDING", configured: 'CONFIGURED', active: "ACTIVE", error: "ERROR"}
+      enum status: { pending: 'PENDING', configured: 'CONFIGURED', active: 'ACTIVE', error: 'ERROR' }
 
       PEM_HEADER = "-----BEGIN CERTIFICATE-----\n"
       PEM_FOOTER = "\n-----END CERTIFICATE-----"
 
+      ENTITY_ID_URI_REQUIRED = [
+        'PING',
+      ]
+
       def name
         service.titlecase
       end
@@ -24,7 +29,7 @@ module Osso
           domain: domain,
           idp_sso_target_url: sso_url,
           idp_cert: sso_cert,
-          issuer: domain,
+          issuer: sso_issuer,
         }
       end
 
@@ -40,10 +45,22 @@ module Osso
 
       alias acs_url assertion_consumer_service_url
 
+      def acs_url_validator
+        Regexp.escape(acs_url)
+      end
+
       def set_status
         self.status = 'configured' if sso_url && sso_cert && pending?
       end
 
+      def set_sso_issuer
+        parts = [domain, oauth_client_id]
+        
+        parts.unshift('https:/') if ENTITY_ID_URI_REQUIRED.any?(service)
+
+        self.sso_issuer = parts.join('/')
+      end
+
       def active!
         update(status: 'active')
       end
@@ -81,15 +98,16 @@ end
 # Table name: identity_providers
 #
 #  id                    :uuid             not null, primary key
-#  service               :string
+#  service               :enum
 #  domain                :string           not null
 #  sso_url               :string
 #  sso_cert              :text
 #  enterprise_account_id :uuid
 #  oauth_client_id       :uuid
-#  status                :enum             default("PENDING")
+#  status                :enum             default("pending")
 #  created_at            :datetime
 #  updated_at            :datetime
+#  users_count           :integer          default(0)
 #
 # Indexes
 #

data/lib/osso/models/models.rb

@@ -10,6 +10,7 @@ module Osso
 end
 
 require_relative 'access_token'
+require_relative 'account'
 require_relative 'app_config'
 require_relative 'authorization_code'
 require_relative 'enterprise_account'

data/lib/osso/models/oauth_client.rb

@@ -5,7 +5,6 @@ module Osso
   module Models
     class OauthClient < ActiveRecord::Base
       has_many :access_tokens
-      has_many :enterprise_accounts
       has_many :refresh_tokens
       has_many :identity_providers
       has_many :redirect_uris

data/lib/osso/models/user.rb

@@ -3,8 +3,8 @@
 module Osso
   module Models
     class User < ActiveRecord::Base
-      belongs_to :enterprise_account
-      belongs_to :identity_provider
+      belongs_to :enterprise_account, counter_cache: true
+      belongs_to :identity_provider, counter_cache: true
       has_many :authorization_codes, dependent: :delete_all
       has_many :access_tokens, dependent: :delete_all
 

data/lib/osso/routes/admin.rb

@@ -1,53 +1,59 @@
 # frozen_string_literal: true
 
-require 'jwt'
+require 'roda'
+require 'sequel/core'
 
-module Osso
-  class Admin < Sinatra::Base
-    include AppConfig
-    helpers Helpers::Auth
-    register Sinatra::Namespace
+DEFAULT_VIEWS_DIR = File.join(File.expand_path(Bundler.root), 'views/rodauth')
 
-    before do
-      chomp_token
+module Osso
+  class Admin < Roda
+    DB = Sequel.postgres(extensions: :activerecord_connection)
+    use Rack::Session::Cookie, secret: ENV['SESSION_SECRET']
+
+    plugin :middleware
+    plugin :render, engine: 'erb', views: ENV['RODAUTH_VIEWS'] || DEFAULT_VIEWS_DIR
+    plugin :route_csrf
+
+    plugin :rodauth do
+      enable :login, :verify_account
+      verify_account_set_password? true
+      already_logged_in { redirect login_redirect }
+      use_database_authentication_functions? false
+
+      before_create_account_route do
+        request.halt unless DB[:accounts].empty?
+      end
     end
 
-    namespace '/admin' do
-      get '/login' do
-        token_protected!
-
-        erb :admin, layout: false
-      end
+    alias erb render
 
-      get '' do
-        internal_protected!
+    route do |r|
+      r.rodauth
 
-        erb :admin, layout: false
+      def current_account
+        Osso::Models::Account.find(rodauth.session['account_id']).
+          context.
+          merge({ rodauth: rodauth })
       end
 
-      get '/enterprise' do
-        token_protected!
-
+      r.on 'admin' do
+        rodauth.require_authentication
         erb :admin, layout: false
       end
 
-      get '/enterprise/:domain' do
-        enterprise_protected!(params[:domain])
+      r.post 'graphql' do
+        rodauth.require_authentication
 
-        erb :admin, layout: false
-      end
+        result = Osso::GraphQL::Schema.execute(
+          r.params['query'],
+          variables: r.params['variables'],
+          context: current_account,
+        )
 
-      get '/config' do
-        admin_protected!
-
-        erb :admin, layout: false
+        result.to_json
       end
 
-      get '/config/:id' do
-        admin_protected!
-
-        erb :admin, layout: false
-      end
+      env['rodauth'] = rodauth
     end
   end
 end

data/lib/osso/routes/auth.rb

@@ -13,7 +13,7 @@ module Osso
     UUID_REGEXP =
       /[0-9a-f]{8}-[0-9a-f]{3,4}-[0-9a-f]{4}-[0-9a-f]{3,4}-[0-9a-f]{12}/.
         freeze
-    
+
     use OmniAuth::Builder do
       OmniAuth::MultiProvider.register(
         self,
@@ -26,7 +26,8 @@ module Osso
           not_pending.
           find(identity_provider_id).
           saml_options
-      rescue
+      rescue StandardError => e
+        Raven.capture_exception(e) if defined?(Raven)
         {}
       end
     end
@@ -38,21 +39,20 @@ module Osso
     namespace '/auth' do
       get '/failure' do
         # ??? invalid ticket, warden throws, ugh
-        
+
         # confirmed:
-        # - a valid but wrong cert will throw here 
+        # - a valid but wrong cert will throw here
         #   (OneLogin::RubySaml::ValidationError, Fingerprint mismatch)
         #   but an _invalid_ cert is not caught. we do validate certs on
         #   configuration, so this may be ok
         #
         # - a valid but wrong ACS URL will throw here. the urls
         #   are pretty complex, but it has come up
-        # 
+        #
         # - specifying the wrong "recipient" in your IDP. Only OL so far
         #   (OneLogin::RubySaml::ValidationError, The response was received
-        #    at vcardme.com instead of 
-        #    http://localhost:9292/auth/saml/e54a9a92-b4b5-4ea5-b0e3-b1423eb20b76/callback) 
-
+        #    at vcardme.com instead of
+        #    http://localhost:9292/auth/saml/e54a9a92-b4b5-4ea5-b0e3-b1423eb20b76/callback)
 
         @error = Osso::Error::SamlConfigError.new
         erb :error
@@ -73,7 +73,7 @@ module Osso
       rescue Osso::Error::Base => e
         @error = e
         erb :error
-      end  
+      end
     end
   end
 end

data/lib/osso/routes/oauth.rb

@@ -16,15 +16,14 @@ module Osso
       # Once they complete IdP login, they will be returned to the
       # redirect_uri with an authorization code parameter.
       get '/authorize' do
-        client = find_client(params[:client_id])
-        enterprise = find_account(domain: params[:domain], client_id: client.id)
+        identity_providers = find_providers
 
         validate_oauth_request(env)
 
-        redirect "/auth/saml/#{enterprise.provider.id}" if enterprise.single_provider?
+        redirect "/auth/saml/#{identity_providers.first.id}" if identity_providers.one?
 
-        @providers = enterprise.identity_providers.not_pending
-        erb :multiple_providers if @providers.count > 1
+        @providers = identity_providers.not_pending
+        return erb :multiple_providers if @providers.count > 1
 
         raise Osso::Error::MissingConfiguredIdentityProvider.new(domain: params[:domain])
       rescue Osso::Error::Base => e
@@ -38,11 +37,12 @@ module Osso
       # and client secret
       post '/token' do
         Rack::OAuth2::Server::Token.new do |req, res|
-          code = Models::AuthorizationCode.
-            find_by_token!(params[:code])
           client = Models::OauthClient.find_by!(identifier: req.client_id)
           req.invalid_client! if client.secret != req.client_secret
+
+          code = Models::AuthorizationCode.find_by_token!(params[:code])
           req.invalid_grant! if code.redirect_uri != req.redirect_uri
+
           res.access_token = code.access_token.to_bearer_token
         end.call(env)
       end
@@ -50,22 +50,35 @@ module Osso
       # Use the access token to request a profile for the user who
       # just logged in. Access tokens are short-lived.
       get '/me' do
-        json Models::AccessToken.
+        token = Models::AccessToken.
           includes(:user).
           valid.
-          find_by_token!(params[:access_token]).
-          user
+          find_by_token!(access_token)
+
+        json token.user.as_json.merge(requested: token.requested)
       end
     end
 
     private
 
-    def find_account(domain:, client_id:)
-      Models::EnterpriseAccount.
-        includes(:identity_providers).
-        find_by!(domain: domain, oauth_client_id: client_id)
-    rescue ActiveRecord::RecordNotFound
-      raise Osso::Error::NoAccountForOAuthClientError.new(domain: params[:domain])
+    def find_providers
+      if params[:email]
+        user = Osso::Models::User.
+          includes(:identity_provider).
+          find_by(email: params[:email])
+        return [user.identity_provider] if user
+      end
+
+      Osso::Models::IdentityProvider.
+        joins(:oauth_client).
+        where(
+          domain: domain_from_params,
+          oauth_clients: { identifier: params[:client_id] },
+        )
+    end
+
+    def domain_from_params
+      params[:domain] || params[:email].split('@')[1]
     end
 
     def find_client(identifier)
@@ -74,14 +87,19 @@ module Osso
       raise Osso::Error::InvalidOAuthClientIdentifier
     end
 
-    def validate_oauth_request(env)
+    def validate_oauth_request(env) # rubocop:disable Metrics/AbcSize
       Rack::OAuth2::Server::Authorize.new do |req, _res|
         client = find_client(req[:client_id])
         session[:osso_oauth_redirect_uri] = req.verify_redirect_uri!(client.redirect_uri_values)
         session[:osso_oauth_state] = params[:state]
+        session[:osso_oauth_requested] = { domain: req[:domain], email: req[:email] }
       end.call(env)
     rescue Rack::OAuth2::Server::Authorize::BadRequest
       raise Osso::Error::InvalidRedirectUri.new(redirect_uri: params[:redirect_uri])
     end
+
+    def access_token
+      params[:access_token] || env.fetch('HTTP_AUTHORIZATION', '').slice(-64..-1)
+    end
   end
 end

data/lib/osso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Osso
-  VERSION = '0.0.5-zeta'
+  VERSION = '0.0.5'
 end

data/lib/osso/views/admin.erb

@@ -0,0 +1,5 @@
+<%# 
+    NB: this file exists so that the admin routes have something to render in spec.
+    In real-world usage, those routes render an index.html file that includes the
+    React app.
+ %>

data/lib/osso/views/error.erb

@@ -0,0 +1 @@
+<%= @error %>

data/lib/osso/views/multiple_providers.erb

@@ -0,0 +1 @@
+MULITPLE PROVIDERS

data/lib/tasks/bootstrap.rake

@@ -7,12 +7,26 @@ require 'osso'
 namespace :osso do
   desc 'Bootstrap Osso data for a deployment'
   task :bootstrap do
-    %w[Production Staging Development].each do |environement|
+    %w[Production Staging Development].each do |environment|
       Osso::Models::OauthClient.create!(
-        name: environement,
-      )
+        name: environment,
+      ) unless Osso::Models::OauthClient.find_by_name(environment)
     end
 
-    Osso::Models::AppConfig.create!
+    Osso::Models::AppConfig.create
+
+    admin_email = ENV['ADMIN_EMAIL']
+
+    if admin_email
+      admin = Osso::Models::Account.create!(
+        email: admin_email,
+        status_id: 1,
+        role: 'admin',
+      )
+
+      rodauth = Osso::Admin.rodauth.new(Osso::Admin.new({}))
+      account = rodauth.account_from_login(admin_email)
+      rodauth.setup_account_verification
+    end
   end
 end

data/osso-rb.gemspec

@@ -16,14 +16,19 @@ Gem::Specification.new do |spec|
   spec.license = 'MIT'
 
   spec.add_runtime_dependency 'activesupport', '>= 6.0.3.2'
+  spec.add_runtime_dependency 'bcrypt', '~> 3.1.13'
   spec.add_runtime_dependency 'graphql'
   spec.add_runtime_dependency 'jwt'
+  spec.add_runtime_dependency 'mail', '~> 2.7.1'
   spec.add_runtime_dependency 'omniauth-multi-provider'
   spec.add_runtime_dependency 'omniauth-saml'
   spec.add_runtime_dependency 'rack', '>= 2.1.4'
   spec.add_runtime_dependency 'rack-contrib'
   spec.add_runtime_dependency 'rack-oauth2'
   spec.add_runtime_dependency 'rake'
+  spec.add_runtime_dependency 'rodauth', '~> 2.5.0'
+  spec.add_runtime_dependency 'sequel', '~> 5.37.0'
+  spec.add_runtime_dependency 'sequel-activerecord_connection', '~> 0.3'
   spec.add_runtime_dependency 'sinatra'
   spec.add_runtime_dependency 'sinatra-activerecord'
   spec.add_runtime_dependency 'sinatra-contrib'