stop allowing mutation through convert_to_cpp backdoor II

Summary: This diff closes the cpp mutation backdoor by copying the underlying cpp object in the `X_convert_to_cpp` API. In the edge case where the struct is `cpp.noncopyable`, we serialize-deserialize a new version.

Reviewed By: prakashgayasen

Differential Revision: D72988992

fbshipit-source-id: fdcafd3c80d1d4eeadbe7c59d986e2a189ee45da

Author: ahilger

third-party/thrift/src/thrift/compiler/generate/templates/py3/converter.pyx.mustache

@@ -18,14 +18,14 @@
 
 {{> common/auto_generated_py}}
 
+from libcpp.memory cimport make_shared, unique_ptr
+from cython.operator cimport dereference as deref, address
+from libcpp.utility cimport move as cmove
 {{^program:gen_py3_cython?}}
-from libcpp.memory cimport make_shared
-from cython.operator cimport dereference as deref
 from thrift.py3.types cimport const_pointer_cast
 cimport {{#program:py3Namespaces}}{{value}}.{{/program:py3Namespaces}}{{program:name}}.thrift_converter as {{!
     }}_{{#program:py3Namespaces}}{{value}}_{{/program:py3Namespaces}}{{program:name}}_thrift_converter
 {{#program:gen_legacy_container_converters?}}
-from libcpp.utility cimport move as cmove
 
 {{#program:inplace_migrate?}}
 cimport {{#program:py3Namespaces}}{{value}}.{{/program:py3Namespaces}}{{program:name}}.types as {{> types/current_module_types}}
@@ -42,6 +42,12 @@ cimport {{#includeNamespace}}{{value}}.{{/includeNamespace}}thrift_converter as
 {{/program:gen_py3_cython?}}
 {{#program:gen_py3_cython?}}
 cimport {{#program:py3Namespaces}}{{value}}.{{/program:py3Namespaces}}{{program:name}}.types as _fbthrift_ctypes
+from thrift.py3.serializer cimport (
+    cserialize as __cserialize,
+    cdeserialize as __cdeserialize,
+)
+from thrift.python.protocol cimport Protocol
+cimport folly.iobuf as _folly__iobuf
 {{/program:gen_py3_cython?}}
 {{#program:inplace_migrate?}}
 {{^program:gen_legacy_container_converters?}}
@@ -67,7 +73,21 @@ cdef shared_ptr[_fbthrift_cbindings.{{> types/c_struct }}] {{struct:name}}_conve
     )
 {{/program:gen_py3_cython?}}
 {{#program:gen_py3_cython?}}
-    return (<_fbthrift_ctypes.{{struct:name}}?>inst).{{> types/cpp_obj}}
+    {{^struct:cpp_noncopyable?}}
+    return make_shared[_fbthrift_cbindings.{{> types/c_struct}}](deref(
+        (<_fbthrift_ctypes.{{struct:name}}?>inst).{{> types/cpp_obj}}
+    ))
+    {{/struct:cpp_noncopyable?}}{{#struct:cpp_noncopyable?}}
+    cdef unique_ptr[_folly__iobuf.cIOBuf] _fbthrift__iobuf = cmove(
+        __cserialize(
+            (<_fbthrift_ctypes.{{struct:name}}?>inst).{{> types/cpp_obj }}.get(),
+            Protocol.BINARY,
+        )
+    )
+    cdef shared_ptr[_fbthrift_cbindings.{{> types/c_struct }}] _fbthrift__out = make_shared[_fbthrift_cbindings.{{> types/c_struct }}]()
+    __cdeserialize(_fbthrift__iobuf.get(), _fbthrift__out.get(), Protocol.BINARY)
+    return cmove(_fbthrift__out)
+    {{/struct:cpp_noncopyable?}}
 
 {{/program:gen_py3_cython?}}
 {{! direct replacement for ._fbthrift_create }}

third-party/thrift/src/thrift/compiler/test/fixtures/basic-annotations/out/py3/gen-py3/module/converter.pyx

@@ -6,17 +6,30 @@
 #  @generated
 #
 
+from libcpp.memory cimport make_shared, unique_ptr
+from cython.operator cimport dereference as deref, address
+from libcpp.utility cimport move as cmove
 cimport module.types as _fbthrift_ctypes
+from thrift.py3.serializer cimport (
+    cserialize as __cserialize,
+    cdeserialize as __cdeserialize,
+)
+from thrift.python.protocol cimport Protocol
+cimport folly.iobuf as _folly__iobuf
 
 
 cdef shared_ptr[_fbthrift_cbindings.cMyStructNestedAnnotation] MyStructNestedAnnotation_convert_to_cpp(object inst) except*:
-    return (<_fbthrift_ctypes.MyStructNestedAnnotation?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    return make_shared[_fbthrift_cbindings.cMyStructNestedAnnotation](deref(
+        (<_fbthrift_ctypes.MyStructNestedAnnotation?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    ))
 
 cdef object MyStructNestedAnnotation_from_cpp(const shared_ptr[_fbthrift_cbindings.cMyStructNestedAnnotation]& c_struct):
     return _fbthrift_ctypes.MyStructNestedAnnotation._create_FBTHRIFT_ONLY_DO_NOT_USE(c_struct)
 
 cdef shared_ptr[_fbthrift_cbindings.cSecretStruct] SecretStruct_convert_to_cpp(object inst) except*:
-    return (<_fbthrift_ctypes.SecretStruct?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    return make_shared[_fbthrift_cbindings.cSecretStruct](deref(
+        (<_fbthrift_ctypes.SecretStruct?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    ))
 
 cdef object SecretStruct_from_cpp(const shared_ptr[_fbthrift_cbindings.cSecretStruct]& c_struct):
     return _fbthrift_ctypes.SecretStruct._create_FBTHRIFT_ONLY_DO_NOT_USE(c_struct)

third-party/thrift/src/thrift/compiler/test/fixtures/basic-enum/out/py3/gen-py3/test/fixtures/enumstrict/module/converter.pyx

@@ -6,11 +6,22 @@
 #  @generated
 #
 
+from libcpp.memory cimport make_shared, unique_ptr
+from cython.operator cimport dereference as deref, address
+from libcpp.utility cimport move as cmove
 cimport test.fixtures.enumstrict.module.types as _fbthrift_ctypes
+from thrift.py3.serializer cimport (
+    cserialize as __cserialize,
+    cdeserialize as __cdeserialize,
+)
+from thrift.python.protocol cimport Protocol
+cimport folly.iobuf as _folly__iobuf
 
 
 cdef shared_ptr[_fbthrift_cbindings.cMyStruct] MyStruct_convert_to_cpp(object inst) except*:
-    return (<_fbthrift_ctypes.MyStruct?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    return make_shared[_fbthrift_cbindings.cMyStruct](deref(
+        (<_fbthrift_ctypes.MyStruct?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    ))
 
 cdef object MyStruct_from_cpp(const shared_ptr[_fbthrift_cbindings.cMyStruct]& c_struct):
     return _fbthrift_ctypes.MyStruct._create_FBTHRIFT_ONLY_DO_NOT_USE(c_struct)

third-party/thrift/src/thrift/compiler/test/fixtures/basic-stack-arguments/out/py3/gen-py3/module/converter.pyx

@@ -6,11 +6,22 @@
 #  @generated
 #
 
+from libcpp.memory cimport make_shared, unique_ptr
+from cython.operator cimport dereference as deref, address
+from libcpp.utility cimport move as cmove
 cimport module.types as _fbthrift_ctypes
+from thrift.py3.serializer cimport (
+    cserialize as __cserialize,
+    cdeserialize as __cdeserialize,
+)
+from thrift.python.protocol cimport Protocol
+cimport folly.iobuf as _folly__iobuf
 
 
 cdef shared_ptr[_fbthrift_cbindings.cMyStruct] MyStruct_convert_to_cpp(object inst) except*:
-    return (<_fbthrift_ctypes.MyStruct?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    return make_shared[_fbthrift_cbindings.cMyStruct](deref(
+        (<_fbthrift_ctypes.MyStruct?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    ))
 
 cdef object MyStruct_from_cpp(const shared_ptr[_fbthrift_cbindings.cMyStruct]& c_struct):
     return _fbthrift_ctypes.MyStruct._create_FBTHRIFT_ONLY_DO_NOT_USE(c_struct)

third-party/thrift/src/thrift/compiler/test/fixtures/basic/out/py3/gen-py3/test/fixtures/basic/module/converter.pyx

@@ -6,53 +6,78 @@
 #  @generated
 #
 
+from libcpp.memory cimport make_shared, unique_ptr
+from cython.operator cimport dereference as deref, address
+from libcpp.utility cimport move as cmove
 cimport test.fixtures.basic.module.types as _fbthrift_ctypes
+from thrift.py3.serializer cimport (
+    cserialize as __cserialize,
+    cdeserialize as __cdeserialize,
+)
+from thrift.python.protocol cimport Protocol
+cimport folly.iobuf as _folly__iobuf
 
 
 cdef shared_ptr[_fbthrift_cbindings.cMyStruct] MyStruct_convert_to_cpp(object inst) except*:
-    return (<_fbthrift_ctypes.MyStruct?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    return make_shared[_fbthrift_cbindings.cMyStruct](deref(
+        (<_fbthrift_ctypes.MyStruct?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    ))
 
 cdef object MyStruct_from_cpp(const shared_ptr[_fbthrift_cbindings.cMyStruct]& c_struct):
     return _fbthrift_ctypes.MyStruct._create_FBTHRIFT_ONLY_DO_NOT_USE(c_struct)
 
 cdef shared_ptr[_fbthrift_cbindings.cContainers] Containers_convert_to_cpp(object inst) except*:
-    return (<_fbthrift_ctypes.Containers?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    return make_shared[_fbthrift_cbindings.cContainers](deref(
+        (<_fbthrift_ctypes.Containers?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    ))
 
 cdef object Containers_from_cpp(const shared_ptr[_fbthrift_cbindings.cContainers]& c_struct):
     return _fbthrift_ctypes.Containers._create_FBTHRIFT_ONLY_DO_NOT_USE(c_struct)
 
 cdef shared_ptr[_fbthrift_cbindings.cMyDataItem] MyDataItem_convert_to_cpp(object inst) except*:
-    return (<_fbthrift_ctypes.MyDataItem?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    return make_shared[_fbthrift_cbindings.cMyDataItem](deref(
+        (<_fbthrift_ctypes.MyDataItem?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    ))
 
 cdef object MyDataItem_from_cpp(const shared_ptr[_fbthrift_cbindings.cMyDataItem]& c_struct):
     return _fbthrift_ctypes.MyDataItem._create_FBTHRIFT_ONLY_DO_NOT_USE(c_struct)
 
 cdef shared_ptr[_fbthrift_cbindings.cMyUnion] MyUnion_convert_to_cpp(object inst) except*:
-    return (<_fbthrift_ctypes.MyUnion?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    return make_shared[_fbthrift_cbindings.cMyUnion](deref(
+        (<_fbthrift_ctypes.MyUnion?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    ))
 
 cdef object MyUnion_from_cpp(const shared_ptr[_fbthrift_cbindings.cMyUnion]& c_struct):
     return _fbthrift_ctypes.MyUnion._create_FBTHRIFT_ONLY_DO_NOT_USE(c_struct)
 
 cdef shared_ptr[_fbthrift_cbindings.cMyException] MyException_convert_to_cpp(object inst) except*:
-    return (<_fbthrift_ctypes.MyException?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    return make_shared[_fbthrift_cbindings.cMyException](deref(
+        (<_fbthrift_ctypes.MyException?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    ))
 
 cdef object MyException_from_cpp(const shared_ptr[_fbthrift_cbindings.cMyException]& c_struct):
     return _fbthrift_ctypes.MyException._create_FBTHRIFT_ONLY_DO_NOT_USE(c_struct)
 
 cdef shared_ptr[_fbthrift_cbindings.cMyExceptionWithMessage] MyExceptionWithMessage_convert_to_cpp(object inst) except*:
-    return (<_fbthrift_ctypes.MyExceptionWithMessage?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    return make_shared[_fbthrift_cbindings.cMyExceptionWithMessage](deref(
+        (<_fbthrift_ctypes.MyExceptionWithMessage?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    ))
 
 cdef object MyExceptionWithMessage_from_cpp(const shared_ptr[_fbthrift_cbindings.cMyExceptionWithMessage]& c_struct):
     return _fbthrift_ctypes.MyExceptionWithMessage._create_FBTHRIFT_ONLY_DO_NOT_USE(c_struct)
 
 cdef shared_ptr[_fbthrift_cbindings.cReservedKeyword] ReservedKeyword_convert_to_cpp(object inst) except*:
-    return (<_fbthrift_ctypes.ReservedKeyword?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    return make_shared[_fbthrift_cbindings.cReservedKeyword](deref(
+        (<_fbthrift_ctypes.ReservedKeyword?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    ))
 
 cdef object ReservedKeyword_from_cpp(const shared_ptr[_fbthrift_cbindings.cReservedKeyword]& c_struct):
     return _fbthrift_ctypes.ReservedKeyword._create_FBTHRIFT_ONLY_DO_NOT_USE(c_struct)
 
 cdef shared_ptr[_fbthrift_cbindings.cUnionToBeRenamed] UnionToBeRenamed_convert_to_cpp(object inst) except*:
-    return (<_fbthrift_ctypes.UnionToBeRenamed?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    return make_shared[_fbthrift_cbindings.cUnionToBeRenamed](deref(
+        (<_fbthrift_ctypes.UnionToBeRenamed?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    ))
 
 cdef object UnionToBeRenamed_from_cpp(const shared_ptr[_fbthrift_cbindings.cUnionToBeRenamed]& c_struct):
     return _fbthrift_ctypes.UnionToBeRenamed._create_FBTHRIFT_ONLY_DO_NOT_USE(c_struct)

third-party/thrift/src/thrift/compiler/test/fixtures/basic/out/py3_inplace/gen-py3/test/fixtures/basic/module/converter.pyx

@@ -6,8 +6,9 @@
 #  @generated
 #
 
-from libcpp.memory cimport make_shared
-from cython.operator cimport dereference as deref
+from libcpp.memory cimport make_shared, unique_ptr
+from cython.operator cimport dereference as deref, address
+from libcpp.utility cimport move as cmove
 from thrift.py3.types cimport const_pointer_cast
 cimport test.fixtures.basic.module.thrift_converter as _test_fixtures_basic_module_thrift_converter
 import test.fixtures.basic.module.types as _test_fixtures_basic_module_types

third-party/thrift/src/thrift/compiler/test/fixtures/complex-union/out/py3/gen-py3/module/converter.pyx

@@ -6,53 +6,90 @@
 #  @generated
 #
 
+from libcpp.memory cimport make_shared, unique_ptr
+from cython.operator cimport dereference as deref, address
+from libcpp.utility cimport move as cmove
 cimport module.types as _fbthrift_ctypes
+from thrift.py3.serializer cimport (
+    cserialize as __cserialize,
+    cdeserialize as __cdeserialize,
+)
+from thrift.python.protocol cimport Protocol
+cimport folly.iobuf as _folly__iobuf
 
 
 cdef shared_ptr[_fbthrift_cbindings.cComplexUnion] ComplexUnion_convert_to_cpp(object inst) except*:
-    return (<_fbthrift_ctypes.ComplexUnion?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    return make_shared[_fbthrift_cbindings.cComplexUnion](deref(
+        (<_fbthrift_ctypes.ComplexUnion?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    ))
 
 cdef object ComplexUnion_from_cpp(const shared_ptr[_fbthrift_cbindings.cComplexUnion]& c_struct):
     return _fbthrift_ctypes.ComplexUnion._create_FBTHRIFT_ONLY_DO_NOT_USE(c_struct)
 
 cdef shared_ptr[_fbthrift_cbindings.cListUnion] ListUnion_convert_to_cpp(object inst) except*:
-    return (<_fbthrift_ctypes.ListUnion?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    return make_shared[_fbthrift_cbindings.cListUnion](deref(
+        (<_fbthrift_ctypes.ListUnion?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    ))
 
 cdef object ListUnion_from_cpp(const shared_ptr[_fbthrift_cbindings.cListUnion]& c_struct):
     return _fbthrift_ctypes.ListUnion._create_FBTHRIFT_ONLY_DO_NOT_USE(c_struct)
 
 cdef shared_ptr[_fbthrift_cbindings.cDataUnion] DataUnion_convert_to_cpp(object inst) except*:
-    return (<_fbthrift_ctypes.DataUnion?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    return make_shared[_fbthrift_cbindings.cDataUnion](deref(
+        (<_fbthrift_ctypes.DataUnion?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    ))
 
 cdef object DataUnion_from_cpp(const shared_ptr[_fbthrift_cbindings.cDataUnion]& c_struct):
     return _fbthrift_ctypes.DataUnion._create_FBTHRIFT_ONLY_DO_NOT_USE(c_struct)
 
 cdef shared_ptr[_fbthrift_cbindings.cVal] Val_convert_to_cpp(object inst) except*:
-    return (<_fbthrift_ctypes.Val?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    return make_shared[_fbthrift_cbindings.cVal](deref(
+        (<_fbthrift_ctypes.Val?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    ))
 
 cdef object Val_from_cpp(const shared_ptr[_fbthrift_cbindings.cVal]& c_struct):
     return _fbthrift_ctypes.Val._create_FBTHRIFT_ONLY_DO_NOT_USE(c_struct)
 
 cdef shared_ptr[_fbthrift_cbindings.cValUnion] ValUnion_convert_to_cpp(object inst) except*:
-    return (<_fbthrift_ctypes.ValUnion?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    return make_shared[_fbthrift_cbindings.cValUnion](deref(
+        (<_fbthrift_ctypes.ValUnion?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    ))
 
 cdef object ValUnion_from_cpp(const shared_ptr[_fbthrift_cbindings.cValUnion]& c_struct):
     return _fbthrift_ctypes.ValUnion._create_FBTHRIFT_ONLY_DO_NOT_USE(c_struct)
 
 cdef shared_ptr[_fbthrift_cbindings.cVirtualComplexUnion] VirtualComplexUnion_convert_to_cpp(object inst) except*:
-    return (<_fbthrift_ctypes.VirtualComplexUnion?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    return make_shared[_fbthrift_cbindings.cVirtualComplexUnion](deref(
+        (<_fbthrift_ctypes.VirtualComplexUnion?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    ))
 
 cdef object VirtualComplexUnion_from_cpp(const shared_ptr[_fbthrift_cbindings.cVirtualComplexUnion]& c_struct):
     return _fbthrift_ctypes.VirtualComplexUnion._create_FBTHRIFT_ONLY_DO_NOT_USE(c_struct)
 
 cdef shared_ptr[_fbthrift_cbindings.cNonCopyableStruct] NonCopyableStruct_convert_to_cpp(object inst) except*:
-    return (<_fbthrift_ctypes.NonCopyableStruct?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    cdef unique_ptr[_folly__iobuf.cIOBuf] _fbthrift__iobuf = cmove(
+        __cserialize(
+            (<_fbthrift_ctypes.NonCopyableStruct?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE.get(),
+            Protocol.BINARY,
+        )
+    )
+    cdef shared_ptr[_fbthrift_cbindings.cNonCopyableStruct] _fbthrift__out = make_shared[_fbthrift_cbindings.cNonCopyableStruct]()
+    __cdeserialize(_fbthrift__iobuf.get(), _fbthrift__out.get(), Protocol.BINARY)
+    return cmove(_fbthrift__out)
 
 cdef object NonCopyableStruct_from_cpp(const shared_ptr[_fbthrift_cbindings.cNonCopyableStruct]& c_struct):
     return _fbthrift_ctypes.NonCopyableStruct._create_FBTHRIFT_ONLY_DO_NOT_USE(c_struct)
 
 cdef shared_ptr[_fbthrift_cbindings.cNonCopyableUnion] NonCopyableUnion_convert_to_cpp(object inst) except*:
-    return (<_fbthrift_ctypes.NonCopyableUnion?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE
+    cdef unique_ptr[_folly__iobuf.cIOBuf] _fbthrift__iobuf = cmove(
+        __cserialize(
+            (<_fbthrift_ctypes.NonCopyableUnion?>inst)._cpp_obj_FBTHRIFT_ONLY_DO_NOT_USE.get(),
+            Protocol.BINARY,
+        )
+    )
+    cdef shared_ptr[_fbthrift_cbindings.cNonCopyableUnion] _fbthrift__out = make_shared[_fbthrift_cbindings.cNonCopyableUnion]()
+    __cdeserialize(_fbthrift__iobuf.get(), _fbthrift__out.get(), Protocol.BINARY)
+    return cmove(_fbthrift__out)
 
 cdef object NonCopyableUnion_from_cpp(const shared_ptr[_fbthrift_cbindings.cNonCopyableUnion]& c_struct):
     return _fbthrift_ctypes.NonCopyableUnion._create_FBTHRIFT_ONLY_DO_NOT_USE(c_struct)