Commit Graph

158 Commits

Author SHA1 Message Date
laura hermanns
415da1ca38 [Horde] Provide optional parameter to report source of Horde URL configuration.
There are several sources to configure the Horde server URL and this change provides that information in the log.
This adds an optional parameter to IDesktopPlatform::GetHordeUrl for compatibility.

An example of a successful Horde URL query in the log could be as follows:
"Getting Horde server URL succeeded [URL: https://your.horde.server.org/, Source: Engine INI configuration]"

#rnx
#rb Ben.Marsh, Ryan.Hummer

[CL 33940698 by laura hermanns in ue5-main branch]
2024-05-28 10:32:32 -04:00
laura hermanns
ac06606d17 [Horde] Add second fallback to find Horde server URL in BaseEngine.ini.
This adds "[Horde]:ServerUrl" section to BaseEngine.ini configuration as second fallback when UE_HORDE_URL is not defined as environment variable nor present in the registry (Windows) or .horde.json file (POSIX).

#jira UE-210043
#rnx
#rb Ben.Marsh

[CL 33610566 by laura hermanns in ue5-main branch]
2024-05-13 18:23:19 -04:00
ben marsh
008c8b08e6 Horde: Fix root path for launching OidcToken. Only affects log messages.
#rnx

[CL 33289288 by ben marsh in ue5-main branch]
2024-04-27 13:37:03 -04:00
ben marsh
c6569dffda Horde: Return exit code 11 from OidcToken if the specified Horde connection does not have auth enabled, allowing the editor to continue despite not having a valid OIDC token.
#jira UE-213464
#rnx

[CL 33289120 by ben marsh in ue5-main branch]
2024-04-27 13:00:28 -04:00
ben marsh
83d03ce93d Horde: Unify the locations probed for the Horde server URL setting between C# tools (Horde Agent, UBT, UGS, etc...) and C++ (Editor).
* On Windows, this setting is stored in the registry under HKCU/SOFTWARE/Epic Games/Horde/Url.
* On other platforms, this setting is stored in the $HOME/.horde.json file.

The setting is no longer persisted to the editor config file.

[FYI] Joe.Kirchoff, Laura.Hermanns

[CL 33281910 by ben marsh in ue5-main branch]
2024-04-26 18:03:52 -04:00
ben marsh
3589633e70 Horde: Fix URL comparison for using access token from the environment.
[CL 33156967 by ben marsh in ue5-main branch]
2024-04-22 19:52:36 -04:00
ben marsh
0a70a2d14e Horde: Add a setting for configuring the Horde server to the editor.
- Falls back to the UE_HORDE_URL environment variable or value configured in the registry from UGS if not set.
- Added support to OIDCToken for configuring using Horde settings using the --HordeUrl argument.
- Added overloads to HordeHttpClient to query auth settings from Horde itself.

#jira UE-211751

[CL 33009887 by ben marsh in ue5-main branch]
2024-04-16 14:55:33 -04:00
anousack kitisa
6a8947ee4f Fixed typo in message log.
#jira UE-209142

[CL 32120514 by anousack kitisa in ue5-main branch]
2024-03-08 10:42:12 -05:00
henrik karlsson
acc64ee23c [DesktopPlatform]
* Added exit code to error message when failing to run OidcToken.exe

[CL 30559330 by henrik karlsson in ue5-main branch]
2024-01-10 20:46:30 -05:00
ben marsh
3647ef962b Horde: Add a typed HTTP client for communicating with the Horde server. Removes boilerplate code for getting an access token, configuring request objects, and parsing responses. Synchronous for now.
[CL 30080857 by ben marsh in ue5-main branch]
2023-12-04 10:09:40 -05:00
ben marsh
f3ef3e01ac [Backout] - CL30069106
[FYI] Ben.Marsh
Original CL Desc
-----------------------------------------------------------------
Horde: Add a typed HTTP client for communicating with the Horde server. Removes boilerplate code for getting an access token, configuring request objects, and parsing responses. Synchronous for now.

[CL 30069215 by ben marsh in ue5-main branch]
2023-12-02 21:19:55 -05:00
ben marsh
e3248c1b3f Horde: Add a typed HTTP client for communicating with the Horde server. Removes boilerplate code for getting an access token, configuring request objects, and parsing responses. Synchronous for now.
[CL 30069108 by ben marsh in ue5-main branch]
2023-12-02 20:45:55 -05:00
steve robb
0bbd5e4d69 Fixed deprecated FString constructors.
#rb james.hopkin

[CL 29690489 by steve robb in ue5-main branch]
2023-11-13 14:15:15 -05:00
nick edwards
69726f5ee7 Update code using FJsonObject to use TCHAR strings instead of ANSI strings. Removes unnecessary string conversions and removes compilation errors when FJsonObject is updated to use FStringViews.
[CL 28536648 by nick edwards in ue5-main branch]
2023-10-06 08:18:42 -04:00
robert millar
befe3866f5 Fix for the case I broke previously when trying to avoid executing UBT to find target definitions, where we find a target file that was not in the cache.
Copy more code from UBT to more correctly scan required plugin directories.

#rb none

