Commit Graph

40975 Commits

Author SHA1 Message Date
Mole
e2d0a0f699 Add docstrings to IHtmlSanitizer 2022-01-24 09:18:31 +01:00
Mole
8b773c90c2 Add IHtmlSanitizer 2022-01-24 08:56:53 +01:00
Bjarke Berg
4b92a47e93 Merge remote-tracking branch 'origin/v9/9.3' into v9/dev
# Conflicts:
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/template.json
2022-01-23 13:44:33 +01:00
Bjarke Berg
f49b661c26 Merge remote-tracking branch 'origin/v9/9.2' into v9/9.3
# Conflicts:
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/template.json
#	src/Directory.Build.props
#	src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
2022-01-23 13:43:34 +01:00
Bjarke Berg
b7d8b7923d Merge remote-tracking branch 'origin/v9/9.2' into v9/dev
# Conflicts:
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/template.json
#	src/Directory.Build.props
#	src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
2022-01-23 13:34:39 +01:00
Bjarke Berg
4843b28184 added contains check for acceptance tests 2022-01-21 19:30:38 +01:00
Bjarke Berg
eb126a77b6 Merge pull request #11893 from umbraco/v9/merge-v9-contrib-into-v9-dev
Merge v9 contrib into v9 dev
2022-01-21 13:18:35 +01:00
Bjarke Berg
12abd883a9 Member 2FA (#11889)
* Bugfix - Take ufprt from form data if the request has form content type, otherwise fallback to use the query

* External linking for members

* Changed migration to reuse old table

* removed unnecessary web.config files

* Cleanup

* Extracted class to own file

* Clean up

* Rollback changes to Umbraco.Web.UI.csproj

* Fixed migration for SqlCE

* Added 2fa for members

* Change notification handler to be on deleted

* Update src/Umbraco.Infrastructure/Security/MemberUserStore.cs

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>

* updated snippets

* Fixed issue with errors not shown on member linking

* fixed issue with errors

* clean up

* Fix issue where external logins could not be used to upgrade Umbraco, because the externalLogin table was expected to look different. (Like after the migration)

* Fixed issue in Ignore legacy column now using result column.

* Updated 2fa for members + publish notification when 2fa is requested.

* Changed so only Members out of box supports 2fa

* Cleanup

* rollback of csproj file, that should not have been changed

* Removed confirmed flag from db. It was not used.

Handle case where a user is signed up for 2fa, but the provider do not exist anymore. Then it is just ignored until it shows up again

Reintroduced ProviderName on interface, to ensure the class can be renamed safely

* Bugfix

* Registering DeleteTwoFactorLoginsOnMemberDeletedHandler

* Rollback nuget packages added by mistake

* Update src/Umbraco.Infrastructure/Services/Implement/TwoFactorLoginService.cs

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>

* Update src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TwoFactorLoginRepository.cs

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>

* Added providername to snippet

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
2022-01-21 13:10:34 +01:00
Bjarke Berg
52a3e285a9 Merge remote-tracking branch 'origin/v8/dev' into v9/dev
# Conflicts:
#	src/Umbraco.Core/Composing/CompositionExtensions/Services.cs
#	src/Umbraco.Core/Constants-AppSettings.cs
#	src/Umbraco.Core/Dashboards/ContentDashboardSettings.cs
#	src/Umbraco.Core/Dashboards/IContentDashboardSettings.cs
#	src/Umbraco.Core/Manifest/ManifestParser.cs
#	src/Umbraco.Core/Manifest/PackageManifest.cs
#	src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Core/Models/PropertyTagsExtensions.cs
#	src/Umbraco.Core/PropertyEditors/ComplexPropertyEditorContentEventHandler.cs
#	src/Umbraco.Core/PropertyEditors/ConfigurationEditor.cs
#	src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs
#	src/Umbraco.Core/Serialization/JsonToStringConverter.cs
#	src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
#	src/Umbraco.Core/Telemetry/ITelemetryService.cs
#	src/Umbraco.Core/Telemetry/Models/PackageTelemetry.cs
#	src/Umbraco.Core/Telemetry/Models/TelemetryReportData.cs
#	src/Umbraco.Core/Telemetry/TelemetryService.cs
#	src/Umbraco.Tests/Manifest/ManifestParserTests.cs
#	src/Umbraco.Tests/PropertyEditors/BlockEditorComponentTests.cs
#	src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
#	src/Umbraco.Tests/PropertyEditors/NestedContentPropertyComponentTests.cs
#	src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
#	src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
#	src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
#	src/Umbraco.Web/Cache/DistributedCacheBinder.cs
#	src/Umbraco.Web/Compose/BlockEditorComponent.cs
#	src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Editors/DashboardController.cs
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/MediaPicker3PropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/MultipleValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
#	src/Umbraco.Web/Telemetry/ReportSiteTask.cs
#	src/Umbraco.Web/Telemetry/TelemetryComponent.cs
#	src/Umbraco.Web/Trees/ContentTreeController.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/WebApi/EnableDetailedErrorsAttribute.cs
2022-01-21 12:40:18 +01:00
Sebastiaan Janssen
ecd32bf033 The marked dev dependency was unused 2022-01-21 10:48:22 +01:00
James Jackson-South
4136adebc8 Bump ImageSharp.Web version 2022-01-21 10:06:07 +01:00
Sebastiaan Janssen
8eb3ef65f6 Merge branch 'v9/dev' into v9/contrib 2022-01-21 10:02:37 +01:00
Bjarke Berg
a8e0690199 moved namespace to match umbraco version 2022-01-21 09:31:09 +01:00
Niels Lyngsø
e204c5bab9 Media Previews (#11888)
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
Co-authored-by: Mads Rasmussen <madsr@hey.com>
Co-authored-by: Paul Johnson <pmj@umbraco.com>
2022-01-20 16:47:00 +01:00
Bjarke Berg
029a261476 Improve functionality for external member logins (#11855)
* Bugfix - Take ufprt from form data if the request has form content type, otherwise fallback to use the query

* External linking for members

* Changed migration to reuse old table

* removed unnecessary web.config files

* Cleanup

* Extracted class to own file

* Clean up

* Rollback changes to Umbraco.Web.UI.csproj

* Fixed migration for SqlCE

* Change notification handler to be on deleted

* Update src/Umbraco.Infrastructure/Security/MemberUserStore.cs

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>

* Fixed issue with errors not shown on member linking

* fixed issue with errors

* clean up

* Fix issue where external logins could not be used to upgrade Umbraco, because the externalLogin table was expected to look different. (Like after the migration)

* Fixed issue in Ignore legacy column now using result column.

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
2022-01-19 09:21:50 +01:00
Paul Johnson
c60d8c8ab8 Added EntityController.GetUrlsByIds support for int & guid + update MNTP (#11680)
Fixes issue with MNTP (for 8.18) in a partial view macro - GH #11631

Renamed GetUrlsByUdis to match, don't do this in v9 as it would be
breaking there, instead mark it obsolete.

TODO: v9 ensure integration test coverage, more painful here as no 
WebApplicationFactory.
2022-01-19 08:32:33 +01:00
Nikolaj Geisle
16fb4f419a Merge pull request #11823 from umbraco/v8/bugfix/dont_show_stacktrace_in_production_mode
Don't show stack trace in production mode
2022-01-18 17:47:14 +01:00
Elitsa Marinovska
24519f6dad Allowlisting remote URLs for displaying content on the content dashboard (#11822)
* Implement allowlisting of urls when fetching data for the content dashboard

* Adding a new setting in the config & removing inexistent one

* Adding description

* Adding description

* Tidy up code
2022-01-18 15:38:03 +01:00
Elitsa Marinovska
229ca989eb V9: Allowlisting remote URLs for displaying content on the content dashboard (#11825)
* Fixing ContentDashboardSettings to work when set in the config

* Moving file in Models folder and adding ContentDashboardUrlAllowlist setting

* Implementing allowlist for content dashboard base url

* Cleanup

* Error msg vs log msg
2022-01-18 15:37:31 +01:00
Elitsa Marinovska
1b5830a9d7 V9: Visiting a page without a template returns "Page Not Found" (#11852)
* Returns "Page Not Found" when template doesn't exist for a docType

* Fix comment

* Use IsNullOrWhiteSpace instead of IsNullOrEmpty

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
2022-01-18 15:36:25 +01:00
Elitsa Marinovska
72f30eb937 Adding else case 2022-01-18 15:19:05 +01:00
Elitsa Marinovska
cce40a0734 Merge branch 'v8/dev' into v8/bugfix/dont_show_stacktrace_in_production_mode 2022-01-18 14:37:14 +01:00
Ronald Barendse
364b8f1c72 Add UmbracoApplicationStartedNotification and UmbracoApplicationStoppedNotification (#11857)
* Add UmbracoApplicationStartedNotification and UmbracoApplicationStoppedNotification

* Include cancellation token when publishing unattended install/upgrade notifications
2022-01-18 13:58:14 +01:00
Paul Johnson
bf166225de Move Umbraco.Tests to legacy dir. (#11878)
(makes grep easier)
2022-01-18 10:39:22 +00:00
Paul Johnson
366a8ba565 Prevent issues for those who wish use ServiceBasedControllerActivator.
Adds registration for CurrentUserController which has ambiguous constructors.
Register our controllers so that issues are visible during dev/test.
2022-01-18 00:40:39 +00:00
Paul Johnson
576f90ad37 Speedup codeql run (#11877)
* Speedup codeql run

* npm build once, ignore node_modules

* Misc cleanup
2022-01-18 00:35:53 +00:00
Paul Johnson
9a145537aa Fix config file, should be on init 2022-01-17 22:29:42 +00:00
Paul Johnson
c410f78986 Restore config file and prevent duplicate run for feature branches 2022-01-17 21:41:24 +00:00
Paul Johnson
2c44d67686 Modify codeql setup. (#11876) 2022-01-17 14:42:41 +00:00
Nikolaj Geisle
0e9525d216 Added null check 2022-01-17 08:32:13 +01:00
Søren Kottal
8cd0e5a003 Change logmessages 2022-01-16 13:42:57 +01:00
Erik-Jan Westendorp
ee1153ee56 Localization: Translate history cleanup labels/descriptions to Dutch (#11835)
* Update nl.xml to show labels in dutch in info content app

* Update nl.xml to show labels in dutch in permissions app
2022-01-16 12:33:49 +01:00
Erik-Jan Westendorp
294ea7373e Localization: Rename RelatieTypen to RelatieTypes (Dutch) (#11849)
* Change RelatieTypen to RelatieTypes

* Small 't'
2022-01-16 12:13:17 +01:00
Erik-Jan Westendorp
73e99b75b2 Add missing read more translation (#11850) 2022-01-16 05:36:45 +01:00
Mole
0eed641235 Delete temp document type file if validation fails (#11836)
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
2022-01-13 13:12:44 +01:00
Bjarke Berg
baba7ffed9 Bugfix - Take ufprt from form data if the request has form content type, otherwise fallback to use the query (#11845) 2022-01-12 13:54:14 +01:00
Bjarne Fyrstenborg
eb4acba081 Set default tree group for core trees (#11801)
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
2022-01-12 12:35:48 +01:00
Nikolaj Geisle
18a3133536 v9: Fix max allowed content length on iis & kestrel (#11802)
* Update web.config

* Change web.config to align with v8 default values

* Adjust kestrel options to align with v8

* Add better comment

* added web.config to root

* change web.config to 30mb

* delete obsolete comment

* No reason to have web.config to just have it default

* Add back ConfigureIISServerOptions.cs

* Add obsolete comment, can't link to documentation yet as it doesn't exist

* Apply suggestions from code review

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>

* Add link to documentation

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
2022-01-12 12:32:53 +01:00
Paul Johnson
d9bdd8196c Misc/obsolete redundant extension (#11838)
* Mark AddUnique<TImplementing> obsolete.

* Remove all internal usages of AddUnique<TImplementing>.
2022-01-10 17:03:33 +01:00
Paul Johnson
a952d17e74 Make using scoped services in notification handlers less painful. (#11733)
* Add failing test to demo issue with handlers + scoped dependencies.

* Make using scoped services in notification handlers less painful.

* Update comments for accuracy.
2022-01-10 15:31:46 +00:00
Ronald Barendse
2155062678 Prune/remove indentation from JSON property values (#11806)
* Use Formatting.None for JSON property data in default value editor

* Use Formatting.None for JSON property data in custom value editors

* Use Formatting.None for JSON property data in Nested Content and Block List

* Use Formatting.None for JSON property tags

* Use Formatting.None for JSON configuration data

* Use Formatting.None in custom JSON converter

* Ensure empty tags and complex editor values are not stored

* Fix NestedContentPropertyComponentTests

* Do not store empty property data

* Use Formatting.None and don't store configured crops (without coordinates)

* Fix JSON deserialization of tags value
2022-01-10 09:32:29 +01:00
Nikolaj Geisle
187cac469e Add package tests (#11824) 2022-01-07 08:55:40 +01:00
Bjarke Berg
642c216f94 Serve Media and App_Plugins using WebRootFileProvider (and allow changing the physical media path) (#11783)
* Allow changing UmbracoMediaPath to an absolute path. Also ensure Imagesharp are handing requests outside of the wwwroot folder.

* Let UmbracoMediaUrl fallback to UmbracoMediaPath when empty

* Add FileSystemFileProvider to expose an IFileSystem as IFileProvider

* Replace IUmbracoMediaFileProvider with IFileProviderFactory implementation

* Fix issue resolving relative paths when media URL has changed

* Remove FileSystemFileProvider and require explicitly implementing IFileProviderFactory

* Update tests (UnauthorizedAccessException isn't thrown anymore for rooted files)

* Update test to use UmbracoMediaUrl

* Add UmbracoMediaPhysicalRootPath global setting

* Remove MediaFileManagerImageProvider and use composited file providers

* Move CreateFileProvider to IFileSystem extension method

* Add rooted path tests

Co-authored-by: Ronald Barendse <ronald@barend.se>
2022-01-06 13:35:24 +01:00
Nikolaj Geisle
d5ba5be096 Merge pull request #11386 from matthewcare/temp-11381
Request Handler Settings for character replacement
2022-01-05 14:56:11 +01:00
Nikolaj Geisle
dfc3e56eb7 Check if we're in debug and set IncludeErrorPolicy accordingly 2022-01-05 13:16:07 +01:00
Ronald Barendse
75bb8051bf Prune Image Cropper and Media Picker (v3) values (#11805)
* Clean up redundant/default Umbraco.ImageCropper data

* Fix ToString() and add HasCrops() method

* Re-use crop/focal point pruning for Umbraco.MediaPicker3

* Fix ImageCropperTest

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
2022-01-05 11:11:27 +01:00
Mole
a54c5bb21d V8: Merge package telemetry from V9 (#11785)
* Merge Telemetry classes from V9

* Use TelemetryService in ReportSiteTask

* Migrate tests
2022-01-04 10:11:34 +01:00
Ronald Barendse
763cb70e67 Move member properties to Member Content App (V9 merge regression) (#11768)
* Fix regression after merging to v9

* Update test to align with removed member properties
2022-01-04 08:21:58 +01:00
Mole
65c0d8fcec V9: Use current request for emails (#11778)
* Use request url for email

* Fixed potential null ref exceptions

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2022-01-04 08:18:01 +01:00
Mole
bbfa975096 Bump versions to non-rc 2022-01-03 15:36:52 +01:00