Commit Graph

36593 Commits

Author SHA1 Message Date
Shannon
e297bc8c8d oops still have c# 9 stuff 2020-12-02 14:43:33 +11:00
Shannon
0846fc5690 Cleans up IBackofficeSecurity, ensures authn for the AuthenticationController/BackOfficeController 2020-12-02 14:28:16 +11:00
Shannon
372674abde re-adds test scheme for test authn/authz 2020-12-02 13:32:14 +11:00
Shannon
4f7c87d1d2 Fix build issues after merge 2020-12-02 13:19:08 +11:00
Shannon
0f0c50b56e Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/2FAuth
# Conflicts:
#	src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs
#	src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/Filters/DenyLocalLoginAuthorizationAttribute.cs
#	src/Umbraco.Web.BackOffice/Filters/OverrideAuthorizationFilterProvider.cs
#	src/Umbraco.Web.Common/Filters/UmbracoBackOfficeAuthorizeAttribute.cs
#	src/Umbraco.Web.Common/Filters/UmbracoBackOfficeAuthorizeFilter.cs
2020-12-02 13:14:47 +11:00
Shannon
37cf0d3d16 clean up TODOs 2020-12-02 13:04:02 +11:00
Shannon
999be04285 cleaning up TODOs 2020-12-02 12:22:08 +11:00
Bjarke Berg
98cf259f0c post merge - fix more issues in legacy csproj
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-12-01 20:20:47 +01:00
Bjarke Berg
2e67275687 Post merge - Fix powershell build.ps1 2020-12-01 14:25:10 +01:00
Bjarke Berg
a1df7c159a Post merge - Fix build 2020-12-01 11:39:24 +01:00
Bjarke Berg
85c01d9905 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
# Conflicts:
#	src/Umbraco.Configuration/Legacy/GlobalSettings.cs
#	src/Umbraco.Core/Configuration/IGlobalSettings.cs
#	src/Umbraco.Core/Models/ContentBaseExtensions.cs
#	src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs
#	src/Umbraco.Core/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Core/Runtime/MainDom.cs
#	src/Umbraco.Core/Services/IRuntimeState.cs
#	src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
#	src/Umbraco.Infrastructure/RuntimeState.cs
#	src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
#	src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs
#	src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
#	src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml
#	src/Umbraco.Web/Controllers/UmbLoginController.cs
#	src/Umbraco.Web/Install/Controllers/InstallController.cs
#	src/Umbraco.Web/PublishedElementExtensions.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/UmbracoInjectedModule.cs
#	src/Umbraco.Web/UrlHelperExtensions.cs
#	src/Umbraco.Web/UrlHelperRenderExtensions.cs
#	src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
2020-12-01 11:34:13 +01:00
Bjarke Berg
739194d71f Post merge - Fix for acceptance tests 2020-12-01 11:02:11 +01:00
Bjarke Berg
27b44c6594 Post merge - Fix for tests 2020-12-01 09:14:46 +01:00
Bjarke Berg
3e0d52b330 Merge pull request #9428 from umbraco/netcore/task/6666-auth-policies
Migrate authorization filters to authorization policies
2020-12-01 08:17:04 +01:00
Shannon
fe5dcd83bb removes the 2FA store implementation since that will need to be manually enabled 2020-12-01 18:14:37 +11:00
Shannon
4671d9d23b moves the back office user auditing logic 2020-12-01 17:51:52 +11:00
Shannon
20b4f55664 Fixes up a bunch of TODOs moves user manager to the back office project so we have acess to necessary services, splits apart files, removes old code, starts implementing the 2fa stuff 2020-12-01 17:24:23 +11:00
Shannon
a995cdc360 Fixes TryConvertTo with StringValues 2020-12-01 16:08:16 +11:00
Shannon
e431c82edc fix returning null issue 2020-12-01 15:20:34 +11:00
Shannon
927335149d try fixing watch task 2020-12-01 15:02:28 +11:00
Shannon
47b4a4d234 FIxes authz on some controllers, fixes js var paths for login providers, simplifies gulp so we aren't building 2x. 2020-12-01 00:19:08 +11:00
Shannon
efff96f711 Creates IBackOfficeSignInManager interface 2020-11-30 22:46:05 +11:00
Shannon
6176046053 Deals with the Xsrf notes and handling in sign in manager 2020-11-30 22:23:10 +11:00
Bjarke Berg
13374a8654 post merge
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-30 11:57:00 +01:00
Bjarke Berg
1aea3f9085 Merge pull request #9414 from umbraco/netcore/feature/linux-paths
Linux paths
2020-11-30 11:30:53 +01:00
Bjarke Berg
c88c842d47 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
#	.github/workflows/codeql-analysis.yml
#	src/Umbraco.Core/CompositionExtensions.cs
#	src/Umbraco.Core/Constants-AppSettings.cs
#	src/Umbraco.Core/GuidUdi.cs
#	src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
#	src/Umbraco.Core/PublishedContentExtensions.cs
#	src/Umbraco.Core/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Core/Routing/UrlProvider.cs
#	src/Umbraco.Core/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Core/Runtime/MainDom.cs
#	src/Umbraco.Core/Services/IRuntimeState.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
#	src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs
#	src/Umbraco.Core/Sync/IServerRegistrar.cs
#	src/Umbraco.Infrastructure/Media/EmbedProviders/Instagram.cs
#	src/Umbraco.Infrastructure/Models/ContentBaseExtensions.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValue.cs
#	src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs
#	src/Umbraco.Tests/Routing/UrlProviderTests.cs
#	src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
#	src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml
#	src/Umbraco.Web/CompositionExtensions.cs
#	src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
#	src/Umbraco.Web/ImageCropperTemplateExtensions.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Runtime/WebInitialComponent.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
#	src/Umbraco.Web/UmbracoContext.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/UmbracoInjectedModule.cs
2020-11-30 11:24:24 +01:00
Shannon
36b3a2b62a fixes media authz resource policies 2020-11-30 19:38:55 +11:00
Shannon
76cbd76f32 Fixes content resource authz 2020-11-30 19:09:14 +11:00
Bjarke Berg
85df7be7e8 Added TestEnvironment
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-30 08:51:12 +01:00
Shannon
36830e4850 remove c# 9 2020-11-30 17:35:58 +11:00
Bjarke Berg
6ce8e55210 Removed check for ValidateStylesheet while file systems don't support both web and content root
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 22:11:51 +01:00
Bjarke Berg
9af77e5f51 Add temp logging, to debug azure pipeline
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 21:53:31 +01:00
Bjarke Berg
8fdf65c78a Add temp logging, to debug azure pipeline
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 20:49:19 +01:00
Bjarke Berg
41bdfd940c Add temp logging, to debug azure pipeline
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 20:34:48 +01:00
Bjarke Berg
f9c51930f7 Add temp logging, to debug azure pipeline
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 19:39:43 +01:00
Sebastiaan Janssen
862a7fdce6 Merge branch 'v8/contrib' into v8/dev 2020-11-27 14:04:55 +01:00
Matt Brailsford
a6f5e48f43 Introduce content app helper (#9425) 2020-11-27 14:02:19 +01:00
Bjarke Berg
2fb7f3ef84 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/linux-paths
# Conflicts:
#	src/Umbraco.Web.BackOffice/Security/AutoLinkSignInResult.cs
2020-11-27 13:49:42 +01:00
Bjarke Berg
5efa93d803 Revert "Revert "FIxes more of the auth procedure""
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:36:09 +01:00
Bjarke Berg
26dc9219c4 Revert "Revert "Cleans up BackofficeSecurity, fixes up AuthenticationController for endpoints that aren't authorized (and simplifies)""
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:35:43 +01:00
Bjarke Berg
a098b956a6 Revert "Revert "Ensures that all back office controllers are authenticated under the back office scheme""
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:35:22 +01:00
Bjarke Berg
541ff0fdb0 Revert "Revert "Moves auto linking logic to the BackOfficeSignInManager""
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:34:58 +01:00
Bjarke Berg
d6357e8fde Revert "Revert "Gets oauth working (with google) now need to test others and debug why the styles aren't working""
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:34:32 +01:00
Bjarke Berg
88c1259d84 Revert "Revert "Moves some files, adds notes, starts poc for back office login providers""
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:33:01 +01:00
Bjarke Berg
3b0d33a84c Revert "Moves some files, adds notes, starts poc for back office login providers"
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:17:58 +01:00
Bjarke Berg
1833bfa1a9 Revert "Gets oauth working (with google) now need to test others and debug why the styles aren't working"
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:17:34 +01:00
Bjarke Berg
efce67fe8a Revert "Moves auto linking logic to the BackOfficeSignInManager"
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:17:13 +01:00
Bjarke Berg
7d61020214 Revert "Ensures that all back office controllers are authenticated under the back office scheme"
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:16:50 +01:00
Bjarke Berg
96ef2fd9b7 Revert "Cleans up BackofficeSecurity, fixes up AuthenticationController for endpoints that aren't authorized (and simplifies)"
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:16:22 +01:00
Bjarke Berg
348f69734b Revert "FIxes more of the auth procedure"
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:15:54 +01:00