Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add IgnoreFeatureCheckForHostUsers option for multitenancy #4224

Merged
merged 3 commits into from
Jan 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/Abp/Authorization/AuthorizationHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@ public class AuthorizationHelper : IAuthorizationHelper, ITransientDependency

private readonly IFeatureChecker _featureChecker;
private readonly IAuthorizationConfiguration _authConfiguration;
private readonly IMultiTenancyConfig _multiTenancyConfig;

public AuthorizationHelper(IFeatureChecker featureChecker, IAuthorizationConfiguration authConfiguration)
public AuthorizationHelper(IFeatureChecker featureChecker, IAuthorizationConfiguration authConfiguration, IMultiTenancyConfig multiTenancyConfig)
{
_featureChecker = featureChecker;
_authConfiguration = authConfiguration;
_multiTenancyConfig = multiTenancyConfig;
AbpSession = NullAbpSession.Instance;
PermissionChecker = NullPermissionChecker.Instance;
LocalizationManager = NullLocalizationManager.Instance;
Expand Down Expand Up @@ -65,6 +67,14 @@ protected virtual async Task CheckFeatures(MethodInfo methodInfo, Type type)
return;
}

if (AbpSession.TenantId == null)
{
if (_multiTenancyConfig.IgnoreFeatureCheckForHostUsers)
{
return;
}
}

foreach (var featureAttribute in featureAttributes)
{
await _featureChecker.CheckEnabledAsync(featureAttribute.RequiresAll, featureAttribute.Features);
Expand Down
6 changes: 6 additions & 0 deletions src/Abp/Configuration/Startup/IMultiTenancyConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ public interface IMultiTenancyConfig
/// </summary>
bool IsEnabled { get; set; }

/// <summary>
/// Ignore feature check for host users
/// Default value: false.
/// </summary>
bool IgnoreFeatureCheckForHostUsers { get; set; }

/// <summary>
/// A list of contributors for tenant resolve process.
/// </summary>
Expand Down
6 changes: 6 additions & 0 deletions src/Abp/Configuration/Startup/MultiTenancyConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ internal class MultiTenancyConfig : IMultiTenancyConfig
/// </summary>
public bool IsEnabled { get; set; }

/// <summary>
/// Ignore feature check for host users
/// Default value: false.
/// </summary>
public bool IgnoreFeatureCheckForHostUsers { get; set; }

public ITypeList<ITenantResolveContributor> Resolvers { get; }

public MultiTenancyConfig()
Expand Down
56 changes: 43 additions & 13 deletions test/Abp.Tests/Authorization/AuthorizationHelper_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,7 @@ public class AuthorizationHelper_Tests

public AuthorizationHelper_Tests()
{
var featureChecker = Substitute.For<IFeatureChecker>();
featureChecker.GetValueAsync(Arg.Any<string>()).Returns("false");

var permissionChecker = Substitute.For<IPermissionChecker>();
permissionChecker.IsGrantedAsync(Arg.Any<string>()).Returns(false);

var configuration = Substitute.For<IAuthorizationConfiguration>();
configuration.IsEnabled.Returns(true);

_authorizeHelper = new AuthorizationHelper(featureChecker, configuration)
{
PermissionChecker = permissionChecker
};
_authorizeHelper = GetAuthorizationHelper(false, false, true);
}

[Fact]
Expand Down Expand Up @@ -63,6 +51,17 @@ public async Task AuthorizedMethodsCanNotBeCalledAnonymously()
});
}

[Fact]
public async Task NotAuthorizedFeatureDependentMethodsCanBeCalledAnonymously()
{
var authorizeHelper = GetAuthorizationHelper(false, false, true);

await authorizeHelper.AuthorizeAsync(
typeof(MyNonAuthorizedClass).GetTypeInfo().GetMethod(nameof(MyNonAuthorizedClass.Test_FeatureDependent)),
typeof(MyNonAuthorizedClass)
);
}

public class MyNonAuthorizedClass
{
public void Test_NotAuthorized()
Expand All @@ -75,6 +74,12 @@ public void Test_Authorized()
{

}

[RequiresFeature("Test")]
public void Test_FeatureDependent()
{

}
}

[AbpAuthorize]
Expand All @@ -91,5 +96,30 @@ public void Test_Authorized()

}
}

private static AuthorizationHelper GetAuthorizationHelper(
bool featureCheckerValue,
bool isGranted,
bool ignoreFeatureCheckForHostUsers)
{
var featureChecker = Substitute.For<IFeatureChecker>();
featureChecker.GetValueAsync(Arg.Any<string>()).Returns(featureCheckerValue.ToString().ToLower());

var permissionChecker = Substitute.For<IPermissionChecker>();
permissionChecker.IsGrantedAsync(Arg.Any<string>()).Returns(isGranted);

var configuration = Substitute.For<IAuthorizationConfiguration>();
configuration.IsEnabled.Returns(true);

var multiTenancyConfig = Substitute.For<IMultiTenancyConfig>();
multiTenancyConfig.IgnoreFeatureCheckForHostUsers.Returns(ignoreFeatureCheckForHostUsers);

var authorizeHelper = new AuthorizationHelper(featureChecker, configuration, multiTenancyConfig)
{
PermissionChecker = permissionChecker
};

return authorizeHelper;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public AuthorizationInterceptor_Tests()
);

LocalIocManager.Register<IAuthorizationConfiguration, AuthorizationConfiguration>();
LocalIocManager.Register<IMultiTenancyConfig, MultiTenancyConfig>();
LocalIocManager.Register<AuthorizationInterceptor>(DependencyLifeStyle.Transient);
LocalIocManager.Register<IAuthorizationHelper, AuthorizationHelper>(DependencyLifeStyle.Transient);
LocalIocManager.IocContainer.Register(
Expand Down