Client-sent AMF (CONTROL_BEHAVIORS) was decoded without limits on the
associative part of arrays, on nesting depth, or on the total number of
values. Associative entries went into an unordered_map with the standard
unseeded string hash, so a client could pick colliding keys and make
insertion quadratic, and deeply nested arrays recursed until the stack
overflowed, crashing the world server.
- The associative map is now an ordered std::map (O(log n) whatever the
keys, deterministic serialization order).
- Each array allows at most 10,000 associative entries, the same as the
existing dense limit, which is now checked before anything is read.
- Arrays may nest at most 32 deep and one deserializer reads at most
100,000 values. Every limit throws, which the only caller already
catches and drops the message.
- Inserting a duplicate key keeps the last value and no longer returns a
reference to a value that was destroyed when the key already held null.
Verified with new unit tests for each limit (including a 100,000 deep
nesting that previously overflowed the stack) and the existing live
packet test, which still decodes.
Fixes#2035
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* Rewrite AMF and behavior logic to use smart pointers, references, and string_views over raw pointers and std::string&
* fix m_BehaviorID initialization
* Fix BlockDefinition member naming
* remove redundant reset()s
* Replace UB forward template declarations with header include
* remove unneeded comment
* remove non-const ref getters
* simplify default behavior id initialization
* Fix invalidated use of Getter to set a value
* Update AddStripMessage.cpp - change push_back to emplace_back
* fix pointer to ref conversion mistake (should not have directly grabbed from the other branch commit)
* deref
* VERY experimental testing of forward declaration of templates - probably will revert
* Revert changes (as expected)
* Update BlockDefinition.h - remove extraneous semicolons
* Update BlockDefinition.h - remove linebreak
* Update Amf3.h member naming scheme
* fix duplicated code
* const iterators
* const pointers
* reviving this branch
* update read switch cases
* Update AMFDeserializeTests.cpp
Redo Amf3 functionality
Overhaul the whole thing due to it being outdated and clunky to use
Sometimes you want to keep the value
Update AMFDeserializeTests.cpp
* Fix enum and constructors
Correct enum to a class and simplify names.
Add a proper default constructor
* Update MasterServer.cpp
* Fix bugs and add more tests
* Refactor: AMF with templates in mind
- Remove hard coded bodge
- Use templates and generics to allow for much looser typing and strengthened implementation
- Move code into header only implementation for portability
Refactor: Convert AMF implementation to templates
- Rip out previous implementation
- Remove all extraneous terminology
- Add proper overloads for all types of inserts
- Fix up tests and codebase
* Fix compiler errors
* Check for null first
* Add specialization for const char*
* Update tests for new template specialization
* Switch BitStream to use references
* Rename files
* Check enum bounds on deserialize
I did this on a phone
* Add AMFDeserializer
Add an AMFDeserializer
Reverted unrelated changes
Add unit tests for AMFDeserializer
Added unit tests for the AMFDeserializer
Finish tests
Finish the AMF deserializer tests. This commit finishes the positive test case and implements a load test case that is expected to take less than 1.5 seconds to process.
Modularized tests
Made tests a bit modular and split into more methods
Specified binary read from file
Specified that on the IO stream we are reading a binary file otherwise windows will terminate reading the binary file on seeing a 1A byte.
Added more tests
Added tests for unimplemented values and edited a test file to be more modular
Updated test text
Fix spacing
Update AMFDeserializeTests.cpp
* Update CMakeLists.txt
* Update AMFDeserializeTests.cpp
f
Actually follow the AMF spec
Update AMFDeserializeTests.cpp
tabs
Add in commented tests
* Follow spec
formatting
Add Integer Tests
Follow Spec more
Follow spec
* Use unique_ptr
* Update AMFDeserialize.cpp
Semantics
Update AMFDeserialize.cpp
Add new lines to EOF
CMake fix
* Add better std string read
Co-authored-by: Daniel Seiler <xiphoseer@mailbox.org>
* make not static
Co-authored-by: Daniel Seiler <xiphoseer@mailbox.org>
