Merge pull request #2105 from ripienaar/2104

(#2104) Allow permissions to be viewed by clients

broker/network/choria_auth.go

@@ -887,6 +887,7 @@ func (a *ChoriaAuth) setMinimalClientPermissions(_ *server.User, caller string,
 	}
 
 	subs = append(subs, replys)
+	pubs = append(pubs, "$SYS.REQ.USER.INFO")
 
 	return subs, pubs
 }

broker/network/choria_auth_test.go

@@ -720,7 +720,7 @@ var _ = Describe("Network Broker/ChoriaAuth", func() {
 						Allow: []string{"*.reply.e33bf0376d4accbb4a8fd24b2f840b2e.>"},
 					}))
 					Expect(user.Permissions.Publish).To(Equal(&server.SubjectPermission{
-						Deny: allSubjects,
+						Allow: []string{"$SYS.REQ.USER.INFO"},
 					}))
 				})
 
@@ -1803,15 +1803,13 @@ var _ = Describe("Network Broker/ChoriaAuth", func() {
 	Describe("setClientPermissions", func() {
 		var (
 			log    *logrus.Entry
-			minSub []string
-			minPub []string
+			minSub = []string{"*.reply.>"}
+			minPub = []string{"$SYS.REQ.USER.INFO"}
 		)
 
 		BeforeEach(func() {
 			log = logrus.NewEntry(logrus.New())
 			log.Logger.SetOutput(GinkgoWriter)
-
-			minSub = []string{"*.reply.>"}
 		})
 
 		Describe("System User", func() {
@@ -1833,7 +1831,9 @@ var _ = Describe("Network Broker/ChoriaAuth", func() {
 				Expect(user.Permissions.Subscribe).To(Equal(&server.SubjectPermission{
 					Allow: minSub,
 				}))
-				Expect(user.Permissions.Publish).To(Equal(&server.SubjectPermission{}))
+				Expect(user.Permissions.Publish).To(Equal(&server.SubjectPermission{
+					Allow: []string{"$SYS.REQ.USER.INFO"},
+				}))
 			})
 
 			It("Should set correct permissions for the choria user", func() {
@@ -1938,7 +1938,7 @@ var _ = Describe("Network Broker/ChoriaAuth", func() {
 				}))
 				Expect(user.Permissions.Publish).To(Equal(&server.SubjectPermission{
 					Allow: minPub,
-					Deny:  allSubjects,
+					Deny:  nil,
 				}))
 			})
 		})
@@ -2002,12 +2002,7 @@ var _ = Describe("Network Broker/ChoriaAuth", func() {
 					Allow: minSub,
 				}))
 				Expect(user.Permissions.Publish).To(Equal(&server.SubjectPermission{
-					Allow: []string{
-						"*.broadcast.agent.>",
-						"*.broadcast.service.>",
-						"*.node.>",
-						"choria.federation.*.federation",
-					},
+					Allow: append(minPub, "*.broadcast.agent.>", "*.broadcast.service.>", "*.node.>", "choria.federation.*.federation"),
 				}))
 			})
 		})
@@ -2023,7 +2018,7 @@ var _ = Describe("Network Broker/ChoriaAuth", func() {
 					Allow: append(minSub, "sub.>"),
 				}))
 				Expect(user.Permissions.Publish).To(Equal(&server.SubjectPermission{
-					Allow: []string{"pub.>"},
+					Allow: append(minPub, "pub.>"),
 				}))
 			})
 		})
@@ -2036,7 +2031,7 @@ var _ = Describe("Network Broker/ChoriaAuth", func() {
 					Allow: []string{"*.reply.0f47cbbd2accc01a51e57261d6e64b8b.>"},
 				}))
 				Expect(user.Permissions.Publish).To(Equal(&server.SubjectPermission{
-					Deny: allSubjects,
+					Allow: minPub,
 				}))
 			})
 
