WIP

Author: DifferentialOrange

box_error.go

@@ -139,7 +139,7 @@ func msgpackDecodeBoxError(d *decoder, v reflect.Value) (err error) {
 }
 
 func encodeBoxError(enc *encoder, boxError BoxError) (err error) {
-	if err = enc.EncodeArrayLen(1); err != nil {
+	if err = enc.EncodeMapLen(1); err != nil {
 		return err
 	}
 	if err = encodeUint(enc, KeyErrorStack); err != nil {
@@ -152,6 +152,18 @@ func encodeBoxError(enc *encoder, boxError BoxError) (err error) {
 	}
 
 	for ; stackDepth > 0; stackDepth-- {
+		isWithFields := (len(boxError.Fields) > 0)
+
+		if isWithFields {
+			if err = enc.EncodeMapLen(7); err != nil {
+				return err
+			}
+		} else {
+			if err = enc.EncodeMapLen(6); err != nil {
+				return err
+			}
+		}
+
 		if err = encodeUint(enc, KeyErrorType); err != nil {
 			return err
 		}
@@ -201,7 +213,7 @@ func encodeBoxError(enc *encoder, boxError BoxError) (err error) {
 			return err
 		}
 
-		if len(boxError.Fields) > 0 {
+		if isWithFields {
 			if err = encodeUint(enc, KeyErrorFields); err != nil {
 				return err
 			}

config.lua

@@ -130,6 +130,8 @@ box.once("init", function()
     -- grants for sql tests
     box.schema.user.grant('test', 'create,read,write,drop,alter', 'space')
     box.schema.user.grant('test', 'create', 'sequence')
+
+    box.schema.user.create('no_grants')
 end)
 
 local function func_name()
@@ -159,6 +161,45 @@ rawset(_G, 'push_func', push_func)
 
 box.space.test:truncate()
 
+local function tarantool_version_at_least(wanted_major, wanted_minor, wanted_patch)
+    -- Borrowed from `determine_enabled_features()` from
+    -- crud/common/utils.lua.
+    local major_minor_patch = _TARANTOOL:split('-', 1)[1]
+    local major_minor_patch_parts = major_minor_patch:split('.', 2)
+
+    local major = tonumber(major_minor_patch_parts[1])
+    local minor = tonumber(major_minor_patch_parts[2])
+    local patch = tonumber(major_minor_patch_parts[3])
+
+    if major < (wanted_major or 0) then return false end
+    if major > (wanted_major or 0) then return true end
+
+    if minor < (wanted_minor or 0) then return false end
+    if minor > (wanted_minor or 0) then return true end
+
+    if patch < (wanted_patch or 0) then return false end
+    if patch > (wanted_patch or 0) then return true end
+
+    return true
+end
+
+if tarantool_version_at_least(2, 10) then
+    local err = box.error.new(box.error.UNKNOWN)
+    rawset(_G, 'simple_error', err)
+
+    local user = box.session.user()
+    box.schema.func.create('forbidden_function', {body = 'function() end'})
+    box.session.su('no_grants')
+    local _, access_denied_error = pcall(function() box.func.forbidden_function:call() end)
+    box.session.su(user)
+    rawset(_G, 'access_denied_error', access_denied_error)
+
+    local e1 = box.error.new(box.error.UNKNOWN)
+    local e2 = box.error.new(box.error.UNKNOWN)
+    e2:set_prev(e1)
+    rawset(_G, 'chained_error', e2)
+end
+
 --box.schema.user.revoke('guest', 'read,write,execute', 'universe')
 
 -- Set listen only when every other thing is configured.

error_ext_test.go

@@ -0,0 +1,100 @@
+package tarantool_test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	. "github.com/tarantool/go-tarantool"
+)
+
+var isErrorExtSupported bool
+
+func skipIfErrorExtUnsupported(t *testing.T) {
+	t.Helper()
+
+	if isErrorExtSupported == false {
+		t.Skip("Skipping test for Tarantool without error extention type support in msgpack")
+	}
+}
+
+var samples = []struct {
+	goErr     BoxError
+	mpBuf     string
+	ttErrName string
+}{
+	{
+		BoxError{
+			Type:    "ClientError",
+			File:    "eval",
+			Line:    1,
+			Message: "Unknown error",
+			Errno:   0,
+			Errcode: 0,
+		},
+		"8100918600ab436c69656e744572726f7201a46576616c020103ad556e6b6e6f776e206572726f72" +
+			"04000500",
+		"simple_error",
+	},
+	{
+		BoxError{
+			Type:    "AccessDeniedError",
+			File:    "/__w/sdk/sdk/tarantool-2.10/tarantool/src/box/func.c",
+			Line:    535,
+			Message: "Execute access to function 'forbidden_function' is denied for user 'no_grants'",
+			Errno:   0,
+			Errcode: 42,
+			Fields: map[interface{}]interface{}{
+				"object_type": "function",
+				"object_name": "forbidden_function",
+				"access_type": "Execute",
+			},
+		},
+		"8100918700b141636365737344656e6965644572726f7201d9342f5f5f772f73646b2f73646b2f74" +
+			"6172616e746f6f6c2d322e31302f746172616e746f6f6c2f7372632f626f782f66756e632e63" +
+			"02cd021703d94e457865637574652061636365737320746f2066756e6374696f6e2027666f72" +
+			"62696464656e5f66756e6374696f6e272069732064656e69656420666f72207573657220276e" +
+			"6f5f6772616e7473270400052a0683ab6f626a6563745f74797065a866756e6374696f6eab6f" +
+			"626a6563745f6e616d65b2666f7262696464656e5f66756e6374696f6eab6163636573735f74" +
+			"797065a745786563757465",
+		"access_denied_error",
+	},
+	{
+		BoxError{
+			Type:    "ClientError",
+			File:    "eval",
+			Line:    1,
+			Message: "Unknown error",
+			Errno:   0,
+			Errcode: 0,
+			Prev: &BoxError{
+				Type:    "ClientError",
+				File:    "eval",
+				Line:    2,
+				Message: "Unknown error",
+				Errno:   0,
+				Errcode: 0,
+			},
+		},
+		"8100928600ab436c69656e744572726f7201a46576616c020303ad556e6b6e6f776e206572726f72" +
+			"040005008600ab436c69656e744572726f7201a46576616c020203ad556e6b6e6f776e206572" +
+			"726f7204000500",
+		"chained_error",
+	},
+}
+
+func TestErrorExtMPEncodeDecode(t *testing.T) {
+	for _, testcase := range samples {
+		t.Run(testcase.ttErrName, func(t *testing.T) {
+			var buf []byte
+			var err error
+			if buf, err = marshal(testcase.goErr); err != nil {
+				t.Fatalf("Failed to encode error ext type '%v' to a MessagePack buffer: %s", testcase.goErr, err)
+			}
+			var v BoxError
+			if err = unmarshal(buf, &v); err != nil {
+				t.Fatalf("Failed to decode MessagePack buffer '%x' to a error ext type: %s", buf, err)
+			}
+			require.Equal(t, v, testcase.goErr)
+		})
+	}
+}

msgpack_helper_test.go

@@ -4,6 +4,7 @@
 package tarantool_test
 
 import (
+	. "github.com/tarantool/go-tarantool"
 	"gopkg.in/vmihailenco/msgpack.v2"
 )
 
@@ -13,3 +14,16 @@ type decoder = msgpack.Decoder
 func encodeUint(e *encoder, v uint64) error {
 	return e.EncodeUint(uint(v))
 }
+
+func toBoxError(i interface{}) (v BoxError, ok bool) {
+	v, ok = i.(BoxError)
+	return
+}
+
+func marshal(v interface{}) ([]byte, error) {
+	return msgpack.Marshal(v)
+}
+
+func unmarshal(data []byte, v interface{}) error {
+	return msgpack.Unmarshal(data, v)
+}

msgpack_v5_helper_test.go

@@ -4,6 +4,7 @@
 package tarantool_test
 
 import (
+	. "github.com/tarantool/go-tarantool"
 	"github.com/vmihailenco/msgpack/v5"
 )
 
@@ -13,3 +14,19 @@ type decoder = msgpack.Decoder
 func encodeUint(e *encoder, v uint64) error {
 	return e.EncodeUint(v)
 }
+
+func toBoxError(i interface{}) (v BoxError, ok bool) {
+	var ptr *BoxError
+	if ptr, ok = i.(*BoxError); ok {
+		dec = *ptr
+	}
+	return
+}
+
+func marshal(v interface{}) ([]byte, error) {
+	return msgpack.Marshal(v)
+}
+
+func unmarshal(data []byte, v interface{}) error {
+	return msgpack.Unmarshal(data, v)
+}

tarantool_test.go

@@ -2869,7 +2869,11 @@ func TestConnectionProtocolInfoSupported(t *testing.T) {
 		clientProtocolInfo,
 		ProtocolInfo{
 			Version:  ProtocolVersion(4),
-			Features: []ProtocolFeature{StreamsFeature, TransactionsFeature},
+			Features: []ProtocolFeature{
+				StreamsFeature,
+				TransactionsFeature,
+				ErrorExtensionFeature,
+			},
 		})
 
 	serverProtocolInfo := conn.ServerProtocolInfo()
@@ -3256,6 +3260,13 @@ func runTestMain(m *testing.M) int {
 		log.Fatalf("Could not check the Tarantool version")
 	}
 
+	if isStreamUnsupported {
+		log.Println("Skipping error extention type tests...")
+		isErrorExtSupported = false
+	} else {
+		isErrorExtSupported = true
+	}
+
 	startOpts.MemtxUseMvccEngine = !isStreamUnsupported
 
 	inst, err := test_helpers.StartTarantool(startOpts)