thrift: filter integration tests

bazel/external/apache_thrift.BUILD

@@ -0,0 +1,20 @@
+# The apache-thrift distribution does not keep the thrift files in a directory with the
+# expected package name (it uses src/Thrift.py vs src/thrift/Thrift.py), so we provide a
+# genrule to copy src/**/*.py to thrift/**/*.py.
+src_files = glob(["src/**/*.py"])
+
+genrule(
+    name = "thrift_files",
+    srcs = src_files,
+    outs = [f.replace("src/", "thrift/") for f in src_files],
+    cmd = '\n'.join(
+        ['mkdir -p $$(dirname $(location %s)) && cp $(location %s) $(location :%s)' % (f, f, f.replace('src/', 'thrift/')) for f in src_files]
+    ),
+    visibility = ["//visibility:private"],
+)
+
+py_library(
+    name = "apache_thrift",
+    srcs = [":thrift_files"],
+    visibility = ["//visibility:public"],
+)

bazel/external/twitter_common_finagle_thrift.BUILD

@@ -0,0 +1,7 @@
+py_library(
+    name = "twitter_common_finagle_thrift",
+    srcs = glob([
+        "gen/**/*.py",
+    ]),
+    visibility = ["//visibility:public"],
+)

bazel/external/twitter_common_lang.BUILD

@@ -0,0 +1,7 @@
+py_library(
+    name = "twitter_common_lang",
+    srcs = glob([
+        "twitter/**/*.py",
+    ]),
+    visibility = ["//visibility:public"],
+)

bazel/external/twitter_common_rpc.BUILD

@@ -0,0 +1,11 @@
+py_library(
+    name = "twitter_common_rpc",
+    srcs = glob([
+        "twitter/**/*.py",
+    ]),
+    visibility = ["//visibility:public"],
+    deps = [
+         "@com_github_twitter_common_lang//:twitter_common_lang",
+         "@com_github_twitter_common_finagle_thrift//:twitter_common_finagle_thrift"
+    ],
+)

bazel/repositories.bzl

@@ -141,6 +141,22 @@ def _python_deps():
         name = "jinja2",
         actual = "@com_github_pallets_jinja//:jinja2",
     )
+    _repository_impl(
+        name = "com_github_apache_thrift",
+        build_file = "@envoy//bazel/external:apache_thrift.BUILD",
+    )
+    _repository_impl(
+        name = "com_github_twitter_common_lang",
+        build_file = "@envoy//bazel/external:twitter_common_lang.BUILD",
+    )
+    _repository_impl(
+        name = "com_github_twitter_common_rpc",
+        build_file = "@envoy//bazel/external:twitter_common_rpc.BUILD",
+    )
+    _repository_impl(
+        name = "com_github_twitter_common_finagle_thrift",
+        build_file = "@envoy//bazel/external:twitter_common_finagle_thrift.BUILD",
+    )
 
 # Bazel native C++ dependencies. For the depedencies that doesn't provide autoconf/automake builds.
 def _cc_deps():

bazel/repository_locations.bzl

@@ -8,6 +8,11 @@ REPOSITORY_LOCATIONS = dict(
         commit = "92020a042c0cd46979db9f6f0cb32783dc07765e",  # 2018-06-08
         remote = "https://github.com/abseil/abseil-cpp",
     ),
