wvengen 2019-02-05 20:53:02 +01:00 committed by wvengen
parent 02f1940694
commit e9be38b3e9
12 changed files with 162 additions and 32 deletions

View file

@ -1,4 +1,6 @@
class Api::V1::BaseController < ApplicationController class Api::V1::BaseController < ApplicationController
include Concerns::AuthApi
protect_from_forgery with: :null_session protect_from_forgery with: :null_session
before_action :skip_session before_action :skip_session
@ -11,16 +13,6 @@ class Api::V1::BaseController < ApplicationController
private private
def authenticate
doorkeeper_authorize!
super if current_user
end
# @return [User] Current user, or +nil+ if no valid token.
def current_user
@current_user ||= User.undeleted.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
end
# @return [Ordergroup] Current user's ordergroup, or +nil+ if no valid token or user has no ordergroup. # @return [Ordergroup] Current user's ordergroup, or +nil+ if no valid token or user has no ordergroup.
def current_ordergroup def current_ordergroup
current_user.try(:ordergroup) current_user.try(:ordergroup)
@ -28,7 +20,9 @@ class Api::V1::BaseController < ApplicationController
def require_ordergroup def require_ordergroup
authenticate authenticate
raise Api::Errors::PermissionRequired unless current_user.ordergroup.present? unless current_ordergroup.present?
raise Api::Errors::PermissionRequired.new('Forbidden, must be in an ordergroup')
end
end end
def skip_session def skip_session
@ -42,13 +36,18 @@ class Api::V1::BaseController < ApplicationController
end end
def not_acceptable_handler(e) def not_acceptable_handler(e)
render status: 422, json: {error: 'not_acceptable', error_description: e.message || 'Data not acceptable' } msg = e.message || 'Data not acceptable'
render status: 422, json: {error: 'not_acceptable', error_description: msg}
end end
def doorkeeper_unauthorized_render_options(error:) def doorkeeper_unauthorized_render_options(error:)
{json: {error: error.name, error_description: error.description}} {json: {error: error.name, error_description: error.description}}
end end
def doorkeeper_forbidden_render_options(error:)
{json: {error: error.name, error_description: error.description}}
end
def permission_required_handler(e) def permission_required_handler(e)
msg = e.message || 'Forbidden, user has no access' msg = e.message || 'Forbidden, user has no access'
render status: 403, json: {error: 'forbidden', error_description: msg} render status: 403, json: {error: 'forbidden', error_description: msg}
@ -58,5 +57,4 @@ class Api::V1::BaseController < ApplicationController
def show_user(user = current_user, **options) def show_user(user = current_user, **options)
user.display user.display
end end
end end

View file

@ -1,5 +1,7 @@
class Api::V1::ConfigsController < Api::V1::BaseController class Api::V1::ConfigsController < Api::V1::BaseController
before_action ->{ doorkeeper_authorize! 'config:user', 'config:read', 'config:write' }
def show def show
render json: FoodsoftConfig, serializer: ConfigSerializer, root: 'config' render json: FoodsoftConfig, serializer: ConfigSerializer, root: 'config'
end end

View file

@ -0,0 +1,9 @@
class Api::V1::User::UsersController < Api::V1::BaseController
before_action ->{ doorkeeper_authorize! 'user:read', 'user:write' }
def show
render json: current_user
end
end

View file

@ -1,7 +0,0 @@
class Api::V1::UsersController < Api::V1::BaseController
def show
render json: current_user
end
end

View file

@ -0,0 +1,66 @@
# Controller concern for authentication methods
#
# Split off from main +ApplicationController+ to allow e.g.
# Doorkeeper to use it too.
module Concerns::AuthApi
extend ActiveSupport::Concern
protected
def authenticate
# authenticate does not look at scopes, we just want to know if there's a valid token
# @see https://github.com/doorkeeper-gem/doorkeeper/blob/v5.0.1/lib/doorkeeper/models/access_token_mixin.rb#L218
doorkeeper_render_error unless doorkeeper_token && doorkeeper_token.accessible?
super if current_user
end
# @return [User] Current user, or +nil+ if no valid token.
def current_user
@current_user ||= User.undeleted.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
end
def doorkeeper_authorize!(*scopes)
super(*scopes)
# In addition to Doorkeeper's authorization and scope check, we also verify
# that the user has permissions for the scope (through its workgroups).
# Unless no scopes were supplied, which means we only want to make sure there
# is a valid user.
#
# If Doorkeeper's +handle_auth_errors+ is set to +:raise+, we don't get here,
# but otherwise we need to check whether +super+ rendered an error.
doorkeeper_authorize_roles!(*scopes) if scopes.present? && !performed?
end
private
# Make sure that at least one the given OAuth scopes is valid for the current user's permissions.
# @raise Api::Errors::PermissionsRequired
def doorkeeper_authorize_roles!(*scopes)
unless scopes.any? {|scope| doorkeeper_scope_permitted?(scope) }
raise Api::Errors::PermissionRequired.new('Forbidden, no permission')
end
end
# Check whether a given OAuth scope is permitted for the current user.
# @note This does not validate whether the given scope is a valid scope.
# @return [Boolean] Whether the given scope is valid for the current user.
# @see https://github.com/foodcoops/foodsoft/issues/582#issuecomment-442513237
def doorkeeper_scope_permitted?(scope)
scope_parts = scope.split(':')
# user sub-scopes like +config:user+ are always permitted
if scope_parts.last == 'user'
return true
end
case scope_parts.first
when 'user' then true # access to the current user's own profile
when 'config' then current_user.role_admin?
when 'users' then current_user.role_admin?
when 'workgroups' then current_user.role_admin?
when 'suppliers' then current_user.role_suppliers?
when 'group_orders' then current_user.role_orders?
when 'finance' then current_user.role_finance?
# please note that offline_access does not belong here, since it is not used for permission checking
end
end
end