[CL 28014916 by robert millar in ue5-main branch]
2023-09-19 17:29:39 -04:00
josh adams
aeb5cb1347 - Restoring a backout after fixing the issue that causes the backout
[Backout] - CL27745134
[FYI] stan.hormell
Original CL Desc
-----------------------------------------------------------------
[Backout] - CL27731288 - CIS / Build Errors
[FYI] Josh.Adams
Original CL Desc
-----------------------------------------------------------------
- Deprecated GetSectionPrivate and FindOrAddSection, and accessors in FConfigFile that could return a non-const FConfigSection (this is so we can track modifications to config values)
- Added AddToSection, RemoveKeyFromSection, etc to replace directly accessing a FConfigSection
- Fixed up Epic code for the deprecations (at least the majority, some projects that aren't built by Horde presubmit may have some that we will address going forward)
#jira UE-194955
#rb david.harvey and various others

[CL 27923017 by josh adams in ue5-main branch]
2023-09-15 13:39:02 -04:00
robert millar
65e0835b44 Fix TargetInfo validation.
Fix checking in plugin directories for targets.
Prevents running UBT on every launch.

[CL 27921132 by robert millar in ue5-main branch]
2023-09-15 13:01:19 -04:00
stan hormell
37bad2d07b [Backout] - CL27731288 - CIS / Build Errors
[FYI] Josh.Adams
Original CL Desc
-----------------------------------------------------------------
- Deprecated GetSectionPrivate and FindOrAddSection, and accessors in FConfigFile that could return a non-const FConfigSection (this is so we can track modifications to config values)
- Added AddToSection, RemoveKeyFromSection, etc to replace directly accessing a FConfigSection
- Fixed up Epic code for the deprecations (at least the majority, some projects that aren't built by Horde presubmit may have some that we will address going forward)
#jira UE-194955
#rb david.harvey and various others

[CL 27745141 by stan hormell in ue5-main branch]
2023-09-10 22:58:21 -04:00
josh adams
a8a9a0b759 - Deprecated GetSectionPrivate and FindOrAddSection, and accessors in FConfigFile that could return a non-const FConfigSection (this is so we can track modifications to config values)
- Added AddToSection, RemoveKeyFromSection, etc to replace directly accessing a FConfigSection
- Fixed up Epic code for the deprecations (at least the majority, some projects that aren't built by Horde presubmit may have some that we will address going forward)
#jira UE-194955
#rb david.harvey and various others

[CL 27731364 by josh adams in ue5-main branch]
2023-09-08 17:58:55 -04:00
zousar shaker
ca374bd482 Add a setting that controls whether the modal acknowledgement dialog is shown before a browser is launched for OIDC authentication in editor. This setting is editor-wide (not per project), but:
1. A project can override the default value in that project's DefaultEditorSettings.ini
2. A user can indicate they don't want to see the dialog in the future, and thata setting is persisted to the user's editor settings file

If the setting indicates (either through defaults or user choice) that the acknowledgement dialog can be skipped, then unattended operations (eg: commandlets like cook etc..) are permitted to attempt interactive login by launching the browser.  If the browser login succeeds within a fixed timespan (30 seconds), then the unattended operation can proceed having successfully obtained an oidc token.  If the browser login hasn't succeeded in the fixed timespan, then the unanttended operation will proceed but will have failed to obtain an oidc token.  In neither case do we block indefinitely on completion of browser login to obtain an oidc token.

#rb joakim.lindqvist
[FYI] stefan.boberg
#jira UE-191803

[CL 27177449 by zousar shaker in ue5-main branch]
2023-08-17 13:13:20 -04:00
david harvey
bdb4199eeb Remove unnecessary WindowsHWrapper.h & MinWindows.h include - both files will be automatically included by AllowWindowsPlatformTypes.h
#jira UE-152863
#rnx
#rb Josh.Adams

[CL 26912096 by david harvey in ue5-main branch]
2023-08-08 05:50:53 -04:00
Ryan Hummer
3ebc0e1bcf Removing mono/xbuild part 1
* Updating references to use dotnet
* Add new RunDotnet scripts
* Removing Mono sh scripts and references to them

#rnx
#jira UE-153293
#rb josh.adams, zack.neyland, brandon.schaefer

[CL 26737744 by Ryan Hummer in ue5-main branch]
2023-08-01 10:02:58 -04:00
Joakim Lindqvist
3924fcb886 DDC is Derived Data Cache - update the message to reflect that.
#preflight none
#rb none

[CL 25674030 by Joakim Lindqvist in ue5-main branch]
2023-05-30 05:49:24 -04:00
devin doucette
90200ff6d0 DDC: Fixes related to the use of OIDC functionality from DesktopPlatform
- Fixed a crash when HttpCacheStore is used without DesktopPlatform.
- Fixed GetOidcAccessToken and GetOidcTokenStatus failing for targets with no Intermediate directory.
- Added DesktopPlatform to DerivedDataTool to allow it to use HttpCacheStore with OIDC.

#rb Zousar.Shaker
[FYI] Dan.Engelbrecht

[CL 25072527 by devin doucette in ue5-main branch]
2023-04-17 15:23:51 -04:00
matt peters
c6a6899e09 OidcToken: Delete temporary files from Intermediate directory after we no longer need them.
#rb Devin.Doucette
#rnx
[FYI] Joakim.Lindqvist
#preflight 6427238550546ea336c81554

[CL 24878299 by matt peters in ue5-main branch]
2023-03-31 16:51:28 -04:00