TUN-1064: Revert OriginCert capnp changes in Cloudflared. Reverts

commits a1ee2342e97 and 8c756c45785.

tunnelrpc/pogs/tunnelrpc.go

@@ -32,7 +32,6 @@ type TunnelRegistration struct {
 	LogLines         []string
 	PermanentFailure bool
 	TunnelID         string `capnp:"tunnelID"`
-	OriginCert       []byte `capnp:"originCert"`
 }
 
 func MarshalTunnelRegistration(s tunnelrpc.TunnelRegistration, p *TunnelRegistration) error {

tunnelrpc/tunnelrpc.capnp

@@ -19,8 +19,6 @@ struct TunnelRegistration {
     permanentFailure @3 :Bool;
     # Displayed to user
     tunnelID @4 :Text;
-    # Certificate that authorizes the origin to run tunnels on the given url.
-    originCert @5 :Data;
 }
 
 struct RegistrationOptions {

tunnelrpc/tunnelrpc.capnp.go

@@ -124,12 +124,12 @@ type TunnelRegistration struct{ capnp.Struct }
 const TunnelRegistration_TypeID = 0xf41a0f001ad49e46
 
 func NewTunnelRegistration(s *capnp.Segment) (TunnelRegistration, error) {
-	st, err := capnp.NewStruct(s, capnp.ObjectSize{DataSize: 8, PointerCount: 5})
+	st, err := capnp.NewStruct(s, capnp.ObjectSize{DataSize: 8, PointerCount: 4})
 	return TunnelRegistration{st}, err
 }
 
 func NewRootTunnelRegistration(s *capnp.Segment) (TunnelRegistration, error) {
-	st, err := capnp.NewRootStruct(s, capnp.ObjectSize{DataSize: 8, PointerCount: 5})
+	st, err := capnp.NewRootStruct(s, capnp.ObjectSize{DataSize: 8, PointerCount: 4})
 	return TunnelRegistration{st}, err
 }
 
@@ -233,26 +233,12 @@ func (s TunnelRegistration) SetTunnelID(v string) error {
 	return s.Struct.SetText(3, v)
 }
 
-func (s TunnelRegistration) OriginCert() ([]byte, error) {
-	p, err := s.Struct.Ptr(4)
-	return []byte(p.Data()), err
-}
-
-func (s TunnelRegistration) HasOriginCert() bool {
-	p, err := s.Struct.Ptr(4)
-	return p.IsValid() || err != nil
-}
-
-func (s TunnelRegistration) SetOriginCert(v []byte) error {
-	return s.Struct.SetData(4, v)
-}
-
 // TunnelRegistration_List is a list of TunnelRegistration.
 type TunnelRegistration_List struct{ capnp.List }
 
 // NewTunnelRegistration creates a new list of TunnelRegistration.
 func NewTunnelRegistration_List(s *capnp.Segment, sz int32) (TunnelRegistration_List, error) {
-	l, err := capnp.NewCompositeList(s, capnp.ObjectSize{DataSize: 8, PointerCount: 5}, sz)
+	l, err := capnp.NewCompositeList(s, capnp.ObjectSize{DataSize: 8, PointerCount: 4}, sz)
 	return TunnelRegistration_List{l}, err
 }
 
@@ -1322,94 +1308,92 @@ func (p TunnelServer_unregisterTunnel_Results_Promise) Struct() (TunnelServer_un
 	return TunnelServer_unregisterTunnel_Results{s}, err
 }
 
-const schema_db8274f9144abc7e = "x\xda\x9cV]\x88\x14W\x16>\xdf\xbd\xddS=2" +
+const schema_db8274f9144abc7e = "x\xda\x9cV]\x8c\x14\xd5\x12\xae\xef\x9c\x99\xedY\xb2" +
-	"cOQ-h\xb32 #\xfe\xe0\xb8\xba\xea2\xce" +
+	"\xcbl\xa7\x87\\\x98\\2\x09Y\xc2OX.\\\xe0" +
-	"\xfe\xcc\xcf\x8e.=;\x8e}m\xddu\xd5\x05\xcb\xee" +
+	"f\xd9{\xaf\xfb\xe3\x82\x99uY\xa6\x190\x08\x98\xd0" +
-	"k[\xb3\xddUMU\xb5\xab\x82?\xc8\xc2\xb2\xb2+" +
+	"\xcc\x1c\x86^{\xba'\xdd=\x08D~$\x18\x95(" +
-	"\xbb\xab\xc2\xea\xe2\xa2\x92\xbc\xe4!?\xe4!\x18&`" +
+	"Q\x91\x071\x18$1Qc\xfc\x89&\x06\x83\x09\xbe" +
-	" \x89\x09F\xccC\x12\x94\x08!\x91yP\x12$C" +
+	"H\x0c1\xbc\xa8\x91Hb\x94\xec\x03DC\xdc\xe8\x83" +
-	"\xf2\x90@\xa8p\xab\xa7\xba\xcb\xd1\xa8\xc9\xdb\xed\xef\x9e" +
+	"&\xa6\xcd\xe9\xd9\x9ei\x16\x05\xf4\xed\xccw\xeaT}" +
-	"{\xcewN\x9d\xf3\x9d^\xb5\x84\x0f\xb2\xd5\xc9\x8f\x93" +
+	"U]\xf5\xd5,\xfb\x07\x1f`\xcb\x93\xdf$\x89\xf4\xe1" +
-	"Db$\xd9\x16\xfc\xb2z\xe3\xd2\xcf\xcf\\\xfb+\xe9" +
+	"d[\xf0\xbf\xea\xa53\xff9q\xf1\x08\xa9Y\x16\x1c" +
-	"Y\x16\x1c\x99\x1c\xcd|\xed\x1f\xff\x88\x08k>`\x87" +
+	"87\x92\xf9\xc5?\xfc5\x11V|\xc1\xf6A\xbb\xc6" +
-	"`\xdce\x1a\x911\xc56\x13\x82\x1b+&_\xfd\xd7" +
+	"\x14\"m\x82\xad'\x04\x97\x96\x9c\xfb\xf0\xd9\xf7\x9ex" +
-	"\xcb\x7f\xfb\x1f\x89%\x00QB#Z\xf3-\xfb\x06\x04" +
+	"\x89\xf4\x05\x00QB!Z\xf1\x1b\xfb\x15\x04M\xe5\xfd" +
-	"C\xe7\x03\x84\xe0\xf4\xcd\xd7\xc6\xab\xff>w\x89\xf4%" +
+	"\x84\xe0\x85\xaf>\x1a\xab>w\xf2\x0c\xa9\x0b\xa2\xfb\xd5" +
-	"\xd1\xfdz\xce\x18%\x82y9\xdc\xbe\xb2:\xf1J\xe3" +
+	"\x9c1J\x04\xb3\xf2\xb8r~y\xe2\x83\xc6M\x92\xcb" +
-	"&\xc9\xd5U/\xbf\xa7\x9e\x0e\xf1\x17\x08\xc1\xc2\xcf\x87" +
+	"\xab\x1e~]>\x1d\xe4o\x13\x82\xb9?\x0cu\xda7" +
-	";\xed\xfb\xc7\xaf\x90\x9eE\x8bE\xc3\xf0\x13>\x0a\xe3" +
+	"\x0e\x9f'5\x8b\x16\x8b\x86\xe1\xb7|\x04\xda\xcf\xf2\xa8" +
-	"+u4\xbe\x08\x8dGw\x9e\xfaOr\xea\xd4U\x12" +
+	"\xfd\x18\x1a\x8fl=\xfe|r\xe2\xf8\x05\xd2\xb3\x88q" +
-	"Y\xc48'\xdb\x94\xf5?\x13.\x8c\x8ba\xf0\xf3\x09" +
+	"N\xb6I\xebg\x12.\xb4W\xc2\xe0\xa7\x12\x0e#\x04" +
-	"\x87\x11\x82\xec\x8b\xbfx~\xb8t\xeb\xda,\xdfaf" +
+	"\xd9w\xfe\xfb\xd6P\xf9\xf2\xc5i\xbe\xc3\xcc\xd6)\x93" +
-	"\x9b\xb4i\xe3\x8f\x9a:m\xd3\xfeB\x08\xd8\x94\xb9\xe0" +
+	"\xda\x83\x8a<mR\x1e!\x04l\xc2\x98s\xe8\xcb{" +
-	"\xd8\x87\xbf\xbe\x1dK\xe1%\xedSP\"\x18\xff\xfd\xce" +
+	"\xae\xc4RxW\xf9\x0e\x94\x08\xc6\x1e\xd8:\xde\xbe\xff" +
-	"\x89\xf6\xc3w\xee\xcc\xa4\x00u\xf5\xac\x16\xa6pYS" +
+	"\xea\xd5\xa9\x14 \xaf^U\xc2\x14\xce*2\xfbU\xdb" +
-	"\xd9\xaf\xdb=$w\xf5m\xbfGz\x96?P\xc8[" +
+	"\x07\xc5\xb6\xde\xcd\xd7I\xcd\xf2\x9b\x0ayY\xe9\x83v" +
-	"Z?\x8c\xbba\x90)\xed\xaaQMiD\xc1\xc9#" +
+	"-\x0c2\xa1\\\xd0\xaa)\x85(8v`x\xfd\xea" +
-	"#\x9b\xd7/z}:\xeen[jZ\xb9\xb3R\xca" +
+	"y\x1fO\xc6\xddmJMJwfJ\xba\xdb\xd9\xfb" +
-	"\xdd\xde\xbe\xcf~\xbb\xf8\xe4[\xd3\xb3X\x87\x86\x7fO" +
+	"\xfd}\xf3\x8f}29\x8duh\xf8Tj1\xb4\x17" +
-	"-\x87qV\xf91\xce(\xe3\xfb\x1b\xff\xff~6\x9d" +
+	"\xa5\x1f\xed\x844\xbe\xb1\xf6\xe5\xcf\xb3\xe9\xecOz\x16" +
-	"\xfdRd\x11\xb7M*\xdb\xcb\xa9\x09\x18\xd7\x95\xed\x9a" +
+	"q\xdb\x90\xfe\xd9\xd48\xb4\xcf\xa4\xed\x8aOS9P" +
-	"wR\x7f\x00\xf5\x06~\xdd\xb6e\xc5\xad%\x8a?\x8d" +
+	"O\xe0\xd7m[Xn-Q\xfaWt,--\x19" +
-	"\x8e\xc5\x95E\xb3f\xd7\xfa7\x1c\xb0<\xdf\xb2\xcb[" +
+	"5\xbb\xd6\xb7f\x8f\xe9\xf9\xa6]\xd9\x18\xe2\xfd\x05\xc7" +
-	"C| \xefT\xac\xe2\xc1< :\xc0\x88\xf4\x85\xfd" +
+	"2K{\x0b\x80\xde\x01F\xa4\xce\xed#\x02\xd4Y[" +
-	"D\x80>o\x07\x11\x98\xae\x0f\x13\x0dXe\xdbqe" +
+	"\x88\xc0Tu\x88\xa8\xdf\xac\xd8\x8e+\x82\xb2\xe9\x95\x1c" +
-	"P\xb2\xbc\xa2c\xdb\x92x\xd1?\xba\xc7\xac\x98vQ" +
+	"\xdb\x16\xc4K\xfe\xc1\x1d\x86e\xd8%\xd1\x0c\xd4vk" +
-	"6\x03\xb5=\x1c\xa8\x11\xa0 \xdd\xfd\xd2]Y\xb7]" +
+	"\xa0F\x80\xa2pw\x0bwi\xddvE\xc5\xf4|\xe1" +
-	"Y\xb6<_\xba\x0d\xb8g o\xbaf\xd5\x13\x09\x9e" +
+	"6\xe0\xee\xfe\x82\xe1\x1aUOO\xf0\x04Q\x02Dj" +
-	" J\x80H\xef<G$\xba8\xc4O\x18\x82\xb2k" +
+	"\xe7I\"\xbd\x8bC\xff'CPq\x8d\x92(\x08\x17" +
-	"\x16e^\xba\xb0\x9c\xd2\xb8i;\x05.\x8bH\x12C" +
+	"\xa6S\x1e3l\xa7\xc8E\x09IbH\x12\x9aAg" +
-	"\x92\xd0\x0c:\xf7\x87\x06\xdd\"\xbdz\xc5\xf7\xa8\xf9\xea" +
+	"\xfe\xd5\xa0\x1b\x84W\xb7|\x8f\x9a\xafn\xff~\xda\xeb" +
-	"\xf1\xefg\xbd\xce\x9b\xe9\x90rG\x93\xf2\x86\x1dj\xc2" +
+	"\x82\x91\x0e)w4)\xaf\xd9\"'\x8cC/0\xa8" +
-	"8D\x9eA\x072jf\xf4M\xa3Db\x8cCl" +
+	"@F\xce\x8c\xban\x84H\x1f\xe5\xd073\xa8\x8ce" +
-	"g\xd0\x19\xcb\x84e\xdd6L$\xf2\x1cb\x17C\xe0" +
+	"\xc2\xb2n\x1a\"\xd2\x0b\x1c\xfa6\x86\xc0q\xcd\x8ai" +
-	"\xb8V\xd9\xb2\x7f#\x89\xbb>:\x89\xa1\x93\x10\xecs" +
+	"\xdf+\x88\xbb>:\x89\xa1\x93\x10\xecr<\xdf6\xaa" +
-	"<\xdf6\xab\x92\x88\xd0A\x0c\x1d\x84\xa3N\xcd\xb7\x1c" +
+	"\x82\x88\xd0A\x0c\x1d\x84\x83N\xcd7\x1d\xdbCWk" +
-	"\xdbCWk\x1e\x08\xe8\x8a\x95\xe0\x11\x1fx\xa8\xee\xef" +
+	"\x1e\x08\xe8\x8a\x95\xe0\x0f>\xf0`\xdd\xdf%l\xdf," +
-	"\x93\xb6o\x15M\xf5\x98(\xfc\xb6-\xca\x8b\x88\xc4 " +
+	"\x19\xf21Q\xf8m[\x94\xe7\x11\xe9\x03\x1c\xfah\x8c" +
-	"\x87\x18\x8bQ\xce\xfd,\x96GDy\xd3\x9eV\x1e\xda" +
+	"r\xfe\xdf\xb1<\"\xca\xebv\xb4\xf2P\x1e\x16{#" +
-	"\x9f\xe5\xc1\x88U\xb7\xac\x9aV%\xfa\x15%3D\xda" +
+	"V9Q5L+\xfa\x15%3H\xca\xfd-\x9b\xdb" +
-	"\xefZ6\x8f\xe3\xb7%\xac\xaa\x1b\xb2\xdb\\\xeb\x0e3" +
+	"\xf1\xdb\x10V\xd5\x0d\xd9\xad\xaf\xe5\xc2\x0c%\xc7%\x11" +
-	"T\x1cWD\x1c\x8d\xc5\x18%*\xf4\x80\xa3\xb0\x0a-" +
+	"Gm>F\x88\x8a\xdd\xe0(.C\x8b\xa6\xd6\x83!" +
-	"\x9aF/\x86\x89\x0aK\x15\xbe\x16-\xa6\xc6jd\x89" +
+	"\xa2\xe2B\x89\xafD\x8b\xa9\xb6\x1cY\xa2\xe2\x12\x89\xf7" +
-	"\x0a+\x14\xde\x07\x06\xf0\x0c8\x91\xb1\x0e\xcf\x11\x15\xfa" +
+	"\x82\x01<\x03N\xa4\xad\xc2\x1bD\xc5^\x09\x0fK\xf3" +
-	"\x14<\xa2\xcc\x13<\x83\x04\x911\x14\xba\x1fT\xf8\x98" +
+	"\x04\xcf A\xa4\x0d\x86\xee\x07$>*\xf1d\"\x83" +
-	"\xc2\x93\x89\x0c\x92DF\x0e\xcb\x89\x0a#\x0a\xdf\xad\xf0" +
+	"$\x91\x96\xc7b\xa2\xe2\xb0\xc4\xb7K\xbc\x8de\xd0F" +
-	"6\x96A\x1b\x91\xf1'L\x10\x15v)|\x9f\xc2\xb5" +
+	"\xa4=\x84q\xa2\xe26\x89\xef\x92\xb8\x92\xcc\xc8\x11\xd5" +
-	"dF\x8d\xa8!\xe1\x12\x15J\x0a\xaf)<5?\x83" +
+	"\x04\\\xa2bY\xe25\x89\xa7fg\x90\"\xd2\xaa!" +
-	"\x14\x91Q\x0d\xf1\x8a\xc2\x0f(\xbc}A\x06\xedDF" +
+	"nI|\x8f\xc4\xdb\xe7d\xd0N\xa4\xd5q\x98\xa8\xe8" +
-	"\x1d\xc7\x89\x0a\xbe\xc2\x8f)|\x0e2\x98Cd\x1c\xc6" +
+	"K\xfc\x90\xc4g \x83\x19D\xda~\x9c$*\x1e\x92" +
-	"9\xa2\xc21\x85\xff\x03\x0cA\xb1bI\xdb\xcf\x95\xe2" +
+	"\xf8\xd3`\x08J\x96)l?_\x8ew\xc2n\xe1z" +
-	"\x9d\xb0_\xba\x9e\xe5\xd8\xd1o\xeex\xcdR\xcb\x99\x81" +
+	"\xa6cG\xbf\xb9\xe35K-\xa6\x06\x1a\x8d6-8" +
-	"F\xa3M\xf3NZM4\xd2-\xd9' M\x08j" +
+	"i9\xd1H\xb7d\x9f\x804!\xa89\x8e5vs" +
-	"\x8eS\x19\x7f\xb0\xc3\xd2\xbeY\xf60\x97\x90\xe7@W" +
+	"\x87\xa5}\xa3\xe2a&\xa1\xc0\x81\xae\x96\x8c\x12$\x18" +
-	"KF\x09\x0a\x0c\xc2y/\xfa\x16\xa5\x1d;WB\x1b" +
+	"\x84\xf3^\xf2MJ;v\xbe\x8c6bhk~\xf2" +
-	"1\xb45?\xf9\x98C\xddE\xb3\x92\xab5\x99X\xde" +
+	"Q\x87r%\xc3\xca\xd7\x9aLLo\xb0\xee;\xf5\x1a" +
-	"P\xddw\xea5\xea.\x99\xbe,\x01\xc4\x00B\xe0\xd6" +
+	"\xe5\xca\x86/\xca\x001\x80\x10\xb8u{\xad\xebT7" +
-	"\xed\x8d\xaeS\xdd\x0a\xe9V-\xdb\xacP\xf3\xa6\xe8T" +
+	"B\xb8U\xd36,j\xde\x94\x9cj\xcd\x15\x9e\x07\xd3" +
-	"k\xae\xf4<X\x8e-\xeaf\xc5\xe2\xfeA\xb4\x13C" +
+	"\xb1\xf5\xbaa\x99\xdc\xdf\x8bvbh\x8f\xf5\x10\x9b\xde" +
-	"{\xac\x87\xd8\xec\x1e\xea\xae\xf5o5\xcb\xaagR\xcd" +
+	"C\xb9Z\xdfF\xa3\"{&\xd5\xec\xebE\x8b\x89\xf4" +
-	"\xbe^\xb6\x9cH\xf4p\x88U\xb1\xbe\xeeU}\xbd\x94" +
+	"n\x0e}Y\xac\xaf{d_/\xe4\xd0W2\xa4\xe5" +
-	"C\xaceH\xab\xe1j\xf6\xf0~\xb3R\x97\x0fu\xeb" +
+	"p5{x\xb7a\xd5\xc5-\xddz'\x15\xab\x08\xbf" +
-	"\x93T\xac,\xfd\xc6)g\xefuz\xf2\xa6\xab\x99U" +
+	"q\xca\xdb;\x9d\xee\x82\xe1*F\xd5\xfb\x9b\xaf7\x08" +
-	"\xefG\xbe\xde\"\xbd\xb4\x12\xa3\xb8\x02\xf6\x13\x89\x14\x87" +
+	"/-\xc5(\xae\x80}Dz\x8aC\xcf0\xf4\xbb\xa1" +
-	"\xc80\x0c\xb8\xa1V\xa1\xab\xb5%f\x8d>\xff\xbep" +
+	"V\xa1\xab\xb5%\xa6\x8d>\xff\xb3p\xfd\x8d(\x8d\xb9" +
-	"\x03\x8d(\x8d\xb9O\x125W3\xa2\x8d\xa4\x8bC\xc4" +
+	"O\x125W3\xa2\x8d\xa4\xea\xfb\x88\xa9y\x05\xadm" +
-	"\xf4\x9c\x86\xd66D\xb4\xfc\xf4_\xb9\xc4\xf4u\x1aX" +
+	"\x88h\xf9\xa9\xffw\x89\xa9\xab\x14\xb0\xe6\xbf\x01D[" +
-	"\xf3\xdf\x00\xa2\xad\xaf/;AL_\xac\x05\x912\xd2" +
+	"_]t\x94\x98:_\x09\"e\xa4\xfeF\xc8\x01\x04" +
-	"@#\xe4 \x82(;\xea\x0e\xf3\x1bD\x10\xc9/\"" +
+	"Qv\x94\x0b\xf3\x1b@\x10\xc9/\"\x05%\x1a@\x01" +
-	"\x05%\x1aD\x1eO_\xee\x87\xd4\xbb\xdb{\x9a\x8aE" +
+	"w_\xee[\xd4;\xe7\xddM\xc5\xa2Uy\xe7z5" +
-	"\xab\xf2\xc9\xf5j\xc4I+\xbe\xaaZ1\xbf\x13D\xa2" +
+	"\xe2\xa4%_Y\xad\x98\xdfq\"\xbd\x83C\x9f\xcd\x10" +
-	"\x83C\xccg\x08*\xce\x8c\x94\xa6\xc7c-\xf48\x89" +
+	"X\xce\x94\x94\xa6\xc7b-t;\x89k\x10\x8e\x84." +
-	"k\x10\x8e\x84.\xad\x1e+\xff\xf3\x9b\xfe\xcf*\x15>" +
+	"-\x1fK\xff\x99\xa6\xff\xfdR\x85\xf7p\xe8Gb\xdd" +
-	"\xcd!.\xc4\xba\xf5\xbc\x02\xff\xcb!\x9e\x89\xa9\xf0E" +
+	"\xfa\x98\x04\x1f\xe5\xd0\x9f\x8c\xa9\xf0\xe3r\x9b\x1c\xe1\xd0" +
-	"\xb5M.p\x88\xc9\xa6\xb0\xe9\x97O\x10\x89I\x0e\xf1" +
+	"O7\x85M=u\x94H?\xcd\xa1\xbf\xd9R5\xf5" +
-	"vK\xd5\xf47\x95\xe1\x1b\x1c\xe2\xbd\x96\xa4\xe9\xd7\xd5" +
+	"ui\xf8\x1a\x87\xfe>\x83\"\\7\xe2\xa9\xd4\xdd\x96" +
-	"\x82z\x97C\xdcd\xd0\xa4\xebF\xe4\xb5\xba\xdbR\xf0" +
+	"X[Ne\xd4\xb4\x85'%`j\xea\xe5\x95\x9c\xf5" +
-	"\x8aS\x1e\xb3l\xe9)]\x98\x91\x02u\xa5\x04\xa0&" +
+	"\x9ap\xab\x86-l\xf8k\x0d\xd3\xaa\xbb\x82Zc\xda" +
-	"\xdd\xaaiK\x1b\xfeF\xd3\xaa\xd4]I\xad\xd9m$" +
+	"\xc8/?\x1cS\x8e\xdf\x03\x00\x00\xff\xff#\xa3\xb8\x8f"
-	"\x9d\x1b\x89\xc9\xc9#7\xdbw\x01\x00\x00\xff\xff\xd0\x91" +
-	"\xc3p"
 
 func init() {
 	schemas.Register(schema_db8274f9144abc7e,