View file

@ -47,8 +47,13 @@ Doorkeeper.configure do
# Define access token scopes for your provider # Define access token scopes for your provider
# For more information go to # For more information go to
# https://github.com/doorkeeper-gem/doorkeeper/wiki/Using-Scopes # https://github.com/doorkeeper-gem/doorkeeper/wiki/Using-Scopes
# default_scopes :public
# optional_scopes :write, :update # default is a collection of read-only scopes
default_scopes 'config:user', 'user:read'
optional_scopes 'config:read', 'config:write',
'user:write',
'offline_access'
# Change the way client credentials are retrieved from the request object. # Change the way client credentials are retrieved from the request object.
# By default it retrieves first from the `HTTP_AUTHORIZATION` header, then # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then

View file

@ -245,9 +245,12 @@ Foodsoft::Application.routes.draw do
namespace :api do namespace :api do
namespace :v1 do namespace :v1 do
resource :user, only: [:show]
resource :config, only: [:show] resource :config, only: [:show]
resource :navigation, only: [:show] resource :navigation, only: [:show]
namespace :user do
root to: 'users#show'
end
end end
end end

View file

@ -9,6 +9,8 @@ The API is documented using [Open API 2.0](https://github.com/OAI/OpenAPI-Specif
/ [Swagger](https://swagger.io/) in [swagger.v1.yml](swagger.v1.yml). / [Swagger](https://swagger.io/) in [swagger.v1.yml](swagger.v1.yml).
This provides a machine-readable reference that is used to provide documentation. This provides a machine-readable reference that is used to provide documentation.
**Note:** the current OAuth scopes may be subject to change, until the next release of Foodsoft.
## API endpoint documentation ## API endpoint documentation
&gt;&gt; [View API documentation](http://petstore.swagger.io/?url=https%3A%2F%2Fraw.githubusercontent.com%2Ffoodcoops%2Ffoodsoft%2Fmaster%2Fdoc%2Fswagger.v1.yml) &lt;&lt; &gt;&gt; [View API documentation](http://petstore.swagger.io/?url=https%3A%2F%2Fraw.githubusercontent.com%2Ffoodcoops%2Ffoodsoft%2Fmaster%2Fdoc%2Fswagger.v1.yml) &lt;&lt;

View file

@ -46,8 +46,12 @@ paths:
description: not logged-in description: not logged-in
schema: schema:
$ref: '#/definitions/Error401' $ref: '#/definitions/Error401'
403:
description: missing scope
schema:
$ref: '#/definitions/Error403'
security: security:
- foodsoft_auth: ['all'] - foodsoft_auth: ['user:read', 'user:write']
/config: /config:
get: get:
summary: configuration variables summary: configuration variables
@ -62,8 +66,12 @@ paths:
description: not logged-in description: not logged-in
schema: schema:
$ref: '#/definitions/Error401' $ref: '#/definitions/Error401'
403:
description: missing scope or no permission
schema:
$ref: '#/definitions/Error403'
security: security:
- foodsoft_auth: ['all'] - foodsoft_auth: ['config:user', 'config:read', 'config:write']
/navigation: /navigation:
get: get:
summary: navigation summary: navigation
@ -82,7 +90,7 @@ paths:
schema: schema:
$ref: '#/definitions/Error401' $ref: '#/definitions/Error401'
security: security:
- foodsoft_auth: ['all'] - foodsoft_auth: []
definitions: definitions:
# models # models
@ -142,6 +150,14 @@ definitions:
description: '<tt>unauthorized</tt>' description: '<tt>unauthorized</tt>'
error_description: error_description:
$ref: '#/definitions/Error/properties/error_description' $ref: '#/definitions/Error/properties/error_description'
Error403:
type: object
properties:
error:
type: string
description: '<tt>forbidden</tt> or <tt>invalid_scope</tt>'
error_description:
$ref: '#/definitions/Error/properties/error_description'
securityDefinitions: securityDefinitions:
foodsoft_auth: foodsoft_auth:
@ -149,5 +165,9 @@ securityDefinitions:
flow: implicit flow: implicit
authorizationUrl: http://localhost:3000/f/oauth/authorize authorizationUrl: http://localhost:3000/f/oauth/authorize
scopes: scopes:
all: full access to user functions config:user: reading Foodsoft configuration for regular users
config:read: reading Foodsoft configuration values
config:write: reading and updating Foodsoft configuration values
user:read: reading your own user profile
user:write: reading and updating your own user profile
offline_access: retain access after user has logged out offline_access: retain access after user has logged out

View file

@ -15,6 +15,7 @@ describe 'API v1', type: :apivore, order: :defined do
context 'has valid paths' do context 'has valid paths' do
context 'user' do context 'user' do
let(:api_scopes) { ['user:read'] }
# create multiple users to make sure we're getting the authenticated user, not just any # create multiple users to make sure we're getting the authenticated user, not just any
let!(:other_user_1) { create :user } let!(:other_user_1) { create :user }
let!(:user) { create :user } let!(:user) { create :user }
@ -23,20 +24,23 @@ describe 'API v1', type: :apivore, order: :defined do
it { is_expected.to validate(:get, '/user', 200, api_auth) } it { is_expected.to validate(:get, '/user', 200, api_auth) }
it { is_expected.to validate(:get, '/user', 401) } it { is_expected.to validate(:get, '/user', 401) }
context 'with invalid access token' do it_handles_invalid_token_and_scope(:get, '/user')
let(:api_access_token) { 'abc' }
it { is_expected.to validate(:get, '/user', 401, api_auth) }
end
end end
context 'config' do context 'config' do
let(:api_scopes) { ['config:user'] }
it { is_expected.to validate(:get, '/config', 200, api_auth) } it { is_expected.to validate(:get, '/config', 200, api_auth) }
it { is_expected.to validate(:get, '/config', 401) } it { is_expected.to validate(:get, '/config', 401) }
it_handles_invalid_token_and_scope(:get, '/config')
end end
context 'navigation' do context 'navigation' do
it { is_expected.to validate(:get, '/navigation', 200, api_auth) } it { is_expected.to validate(:get, '/navigation', 200, api_auth) }
it { is_expected.to validate(:get, '/navigation', 401) } it { is_expected.to validate(:get, '/navigation', 401) }
it_handles_invalid_token(:get, '/navigation')
end end
end end

View file

@ -21,6 +21,14 @@ FactoryBot.define do
create :ordergroup, user_ids: [user.id] create :ordergroup, user_ids: [user.id]
end end
end end
[:ordergroup, :finance, :invoices, :article_meta, :suppliers, :pickups, :orders].each do |role|
trait "role_#{role}".to_sym do
after :create do |user, evaluator|
create :workgroup, "role_#{role}" => true, user_ids: [user.id]
end
end
end
end end
factory :group do factory :group do

View file

@ -3,8 +3,28 @@ module ApiHelper
included do included do
let(:user) { create(:user) } let(:user) { create(:user) }
let(:api_access_token) { create(:oauth2_access_token, resource_owner_id: user.id).token } let(:api_scopes) { [] } # empty scopes for stricter testing (in reality this would be default_scopes)
let(:api_access_token) { create(:oauth2_access_token, resource_owner_id: user.id, scopes: api_scopes&.join(' ')).token }
let(:api_authorization) { "Bearer #{api_access_token}" } let(:api_authorization) { "Bearer #{api_access_token}" }
def self.it_handles_invalid_token(method, path, params_block = ->{ api_auth })
context 'with invalid access token' do
let(:api_access_token) { 'abc' }
it { is_expected.to validate(method, path, 401, instance_exec(&params_block)) }
end
end
def self.it_handles_invalid_scope(method, path, params_block = ->{ api_auth })
context 'with invalid scope' do
let(:api_scopes) { ['none'] }
it { is_expected.to validate(method, path, 403, instance_exec(&params_block)) }
end
end
def self.it_handles_invalid_token_and_scope(*args)
it_handles_invalid_token(*args)
it_handles_invalid_scope(*args)
end
end end
# Add authentication to parameters for {Swagger::RspecHelpers#validate} # Add authentication to parameters for {Swagger::RspecHelpers#validate}