@@ -2047,7 +2042,7 @@ var _ = Describe("Network Broker/ChoriaAuth", func() {
 					Allow: []string{"*.reply.>"},
 				}))
 				Expect(user.Permissions.Publish).To(Equal(&server.SubjectPermission{
-					Deny: allSubjects,
+					Allow: minPub,
 				}))
 			})
 		})

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/awesome-gocui/gocui v1.1.0
 	github.com/brutella/hc v1.2.5
 	github.com/choria-io/appbuilder v0.9.1-0.20231206212603-ba0ccaadd57a
-	github.com/choria-io/fisk v0.6.1
+	github.com/choria-io/fisk v0.6.2
 	github.com/choria-io/go-updater v0.1.0
 	github.com/choria-io/tokens v0.0.3
 	github.com/cloudevents/sdk-go/v2 v2.14.0
@@ -37,8 +37,8 @@ require (
 	github.com/nats-io/natscli v0.1.2-0.20231206213629-ded94d8ba8dc
 	github.com/onsi/ginkgo/v2 v2.13.2
 	github.com/onsi/gomega v1.30.0
-	github.com/open-policy-agent/opa v0.59.0
-	github.com/prometheus/client_golang v1.17.0
+	github.com/open-policy-agent/opa v0.60.0
+	github.com/prometheus/client_golang v1.18.0
 	github.com/prometheus/client_model v0.5.0
 	github.com/robfig/cron v1.2.0
 	github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
@@ -75,12 +75,12 @@ require (
 	github.com/gdamore/encoding v1.0.0 // indirect
 	github.com/gdamore/tcell/v2 v2.7.0 // indirect
 	github.com/go-ini/ini v1.67.0 // indirect
-	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/google/flatbuffers v23.3.3+incompatible // indirect
-	github.com/google/pprof v0.0.0-20231212022811-ec68065c825e // indirect
+	github.com/google/pprof v0.0.0-20231229205709-960ae82b1e42 // indirect
 	github.com/google/uuid v1.5.0 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/goss-org/GOnetstat v0.0.0-20230101144325-22be0bd9e64d // indirect
@@ -110,7 +110,7 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/nats-io/jwt/v2 v2.5.3 // indirect
-	github.com/nats-io/nkeys v0.4.6 // indirect
+	github.com/nats-io/nkeys v0.4.7 // indirect
 	github.com/nats-io/nsc/v2 v2.8.6-0.20231117160437-b49262c20be8 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/oleiade/reflections v1.0.1 // indirect
@@ -139,12 +139,12 @@ require (
 	go.uber.org/goleak v1.2.1 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
-	golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611 // indirect
+	golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
 	golang.org/x/mod v0.14.0 // indirect
 	golang.org/x/net v0.19.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	gonum.org/v1/gonum v0.12.0 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/alessio/shellescape.v1 v1.0.0-20170105083845-52074bc9df61 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

@@ -50,8 +50,8 @@ github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitf
 github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
 github.com/choria-io/appbuilder v0.9.1-0.20231206212603-ba0ccaadd57a h1:h9Ekd06CZTjo/ND41XaTdTeWU4yExbKaNQm5QHfkkKo=
 github.com/choria-io/appbuilder v0.9.1-0.20231206212603-ba0ccaadd57a/go.mod h1:xENRbaZ6Kza8n9OzDcBg9FNZ5AkF4LBoKSl/CAHC0jQ=
-github.com/choria-io/fisk v0.6.1 h1:umFzmj2Ecttk89AFoxnqCph0exAmChqhJklvE+Id18o=
-github.com/choria-io/fisk v0.6.1/go.mod h1:m6kd61ycRGwkyb0SDdgmcQXW9fQJuqeH4DKEjRxJewg=
+github.com/choria-io/fisk v0.6.2 h1:Vfvpcv8SD53FHW5cT4u7LStpz/wThwRPQHU7mzv1kMI=
+github.com/choria-io/fisk v0.6.2/go.mod h1:PajiUZTAotE5zO18eU6UexuPLLv565WOma4dB0ObxRM=
 github.com/choria-io/go-updater v0.1.0 h1:+Pt2ifsDh478T/ldA8fnDwavvH3RTQNn1mkrabVZ5eg=
 github.com/choria-io/go-updater v0.1.0/go.mod h1:8qj3lwYUC6c0zqsvaKP4pNu8GMHbIr5WGrd5YUWByWw=
 github.com/choria-io/goform v0.0.3 h1:4LhR1Wwj1bre8ZHfhSIseGDhAzDL4U5LQcfYP75QGng=
@@ -98,8 +98,8 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9
 github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
 github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
-github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
+github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
@@ -116,19 +116,17 @@ github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
 github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/google/flatbuffers v23.3.3+incompatible h1:5PJI/WbJkaMTvpGxsHVKG/LurN/KnWXNyGpwSCDgen0=
 github.com/google/flatbuffers v23.3.3+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20231212022811-ec68065c825e h1:bwOy7hAFd0C91URzMIEBfr6BAz29yk7Qj0cy6S7DJlU=
-github.com/google/pprof v0.0.0-20231212022811-ec68065c825e/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
+github.com/google/pprof v0.0.0-20231229205709-960ae82b1e42 h1:dHLYa5D8/Ta0aLR2XcPsrkpAgGeFs6thhMcQK0oQ0n8=
+github.com/google/pprof v0.0.0-20231229205709-960ae82b1e42/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -234,8 +232,8 @@ github.com/nats-io/nats.go v1.31.0 h1:/WFBHEc/dOKBF6qf1TZhrdEfTmOZ5JzdJ+Y3m6Y/p7
 github.com/nats-io/nats.go v1.31.0/go.mod h1:di3Bm5MLsoB4Bx61CBTsxuarI36WbhAwOm8QrW39+i8=
 github.com/nats-io/natscli v0.1.2-0.20231206213629-ded94d8ba8dc h1:wJbQBQSpFt9XHUViKeEPRl34aZlrbXArp+ck9vYUH/c=
 github.com/nats-io/natscli v0.1.2-0.20231206213629-ded94d8ba8dc/go.mod h1:tdVTxpKrg2D+m6J8rplrfFgL4ydA3YLN8dWgAOMpCkM=
-github.com/nats-io/nkeys v0.4.6 h1:IzVe95ru2CT6ta874rt9saQRkWfe2nFj1NtvYSLqMzY=
-github.com/nats-io/nkeys v0.4.6/go.mod h1:4DxZNzenSVd1cYQoAa8948QY3QDjrHfcfVADymtkpts=
+github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI=
+github.com/nats-io/nkeys v0.4.7/go.mod h1:kqXRgRDPlGy7nGaEDMuYzmiJCIAAWDK0IMBtDmGD0nc=
 github.com/nats-io/nsc/v2 v2.8.6-0.20231117160437-b49262c20be8 h1:MqR1Fp9vHrcKcs3BMRmEnHaF7m+fcWiKJEWT6cInMNM=
 github.com/nats-io/nsc/v2 v2.8.6-0.20231117160437-b49262c20be8/go.mod h1:iOC7u3x7LrisgXnlhk6TclXSZl4KI1r6OYqXf/l22m0=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
@@ -247,16 +245,16 @@ github.com/onsi/ginkgo/v2 v2.13.2 h1:Bi2gGVkfn6gQcjNjZJVO8Gf0FHzMPf2phUei9tejVMs
 github.com/onsi/ginkgo/v2 v2.13.2/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM=
 github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
 github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
-github.com/open-policy-agent/opa v0.59.0 h1:1WFU/KUhJAr3qatm0Lf8Ea5jp10ZmlE2M07oaLiHypg=
-github.com/open-policy-agent/opa v0.59.0/go.mod h1:rdJSkEc4oQ+0074/3Fsgno5bkPsYxTjU5aLNmMujIvI=
+github.com/open-policy-agent/opa v0.60.0 h1:ZPoPt4yeNs5UXCpd/P/btpSyR8CR0wfhVoh9BOwgJNs=
+github.com/open-policy-agent/opa v0.60.0/go.mod h1:aD5IK6AiLNYBjNXn7E02++yC8l4Z+bRDvgM6Ss0bBzA=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/profile v1.6.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
-github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
+github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
+github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA=
 github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
 github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
 github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM=
@@ -360,8 +358,8 @@ golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL
 golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
-golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611 h1:qCEDpW1G+vcj3Y7Fy52pEM1AWm3abj8WimGYejI3SC4=
-golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
+golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM=
+golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
@@ -447,12 +445,11 @@ gonum.org/v1/gonum v0.12.0 h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o=
 gonum.org/v1/gonum v0.12.0/go.mod h1:73TDxJfAAHeA8Mk9mf8NlIppyhQNo5GLTcYeqgo2lvY=
 gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
 gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc=
-google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4=
-google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 h1:W18sezcAYs+3tDZX4F80yctqa12jcP1PUS2gQu1zTPU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 h1:6GQBEOdGkX6MMTLT9V+TjtIRZCw9VPD5Z+yHY9wMgS0=
+google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU=
+google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
+google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/alessio/shellescape.v1 v1.0.0-20170105083845-52074bc9df61 h1:8ajkpB4hXVftY5ko905id+dOnmorcS2CHNxxHLLDcFM=
 gopkg.in/alessio/shellescape.v1 v1.0.0-20170105083845-52074bc9df61/go.mod h1:IfMagxm39Ys4ybJrDb7W3Ob8RwxftP0Yy+or/NVz1O8=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

integration/ca/one/ca-key.pem

@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJ2hGwI3qw3Gsx2aN4sFbRXTVN3KP+3jyMi+ahqSVW93oAoGCCqGSM49
-AwEHoUQDQgAEjZlAOpOHzZJIuhCxOUYzYl0tFXxW3RL4ijXMMp58W2PTJmDk+1Je
-k0g38D6bmjj0Pz3o3SqCWUdwdLogoEHM5A==
+MHcCAQEEIJTWxe6CihUOiJ0XGdp851Nw5WWIsy3VppyIYOLG5I7goAoGCCqGSM49
+AwEHoUQDQgAEAk/yaR1s45RsPvz7R6ZgjPXiKeuD0GbV2W2YdMKi3smZ3XAHPwPl
+NDmvnbG9RXtrsgqQSRY6ZIm+8ZFeuVtxzw==
 -----END EC PRIVATE KEY-----

integration/ca/one/ca.csr

@@ -1,10 +1,10 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIIBWjCCAQACAQAweTELMAkGA1UEBhMCWFgxETAPBgNVBAgTCExvY2FsaXR5MQ0w
+MIIBWTCCAQACAQAweTELMAkGA1UEBhMCWFgxETAPBgNVBAgTCExvY2FsaXR5MQ0w
 CwYDVQQHEwRDaXR5MQ8wDQYDVQQKEwZDaG9yaWExJTAjBgNVBAsTHFVuaXQgdGVz
 dGluZyBJbnRlcm1lZGlhdGUgQ0ExEDAOBgNVBAMTB1Jvb3QgQ0EwWTATBgcqhkjO
-PQIBBggqhkjOPQMBBwNCAASNmUA6k4fNkki6ELE5RjNiXS0VfFbdEviKNcwynnxb
-Y9MmYOT7Ul6TSDfwPpuaOPQ/PejdKoJZR3B0uiCgQczkoCUwIwYJKoZIhvcNAQkO
-MRYwFDASBgNVHRMBAf8ECDAGAQH/AgEBMAoGCCqGSM49BAMCA0gAMEUCIH2yXgAF
-Ftq2jjHXwO+LE1XAY0VOglufHW3U9GqZv5qHAiEAlqn5BoAFzJqyBSfMz1nGzAvc
-JwrLpb5bp/czG8ZaReQ=
+PQIBBggqhkjOPQMBBwNCAAQCT/JpHWzjlGw+/PtHpmCM9eIp64PQZtXZbZh0wqLe
+yZndcAc/A+U0Oa+dsb1Fe2uyCpBJFjpkib7xkV65W3HPoCUwIwYJKoZIhvcNAQkO
+MRYwFDASBgNVHRMBAf8ECDAGAQH/AgEBMAoGCCqGSM49BAMCA0cAMEQCIFIWzWK8
+J27e7Y3Z5tQYkMJ+A23ZuUP+E/FHIBzB3uu/AiB0GxIgUI2p6462SrdrAEsTB8Y0
+fvD6PuWHDOtqjUskRg==
 -----END CERTIFICATE REQUEST-----

integration/ca/one/ca.pem

@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICOjCCAeGgAwIBAgIUGvm42ZxlBfMoyl7aDtK/XC8QLbswCgYIKoZIzj0EAwIw
-eTELMAkGA1UEBhMCWFgxETAPBgNVBAgTCExvY2FsaXR5MQ0wCwYDVQQHEwRDaXR5
-MQ8wDQYDVQQKEwZDaG9yaWExJTAjBgNVBAsTHFVuaXQgdGVzdGluZyBJbnRlcm1l
-ZGlhdGUgQ0ExEDAOBgNVBAMTB1Jvb3QgQ0EwIBcNMjMwMzIxMTY0NDAwWhgPMjA1
-MzAzMTMxNjQ0MDBaMHkxCzAJBgNVBAYTAlhYMREwDwYDVQQIEwhMb2NhbGl0eTEN
-MAsGA1UEBxMEQ2l0eTEPMA0GA1UEChMGQ2hvcmlhMSUwIwYDVQQLExxVbml0IHRl
-c3RpbmcgSW50ZXJtZWRpYXRlIENBMRAwDgYDVQQDEwdSb290IENBMFkwEwYHKoZI
-zj0CAQYIKoZIzj0DAQcDQgAEjZlAOpOHzZJIuhCxOUYzYl0tFXxW3RL4ijXMMp58
-W2PTJmDk+1Jek0g38D6bmjj0Pz3o3SqCWUdwdLogoEHM5KNFMEMwDgYDVR0PAQH/
-BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYDVR0OBBYEFBrKl/DBXYlm7ZiP
-gj/pbUyTVUBqMAoGCCqGSM49BAMCA0cAMEQCIB4BHyTG0cPkdm3Y+SMEM+MyxnwP
-czBP3iy0iBN8WM0hAiA0X6X8dOJ0H18sgH6ydc75muNQEfY21xCH/bmf3mEfTA==
+MIICOTCCAeCgAwIBAgITF6BMyhl9EQMPcsE8HOeSN7dTYzAKBggqhkjOPQQDAjB5
+MQswCQYDVQQGEwJYWDERMA8GA1UECBMITG9jYWxpdHkxDTALBgNVBAcTBENpdHkx
+DzANBgNVBAoTBkNob3JpYTElMCMGA1UECxMcVW5pdCB0ZXN0aW5nIEludGVybWVk
+aWF0ZSBDQTEQMA4GA1UEAxMHUm9vdCBDQTAgFw0yNDAxMDQxNDIzMDBaGA8yMDUz
+MTIyNzE0MjMwMFoweTELMAkGA1UEBhMCWFgxETAPBgNVBAgTCExvY2FsaXR5MQ0w
+CwYDVQQHEwRDaXR5MQ8wDQYDVQQKEwZDaG9yaWExJTAjBgNVBAsTHFVuaXQgdGVz
+dGluZyBJbnRlcm1lZGlhdGUgQ0ExEDAOBgNVBAMTB1Jvb3QgQ0EwWTATBgcqhkjO
+PQIBBggqhkjOPQMBBwNCAAQCT/JpHWzjlGw+/PtHpmCM9eIp64PQZtXZbZh0wqLe
+yZndcAc/A+U0Oa+dsb1Fe2uyCpBJFjpkib7xkV65W3HPo0UwQzAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBATAdBgNVHQ4EFgQULT2A3QfNqV6NaEjc
+n8xgwGg3hW0wCgYIKoZIzj0EAwIDRwAwRAIgTyMxIVJ4qbCB7PrCc6vBM+U8uZFR
+GIqkSxPEOF8LfY0CIA/REd8cM3mSNnfwml1x5Br86KcvOgnvjPly1EJxF6OG
 -----END CERTIFICATE-----