Merge pull request #2774 from vibe-d/fix_string_enum_deserialization

Fix deserialization of string based enum types
vibe-d · Feb 7, 2024 · 8e35c8c · 8e35c8c
2 parents 9b9b192 + 3227f04
commit 8e35c8c
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 5 deletions.
diff --git a/data/vibe/data/serialization.d b/data/vibe/data/serialization.d
@@ -135,7 +135,7 @@ import vibe.internal.meta.traits;
 import vibe.internal.meta.uda;
 
 import std.array : Appender, appender;
-import std.conv : to;
+import std.conv : ConvException, to;
 import std.exception : enforce;
 import std.range.primitives : ElementType, isInputRange;
 import std.traits;
@@ -718,7 +718,13 @@ private template deserializeValueImpl(Serializer, alias Policy) {
 			static if (hasPolicyAttributeL!(ByNameAttribute, Policy, ATTRIBUTES)) {
 				return ser.deserializeValue!(string, ATTRIBUTES).to!T();
 			} else {
-				return cast(T)ser.deserializeValue!(OriginalType!T);
+				auto value = ser.deserializeValue!(OriginalType!T);
+				switch (value) {
+					default:
+						throw new ConvException("Unexpected enum value " ~ value.to!string);
+					static foreach (enumvalue; NoDuplicates!(EnumMembers!T))
+						case enumvalue: return enumvalue;
+				}
 			}
 		} else static if (Serializer.isSupportedValueType!T) {
 			return ser.readValue!(Traits, T)();
@@ -2212,3 +2218,46 @@ unittest { // issue #2110 - single-element tuples
 	assert(serialize!TestSerializer(s) == expected);
 	assert(deserialize!(TestSerializer, S)(expected) == s);
 }
+
+unittest {
+	import std.conv : ConvException;
+	import std.exception : assertThrown, assertNotThrown;
+
+	enum Testable : string {
+		foo = "foo",
+		bar = "bar",
+		baz = "bar"
+	}
+
+	Testable deserializeString(string value) {
+		return deserialize!(TestSerializer, Testable)("V(Aya)(" ~ value ~ ")");
+	}
+
+	foreach (string val; ["foo", "bar"])
+		assert(deserializeString(val) == val.to!Testable);
+
+	assertThrown!ConvException(deserializeString("foobar"));
+}
+
+unittest {
+	import std.conv : ConvException;
+	import std.exception : assertThrown, assertNotThrown;
+
+	enum Foo {
+		foobar
+	};
+
+	struct Testable {
+		@byName
+		Foo bar;
+	}
+
+	void deserializeString(string value) {
+		auto d = "D(" ~ Testable.mangleof ~ ")";
+		auto de = "DE(" ~ Foo.mangleof ~ ",bar)";
+		deserialize!(TestSerializer, Testable)(d ~ "{" ~ de ~ "(V(Aya)(" ~ value ~ "))" ~ de ~ "}" ~ d);
+	}
+
+	assertNotThrown(deserializeString("foobar"));
+	assertThrown!ConvException(deserializeString("baz"));
+}
diff --git a/mongodb/vibe/db/mongo/collection.d b/mongodb/vibe/db/mongo/collection.d
@@ -1477,7 +1477,7 @@ struct MaxWireVersion
 MaxWireVersion until(WireVersion v) @safe { return MaxWireVersion(v); }
 
 /// Unsets nullable fields not matching the server version as defined per UDAs.
-void enforceWireVersionConstraints(T)(ref T field, WireVersion serverVersion,
+void enforceWireVersionConstraints(T)(ref T field, int serverVersion,
 	string file = __FILE__, size_t line = __LINE__)
 @safe {
 	import std.traits : getUDAs;

diff --git a/mongodb/vibe/db/mongo/connection.d b/mongodb/vibe/db/mongo/connection.d
@@ -1120,7 +1120,7 @@ struct ServerDescription
 	Nullable!BsonDate lastWriteDate;
 	Nullable!BsonObjectID opTime;
 	ServerType type = ServerType.unknown;
-	WireVersion minWireVersion, maxWireVersion;
+	int minWireVersion, maxWireVersion;
 	string me;
 	string[] hosts, passives, arbiters;
 	string[string] tags;
@@ -1153,7 +1153,8 @@ enum WireVersion : int
 	v50 = 13,
 	v51 = 14,
 	v52 = 15,
-	v53 = 16
+	v53 = 16,
+	v60 = 17
 }
 
 private string getHostArchitecture()