diff --git a/.gitignore b/.gitignore index 8c7749da..97c10bd2 100644 --- a/.gitignore +++ b/.gitignore @@ -161,5 +161,10 @@ ENV/ # Rope project settings .ropeproject +# localhost cert authority intermediate files +misc/localhost.csr +misc/localhostCA.key +misc/localhostCA.srl + node_modules -vendor \ No newline at end of file +vendor diff --git a/README.md b/README.md index e842843f..1530e7f9 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ [![GoDoc](http://img.shields.io/badge/GoDoc-Reference-blue.svg)](https://godoc.org/github.com/improbable-eng/grpc-web/go/grpcweb) [![Apache 2.0 License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](LICENSE) [![quality: alpha](https://img.shields.io/badge/quality-alpha-orange.svg)](#status) +[![Slack](slack.png)](https://join.slack.com/t/improbable-eng/shared_invite/enQtMzQ1ODcyMzQ5MjM4LWY5ZWZmNGM2ODc5MmViNmQ3ZTA3ZTY3NzQwOTBlMTkzZmIxZTIxODk0OWU3YjZhNWVlNDU3MDlkZGViZjhkMjc) [gRPC](http://www.grpc.io/) is a modern, [HTTP2](https://hpbn.co/http2/)-based protocol, that provides RPC semantics using the strongly-typed *binary* data format of [protocol buffers](https://developers.google.com/protocol-buffers/docs/overview) across multiple languages (C++, C#, Golang, Java, Python, NodeJS, ObjectiveC, etc.) diff --git a/example/README.md b/example/README.md index b5b99c61..015031ec 100644 --- a/example/README.md +++ b/example/README.md @@ -10,9 +10,8 @@ ### Using HTTP2 -HTTP2 requires TLS. This repository contains certificates in the `misc` directory. You can optionally generate your own replacements using the `gen_cert.sh` in the same directory. - -Follow [this guide](http://stackoverflow.com/questions/7580508/getting-chrome-to-accept-self-signed-localhost-certificate) to accept the certificates in Chrome. +HTTP2 requires TLS. This repository contains certificates in the `../misc` directory which are used by the server. You can optionally generate your own replacements using the `gen_cert.sh` in the same directory. +You will need to import the `../misc/localhostCA.pem` certificate authority into your browser, checking the "Trust this CA to identify websites" so that your browser trusts the localhost server. * `npm run start:tls` to start the Golang server and Webpack dev server with the certificates in `misc` * Go to `https://localhost:8082` diff --git a/example/go/Gopkg.lock b/example/go/Gopkg.lock index cfd5b181..6dcad9ab 100644 --- a/example/go/Gopkg.lock +++ b/example/go/Gopkg.lock @@ -2,50 +2,110 @@ [[projects]] - branch = "master" name = "github.com/golang/protobuf" - packages = ["proto","ptypes","ptypes/any","ptypes/duration","ptypes/timestamp"] - revision = "1e59b77b52bf8e4b449a57e6f79f21226d571845" + packages = [ + "proto", + "ptypes", + "ptypes/any", + "ptypes/duration", + "ptypes/timestamp" + ] + revision = "925541529c1fa6821df4e44ce2723319eb2be768" + version = "v1.0.0" + +[[projects]] + name = "github.com/gorilla/websocket" + packages = ["."] + revision = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b" + version = "v1.2.0" [[projects]] name = "github.com/improbable-eng/grpc-web" packages = ["go/grpcweb"] - revision = "7174732598544bdecfa12fb81ca2f1601cf1b587" - version = "0.3.0-beta" + revision = "58d1f6c3d97b6d81d7eebd7d26d5942a1d40cb46" + version = "0.6.0" [[projects]] name = "github.com/rs/cors" packages = ["."] - revision = "7af7a1e09ba336d2ea14b1ce73bf693c6837dbf6" - version = "v1.2" + revision = "feef513b9575b32f84bafa580aad89b011259019" + version = "v1.3.0" [[projects]] branch = "master" name = "golang.org/x/net" - packages = ["context","http2","http2/hpack","idna","internal/timeseries","lex/httplex","trace"] - revision = "d866cfc389cec985d6fda2859936a575a55a3ab6" + packages = [ + "context", + "http/httpguts", + "http2", + "http2/hpack", + "idna", + "internal/timeseries", + "lex/httplex", + "trace" + ] + revision = "5f9ae10d9af5b1c89ae6904293b14b064d4ada23" [[projects]] - branch = "master" name = "golang.org/x/text" - packages = ["collate","collate/build","internal/colltab","internal/gen","internal/tag","internal/triegen","internal/ucd","language","secure/bidirule","transform","unicode/bidi","unicode/cldr","unicode/norm","unicode/rangetable"] - revision = "eb22672bea55af56d225d4e35405f4d2e9f062a0" + packages = [ + "collate", + "collate/build", + "internal/colltab", + "internal/gen", + "internal/tag", + "internal/triegen", + "internal/ucd", + "language", + "secure/bidirule", + "transform", + "unicode/bidi", + "unicode/cldr", + "unicode/norm", + "unicode/rangetable" + ] + revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" + version = "v0.3.0" [[projects]] branch = "master" name = "google.golang.org/genproto" packages = ["googleapis/rpc/status"] - revision = "a8101f21cf983e773d0c1133ebc5424792003214" + revision = "7fd901a49ba6a7f87732eb344f6e3c5b19d1b200" [[projects]] name = "google.golang.org/grpc" - packages = [".","balancer","balancer/roundrobin","codes","connectivity","credentials","encoding","grpclb/grpc_lb_v1/messages","grpclog","internal","keepalive","metadata","naming","peer","resolver","resolver/dns","resolver/passthrough","stats","status","tap","transport"] - revision = "e687fa4e6424368ece6e4fe727cea2c806a0fcb4" - version = "v1.8.2" + packages = [ + ".", + "balancer", + "balancer/base", + "balancer/roundrobin", + "codes", + "connectivity", + "credentials", + "encoding", + "encoding/proto", + "grpclb/grpc_lb_v1/messages", + "grpclog", + "internal", + "keepalive", + "metadata", + "naming", + "peer", + "resolver", + "resolver/dns", + "resolver/passthrough", + "stats", + "status", + "tap", + "transport" + ] + revision = "d11072e7ca9811b1100b80ca0269ac831f06d024" + version = "v1.11.3" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "9b63a28eff00bb27eaeb856141b43834ef58214d86c906d4220b8cd794db33c0" + inputs-digest = "7c4005512c7bcf970b40141c089e3e607d96b953116641c4635299f5a35acdb7" solver-name = "gps-cdcl" solver-version = 1 diff --git a/example/go/Gopkg.toml b/example/go/Gopkg.toml index 9425a542..01f78944 100644 --- a/example/go/Gopkg.toml +++ b/example/go/Gopkg.toml @@ -1,4 +1,3 @@ - # Gopkg.toml example # # Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md @@ -17,6 +16,31 @@ # source = "github.com/myfork/project2" # # [[override]] -# name = "github.com/x/y" -# version = "2.4.0" +# name = "github.com/x/y" +# version = "2.4.0" +# +# [prune] +# non-go = false +# go-tests = true +# unused-packages = true + + +[[constraint]] + name = "github.com/golang/protobuf" + version = "1.0.0" + +[[constraint]] + name = "github.com/improbable-eng/grpc-web" + version = "0.6.0" + +[[constraint]] + branch = "master" + name = "golang.org/x/net" + +[[constraint]] + name = "google.golang.org/grpc" + version = "1.11.3" +[prune] + go-tests = true + unused-packages = true diff --git a/misc/gen_cert.sh b/misc/gen_cert.sh index e4b76fac..8d598aaa 100755 --- a/misc/gen_cert.sh +++ b/misc/gen_cert.sh @@ -1,5 +1,23 @@ #!/bin/bash -# Regenerate the self-signed certificate for local host. +# Regenerate the self-signed certificate for local host. Recent versions of firefox and chrome(ium) +# require a certificate authority to be imported by the browser (localhostCA.pem) while +# the server uses a cert and key signed by that certificate authority. +# Based partly on https://stackoverflow.com/a/48791236 +CA_PASSWORD=notsafe -openssl req -x509 -sha256 -nodes -newkey rsa:2048 -days 1024 -keyout localhost.key -out localhost.crt +# Generate the root certificate authority key with the set password +openssl genrsa -des3 -passout pass:$CA_PASSWORD -out localhostCA.key 2048 +# Generate a root-certificate based on the root-key for importing to browsers. +openssl req -x509 -new -nodes -key localhostCA.key -passin pass:$CA_PASSWORD -config localhostCA.conf -sha256 -days 1825 -out localhostCA.pem + +# Generate a new private key +openssl genrsa -out localhost.key 2048 + +# Generate a Certificate Signing Request (CSR) based on that private key (reusing the +# localhostCA.conf details) +openssl req -new -key localhost.key -out localhost.csr -config localhostCA.conf + +# Create the certificate for the webserver to serve using the localhost.conf config. +openssl x509 -req -in localhost.csr -CA localhostCA.pem -CAkey localhostCA.key -CAcreateserial \ +-out localhost.crt -days 1024 -sha256 -extfile localhost.conf -passin pass:$CA_PASSWORD diff --git a/misc/localhost.conf b/misc/localhost.conf new file mode 100644 index 00000000..9e348e31 --- /dev/null +++ b/misc/localhost.conf @@ -0,0 +1,8 @@ +authorityKeyIdentifier=keyid,issuer +basicConstraints=CA:FALSE +keyUsage = digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment +subjectAltName = @alt_names + +[alt_names] +DNS.1 = localhost + diff --git a/misc/localhost.crt b/misc/localhost.crt index 91e66525..007162a4 100644 --- a/misc/localhost.crt +++ b/misc/localhost.crt @@ -1,21 +1,30 @@ -----BEGIN CERTIFICATE----- -MIIDXTCCAkWgAwIBAgIJAJ9+sGD4WNLKMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV -BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX -aWRnaXRzIFB0eSBMdGQwHhcNMTcxMTE5MDAxNDQzWhcNMjAwOTA4MDAxNDQzWjBF -MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50 -ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEAtbP4y7NBsoYDv1JLdowsE6+OZmH9ll4U7g0DASrgRly+UVIUXt9RumKl -ly/zCPlDWbzilbdNab8bXLibsodozjo8c3GMIaJXfMKZNvj5Hdv5NLBhPzBfTXNZ -nPASFwe25Hb9dgnNaTkmxeBCehBBHfg5WP+XEuFvzqTw8rs2yh6oH79Jkrf0+VKv -J2qpa3CQ3DdFtOKhg5KI4OfvcFvdLmgB8T8qWIx/U73MiNi8jaQEzK+qR2eBXjhC -8x6iRrba9yVw+SKIJy0q4jMVhwkPbApLUUt0R1VeHwaiEEkKLKS6wPvP4Uo12lH7 -chLWNqewfq+n7T2foCHR7Z9kVylUDQIDAQABo1AwTjAdBgNVHQ4EFgQU42OhBKej -WYWFW4P+2SWZT+4tERQwHwYDVR0jBBgwFoAU42OhBKejWYWFW4P+2SWZT+4tERQw -DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAJGI+eBF6vAtNjXoz+o8o -8ryXleCayKGs2ehpSk4IEzWAk5uMa+QEOQMeb5JkNMDitNpTw/xX3N7w+Dt/2ohw -r4ZkBisZLhM8Foz7XJAlki27dysajYh4j3g+w3qF/g8LVtxBbsNHLYTz3bRY05I1 -49YymLA47sQ++5T0TOWrvyVrg8GFwBjEL4s6XwQJNQxlSVXBJsqwFBe/vzAkEHUK -4i4mVXAWwfaNy0oZ0AjQyT/tERMf8fIPsCbJj2xPzNsS71xnYcLT6LJeSfpnQcQq -CNPOsr5Idk/ZtthUdCEIcUV7TUt++4ZwitVC9LaZII7X5qn7Q1EKG8LbhxytI+Nb -eQ== +MIIFJDCCBAygAwIBAgIJAKtZMXHzGYuqMA0GCSqGSIb3DQEBCwUAMIHDMQswCQYD +VQQGEwJVUzETMBEGA1UECAwKR1JQQyBTdGF0ZTESMBAGA1UEBwwJR1JQQyBUb3du +MSgwJgYDVQQKDB9HUlBDIFdlYiBsb2NhbGhvc3QgT3JnYW5pc2F0aW9uMRYwFAYD +VQQLDA1PcmcgVW5pdCBOYW1lMSQwIgYDVQQDDBtHUlBDIFdlYiBleGFtcGxlIGRl +diBzZXJ2ZXIxIzAhBgkqhkiG9w0BCQEWFGdycGMtd2ViQGV4YW1wbGUuY29tMB4X +DTE4MDQxNDEyMjMwNloXDTIxMDIwMTEyMjMwNlowgcMxCzAJBgNVBAYTAlVTMRMw +EQYDVQQIDApHUlBDIFN0YXRlMRIwEAYDVQQHDAlHUlBDIFRvd24xKDAmBgNVBAoM +H0dSUEMgV2ViIGxvY2FsaG9zdCBPcmdhbmlzYXRpb24xFjAUBgNVBAsMDU9yZyBV +bml0IE5hbWUxJDAiBgNVBAMMG0dSUEMgV2ViIGV4YW1wbGUgZGV2IHNlcnZlcjEj +MCEGCSqGSIb3DQEJARYUZ3JwYy13ZWJAZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3 +DQEBAQUAA4IBDwAwggEKAoIBAQDCX5apirBc6RgQynOoBfsPorOInemtEeAjm00m +/QF35wszdN9pB41s0wbQtj89SMM4thY/SkGrDDzTDBJRRqHa5klzsRRcbPXi0f5p +1admNnMiZTA/jOvi8DulWqbacLn9AbaaItevGADJSAK81dUCTXkcYV2KKAKPcQVO +HQVY2Fcm1E6x7ZrZ5vFgQ9GaWPrsuZ1Xi/UoYzCTen2CpAcLshhC4Sps++QUI8F8 +XBVjjAh6F0Zp6pnS+kIG9zlxwBSDpqtD5Uo0qatBXSycOiFAeVxIQL+8gF6Q45lX +3aTCWGbGhkuiLwyqRr89S9YecwNqdOj8vNTwe8a9IcQyWzMdAgMBAAGjggEXMIIB +EzCB4gYDVR0jBIHaMIHXoYHJpIHGMIHDMQswCQYDVQQGEwJVUzETMBEGA1UECAwK +R1JQQyBTdGF0ZTESMBAGA1UEBwwJR1JQQyBUb3duMSgwJgYDVQQKDB9HUlBDIFdl +YiBsb2NhbGhvc3QgT3JnYW5pc2F0aW9uMRYwFAYDVQQLDA1PcmcgVW5pdCBOYW1l +MSQwIgYDVQQDDBtHUlBDIFdlYiBleGFtcGxlIGRldiBzZXJ2ZXIxIzAhBgkqhkiG +9w0BCQEWFGdycGMtd2ViQGV4YW1wbGUuY29tggkAgFvCFZ4S5fIwCQYDVR0TBAIw +ADALBgNVHQ8EBAMCBPAwFAYDVR0RBA0wC4IJbG9jYWxob3N0MA0GCSqGSIb3DQEB +CwUAA4IBAQApL/qb/LfwpFyA8IbnkXnPMbx6kZjHxlAHjmmUUUOL2LtkmwGm2qDx +9BjXPwg41IEVkYzNYGUJPuS1CWL5lcX5FkZfcvvP3aNznVeDkizCE3kPO7NO4lAt +lVbfQZbTZaU7BmnwkoQwkVRZkctAF39sD06i5hsC0bOZXWL1KExvkb5IUWhjAsQC +N7O0aWXX1jalSRIlQ7eEcpX93lk2ehKriaBNNRl4OEd36vxhFQ+OG1dATqrwroPz +HbWLHxyNRZiLoW3kgiHCKjrwWksm/l3dti6tBIvc42WUOo6qkHQE5MuJI9wYt8My +twXlc+kW8TOaxGhkHjszrKFgqHSAKjmx -----END CERTIFICATE----- diff --git a/misc/localhost.key b/misc/localhost.key index e5c517e3..b87c956b 100644 --- a/misc/localhost.key +++ b/misc/localhost.key @@ -1,28 +1,27 @@ ------BEGIN PRIVATE KEY----- -MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC1s/jLs0GyhgO/ -Ukt2jCwTr45mYf2WXhTuDQMBKuBGXL5RUhRe31G6YqWXL/MI+UNZvOKVt01pvxtc -uJuyh2jOOjxzcYwhold8wpk2+Pkd2/k0sGE/MF9Nc1mc8BIXB7bkdv12Cc1pOSbF -4EJ6EEEd+DlY/5cS4W/OpPDyuzbKHqgfv0mSt/T5Uq8naqlrcJDcN0W04qGDkojg -5+9wW90uaAHxPypYjH9TvcyI2LyNpATMr6pHZ4FeOELzHqJGttr3JXD5IognLSri -MxWHCQ9sCktRS3RHVV4fBqIQSQospLrA+8/hSjXaUftyEtY2p7B+r6ftPZ+gIdHt -n2RXKVQNAgMBAAECggEAeCzVA1zGud07A0HZmUlyKX72Dq8Gunn1G9DNSOtjtAXI -9h30TR8kfcKaxJi5BBlgOyzbK6w1bhgwb63FhFlcrvEDZFMYHHKzrFdEYIBguyfu -9bMmTlWe4qnE/jAltseqZgZw8q3fBpX/F+aP8Q1pE/pFa6B3+cvSV/jtR40c2qY3 -P1Iz9KehAjav9E+GOy670w9klSzK2uQ032SDFVuBeGo62uYYNp8R94kHBq5ksMNr -WRW001m0ii4JvT9etB/CvMM2DA8kNOMGNhNhh2C/DckDYDx7vsHKYdrIdLuC4GPU -gC7TYIVX2IgwnGbMeSSYNkI/3ACeYPkfTAImVvqKfQKBgQDu8rCu0TXcFh5xe/xz -3c4hbC3mlvjJ/Gb1vnBovnMVww7SHe7gsTBT/vabaE00fGabLeJ8BpVBjmy6vHR0 -ekqWQN+eEywDySPrgzEHOTxOZ4C6gzC8cOhNCOd3iVXEZrhVkBTSoPrD+Wg1b5rp -ykWF/5Guao0guTyNQDUUhFvAhwKBgQDCq3r8WuXlBWPwBarBXsILctQzdiR6PjSz -eRDYg1GH1zIRsRaLB7LeC9Z3uXgiOLo5v5YAIE+bX+sSNr2rWPe64lUjtDh8lTov -V2Q9wsfFx+Mf9KqIJPfXc2th7eNPh9WUpX+nHVSEGYFXR068MEbTFkx8CKwlhXo0 -7lOc05JPywKBgG+V/DaXUqyl06+xc/Jz+YgYKdNOW36QFVDbj0kK71mRTsGG4wAh -Hu2K2oU2jx9cnNoI8oRy2o7TwSjvSv7+AQjr4MHEOEDIVLLuAB5cdzIyGaaAD2lg -3MrkxptHEjt2sMycTW0TaifMuAKETPay1AbAk7q83Y0TlBhujJs5OFPPAoGABZfd -ucB22IS2IWBYTqQFWUTcWfosBCMjaoCw/jePsSJ6us1mw2neNskKSXhXvkv49c3O -ZoSHJQS1gVl3S6QLwh/cqGD2OoYjHNca9zdQfBtJKFLkT3MYd+VGEZM/M7rIZTP4 -HfoWwpDlCXfwCDIu5sO+QNYS9CUIpNqwJlJh4s8CgYBs/RAD3CNGT2RsytwIqf9U -KIpjnrCb0mwJ8sefPHUlGpzRItyQl/Hj1VtYqG1JTVKgPUqMi24Olc3fUniyQkys -eMT3aGfRwXi9dUus13jVsK07UEjIWyd2Ebe4X64KJvHBE5ySBHPvNNuycCmpy2ou -AlJb9zJKArT8QqGJyIxbcQ== ------END PRIVATE KEY----- +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEAwl+WqYqwXOkYEMpzqAX7D6KziJ3prRHgI5tNJv0Bd+cLM3Tf +aQeNbNMG0LY/PUjDOLYWP0pBqww80wwSUUah2uZJc7EUXGz14tH+adWnZjZzImUw +P4zr4vA7pVqm2nC5/QG2miLXrxgAyUgCvNXVAk15HGFdiigCj3EFTh0FWNhXJtRO +se2a2ebxYEPRmlj67LmdV4v1KGMwk3p9gqQHC7IYQuEqbPvkFCPBfFwVY4wIehdG +aeqZ0vpCBvc5ccAUg6arQ+VKNKmrQV0snDohQHlcSEC/vIBekOOZV92kwlhmxoZL +oi8Mqka/PUvWHnMDanTo/LzU8HvGvSHEMlszHQIDAQABAoIBAQCOZAwxA4KTbcbN +diIn8smq+Jvg9x3aRYAXVYu9hhbvSXhxJ6sKfBfkousZNok5UfaBsxK1JqbYsUxV +p0A7/ixP+efRMuYhl0jB8ugXjAbn3/eUOOCRjaC4TRjE15Xn7DCz4e9tFx0+Da11 +xqUKxPMYjrysR7+ImCrX/gnO4X+rRvosX1LID9a105Hez28OXrz7/qw0ECa9aheg +eWAmZItVRVq+VRe7JY52l9RnwY0HZRB7YN5e0NSS5pNCfewZTeaMTH9whkqj3U/G +LbMu13D6MMrfPgU43MIimbmxrbqlWpaHsLZQFWSZiJdVar91FERz6BOMtr/DpnMH +WpOKG6+BAoGBAOAT1JoRGHaccDpWeLhI+JV2lwrNK30sJE5pYATsg7jPm8cOIsjc +OhZleU4Kbom6PavZtITJjZDGOQDPCVukdIsNXgd4hmI4c8jLUsHhMzXcVJYvO5US +vpLn8MXoaVohgyofQo8ihmwMxQWD/efjg96+N8Soq4gXSb4yWrZoSawRAoGBAN4Q +cStLeJdlhJSUVAU6I8syRLKVURCguscFOyd8DETBSE0nu+KizhoEgJvofBqJ3efp +lwjoxMLQsoFGK6npscnXnNDQcszCDroI74DVx+IHnsI8rWVS0hBtfrh1HsLM0++9 +ay8gZRCDKMIQOtjkPo2e5RExMXjmr1DOMIqyxVJNAoGAV9DtvQN+Jt3gTbydyvsu +EMVNJHqL1J58DA7YBpX6eW9DiZtMnpNQYH6cL61+7JMEoFjNmkyzIk3NATgiXrvw +wJ4Yf60IXW3qUoL8h+cN/sm+jK0uGJoj/cbQYX9X6m6/zL47g4TwUWAfxq2X0E0l +3SGHEZdYwhj+WX+6dUohtUECgYAYvRIudZDwpNGZT9DwaCK2r1nx3yqRxKYqJ84I +PwyK2FF6rvOCcwqs4VWGiObSegtrm51E09Gftmo8dpnEqxEwYEHLDX3Mi83iMb6k +xqwm5RxtnR7gC9L1G42jdQDBSNpPefWn4V8A8OuoevBjW0IQuuPf/2/4fRKI2P+V +ZAcRfQKBgBDPWqDOA4hkhKBdbvr6CZ3DxXQXkRIa3wP6P1qgGb9HpYE3cOsN+uPy +v/E4LsZC8rW40q/HdHqBhBC6FFd23LV5cx6d0z+06RlasDEvFfBg7iFSIJL22o2B +Lpye7y95ratx8p6lYXcPVeO4zPKdvGg9ZKA0WD0TS4fL6kFo5Wb+ +-----END RSA PRIVATE KEY----- diff --git a/misc/localhostCA.conf b/misc/localhostCA.conf new file mode 100644 index 00000000..0bcaa2fe --- /dev/null +++ b/misc/localhostCA.conf @@ -0,0 +1,12 @@ +[ req ] +prompt = no +distinguished_name = req_distinguished_name + +[ req_distinguished_name ] +C = US +ST = GRPC State +L = GRPC Town +O = GRPC Web localhost Organisation +OU = Org Unit Name +CN = GRPC Web example dev server +emailAddress = grpc-web@example.com diff --git a/misc/localhostCA.pem b/misc/localhostCA.pem new file mode 100644 index 00000000..2efac5c2 --- /dev/null +++ b/misc/localhostCA.pem @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEBDCCAuwCCQCAW8IVnhLl8jANBgkqhkiG9w0BAQsFADCBwzELMAkGA1UEBhMC +VVMxEzARBgNVBAgMCkdSUEMgU3RhdGUxEjAQBgNVBAcMCUdSUEMgVG93bjEoMCYG +A1UECgwfR1JQQyBXZWIgbG9jYWxob3N0IE9yZ2FuaXNhdGlvbjEWMBQGA1UECwwN +T3JnIFVuaXQgTmFtZTEkMCIGA1UEAwwbR1JQQyBXZWIgZXhhbXBsZSBkZXYgc2Vy +dmVyMSMwIQYJKoZIhvcNAQkBFhRncnBjLXdlYkBleGFtcGxlLmNvbTAeFw0xODA0 +MTQxMjIzMDZaFw0yMzA0MTMxMjIzMDZaMIHDMQswCQYDVQQGEwJVUzETMBEGA1UE +CAwKR1JQQyBTdGF0ZTESMBAGA1UEBwwJR1JQQyBUb3duMSgwJgYDVQQKDB9HUlBD +IFdlYiBsb2NhbGhvc3QgT3JnYW5pc2F0aW9uMRYwFAYDVQQLDA1PcmcgVW5pdCBO +YW1lMSQwIgYDVQQDDBtHUlBDIFdlYiBleGFtcGxlIGRldiBzZXJ2ZXIxIzAhBgkq +hkiG9w0BCQEWFGdycGMtd2ViQGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEA07Yhtl3Q3UQ7Rk3h525x/9S6vGLuxHHDRL5rqO6W3sxq +Bci5jJpqo+z2skzvyhXMsTSQGbzOzU4iLt+a87oAsSCaR+qLXYJJZK0zmW31+/MA +xpEEv6Tj0mi43TWbXBs6GmwFd5eUXZsl5j72Cq9RyrHTDG3AWyszwwX/TF0VdRaL +yILlSNBkq+ipm+yH2GD1rTgxHwNE9FVGQmU60NIBSsP9d0pphKRiRPh6PxJvIxHw +b8sznBmTPklNmSBlU2bnHhVdkjPtENWam4O7ompNLBd3gTL5yXxRudBECEQpHBCN +saqtxfwoR6RgUw5/dOAfZlCvIdbRX0XQW0WpHJabMwIDAQABMA0GCSqGSIb3DQEB +CwUAA4IBAQAp21I0w1zT43gZ7zWqZVEotIdxUSSRbG/YmkC2fGiRcPzxjNIkobYM +YWGc1kSrn1fKPd7sYo8suA/tjIQCiROLA6Lkh5x9NTtwN/cen7c13TrOckcfTgBK +CI83LFuSixYFF7nKli2bN0v9G+FSTC1Rk7PPTToNI3QNwCGTQj0BBzcY1xUN/2bg +KwUa8TaeqjMqpnZWaVZ9j1YEkyFhoI9wG/oGHGD9S6OBiN4smzmd30FZtjXl4XhX +LZqicnHYr9kJog15W94XD8g/1S8xuMyPkIapEXXytYwJ+K78NrUIASHq2P6j1Tor +ebAVe9mZRbZ0spIEr0PrxZtX1eWnR5n8 +-----END CERTIFICATE----- diff --git a/slack.png b/slack.png new file mode 100644 index 00000000..eb951fcf Binary files /dev/null and b/slack.png differ diff --git a/ts/src/transports/fetch.ts b/ts/src/transports/fetch.ts index 25fa6bae..230ba86a 100644 --- a/ts/src/transports/fetch.ts +++ b/ts/src/transports/fetch.ts @@ -23,14 +23,15 @@ class Fetch implements Transport { this.options = transportOptions; } - pump(readerArg: ReadableStreamReader, res: Response): Promise { + pump(readerArg: ReadableStreamReader, res: Response) { this.reader = readerArg; if (this.cancelled) { // If the request was cancelled before the first pump then cancel it here this.options.debug && debug("Fetch.pump.cancel at first pump"); - return this.reader.cancel(); + this.reader.cancel(); + return; } - return this.reader.read() + this.reader.read() .then((result: { done: boolean, value: Uint8Array }) => { if (result.done) { detach(() => { @@ -41,7 +42,8 @@ class Fetch implements Transport { detach(() => { this.options.onChunk(result.value); }); - return this.pump(this.reader, res); + this.pump(this.reader, res); + return; }); } @@ -58,7 +60,8 @@ class Fetch implements Transport { this.options.onHeaders(new Metadata(res.headers as any), res.status); }); if (res.body) { - return this.pump(res.body.getReader(), res) + this.pump(res.body.getReader(), res) + return; } return res; }).catch(err => {