+    com_github_apache_thrift = dict(
+        sha256 = "7d59ac4fdcb2c58037ebd4a9da5f9a49e3e034bf75b3f26d9fe48ba3d8806e6b",
+        urls = ["https://files.pythonhosted.org/packages/c6/b4/510617906f8e0c5660e7d96fbc5585113f83ad547a3989b80297ac72a74c/thrift-0.11.0.tar.gz"], # 0.11.0
+        strip_prefix = "thrift-0.11.0",
+    ),
     com_github_bombela_backward = dict(
         commit = "44ae9609e860e3428cd057f7052e505b4819eb84",  # 2018-02-06
         remote = "https://github.com/bombela/backward-cpp",
@@ -80,6 +85,21 @@ REPOSITORY_LOCATIONS = dict(
         commit = "f54b0e47a08782a6131cc3d60f94d038fa6e0a51",  # v1.1.0
         remote = "https://github.com/tencent/rapidjson",
     ),
+    com_github_twitter_common_lang = dict(
+        sha256 = "56d1d266fd4767941d11c27061a57bc1266a3342e551bde3780f9e9eb5ad0ed1",
+        urls = ["https://files.pythonhosted.org/packages/08/bc/d6409a813a9dccd4920a6262eb6e5889e90381453a5f58938ba4cf1d9420/twitter.common.lang-0.3.9.tar.gz"],  # 0.3.9
+        strip_prefix = "twitter.common.lang-0.3.9/src",
+    ),
+    com_github_twitter_common_rpc = dict(
+        sha256 = "0792b63fb2fb32d970c2e9a409d3d00633190a22eb185145fe3d9067fdaa4514",
+        urls = ["https://files.pythonhosted.org/packages/be/97/f5f701b703d0f25fbf148992cd58d55b4d08d3db785aad209255ee67e2d0/twitter.common.rpc-0.3.9.tar.gz"],  # 0.3.9
+        strip_prefix = "twitter.common.rpc-0.3.9/src",
+    ),
+    com_github_twitter_common_finagle_thrift = dict(
+        sha256 = "1e3a57d11f94f58745e6b83348ecd4fa74194618704f45444a15bc391fde497a",
+        urls = ["https://files.pythonhosted.org/packages/f9/e7/4f80d582578f8489226370762d2cf6bc9381175d1929eba1754e03f70708/twitter.common.finagle-thrift-0.3.9.tar.gz"], # 0.3.9
+        strip_prefix = "twitter.common.finagle-thrift-0.3.9/src",
+    ),
     com_google_googletest = dict(
         commit = "43863938377a9ea1399c0596269e0890b5c5515a",
         remote = "https://github.com/google/googletest",

test/extensions/filters/network/thrift_proxy/driver/BUILD

@@ -0,0 +1,36 @@
+licenses(["notice"])  # Apache 2
+
+load("//bazel:envoy_build_system.bzl", "envoy_package")
+
+envoy_package()
+
+filegroup(
+    name = "generate_fixture",
+    srcs = ["generate_fixture.sh"],
+    data = [
+        ":client",
+        ":server",
+    ],
+)
+
+py_binary(
+    name = "client",
+    srcs = ["client.py"],
+    deps = [
+        "//test/extensions/filters/network/thrift_proxy/driver/fbthrift:fbthrift_lib",
+        "//test/extensions/filters/network/thrift_proxy/driver/finagle:finagle_lib",
+        "//test/extensions/filters/network/thrift_proxy/driver/generated/example:example_lib",
+        "@com_github_twitter_common_rpc//:twitter_common_rpc",
+    ],
+)
+
+py_binary(
+    name = "server",
+    srcs = ["server.py"],
+    deps = [
+        "//test/extensions/filters/network/thrift_proxy/driver/fbthrift:fbthrift_lib",
+        "//test/extensions/filters/network/thrift_proxy/driver/finagle:finagle_lib",
+        "//test/extensions/filters/network/thrift_proxy/driver/generated/example:example_lib",
+        "@com_github_twitter_common_rpc//:twitter_common_rpc",
+    ],
+)

test/extensions/filters/network/thrift_proxy/driver/client.py

@@ -0,0 +1,236 @@
+#!/usr/bin/env python
+
+import os
+import argparse
+import io
+import sys
+
+from generated.example import Example
+from generated.example.ttypes import (
+    Param, Result, TheWorks, AppException
+)
+
+from thrift import Thrift
+from thrift.protocol import TBinaryProtocol, TCompactProtocol, TJSONProtocol, TMultiplexedProtocol
+from thrift.transport import TSocket
+from thrift.transport import TTransport
+from fbthrift import THeaderTransport
+from twitter.common.rpc.finagle.protocol import TFinagleProtocol
+
+class TRecordingTransport(TTransport.TTransportBase):
+    def __init__(self, underlying, writehandle, readhandle):
+        self._underlying = underlying
+        self._whandle = writehandle
+        self._rhandle = readhandle
+
+    def isOpen(self):
+        return self._underlying.isOpen()
+
+    def open(self):
+        if not self._underlying.isOpen():
+            self._underlying.open()
+
+    def close(self):
+        self._underlying.close()
+        self._whandle.close()
+        self._rhandle.close()
+
+    def read(self, sz):
+        buf = self._underlying.read(sz)
+        if len(buf) != 0:
+            self._rhandle.write(buf)
+        return buf
+
+    def write(self, buf):
+        if len(buf) != 0:
+            self._whandle.write(buf)
+        self._underlying.write(buf)
+
+    def flush(self):
+        self._underlying.flush()
+        self._whandle.flush()
+        self._rhandle.flush()
+
+
+def main(cfg, reqhandle, resphandle):
+    if cfg.unix:
+        if cfg.addr == "":
+            sys.exit("invalid unix domain socket: {}".format(cfg.addr))
+        socket = TSocket.TSocket(unix_socket=cfg.addr)
+    else:
+        (host, port) = cfg.addr.split(":")
+        if host == "":
+            host = "localhost"
+        if port == "":
+            sys.exit("invalid address: {}".format(cfg.addr))
+        socket = TSocket.TSocket(host=host, port=int(port))
+
+    transport = TRecordingTransport(socket, reqhandle, resphandle)
+
+    if cfg.transport == "framed":
+        transport = TTransport.TFramedTransport(transport)
+    elif cfg.transport == "unframed":
+        transport = TTransport.TBufferedTransport(transport)
+    elif cfg.transport == "header":
+        transport = THeaderTransport.THeaderTransport(
+            transport,
+            client_type=THeaderTransport.CLIENT_TYPE.HEADER,
+        )
+    else:
+        sys.exit("unknown transport {0}".format(cfg.transport))
+
+    transport.open()
+
+    if cfg.protocol == "binary":
+        protocol = TBinaryProtocol.TBinaryProtocol(transport)
+    elif cfg.protocol == "compact":
+        protocol = TCompactProtocol.TCompactProtocol(transport)
+    elif cfg.protocol == "json":
+        protocol = TJSONProtocol.TJSONProtocol(transport)
+    elif cfg.protocol == "finagle":
+        protocol = TFinagleProtocol(transport, client_id="thrift-playground")
+    else:
+        sys.exit("unknown protocol {0}".format(cfg.protocol))
+
+    if cfg.service is not None:
+        protocol = TMultiplexedProtocol.TMultiplexedProtocol(protocol, cfg.service)
+
+    client = Example.Client(protocol)
+
+    try:
+        if cfg.method == "ping":
+            client.ping()
+            print("client: pinged")
+        elif cfg.method == "poke":
+            client.poke()
+            print("client: poked")
+        elif cfg.method == "add":
+            if len(cfg.params) != 2:
+                sys.exit("add takes 2 arguments, got: {0}".format(cfg.params))
+
+            a = int(cfg.params[0])
+            b = int(cfg.params[1])
+            v = client.add(a, b)
+            print("client: added {0} + {1} = {2}".format(a, b, v))
+        elif cfg.method == "execute":
+            param = Param(
+                return_fields = cfg.params,
+                the_works = TheWorks(
+                    field_1 = True,
+                    field_2 = 0x7f,
+                    field_3 = 0x7fff,
+                    field_4 = 0x7fffffff,
+                    field_5 = 0x7fffffffffffffff,
+                    field_6 = -1.5,
+                    field_7 = u"string is UTF-8: \U0001f60e",
+                    field_8 = b"binary is bytes: \x80\x7f\x00\x01",
+                    field_9 = { 1: "one", 2: "two", 3: "three" },
+                    field_10 = [ 1, 2, 4, 8 ],
+                    field_11 = set(["a", "b", "c"]),
+                    field_12 = False,
+                )
+            )
+
+            try:
+                result = client.execute(param)
+                print("client: executed {0}: {1}".format(param, result))
+            except AppException as e:
+                print("client: execute failed with IDL Exception: {0}".format(e.why))
+        else:
+            sys.exit("unknown method {0}".format(cfg.method))
+    except Thrift.TApplicationException as e:
+        print("client exception: {0}: {1}".format(e.type, e.message))
+
+    if cfg.request is None:
+        req = "".join( [ "%02X " % ord( x ) for x in reqhandle.getvalue() ] ).strip()
+        print("request: {}".format(req))
+    if cfg.response is None:
+        resp = "".join( [ "%02X " % ord( x ) for x in resphandle.getvalue() ] ).strip()
+        print("response: {}".format(resp))
+
+    transport.close()
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(
+        description="Thrift client tool.",
+    )
+    parser.add_argument(
+        "method",
+        metavar="METHOD",
+        help="Name of the service method to invoke.",
+    )
+    parser.add_argument(
+        "params",
+        metavar="PARAMS",
+        nargs="*",
+        help="Method parameters",
+    )
+    parser.add_argument(
+        "-a",
+        "--addr",
+        metavar="ADDR",
+        dest="addr",
+        required=True,
+        help="Target address for requests in the form host:port. The host is optional. If --unix" +
+            " is set, the address is the socket name.",
+    )
+    parser.add_argument(
+        "-m",
+        "--multiplex",
+        metavar="SERVICE",
+        dest="service",
+        help="Enable service multiplexing and set the service name.",
+    )
+    parser.add_argument(
+        "-p",
+        "--protocol",
+        dest="protocol",
+        default="binary",
+        choices=["binary", "compact", "json", "finagle"],
+        help="selects a protocol.",
+    )
+    parser.add_argument(
+        "--request",
+        metavar="FILE",
+        dest="request",
+        help="Writes the Thrift request to a file.",
+    )
+    parser.add_argument(
+        "--response",
+        metavar="FILE",
+        dest="response",
+        help="Writes the Thrift response to a file.",
+    )
+    parser.add_argument(
+        "-t",
+        "--transport",
+        dest="transport",
+        default="framed",
+        choices=["framed", "unframed", "header"],
+        help="selects a transport.",
+    )
+    parser.add_argument(
+        "-u",
+        "--unix",
+        dest="unix",
+        action="store_true",
+    )
+    cfg = parser.parse_args()
+
+    reqhandle = io.BytesIO()
+    resphandle = io.BytesIO()
+    if cfg.request is not None:
+        try:
+            reqhandle = io.open(cfg.request, "wb")
+        except IOError as e:
+            sys.exit("I/O error({0}): {1}".format(e.errno, e.strerror))
+    if cfg.response is not None:
+        try:
+            resphandle = io.open(cfg.response, "wb")
+        except IOError as e:
+            sys.exit("I/O error({0}): {1}".format(e.errno, e.strerror))
+    try:
+        main(cfg, reqhandle, resphandle)
+    except Thrift.TException as tx:
+        sys.exit("Unhandled Thrift Exception: {0}".format(tx.message))