Send DS's SDL to clients from the AuthSrv #184
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dgelessus
reviewed
Aug 27, 2023
zrax
reviewed
Aug 28, 2023
The encrypted stream class in *intended* for writing out minified copies of the SDL files for the client, but adding the ability to read encrypted SDL is just such low-hanging fruit that we might as well add support for it.
Co-authored-by: dgelessus <dgelessus@users.noreply.github.com>
The client now prefers to download SDL files from the server, even when `/LocalData` is supplied. Therefore, it is important that DS is always able to serve SDL files without intervention. So, when SDLs are requested from the AuthServ, send down an encrypted copy of the SDLs that DS loaded.
Hoikas
force-pushed
the
sdl_exchange2
branch
from
99cbdcd
to
ac7a10e
Compare
|
I've removed the round-trip minifying step from this PR. Encrypted SDL files are not required for ease of use - DS can encrypt files before sending them down. |
zrax
reviewed
Feb 20, 2024
AuthServ/AuthServer.cpp
Outdated
| filename = DS::Settings::AuthRoot() + filename; | ||
| } | ||
|
|
||
| std::unique_ptr<DS::Stream> stream = std::make_unique<DS::FileStream>(); |
There was a problem hiding this comment.
Suggested change
| std::unique_ptr<DS::Stream> stream = std::make_unique<DS::FileStream>(); | |
| auto stream = std::make_unique<DS::FileStream>(); |
A unique_ptr<U> can be converted to a unique_ptr<T> if U derives from T, so there's no need for the extra casting complexity...
There was a problem hiding this comment.
While this is true, later in the function, a DS::BufferStream can be moved to this std::unique_ptr. I'll do some work to remove the fiddly casting to make that more clear.
AuthServ/AuthServer.cpp
Outdated
| try { | ||
| stream->open(filename.c_str(), "rb"); | ||
| static_cast<DS::FileStream*>(stream.get())->open(filename.c_str(), "rb"); |
There was a problem hiding this comment.
Suggested change
| static_cast<DS::FileStream*>(stream.get())->open(filename.c_str(), "rb"); | |
| stream->open(filename.c_str(), "rb"); |
Co-authored-by: Michael Hansen <zrax0111@gmail.com>
zrax
approved these changes
Feb 20, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
H-uru/Plasma#1450 changed the meaning of
/LocalDatato "use the local PRPs and Python files" but still rely on the server's SDL. This means that clients either need to use the new/LocalSDLflag to use their own SDL, which is known to be dangerous, or we need to make it easier to get the known correct SDL to clients connecting to DirtSand.Therefore, this adds the ability for DirtSand to automatically send down the SDL it is using internally to clients. It uses the very old auth secure preloader functionality, so it is compatible with all known clients. Most SDL files are quite small, which results in fairly poor download performance. Further, AuthSrv downloads are not compressed. So, I elected to give DirtSand the ability to write out its own SDL file containing all known state descriptors and omitting irrelevant comments and whitespace to give an optimal experience for users.
The last two commits could be deferred to another pull request, but I suspected some of the excess copying and memory management might be remarked upon, so I included those ideas for completeness' sake.