From a418c0f5a8412f188637d1985db4328c2772951b Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Mon, 20 Nov 2023 16:06:03 +0100 Subject: [PATCH 1/7] add checksums for infractl --- Makefile | 1 + scripts/checksums | 12 ++++++++++++ scripts/go-build | 5 ----- 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100755 scripts/checksums diff --git a/Makefile b/Makefile index 5af2438b8..0fd521acf 100644 --- a/Makefile +++ b/Makefile @@ -135,6 +135,7 @@ cli: GOARCH=amd64 GOOS=darwin ./scripts/go-build -o bin/infractl-darwin-amd64 ./cmd/infractl GOARCH=arm64 GOOS=darwin ./scripts/go-build -o bin/infractl-darwin-arm64 ./cmd/infractl GOARCH=amd64 GOOS=linux ./scripts/go-build -o bin/infractl-linux-amd64 ./cmd/infractl + @./scripts/checksums # cli-local - Builds the infractl client binary # When run locally, a Darwin binary is built and installed into the user's GOPATH bin. diff --git a/scripts/checksums b/scripts/checksums new file mode 100755 index 000000000..9002ad808 --- /dev/null +++ b/scripts/checksums @@ -0,0 +1,12 @@ +#!/bin/bash + +main() { + local filename="infractl-CHECKSUMS" + pushd bin/ >/dev/null || exit 1 + rm -f "${filename}" + shasum -a 512 -- infractl-* > "${filename}" + popd bin/ >/dev/null || exit 1 + +} + +main "$@" diff --git a/scripts/go-build b/scripts/go-build index 92bf5334e..b8fbe3eea 100755 --- a/scripts/go-build +++ b/scripts/go-build @@ -4,11 +4,6 @@ main() { # Current time in epoch seconds. local BUILD_TIMESTAMP="$(date +'%s')" - # The URL for the CircleCI workflow that was run for the current commit. - local STABLE_CIRCLECI_WORKFLOW_URL - if [ -n "$CIRCLE_WORKFLOW_ID" ]; then - STABLE_CIRCLECI_WORKFLOW_URL="https://circleci.com/workflow-run/${CIRCLE_WORKFLOW_ID}" - fi # The Git short SHA for the current commit. local STABLE_GIT_SHORT_SHA="$(git rev-parse --short HEAD)" From f2b4d632404f216767d11ecce64436d9e794b504 Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Mon, 20 Nov 2023 16:27:50 +0100 Subject: [PATCH 2/7] fix popd --- scripts/checksums | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/checksums b/scripts/checksums index 9002ad808..9c47f50cc 100755 --- a/scripts/checksums +++ b/scripts/checksums @@ -5,7 +5,7 @@ main() { pushd bin/ >/dev/null || exit 1 rm -f "${filename}" shasum -a 512 -- infractl-* > "${filename}" - popd bin/ >/dev/null || exit 1 + popd >/dev/null || exit 1 } From 95853a9ac17993d7db670efd657e7feb2da30101 Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Mon, 20 Nov 2023 16:42:13 +0100 Subject: [PATCH 3/7] add checksums download button --- ui/src/containers/DownloadsPage/InfractlPageSection.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/src/containers/DownloadsPage/InfractlPageSection.tsx b/ui/src/containers/DownloadsPage/InfractlPageSection.tsx index ac1bc6c66..d8f572e1e 100644 --- a/ui/src/containers/DownloadsPage/InfractlPageSection.tsx +++ b/ui/src/containers/DownloadsPage/InfractlPageSection.tsx @@ -8,6 +8,7 @@ export default function InfractlPageSection(): ReactElement { 'Download for Intel Mac': '/downloads/infractl-darwin-amd64', 'Download for M1 Mac': '/downloads/infractl-darwin-arm64', 'Download for Linux': '/downloads/infractl-linux-amd64', + 'Checksums (SHA-512)': '/downloads/infractl-CHECKSUMS', }; const infractlLinks = Object.entries(infractlDownloads).map(([label, value]) => ( From cad7cbe3453d2e9d517b9a7ea9c533598aeb8197 Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Mon, 20 Nov 2023 17:17:14 +0100 Subject: [PATCH 4/7] add instructions how to verify download integrity --- scripts/checksums | 2 +- .../containers/DownloadsPage/UserServiceAccountToken.tsx | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/checksums b/scripts/checksums index 9c47f50cc..d07bf56a7 100755 --- a/scripts/checksums +++ b/scripts/checksums @@ -4,7 +4,7 @@ main() { local filename="infractl-CHECKSUMS" pushd bin/ >/dev/null || exit 1 rm -f "${filename}" - shasum -a 512 -- infractl-* > "${filename}" + shasum --algorithm 512 -- infractl-* > "${filename}" popd >/dev/null || exit 1 } diff --git a/ui/src/containers/DownloadsPage/UserServiceAccountToken.tsx b/ui/src/containers/DownloadsPage/UserServiceAccountToken.tsx index 2643d0e7a..1eaf12543 100644 --- a/ui/src/containers/DownloadsPage/UserServiceAccountToken.tsx +++ b/ui/src/containers/DownloadsPage/UserServiceAccountToken.tsx @@ -46,11 +46,15 @@ export default function UserServiceAccountToken(): ReactElement { example, you may put it in your Go executable directory.

- Here are the commands to move the file, allow it to execute on an Intel-based Mac, confirm + Additionally, you may verify the integrity of the binary by downloading the CHECKSUMS (SHA-512) file. +

+

+ Here are the commands to check the integrity, move the file, allow it to execute on an Intel-based Mac, confirm its location, and help you learn about its features.

-          $ install ~/Downloads/infractl-darwin-amd64 $GOPATH/bin/infractl
+          $ shasum --check --ignore-missing infractl-CHECKSUMS
+          
$ install infractl-darwin-amd64 $GOPATH/bin/infractl
$ xattr -c $GOPATH/bin/infractl
$ which infractl
$ infractl help From 535a9e455ff62857d1bb2989acdba70672d4d9a7 Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Mon, 20 Nov 2023 17:51:15 +0100 Subject: [PATCH 5/7] implement API to download checksums --- generated/api/v1/service.pb.go | 345 +++++++++++++++++--------- generated/api/v1/service.pb.gw.go | 48 ++++ generated/api/v1/service.swagger.json | 38 +++ proto/api/v1/service.proto | 11 + service/cli.go | 31 ++- 5 files changed, 353 insertions(+), 120 deletions(-) diff --git a/generated/api/v1/service.pb.go b/generated/api/v1/service.pb.go index 8286c25f0..af5cdcc4e 100644 --- a/generated/api/v1/service.pb.go +++ b/generated/api/v1/service.pb.go @@ -1563,6 +1563,45 @@ func (m *CliUpgradeResponse) GetFileChunk() []byte { return nil } +type CliChecksumResponse struct { + FileChunk []byte `protobuf:"bytes,1,opt,name=fileChunk,proto3" json:"fileChunk,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *CliChecksumResponse) Reset() { *m = CliChecksumResponse{} } +func (m *CliChecksumResponse) String() string { return proto.CompactTextString(m) } +func (*CliChecksumResponse) ProtoMessage() {} +func (*CliChecksumResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_a0b84a42fa06f626, []int{22} +} + +func (m *CliChecksumResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CliChecksumResponse.Unmarshal(m, b) +} +func (m *CliChecksumResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CliChecksumResponse.Marshal(b, m, deterministic) +} +func (m *CliChecksumResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_CliChecksumResponse.Merge(m, src) +} +func (m *CliChecksumResponse) XXX_Size() int { + return xxx_messageInfo_CliChecksumResponse.Size(m) +} +func (m *CliChecksumResponse) XXX_DiscardUnknown() { + xxx_messageInfo_CliChecksumResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_CliChecksumResponse proto.InternalMessageInfo + +func (m *CliChecksumResponse) GetFileChunk() []byte { + if m != nil { + return m.FileChunk + } + return nil +} + type InfraStatus struct { // MaintenanceActive is an indicator whether a maintenance is ongoing. MaintenanceActive bool `protobuf:"varint,1,opt,name=MaintenanceActive,proto3" json:"MaintenanceActive,omitempty"` @@ -1577,7 +1616,7 @@ func (m *InfraStatus) Reset() { *m = InfraStatus{} } func (m *InfraStatus) String() string { return proto.CompactTextString(m) } func (*InfraStatus) ProtoMessage() {} func (*InfraStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_a0b84a42fa06f626, []int{22} + return fileDescriptor_a0b84a42fa06f626, []int{23} } func (m *InfraStatus) XXX_Unmarshal(b []byte) error { @@ -1642,131 +1681,134 @@ func init() { proto.RegisterType((*LogsResponse)(nil), "v1.LogsResponse") proto.RegisterType((*CliUpgradeRequest)(nil), "v1.CliUpgradeRequest") proto.RegisterType((*CliUpgradeResponse)(nil), "v1.CliUpgradeResponse") + proto.RegisterType((*CliChecksumResponse)(nil), "v1.CliChecksumResponse") proto.RegisterType((*InfraStatus)(nil), "v1.InfraStatus") } func init() { proto.RegisterFile("service.proto", fileDescriptor_a0b84a42fa06f626) } var fileDescriptor_a0b84a42fa06f626 = []byte{ - // 1876 bytes of a gzipped FileDescriptorProto + // 1917 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0xcb, 0x73, 0x1b, 0x49, - 0x19, 0xf7, 0x48, 0xb2, 0x1e, 0x9f, 0x6c, 0x65, 0xdc, 0x71, 0x9c, 0xd9, 0x89, 0xd7, 0xa4, 0x7a, - 0x97, 0x22, 0x65, 0x82, 0xb5, 0x11, 0x50, 0xbb, 0x15, 0xb2, 0x4b, 0xc9, 0x92, 0x1c, 0x0b, 0xe4, - 0x07, 0x2d, 0x7b, 0xb3, 0x0b, 0x07, 0x68, 0x4b, 0x2d, 0x79, 0xca, 0xa3, 0x19, 0x31, 0xd3, 0x52, - 0xd6, 0x95, 0x0a, 0x07, 0xfe, 0x05, 0x4e, 0xfc, 0x1f, 0x9c, 0x28, 0x2e, 0x1c, 0x39, 0x52, 0x14, - 0x57, 0x4e, 0x1c, 0xb8, 0x70, 0xe3, 0x0f, 0xa0, 0xfa, 0x31, 0x0f, 0xbd, 0x92, 0x54, 0xf6, 0x36, - 0xdf, 0xeb, 0xf7, 0xf5, 0xf7, 0xe8, 0xef, 0xeb, 0x81, 0xcd, 0x90, 0x05, 0x53, 0xa7, 0xc7, 0x0e, - 0xc6, 0x81, 0xcf, 0x7d, 0x94, 0x99, 0x3e, 0xb1, 0x77, 0x87, 0xbe, 0x3f, 0x74, 0x59, 0x95, 0x8e, - 0x9d, 0x2a, 0xf5, 0x3c, 0x9f, 0x53, 0xee, 0xf8, 0x5e, 0xa8, 0x34, 0xec, 0x3d, 0x2d, 0x95, 0xd4, - 0xd5, 0x64, 0x50, 0xed, 0x4f, 0x02, 0xa9, 0xa0, 0xe5, 0x0f, 0xe6, 0xe5, 0x6c, 0x34, 0xe6, 0xb7, - 0x5a, 0xf8, 0x9d, 0x79, 0x21, 0x77, 0x46, 0x2c, 0xe4, 0x74, 0x34, 0x56, 0x0a, 0x78, 0x0f, 0x36, - 0x08, 0x0b, 0xfd, 0x49, 0xd0, 0x63, 0x87, 0xb7, 0xed, 0x26, 0xaa, 0x40, 0xc6, 0xe9, 0x5b, 0xc6, - 0x43, 0xe3, 0x51, 0x89, 0x64, 0x9c, 0x3e, 0xfe, 0xbb, 0x01, 0x85, 0x2f, 0x59, 0x10, 0x3a, 0xbe, - 0x87, 0x3e, 0x83, 0xd2, 0xe1, 0xc4, 0x71, 0xfb, 0x4d, 0xca, 0x99, 0x54, 0x29, 0xd7, 0xec, 0x03, - 0xe5, 0xe0, 0x20, 0x72, 0x70, 0x70, 0x11, 0x39, 0x20, 0x89, 0x32, 0xda, 0x85, 0xd2, 0x73, 0x87, - 0x37, 0xfc, 0xd1, 0xc8, 0xe1, 0x56, 0x46, 0x82, 0x27, 0x0c, 0x29, 0xf5, 0xb5, 0x13, 0x2b, 0xab, - 0xa5, 0x11, 0x03, 0xd9, 0x50, 0x3c, 0x77, 0x29, 0x1f, 0xf8, 0xc1, 0xc8, 0xca, 0x49, 0x61, 0x4c, - 0x23, 0x2b, 0x3e, 0x9c, 0xb5, 0x2e, 0x45, 0x85, 0x94, 0xd5, 0x0b, 0x3f, 0xb8, 0x19, 0xb8, 0xfe, - 0x4b, 0x2b, 0xaf, 0xac, 0x22, 0x1a, 0xbf, 0x82, 0xca, 0x8b, 0x6b, 0x9f, 0x8e, 0x1c, 0xc2, 0xc2, - 0xb1, 0xef, 0x85, 0x0c, 0xed, 0x41, 0xee, 0x32, 0x64, 0x81, 0x0e, 0xaa, 0x78, 0x30, 0x7d, 0x72, - 0x20, 0xe8, 0xe3, 0x35, 0x22, 0xf9, 0xe8, 0x19, 0x54, 0xba, 0xaa, 0x6c, 0xf5, 0x5e, 0xcf, 0x9f, - 0x78, 0x2a, 0x88, 0x72, 0x0d, 0x09, 0xcd, 0x59, 0xc9, 0xf1, 0x1a, 0x99, 0xd3, 0x3d, 0x2c, 0x43, - 0x69, 0x1c, 0x38, 0x5e, 0xcf, 0x19, 0x53, 0x17, 0xff, 0x4e, 0xb9, 0x42, 0x35, 0xc8, 0xb7, 0xbe, - 0x19, 0x3b, 0xc1, 0xed, 0x3b, 0x64, 0x52, 0x6b, 0x22, 0x04, 0xb9, 0x53, 0x3a, 0x62, 0x3a, 0x83, - 0xf2, 0x1b, 0x6d, 0xc3, 0x7a, 0x6b, 0x44, 0x1d, 0x57, 0x27, 0x4e, 0x11, 0x22, 0x31, 0xe7, 0x4e, - 0x8f, 0x4f, 0x02, 0xa6, 0x73, 0x16, 0x91, 0xf8, 0x4f, 0xc6, 0x7c, 0x2c, 0x31, 0xac, 0x91, 0x82, - 0x7d, 0x08, 0xe5, 0x26, 0x0b, 0x7b, 0x81, 0x33, 0x16, 0xad, 0xa6, 0x3d, 0xa6, 0x59, 0x2b, 0x1c, - 0xdb, 0x50, 0x6c, 0x87, 0xe1, 0x84, 0xf5, 0xeb, 0x5c, 0x7a, 0xce, 0x92, 0x98, 0x16, 0x75, 0x3e, - 0xf5, 0xf9, 0x21, 0x1b, 0xf8, 0x01, 0x93, 0xf5, 0xca, 0x92, 0x84, 0x21, 0xa4, 0x32, 0x4c, 0x16, - 0xd6, 0xb9, 0x2c, 0x59, 0x96, 0x24, 0x0c, 0xdc, 0x85, 0xcd, 0x0b, 0xff, 0x86, 0x79, 0x71, 0xc9, - 0x1e, 0x43, 0x21, 0xaa, 0x85, 0xb1, 0xaa, 0x16, 0x24, 0x52, 0x11, 0x87, 0x95, 0xe6, 0x3a, 0x10, - 0x45, 0xe0, 0x7f, 0x1a, 0x50, 0x3a, 0xa7, 0x01, 0x1d, 0x31, 0xce, 0x82, 0xf7, 0x4f, 0xc3, 0x97, - 0xd4, 0x9d, 0xb0, 0x28, 0x0d, 0x92, 0x10, 0x69, 0x38, 0x93, 0x72, 0xea, 0xca, 0x34, 0x14, 0x49, - 0x4c, 0xcb, 0x14, 0x79, 0x9c, 0x05, 0x42, 0xb6, 0xae, 0x64, 0x11, 0x2d, 0xd0, 0xce, 0x82, 0x3e, - 0x0b, 0x64, 0x02, 0xd6, 0x89, 0x22, 0xc4, 0xc9, 0x8e, 0x99, 0x3b, 0xb6, 0x0a, 0xea, 0x64, 0xe2, - 0x5b, 0xa0, 0x1c, 0x05, 0xfe, 0xe8, 0xc8, 0x71, 0x99, 0x55, 0x54, 0x28, 0x11, 0x8d, 0xff, 0x66, - 0x40, 0xe5, 0xc8, 0xa5, 0x53, 0x3f, 0xa8, 0x07, 0xdc, 0x19, 0xd0, 0xde, 0xfb, 0xd6, 0xf8, 0x13, - 0xc8, 0x5d, 0xd0, 0x61, 0x68, 0x65, 0x1f, 0x66, 0x1f, 0x95, 0x6b, 0xbb, 0x22, 0xc3, 0xb3, 0xb8, - 0x07, 0x42, 0xdc, 0xf2, 0x78, 0x70, 0x4b, 0xa4, 0xa6, 0x7d, 0x06, 0xa5, 0x98, 0x85, 0x4c, 0xc8, - 0xde, 0xb0, 0x5b, 0xed, 0x53, 0x7c, 0xa2, 0xc7, 0xb0, 0x3e, 0x95, 0xd9, 0x52, 0xf7, 0x67, 0x67, - 0xa1, 0xe9, 0x5b, 0x62, 0x78, 0x11, 0xa5, 0xf4, 0x34, 0xf3, 0x99, 0x81, 0xff, 0x95, 0x85, 0xbc, - 0xf2, 0x29, 0x66, 0x53, 0xbb, 0x19, 0xcd, 0xa6, 0x76, 0x73, 0xe9, 0x75, 0x98, 0x8b, 0x29, 0xbb, - 0x18, 0xd3, 0x4f, 0x60, 0xa3, 0x3e, 0xa5, 0x8e, 0x4b, 0xaf, 0x1c, 0xd7, 0xe1, 0xb7, 0xb2, 0x3c, - 0x95, 0xda, 0xfd, 0x24, 0xb6, 0x03, 0x9a, 0x12, 0x93, 0x19, 0x65, 0xf4, 0x14, 0x20, 0x6e, 0x98, - 0xd0, 0x5a, 0x97, 0x69, 0xb1, 0x53, 0xa6, 0x89, 0x50, 0x25, 0x25, 0xa5, 0x8d, 0x3e, 0x85, 0x52, - 0x94, 0xb6, 0xd0, 0xca, 0x4b, 0xd3, 0x0f, 0x52, 0xa6, 0xb1, 0x4c, 0x59, 0x26, 0xba, 0x76, 0x07, - 0xee, 0xcc, 0xe1, 0x2e, 0xc9, 0xec, 0x47, 0xb3, 0x99, 0xdd, 0x14, 0xc8, 0xb1, 0x55, 0x2a, 0xa1, - 0xf6, 0x39, 0x54, 0x66, 0x5d, 0x2d, 0x01, 0x7b, 0x34, 0x0b, 0x86, 0x16, 0x0b, 0x9f, 0x2e, 0xd1, - 0x33, 0xd8, 0x48, 0xa7, 0x0c, 0x95, 0x60, 0x9d, 0xba, 0xe3, 0x6b, 0x6a, 0xae, 0xa1, 0x22, 0xe4, - 0xae, 0x18, 0xa7, 0xa6, 0x81, 0x00, 0xf2, 0x21, 0xa7, 0x57, 0x2e, 0x33, 0x33, 0xa8, 0x0c, 0x85, - 0x3e, 0x1b, 0xd0, 0x89, 0xcb, 0xcd, 0x2c, 0xfe, 0x2e, 0x6c, 0x29, 0xe8, 0x8e, 0x13, 0x72, 0xc2, - 0x7e, 0x3b, 0x61, 0x21, 0x17, 0x47, 0xa2, 0xae, 0x2b, 0x8f, 0x54, 0x24, 0xe2, 0x13, 0x5f, 0x00, - 0x4a, 0xab, 0xe9, 0x29, 0x60, 0x41, 0xa1, 0xa9, 0x90, 0xf4, 0xf1, 0x23, 0x12, 0x7d, 0x0c, 0x05, - 0xa5, 0x1f, 0x5a, 0x19, 0x99, 0x6b, 0x48, 0x82, 0x20, 0x91, 0x08, 0xff, 0x27, 0x03, 0x85, 0x86, - 0x3b, 0x09, 0xc5, 0xfd, 0x9f, 0x6f, 0x2f, 0x0c, 0xf9, 0x2e, 0xa7, 0x7c, 0x12, 0xca, 0x2c, 0x54, - 0x14, 0x80, 0xe2, 0x10, 0x2d, 0x41, 0x3b, 0x51, 0x73, 0xea, 0x4e, 0x8b, 0x5a, 0x55, 0xdc, 0xe3, - 0x97, 0x1e, 0x0b, 0xf4, 0xf4, 0x55, 0x84, 0x58, 0xa0, 0x8d, 0x80, 0x51, 0xce, 0xfa, 0x67, 0x6a, - 0x61, 0xbd, 0x65, 0x81, 0xc6, 0xca, 0xe8, 0x99, 0x6c, 0x6b, 0x1e, 0xf8, 0xb7, 0xd2, 0x36, 0xff, - 0x56, 0xdb, 0xb4, 0x3a, 0xfa, 0x31, 0x14, 0x3b, 0xce, 0x80, 0x85, 0x63, 0xea, 0xc9, 0x19, 0x22, - 0x1a, 0x6f, 0xde, 0xb4, 0xa9, 0x5f, 0x15, 0x24, 0x56, 0x9d, 0xbf, 0x4b, 0xc5, 0xc5, 0xbb, 0x64, - 0x42, 0xf6, 0x92, 0x74, 0xac, 0x92, 0xea, 0x9c, 0x4b, 0xd2, 0x11, 0x05, 0x69, 0xf8, 0x9e, 0xc7, - 0x7a, 0xdc, 0x02, 0x55, 0x10, 0x4d, 0xe2, 0xaf, 0x00, 0xe9, 0x4c, 0xbf, 0xb1, 0xd0, 0x02, 0x81, - 0xc9, 0xb1, 0xdf, 0x97, 0x79, 0x2f, 0x92, 0x88, 0x14, 0xc9, 0x1e, 0x07, 0x6c, 0xe0, 0x7c, 0x13, - 0x25, 0x5b, 0x51, 0xf8, 0x0b, 0xb8, 0x3b, 0x83, 0xac, 0x7b, 0xe3, 0x7b, 0x50, 0xd4, 0xec, 0xd0, - 0x32, 0x64, 0x0b, 0x94, 0x45, 0x05, 0x35, 0x8f, 0xc4, 0x42, 0xfc, 0x67, 0x03, 0xee, 0x44, 0x41, - 0x47, 0xe7, 0x9a, 0x7b, 0x07, 0xcd, 0xa4, 0x30, 0xf3, 0xee, 0x29, 0xac, 0x41, 0x7e, 0xc4, 0xf8, - 0xb5, 0xdf, 0x97, 0x47, 0xae, 0xa8, 0x59, 0x31, 0xe7, 0xeb, 0xe0, 0x44, 0x6a, 0x10, 0xad, 0x89, - 0x1f, 0x43, 0x5e, 0x71, 0xc4, 0x3d, 0x21, 0xad, 0xf3, 0x4e, 0xbd, 0xd1, 0x32, 0xd7, 0x50, 0x01, - 0xb2, 0xf5, 0x66, 0xd3, 0x34, 0xd0, 0x06, 0x14, 0xbb, 0x97, 0x87, 0x17, 0xa4, 0xde, 0xb8, 0x30, - 0x33, 0xf8, 0x2f, 0x19, 0xd8, 0x56, 0x7d, 0x12, 0x05, 0x96, 0x44, 0x30, 0xd3, 0xce, 0xef, 0x19, - 0xc1, 0xf1, 0xcc, 0xc4, 0x53, 0x8b, 0xe0, 0x91, 0xcc, 0xe3, 0x12, 0xa7, 0x6f, 0x9c, 0x7f, 0x73, - 0xed, 0x94, 0x5b, 0x6c, 0x27, 0x0b, 0x0a, 0xa7, 0x7e, 0xd7, 0xa5, 0xbd, 0x1b, 0xbd, 0x18, 0x23, - 0x52, 0x48, 0xe4, 0x47, 0xf3, 0x44, 0xf6, 0x7e, 0x91, 0x44, 0xa4, 0xfd, 0xf9, 0xbb, 0x0c, 0xc7, - 0xed, 0xf4, 0x3c, 0x2b, 0xa5, 0x67, 0xd7, 0x00, 0x8a, 0xdf, 0x72, 0x47, 0xea, 0x3b, 0x90, 0x4d, - 0xee, 0x00, 0x82, 0xdc, 0x89, 0xdf, 0x57, 0x2f, 0xaf, 0x75, 0x22, 0xbf, 0xf1, 0x17, 0x60, 0xea, - 0x54, 0xc5, 0xc3, 0x17, 0xed, 0xa7, 0x17, 0x82, 0xea, 0xd0, 0x0d, 0x91, 0xd9, 0x78, 0xc6, 0x26, - 0x62, 0xfc, 0x1a, 0xb2, 0x1d, 0x7f, 0xb8, 0xf4, 0x88, 0x3f, 0x82, 0x42, 0x97, 0xd3, 0x80, 0xeb, - 0x0b, 0xf3, 0xe6, 0xb9, 0x10, 0xa9, 0x0a, 0xa4, 0x43, 0xbf, 0x7f, 0x2b, 0xcf, 0xbd, 0x41, 0xe4, - 0xb7, 0xc8, 0xf2, 0x09, 0x0b, 0x43, 0x3a, 0x8c, 0x5f, 0x8d, 0x9a, 0xc4, 0xdf, 0x87, 0x8d, 0x8e, - 0x3f, 0x0c, 0xe3, 0xbb, 0xf5, 0x00, 0x72, 0x82, 0xd6, 0xa7, 0x2e, 0xc8, 0xae, 0xf6, 0x87, 0x44, - 0x32, 0xf1, 0xa7, 0xb0, 0xd5, 0x70, 0x9d, 0xcb, 0xf1, 0x30, 0xa0, 0x7d, 0x96, 0x6a, 0x47, 0x3f, - 0x8c, 0xda, 0xd1, 0x0f, 0x85, 0x7f, 0x1a, 0xf4, 0xae, 0xa3, 0xe5, 0x2d, 0xbe, 0x71, 0x4d, 0x8c, - 0x88, 0xc4, 0x50, 0xfb, 0xda, 0x85, 0xd2, 0xc0, 0x71, 0x59, 0xe3, 0x7a, 0xe2, 0xdd, 0x48, 0x80, - 0x0d, 0x92, 0x30, 0xf0, 0xaf, 0xa0, 0xdc, 0xf6, 0x06, 0x01, 0xd5, 0x03, 0xf9, 0x31, 0x6c, 0x9d, - 0x50, 0xc7, 0xe3, 0xcc, 0xa3, 0x9e, 0x78, 0x07, 0x72, 0x67, 0xca, 0xf4, 0x74, 0x59, 0x14, 0xa0, - 0x3d, 0x00, 0xc9, 0xa4, 0x8e, 0x98, 0xd5, 0xea, 0x28, 0x29, 0xce, 0xfe, 0xcf, 0xa3, 0x15, 0x20, - 0xd6, 0xd7, 0x51, 0xbd, 0xdd, 0x69, 0x35, 0xcd, 0x35, 0x71, 0x01, 0x1b, 0xa4, 0x55, 0xbf, 0x68, - 0x9f, 0x3e, 0x37, 0x0d, 0xb1, 0xed, 0x48, 0xab, 0xde, 0xfc, 0xda, 0xcc, 0xa0, 0x0a, 0x40, 0xb3, - 0xd5, 0xbd, 0x20, 0x67, 0x5f, 0x0b, 0x51, 0x56, 0x28, 0x1e, 0xb5, 0x4f, 0xdb, 0xdd, 0xe3, 0x56, - 0xd3, 0xcc, 0xd5, 0xbe, 0x82, 0x8a, 0xfe, 0x3b, 0xd1, 0xaf, 0x54, 0x74, 0x04, 0xf0, 0x9c, 0xf1, - 0xe8, 0x97, 0x65, 0xc5, 0x63, 0xc8, 0x96, 0x53, 0x4b, 0x2b, 0xe1, 0xbb, 0xbf, 0xff, 0xc7, 0xbf, - 0xff, 0x90, 0xd9, 0x44, 0xe5, 0xea, 0xf4, 0x49, 0x75, 0xaa, 0x98, 0xb5, 0xff, 0x19, 0x50, 0x16, - 0x3f, 0x15, 0x11, 0xee, 0x31, 0xe4, 0xd5, 0x0f, 0xce, 0x4a, 0x4c, 0xb9, 0xd1, 0x67, 0x7f, 0x82, - 0x30, 0x92, 0xd0, 0x1b, 0x08, 0x04, 0xf4, 0x4b, 0x65, 0xff, 0x0b, 0x28, 0xab, 0x7b, 0x2e, 0x1f, - 0xcc, 0x68, 0xc9, 0x1b, 0xdb, 0xde, 0x12, 0xbc, 0x99, 0xb7, 0x39, 0x7e, 0x20, 0x91, 0xee, 0x61, - 0x53, 0x20, 0x71, 0x21, 0xfa, 0x41, 0x4f, 0xa2, 0x3c, 0x35, 0xf6, 0xd1, 0xb1, 0x7e, 0x8a, 0xaf, - 0x3c, 0xdb, 0x12, 0xc0, 0x6d, 0x09, 0x58, 0xc1, 0xa5, 0x18, 0xf0, 0xa9, 0xb1, 0x5f, 0xfb, 0xa3, - 0x01, 0x9b, 0x6a, 0xdf, 0x46, 0x81, 0xb7, 0x21, 0x27, 0x56, 0x00, 0xba, 0x97, 0xec, 0xfa, 0xd4, - 0xb2, 0xb1, 0x77, 0xe6, 0xd9, 0xcb, 0x22, 0x1f, 0xa8, 0x0d, 0xfe, 0x39, 0xe4, 0xda, 0xde, 0xc0, - 0x47, 0xa6, 0xb0, 0x49, 0xff, 0x22, 0xdb, 0xa9, 0x87, 0x04, 0xbe, 0x2f, 0x2d, 0xb7, 0xd0, 0x9d, - 0xc4, 0xb2, 0xfa, 0xca, 0xe9, 0xbf, 0xae, 0xfd, 0x35, 0x07, 0x15, 0x7d, 0xe1, 0xa3, 0xc3, 0xfd, - 0x74, 0x25, 0x62, 0x7a, 0x2f, 0x61, 0x4b, 0x42, 0x22, 0x24, 0x93, 0xd7, 0x53, 0x4c, 0x89, 0x89, - 0x3a, 0x3a, 0xba, 0x9d, 0x94, 0x7a, 0x3a, 0xbc, 0xfb, 0x0b, 0x7c, 0x1d, 0xdf, 0x4c, 0xd3, 0x68, - 0x48, 0xf4, 0x9b, 0x64, 0x1f, 0xa0, 0xbb, 0x4b, 0xd6, 0x92, 0xbd, 0x7a, 0x3d, 0xe0, 0x8f, 0x25, - 0xe0, 0x1e, 0xfe, 0x60, 0xfe, 0x8c, 0x55, 0x57, 0x83, 0x88, 0x4a, 0x77, 0x20, 0xaf, 0x9a, 0x07, - 0x59, 0xab, 0x16, 0x86, 0xbd, 0x90, 0x0c, 0xbc, 0x23, 0xb1, 0x4d, 0x9c, 0x3e, 0xac, 0x40, 0x7b, - 0x91, 0x9a, 0x96, 0x4b, 0x72, 0xb8, 0x9d, 0x0a, 0x3e, 0x19, 0x9b, 0x58, 0x82, 0xed, 0x22, 0x7b, - 0xe1, 0xa0, 0x34, 0xc6, 0xea, 0x40, 0xbe, 0xc9, 0x5c, 0xc6, 0xd9, 0x12, 0xd4, 0x15, 0x3d, 0x1a, - 0x15, 0x69, 0x7f, 0xb1, 0x48, 0x6d, 0x35, 0x19, 0x97, 0x60, 0x99, 0x7a, 0x4a, 0xc6, 0x53, 0x14, - 0x7f, 0x28, 0x51, 0xee, 0xa3, 0x7b, 0x8b, 0x69, 0xf4, 0x87, 0x61, 0x6d, 0x04, 0xd0, 0x70, 0x9d, - 0xa8, 0x7d, 0x7e, 0x0d, 0x05, 0x3d, 0x19, 0x55, 0x7b, 0x2f, 0x8c, 0x58, 0x7b, 0x67, 0x9e, 0xad, - 0xdd, 0x7c, 0x24, 0xdd, 0x7c, 0x88, 0x1e, 0x28, 0x37, 0x4e, 0xf5, 0x95, 0x1f, 0xbe, 0xae, 0xbe, - 0x12, 0x23, 0xf7, 0x75, 0x75, 0xa2, 0x94, 0x3f, 0x31, 0x6a, 0xff, 0x35, 0x00, 0xa5, 0x46, 0x69, - 0x32, 0x4c, 0x4a, 0xcf, 0x19, 0x8f, 0xde, 0xbb, 0x2b, 0xee, 0xec, 0x1d, 0xe1, 0x3a, 0x65, 0x3c, - 0x7b, 0xa5, 0x42, 0x65, 0xfc, 0x33, 0x28, 0x13, 0x16, 0xbe, 0x37, 0xd6, 0x7e, 0x1a, 0xab, 0x0e, - 0xa5, 0x6e, 0x8c, 0x34, 0x6f, 0xb1, 0x12, 0xc2, 0x4e, 0x41, 0x1c, 0xe6, 0x7e, 0x99, 0x99, 0x3e, - 0xb9, 0xca, 0x4b, 0xef, 0x3f, 0xfc, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x3f, 0xda, 0x37, - 0x98, 0x13, 0x00, 0x00, + 0x19, 0xf7, 0x48, 0xb2, 0x1e, 0x9f, 0x6c, 0x59, 0xee, 0x38, 0xce, 0xec, 0xc4, 0x6b, 0x52, 0xbd, + 0x4b, 0x91, 0x32, 0xc1, 0x4a, 0xb4, 0x50, 0xbb, 0x15, 0xb2, 0x4b, 0xc9, 0x92, 0x1c, 0x0b, 0xe4, + 0x07, 0x6d, 0x7b, 0xb3, 0x0b, 0x07, 0x68, 0x4b, 0x2d, 0x79, 0xca, 0xa3, 0x19, 0x31, 0xd3, 0x52, + 0xd6, 0x95, 0x0a, 0x07, 0xfe, 0x05, 0x4e, 0xfc, 0x1f, 0x9c, 0x28, 0x2e, 0x54, 0x71, 0xe1, 0x48, + 0x51, 0x5c, 0x39, 0x71, 0xe0, 0xc2, 0x8d, 0x3f, 0x80, 0xea, 0xd7, 0x68, 0xf4, 0x4a, 0x52, 0xd9, + 0xdb, 0x7c, 0xaf, 0xdf, 0xd7, 0xdf, 0xa3, 0xbf, 0xaf, 0x07, 0xd6, 0x23, 0x16, 0x8e, 0xdd, 0x0e, + 0xdb, 0x1f, 0x86, 0x01, 0x0f, 0x50, 0x6a, 0xfc, 0xc4, 0xd9, 0xe9, 0x07, 0x41, 0xdf, 0x63, 0x15, + 0x3a, 0x74, 0x2b, 0xd4, 0xf7, 0x03, 0x4e, 0xb9, 0x1b, 0xf8, 0x91, 0xd2, 0x70, 0x76, 0xb5, 0x54, + 0x52, 0x57, 0xa3, 0x5e, 0xa5, 0x3b, 0x0a, 0xa5, 0x82, 0x96, 0xdf, 0x9f, 0x95, 0xb3, 0xc1, 0x90, + 0xdf, 0x6a, 0xe1, 0x77, 0x66, 0x85, 0xdc, 0x1d, 0xb0, 0x88, 0xd3, 0xc1, 0x50, 0x29, 0xe0, 0x5d, + 0x58, 0x23, 0x2c, 0x0a, 0x46, 0x61, 0x87, 0x1d, 0xdc, 0xb6, 0x1a, 0xa8, 0x04, 0x29, 0xb7, 0x6b, + 0x5b, 0x0f, 0xac, 0x87, 0x05, 0x92, 0x72, 0xbb, 0xf8, 0xef, 0x16, 0xe4, 0xbe, 0x64, 0x61, 0xe4, + 0x06, 0x3e, 0xfa, 0x0c, 0x0a, 0x07, 0x23, 0xd7, 0xeb, 0x36, 0x28, 0x67, 0x52, 0xa5, 0x58, 0x75, + 0xf6, 0x95, 0x83, 0x7d, 0xe3, 0x60, 0xff, 0xc2, 0x38, 0x20, 0x13, 0x65, 0xb4, 0x03, 0x85, 0xe7, + 0x2e, 0xaf, 0x07, 0x83, 0x81, 0xcb, 0xed, 0x94, 0x04, 0x9f, 0x30, 0xa4, 0x34, 0xd0, 0x4e, 0xec, + 0xb4, 0x96, 0x1a, 0x06, 0x72, 0x20, 0x7f, 0xe6, 0x51, 0xde, 0x0b, 0xc2, 0x81, 0x9d, 0x91, 0xc2, + 0x98, 0x46, 0x76, 0x7c, 0x38, 0x7b, 0x55, 0x8a, 0x72, 0x09, 0xab, 0x17, 0x41, 0x78, 0xd3, 0xf3, + 0x82, 0x97, 0x76, 0x56, 0x59, 0x19, 0x1a, 0xbf, 0x82, 0xd2, 0x8b, 0xeb, 0x80, 0x0e, 0x5c, 0xc2, + 0xa2, 0x61, 0xe0, 0x47, 0x0c, 0xed, 0x42, 0xe6, 0x32, 0x62, 0xa1, 0x0e, 0x2a, 0xbf, 0x3f, 0x7e, + 0xb2, 0x2f, 0xe8, 0xa3, 0x15, 0x22, 0xf9, 0xe8, 0x19, 0x94, 0xce, 0x55, 0xd9, 0x6a, 0x9d, 0x4e, + 0x30, 0xf2, 0x55, 0x10, 0xc5, 0x2a, 0x12, 0x9a, 0xd3, 0x92, 0xa3, 0x15, 0x32, 0xa3, 0x7b, 0x50, + 0x84, 0xc2, 0x30, 0x74, 0xfd, 0x8e, 0x3b, 0xa4, 0x1e, 0xfe, 0xad, 0x72, 0x85, 0xaa, 0x90, 0x6d, + 0x7e, 0x33, 0x74, 0xc3, 0xdb, 0x77, 0xc8, 0xa4, 0xd6, 0x44, 0x08, 0x32, 0x27, 0x74, 0xc0, 0x74, + 0x06, 0xe5, 0x37, 0xda, 0x82, 0xd5, 0xe6, 0x80, 0xba, 0x9e, 0x4e, 0x9c, 0x22, 0x44, 0x62, 0xce, + 0xdc, 0x0e, 0x1f, 0x85, 0x4c, 0xe7, 0xcc, 0x90, 0xf8, 0x8f, 0xd6, 0x6c, 0x2c, 0x31, 0xac, 0x95, + 0x80, 0x7d, 0x00, 0xc5, 0x06, 0x8b, 0x3a, 0xa1, 0x3b, 0x14, 0xad, 0xa6, 0x3d, 0x26, 0x59, 0x4b, + 0x1c, 0x3b, 0x90, 0x6f, 0x45, 0xd1, 0x88, 0x75, 0x6b, 0x5c, 0x7a, 0x4e, 0x93, 0x98, 0x16, 0x75, + 0x3e, 0x09, 0xf8, 0x01, 0xeb, 0x05, 0x21, 0x93, 0xf5, 0x4a, 0x93, 0x09, 0x43, 0x48, 0x65, 0x98, + 0x2c, 0xaa, 0x71, 0x59, 0xb2, 0x34, 0x99, 0x30, 0xf0, 0x39, 0xac, 0x5f, 0x04, 0x37, 0xcc, 0x8f, + 0x4b, 0xf6, 0x08, 0x72, 0xa6, 0x16, 0xd6, 0xb2, 0x5a, 0x10, 0xa3, 0x22, 0x0e, 0x2b, 0xcd, 0x75, + 0x20, 0x8a, 0xc0, 0xff, 0xb4, 0xa0, 0x70, 0x46, 0x43, 0x3a, 0x60, 0x9c, 0x85, 0xef, 0x9f, 0x86, + 0x2f, 0xa9, 0x37, 0x62, 0x26, 0x0d, 0x92, 0x10, 0x69, 0x38, 0x95, 0x72, 0xea, 0xc9, 0x34, 0xe4, + 0x49, 0x4c, 0xcb, 0x14, 0xf9, 0x9c, 0x85, 0x42, 0xb6, 0xaa, 0x64, 0x86, 0x16, 0x68, 0xa7, 0x61, + 0x97, 0x85, 0x32, 0x01, 0xab, 0x44, 0x11, 0xe2, 0x64, 0x47, 0xcc, 0x1b, 0xda, 0x39, 0x75, 0x32, + 0xf1, 0x2d, 0x50, 0x0e, 0xc3, 0x60, 0x70, 0xe8, 0x7a, 0xcc, 0xce, 0x2b, 0x14, 0x43, 0xe3, 0xbf, + 0x59, 0x50, 0x3a, 0xf4, 0xe8, 0x38, 0x08, 0x6b, 0x21, 0x77, 0x7b, 0xb4, 0xf3, 0xbe, 0x35, 0x7e, + 0x0c, 0x99, 0x0b, 0xda, 0x8f, 0xec, 0xf4, 0x83, 0xf4, 0xc3, 0x62, 0x75, 0x47, 0x64, 0x78, 0x1a, + 0x77, 0x5f, 0x88, 0x9b, 0x3e, 0x0f, 0x6f, 0x89, 0xd4, 0x74, 0x4e, 0xa1, 0x10, 0xb3, 0x50, 0x19, + 0xd2, 0x37, 0xec, 0x56, 0xfb, 0x14, 0x9f, 0xe8, 0x11, 0xac, 0x8e, 0x65, 0xb6, 0xd4, 0xfd, 0xd9, + 0x9e, 0x6b, 0xfa, 0xa6, 0x18, 0x5e, 0x44, 0x29, 0x3d, 0x4d, 0x7d, 0x66, 0xe1, 0x7f, 0xa5, 0x21, + 0xab, 0x7c, 0x8a, 0xd9, 0xd4, 0x6a, 0x98, 0xd9, 0xd4, 0x6a, 0x2c, 0xbc, 0x0e, 0x33, 0x31, 0xa5, + 0xe7, 0x63, 0xfa, 0x31, 0xac, 0xd5, 0xc6, 0xd4, 0xf5, 0xe8, 0x95, 0xeb, 0xb9, 0xfc, 0x56, 0x96, + 0xa7, 0x54, 0xbd, 0x37, 0x89, 0x6d, 0x9f, 0x26, 0xc4, 0x64, 0x4a, 0x19, 0x3d, 0x05, 0x88, 0x1b, + 0x26, 0xb2, 0x57, 0x65, 0x5a, 0x9c, 0x84, 0xe9, 0x44, 0xa8, 0x92, 0x92, 0xd0, 0x46, 0x9f, 0x42, + 0xc1, 0xa4, 0x2d, 0xb2, 0xb3, 0xd2, 0xf4, 0x83, 0x84, 0x69, 0x2c, 0x53, 0x96, 0x13, 0x5d, 0xa7, + 0x0d, 0x1b, 0x33, 0xb8, 0x0b, 0x32, 0xfb, 0xd1, 0x74, 0x66, 0xd7, 0x05, 0x72, 0x6c, 0x95, 0x48, + 0xa8, 0x73, 0x06, 0xa5, 0x69, 0x57, 0x0b, 0xc0, 0x1e, 0x4e, 0x83, 0xa1, 0xf9, 0xc2, 0x27, 0x4b, + 0xf4, 0x0c, 0xd6, 0x92, 0x29, 0x43, 0x05, 0x58, 0xa5, 0xde, 0xf0, 0x9a, 0x96, 0x57, 0x50, 0x1e, + 0x32, 0x57, 0x8c, 0xd3, 0xb2, 0x85, 0x00, 0xb2, 0x11, 0xa7, 0x57, 0x1e, 0x2b, 0xa7, 0x50, 0x11, + 0x72, 0x5d, 0xd6, 0xa3, 0x23, 0x8f, 0x97, 0xd3, 0xf8, 0xbb, 0xb0, 0xa9, 0xa0, 0xdb, 0x6e, 0xc4, + 0x09, 0xfb, 0xcd, 0x88, 0x45, 0x5c, 0x1c, 0x89, 0x7a, 0x9e, 0x3c, 0x52, 0x9e, 0x88, 0x4f, 0x7c, + 0x01, 0x28, 0xa9, 0xa6, 0xa7, 0x80, 0x0d, 0xb9, 0x86, 0x42, 0xd2, 0xc7, 0x37, 0x24, 0xfa, 0x18, + 0x72, 0x4a, 0x3f, 0xb2, 0x53, 0x32, 0xd7, 0x30, 0x09, 0x82, 0x18, 0x11, 0xfe, 0x4f, 0x0a, 0x72, + 0x75, 0x6f, 0x14, 0x89, 0xfb, 0x3f, 0xdb, 0x5e, 0x18, 0xb2, 0xe7, 0x9c, 0xf2, 0x51, 0x24, 0xb3, + 0x50, 0x52, 0x00, 0x8a, 0x43, 0xb4, 0x04, 0x6d, 0x9b, 0xe6, 0xd4, 0x9d, 0x66, 0x5a, 0x55, 0xdc, + 0xe3, 0x97, 0x3e, 0x0b, 0xf5, 0xf4, 0x55, 0x84, 0x58, 0xa0, 0xf5, 0x90, 0x51, 0xce, 0xba, 0xa7, + 0x6a, 0x61, 0xbd, 0x65, 0x81, 0xc6, 0xca, 0xe8, 0x99, 0x6c, 0x6b, 0x1e, 0x06, 0xb7, 0xd2, 0x36, + 0xfb, 0x56, 0xdb, 0xa4, 0x3a, 0xfa, 0x11, 0xe4, 0xdb, 0x6e, 0x8f, 0x45, 0x43, 0xea, 0xcb, 0x19, + 0x22, 0x1a, 0x6f, 0xd6, 0xb4, 0xa1, 0x5f, 0x15, 0x24, 0x56, 0x9d, 0xbd, 0x4b, 0xf9, 0xf9, 0xbb, + 0x54, 0x86, 0xf4, 0x25, 0x69, 0xdb, 0x05, 0xd5, 0x39, 0x97, 0xa4, 0x2d, 0x0a, 0x52, 0x0f, 0x7c, + 0x9f, 0x75, 0xb8, 0x0d, 0xaa, 0x20, 0x9a, 0xc4, 0x5f, 0x01, 0xd2, 0x99, 0x7e, 0x63, 0xa1, 0x05, + 0x02, 0x93, 0x63, 0xbf, 0x2b, 0xf3, 0x9e, 0x27, 0x86, 0x14, 0xc9, 0x1e, 0x86, 0xac, 0xe7, 0x7e, + 0x63, 0x92, 0xad, 0x28, 0xfc, 0x05, 0xdc, 0x99, 0x42, 0xd6, 0xbd, 0xf1, 0x3d, 0xc8, 0x6b, 0x76, + 0x64, 0x5b, 0xb2, 0x05, 0x8a, 0xa2, 0x82, 0x9a, 0x47, 0x62, 0x21, 0xfe, 0x93, 0x05, 0x1b, 0x26, + 0x68, 0x73, 0xae, 0x99, 0x77, 0xd0, 0x54, 0x0a, 0x53, 0xef, 0x9e, 0xc2, 0x2a, 0x64, 0x07, 0x8c, + 0x5f, 0x07, 0x5d, 0x79, 0xe4, 0x92, 0x9a, 0x15, 0x33, 0xbe, 0xf6, 0x8f, 0xa5, 0x06, 0xd1, 0x9a, + 0xf8, 0x11, 0x64, 0x15, 0x47, 0xdc, 0x13, 0xd2, 0x3c, 0x6b, 0xd7, 0xea, 0xcd, 0xf2, 0x0a, 0xca, + 0x41, 0xba, 0xd6, 0x68, 0x94, 0x2d, 0xb4, 0x06, 0xf9, 0xf3, 0xcb, 0x83, 0x0b, 0x52, 0xab, 0x5f, + 0x94, 0x53, 0xf8, 0xcf, 0x29, 0xd8, 0x52, 0x7d, 0x62, 0x02, 0x9b, 0x44, 0x30, 0xd5, 0xce, 0xef, + 0x19, 0xc1, 0xd1, 0xd4, 0xc4, 0x53, 0x8b, 0xe0, 0xa1, 0xcc, 0xe3, 0x02, 0xa7, 0x6f, 0x9c, 0x7f, + 0x33, 0xed, 0x94, 0x99, 0x6f, 0x27, 0x1b, 0x72, 0x27, 0xc1, 0xb9, 0x47, 0x3b, 0x37, 0x7a, 0x31, + 0x1a, 0x52, 0x48, 0xe4, 0x47, 0xe3, 0x58, 0xf6, 0x7e, 0x9e, 0x18, 0xd2, 0xf9, 0xfc, 0x5d, 0x86, + 0xe3, 0x56, 0x72, 0x9e, 0x15, 0x92, 0xb3, 0xab, 0x07, 0xf9, 0x6f, 0xb9, 0x23, 0xf5, 0x1d, 0x48, + 0x4f, 0xee, 0x00, 0x82, 0xcc, 0x71, 0xd0, 0x55, 0x2f, 0xaf, 0x55, 0x22, 0xbf, 0xf1, 0x17, 0x50, + 0xd6, 0xa9, 0x8a, 0x87, 0x2f, 0xda, 0x4b, 0x2e, 0x04, 0xd5, 0xa1, 0x6b, 0x22, 0xb3, 0xf1, 0x8c, + 0x9d, 0x88, 0xf1, 0x6b, 0x48, 0xb7, 0x83, 0xfe, 0xc2, 0x23, 0xfe, 0x10, 0x72, 0xe7, 0x9c, 0x86, + 0x5c, 0x5f, 0x98, 0x37, 0xcf, 0x05, 0xa3, 0x2a, 0x90, 0x0e, 0x82, 0xee, 0xad, 0x3c, 0xf7, 0x1a, + 0x91, 0xdf, 0x22, 0xcb, 0xc7, 0x2c, 0x8a, 0x68, 0x3f, 0x7e, 0x35, 0x6a, 0x12, 0x7f, 0x1f, 0xd6, + 0xda, 0x41, 0x3f, 0x8a, 0xef, 0xd6, 0x7d, 0xc8, 0x08, 0x5a, 0x9f, 0x3a, 0x27, 0xbb, 0x3a, 0xe8, + 0x13, 0xc9, 0xc4, 0x9f, 0xc2, 0x66, 0xdd, 0x73, 0x2f, 0x87, 0xfd, 0x90, 0x76, 0x59, 0xa2, 0x1d, + 0x83, 0xc8, 0xb4, 0x63, 0x10, 0x09, 0xff, 0x34, 0xec, 0x5c, 0x9b, 0xe5, 0x2d, 0xbe, 0x71, 0x55, + 0x8c, 0x88, 0x89, 0xa1, 0xf6, 0xb5, 0x03, 0x85, 0x9e, 0xeb, 0xb1, 0xfa, 0xf5, 0xc8, 0xbf, 0x91, + 0x00, 0x6b, 0x64, 0xc2, 0xc0, 0x9f, 0x88, 0xcb, 0xef, 0xd6, 0xaf, 0x59, 0xe7, 0x26, 0x1a, 0x0d, + 0xde, 0xd1, 0xe8, 0x97, 0x50, 0x6c, 0xf9, 0xbd, 0x90, 0xea, 0x29, 0xfe, 0x08, 0x36, 0x8f, 0xa9, + 0xeb, 0x73, 0xe6, 0x53, 0x5f, 0x3c, 0x1e, 0xb9, 0x3b, 0x66, 0x7a, 0x24, 0xcd, 0x0b, 0xd0, 0x2e, + 0x80, 0x64, 0x52, 0x57, 0x0c, 0x78, 0x75, 0xfe, 0x04, 0x67, 0xef, 0x67, 0x66, 0x6f, 0x88, 0x9d, + 0x77, 0x58, 0x6b, 0xb5, 0x9b, 0x8d, 0xf2, 0x8a, 0xb8, 0xb5, 0x75, 0xd2, 0xac, 0x5d, 0xb4, 0x4e, + 0x9e, 0x97, 0x2d, 0xb1, 0x22, 0x49, 0xb3, 0xd6, 0xf8, 0xba, 0x9c, 0x42, 0x25, 0x80, 0x46, 0xf3, + 0xfc, 0x82, 0x9c, 0x7e, 0x2d, 0x44, 0x69, 0xa1, 0x78, 0xd8, 0x3a, 0x69, 0x9d, 0x1f, 0x35, 0x1b, + 0xe5, 0x4c, 0xf5, 0x2b, 0x28, 0xe9, 0x5f, 0x1a, 0xfd, 0xb4, 0x45, 0x87, 0x00, 0xcf, 0x19, 0x37, + 0xff, 0x39, 0x4b, 0x5e, 0x50, 0x8e, 0x1c, 0x75, 0x5a, 0x09, 0xdf, 0xf9, 0xdd, 0x3f, 0xfe, 0xfd, + 0xfb, 0xd4, 0x3a, 0x2a, 0x56, 0xc6, 0x4f, 0x2a, 0x63, 0xc5, 0xac, 0xfe, 0xcf, 0x82, 0xa2, 0xf8, + 0x13, 0x31, 0xb8, 0x47, 0x90, 0x55, 0x7f, 0x45, 0x4b, 0x31, 0xe5, 0x33, 0x60, 0xfa, 0xcf, 0x09, + 0x23, 0x09, 0xbd, 0x86, 0x40, 0x40, 0xbf, 0x54, 0xf6, 0x3f, 0x87, 0xa2, 0x1a, 0x0e, 0xf2, 0x95, + 0x8d, 0x16, 0x3c, 0xcc, 0x9d, 0x4d, 0xc1, 0x9b, 0x7a, 0xd0, 0xe3, 0xfb, 0x12, 0xe9, 0x2e, 0x2e, + 0x0b, 0x24, 0x2e, 0x44, 0x3f, 0xe8, 0x48, 0x94, 0xa7, 0xd6, 0x1e, 0x3a, 0xd2, 0xef, 0xf7, 0xa5, + 0x67, 0x5b, 0x00, 0xb8, 0x25, 0x01, 0x4b, 0xb8, 0x10, 0x03, 0x3e, 0xb5, 0xf6, 0xaa, 0x7f, 0xb0, + 0x60, 0x5d, 0x2d, 0x69, 0x13, 0x78, 0x0b, 0x32, 0x62, 0x6f, 0xa0, 0xbb, 0x93, 0x07, 0x42, 0x62, + 0x43, 0x39, 0xdb, 0xb3, 0xec, 0x45, 0x91, 0xf7, 0xd4, 0xda, 0xff, 0x1c, 0x32, 0x2d, 0xbf, 0x17, + 0xa0, 0xb2, 0xb0, 0x49, 0xfe, 0x57, 0x3b, 0x89, 0xd7, 0x07, 0xbe, 0x27, 0x2d, 0x37, 0xd1, 0xc6, + 0xc4, 0xb2, 0xf2, 0xca, 0xed, 0xbe, 0xae, 0xfe, 0x25, 0x03, 0x25, 0x3d, 0x25, 0xcc, 0xe1, 0x7e, + 0xb2, 0x14, 0x31, 0xb9, 0xcc, 0xb0, 0x2d, 0x21, 0x11, 0x92, 0xc9, 0xeb, 0x28, 0xa6, 0xc4, 0x44, + 0x6d, 0x1d, 0xdd, 0x76, 0x42, 0x3d, 0x19, 0xde, 0xbd, 0x39, 0xbe, 0x8e, 0x6f, 0xaa, 0x69, 0x34, + 0x24, 0xfa, 0xf5, 0x64, 0x89, 0xa0, 0x3b, 0x0b, 0x76, 0x99, 0xb3, 0x7c, 0xa7, 0xe0, 0x8f, 0x25, + 0xe0, 0x2e, 0xfe, 0x60, 0xf6, 0x8c, 0x15, 0x4f, 0x83, 0x88, 0x4a, 0xb7, 0x21, 0xab, 0x9a, 0x07, + 0xd9, 0xcb, 0xb6, 0x8c, 0x33, 0x97, 0x0c, 0xbc, 0x2d, 0xb1, 0xcb, 0x38, 0x79, 0x58, 0x81, 0xf6, + 0x22, 0x31, 0x62, 0x17, 0xe4, 0x70, 0x2b, 0x11, 0xfc, 0x64, 0xd6, 0x62, 0x09, 0xb6, 0x83, 0x9c, + 0xb9, 0x83, 0xd2, 0x18, 0xab, 0x0d, 0xd9, 0x06, 0xf3, 0x18, 0x67, 0x0b, 0x50, 0x97, 0xf4, 0xa8, + 0x29, 0xd2, 0xde, 0x7c, 0x91, 0x5a, 0x6a, 0x9c, 0x2e, 0xc0, 0x2a, 0xeb, 0xd1, 0x1a, 0x8f, 0x5e, + 0xfc, 0xa1, 0x44, 0xb9, 0x87, 0xee, 0xce, 0xa7, 0x31, 0xe8, 0x47, 0xd5, 0xbf, 0x5a, 0x00, 0x75, + 0xcf, 0x35, 0xfd, 0xf3, 0x2b, 0xc8, 0xe9, 0x79, 0xaa, 0xfa, 0x7b, 0x6e, 0x30, 0x3b, 0xdb, 0xb3, + 0x6c, 0xed, 0xe7, 0x23, 0xe9, 0xe7, 0x43, 0x74, 0x5f, 0xf9, 0x71, 0x2b, 0xaf, 0x82, 0xe8, 0x75, + 0xe5, 0x95, 0x18, 0xd4, 0xaf, 0x2b, 0x23, 0xa5, 0xfc, 0xd8, 0x42, 0x97, 0x50, 0x30, 0xc3, 0x37, + 0x5a, 0x7a, 0x3b, 0x75, 0x93, 0xcd, 0x8d, 0x69, 0x7c, 0x57, 0x3a, 0xd9, 0x40, 0xeb, 0xd2, 0x89, + 0xc1, 0x79, 0x6c, 0x55, 0xff, 0x6b, 0x01, 0x4a, 0x8c, 0xe8, 0xc9, 0x90, 0x2a, 0x3c, 0x67, 0xdc, + 0x3c, 0xbe, 0x97, 0x78, 0xdb, 0x10, 0xde, 0x12, 0xc6, 0xd3, 0x57, 0x35, 0x52, 0xc6, 0x3f, 0x85, + 0x22, 0x61, 0xd1, 0x7b, 0x63, 0xed, 0x25, 0xb1, 0x6a, 0x50, 0x38, 0x8f, 0x91, 0x66, 0x2d, 0x96, + 0x42, 0x38, 0x09, 0x88, 0x83, 0xcc, 0x2f, 0x52, 0xe3, 0x27, 0x57, 0x59, 0xe9, 0xfd, 0x93, 0xff, + 0x07, 0x00, 0x00, 0xff, 0xff, 0x22, 0xb2, 0x8a, 0xb2, 0x25, 0x14, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2419,6 +2461,8 @@ var _ClusterService_serviceDesc = grpc.ServiceDesc{ type CliServiceClient interface { // Upgrade - gets an updated binary if it exists. Upgrade(ctx context.Context, in *CliUpgradeRequest, opts ...grpc.CallOption) (CliService_UpgradeClient, error) + // Checksums - gets a file with checksums for the binaries + Checksums(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (CliService_ChecksumsClient, error) } type cliServiceClient struct { @@ -2461,10 +2505,44 @@ func (x *cliServiceUpgradeClient) Recv() (*CliUpgradeResponse, error) { return m, nil } +func (c *cliServiceClient) Checksums(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (CliService_ChecksumsClient, error) { + stream, err := c.cc.NewStream(ctx, &_CliService_serviceDesc.Streams[1], "/v1.CliService/Checksums", opts...) + if err != nil { + return nil, err + } + x := &cliServiceChecksumsClient{stream} + if err := x.ClientStream.SendMsg(in); err != nil { + return nil, err + } + if err := x.ClientStream.CloseSend(); err != nil { + return nil, err + } + return x, nil +} + +type CliService_ChecksumsClient interface { + Recv() (*CliChecksumResponse, error) + grpc.ClientStream +} + +type cliServiceChecksumsClient struct { + grpc.ClientStream +} + +func (x *cliServiceChecksumsClient) Recv() (*CliChecksumResponse, error) { + m := new(CliChecksumResponse) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + // CliServiceServer is the server API for CliService service. type CliServiceServer interface { // Upgrade - gets an updated binary if it exists. Upgrade(*CliUpgradeRequest, CliService_UpgradeServer) error + // Checksums - gets a file with checksums for the binaries + Checksums(*emptypb.Empty, CliService_ChecksumsServer) error } // UnimplementedCliServiceServer can be embedded to have forward compatible implementations. @@ -2474,6 +2552,9 @@ type UnimplementedCliServiceServer struct { func (*UnimplementedCliServiceServer) Upgrade(req *CliUpgradeRequest, srv CliService_UpgradeServer) error { return status.Errorf(codes.Unimplemented, "method Upgrade not implemented") } +func (*UnimplementedCliServiceServer) Checksums(req *emptypb.Empty, srv CliService_ChecksumsServer) error { + return status.Errorf(codes.Unimplemented, "method Checksums not implemented") +} func RegisterCliServiceServer(s *grpc.Server, srv CliServiceServer) { s.RegisterService(&_CliService_serviceDesc, srv) @@ -2500,6 +2581,27 @@ func (x *cliServiceUpgradeServer) Send(m *CliUpgradeResponse) error { return x.ServerStream.SendMsg(m) } +func _CliService_Checksums_Handler(srv interface{}, stream grpc.ServerStream) error { + m := new(emptypb.Empty) + if err := stream.RecvMsg(m); err != nil { + return err + } + return srv.(CliServiceServer).Checksums(m, &cliServiceChecksumsServer{stream}) +} + +type CliService_ChecksumsServer interface { + Send(*CliChecksumResponse) error + grpc.ServerStream +} + +type cliServiceChecksumsServer struct { + grpc.ServerStream +} + +func (x *cliServiceChecksumsServer) Send(m *CliChecksumResponse) error { + return x.ServerStream.SendMsg(m) +} + var _CliService_serviceDesc = grpc.ServiceDesc{ ServiceName: "v1.CliService", HandlerType: (*CliServiceServer)(nil), @@ -2510,6 +2612,11 @@ var _CliService_serviceDesc = grpc.ServiceDesc{ Handler: _CliService_Upgrade_Handler, ServerStreams: true, }, + { + StreamName: "Checksums", + Handler: _CliService_Checksums_Handler, + ServerStreams: true, + }, }, Metadata: "service.proto", } diff --git a/generated/api/v1/service.pb.gw.go b/generated/api/v1/service.pb.gw.go index 9f92bd7ee..967cc09c2 100644 --- a/generated/api/v1/service.pb.gw.go +++ b/generated/api/v1/service.pb.gw.go @@ -622,6 +622,23 @@ func request_CliService_Upgrade_0(ctx context.Context, marshaler runtime.Marshal } +func request_CliService_Checksums_0(ctx context.Context, marshaler runtime.Marshaler, client CliServiceClient, req *http.Request, pathParams map[string]string) (CliService_ChecksumsClient, runtime.ServerMetadata, error) { + var protoReq emptypb.Empty + var metadata runtime.ServerMetadata + + stream, err := client.Checksums(ctx, &protoReq) + if err != nil { + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + return nil, metadata, err + } + metadata.HeaderMD = header + return stream, metadata, nil + +} + func request_InfraStatusService_GetStatus_0(ctx context.Context, marshaler runtime.Marshaler, client InfraStatusServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq emptypb.Empty var metadata runtime.ServerMetadata @@ -995,6 +1012,13 @@ func RegisterCliServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, return }) + mux.Handle("GET", pattern_CliService_Checksums_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport") + _, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + }) + return nil } @@ -1616,15 +1640,39 @@ func RegisterCliServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, }) + mux.Handle("GET", pattern_CliService_Checksums_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_CliService_Checksums_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_CliService_Checksums_0(ctx, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...) + + }) + return nil } var ( pattern_CliService_Upgrade_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"v1", "cli", "os", "arch", "upgrade"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_CliService_Checksums_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "checksums"}, "", runtime.AssumeColonVerbOpt(true))) ) var ( forward_CliService_Upgrade_0 = runtime.ForwardResponseStream + + forward_CliService_Checksums_0 = runtime.ForwardResponseStream ) // RegisterInfraStatusServiceHandlerFromEndpoint is same as RegisterInfraStatusServiceHandler but diff --git a/generated/api/v1/service.swagger.json b/generated/api/v1/service.swagger.json index e3f68bed3..c3dbc0008 100644 --- a/generated/api/v1/service.swagger.json +++ b/generated/api/v1/service.swagger.json @@ -11,6 +11,23 @@ "application/json" ], "paths": { + "/v1/checksums": { + "get": { + "summary": "CreateToken generates an arbitrary service account token", + "operationId": "Checksums", + "responses": { + "200": { + "description": "A successful response.(streaming responses)", + "schema": { + "$ref": "#/x-stream-definitions/v1CliChecksumResponse" + } + } + }, + "tags": [ + "CliService" + ] + } + }, "/v1/cli/{os}/{arch}/upgrade": { "get": { "operationId": "Upgrade", @@ -500,6 +517,15 @@ } } }, + "v1CliChecksumResponse": { + "type": "object", + "properties": { + "fileChunk": { + "type": "string", + "format": "byte" + } + } + }, "v1CliUpgradeResponse": { "type": "object", "properties": { @@ -928,6 +954,18 @@ } }, "x-stream-definitions": { + "v1CliChecksumResponse": { + "type": "object", + "properties": { + "result": { + "$ref": "#/definitions/v1CliChecksumResponse" + }, + "error": { + "$ref": "#/definitions/runtimeStreamError" + } + }, + "title": "Stream result of v1CliChecksumResponse" + }, "v1CliUpgradeResponse": { "type": "object", "properties": { diff --git a/proto/api/v1/service.proto b/proto/api/v1/service.proto index 2ab3ba02d..490f5f9d2 100644 --- a/proto/api/v1/service.proto +++ b/proto/api/v1/service.proto @@ -452,6 +452,10 @@ message CliUpgradeResponse { bytes fileChunk = 1; } +message CliChecksumResponse { + bytes fileChunk = 1; +} + // CliService provides an upgrade path for the command line interface. service CliService { // Upgrade - gets an updated binary if it exists. @@ -460,6 +464,13 @@ service CliService { get: "/v1/cli/{os}/{arch}/upgrade" }; } + + // Checksums - gets a file with checksums for the binaries + rpc Checksums (google.protobuf.Empty) returns (stream CliChecksumResponse) { + option (google.api.http) = { + get: "/v1/checksums" + }; + } } message InfraStatus { diff --git a/service/cli.go b/service/cli.go index 914653d03..b3e738286 100644 --- a/service/cli.go +++ b/service/cli.go @@ -11,6 +11,7 @@ import ( "github.com/stackrox/infra/pkg/platform" "github.com/stackrox/infra/service/middleware" "google.golang.org/grpc" + "google.golang.org/protobuf/types/known/emptypb" ) const bufferSize = 1000 * 1024 @@ -62,10 +63,38 @@ func (s *cliImpl) Upgrade(request *v1.CliUpgradeRequest, stream v1.CliService_Up return nil } +func (s *cliImpl) Checksums(request *emptypb.Empty, stream v1.CliService_ChecksumsServer) error { + filename := webRoot + "/downloads/infractl-CHECKSUMS" + file, err := os.Open(filename) + if err != nil { + log.Log(logging.ERROR, "failed to open CHECKSUM file", "error", err) + return err + } + defer file.Close() + buff := make([]byte, bufferSize) + for { + bytesRead, err := file.Read(buff) + if err == io.EOF { + break + } + if err != nil { + log.Log(logging.ERROR, "error while reading CHECKSUM chunk", "error", err) + return err + } + resp := &v1.CliChecksumResponse{FileChunk: buff[:bytesRead]} + if err := stream.Send(resp); err != nil { + log.Log(logging.ERROR, "error while sending CHECKSUM chunk", "error", err) + return err + } + } + return nil +} + // Access configures access for this service. func (s *cliImpl) Access() map[string]middleware.Access { return map[string]middleware.Access{ - "/v1.CliUpgradeService/Download": middleware.Authenticated, + "/v1.CliUpgradeService/Download": middleware.Authenticated, + "/v1.CliUpgradeService/Checksums": middleware.Authenticated, } } From 017afcac7bd2055ff80d85e9330423d7261dbcf8 Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Mon, 20 Nov 2023 18:27:57 +0100 Subject: [PATCH 6/7] fix lint issues --- service/cli.go | 2 +- .../containers/DownloadsPage/UserServiceAccountToken.tsx | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/service/cli.go b/service/cli.go index b3e738286..673ed4a82 100644 --- a/service/cli.go +++ b/service/cli.go @@ -63,7 +63,7 @@ func (s *cliImpl) Upgrade(request *v1.CliUpgradeRequest, stream v1.CliService_Up return nil } -func (s *cliImpl) Checksums(request *emptypb.Empty, stream v1.CliService_ChecksumsServer) error { +func (s *cliImpl) Checksums(_ *emptypb.Empty, stream v1.CliService_ChecksumsServer) error { filename := webRoot + "/downloads/infractl-CHECKSUMS" file, err := os.Open(filename) if err != nil { diff --git a/ui/src/containers/DownloadsPage/UserServiceAccountToken.tsx b/ui/src/containers/DownloadsPage/UserServiceAccountToken.tsx index 1eaf12543..de787e5a0 100644 --- a/ui/src/containers/DownloadsPage/UserServiceAccountToken.tsx +++ b/ui/src/containers/DownloadsPage/UserServiceAccountToken.tsx @@ -46,11 +46,12 @@ export default function UserServiceAccountToken(): ReactElement { example, you may put it in your Go executable directory.

- Additionally, you may verify the integrity of the binary by downloading the CHECKSUMS (SHA-512) file. + Additionally, you may verify the integrity of the binary by downloading the{' '} + CHECKSUMS (SHA-512) file.

- Here are the commands to check the integrity, move the file, allow it to execute on an Intel-based Mac, confirm - its location, and help you learn about its features. + Here are the commands to check the integrity, move the file, allow it to execute on an + Intel-based Mac, confirm its location, and help you learn about its features.

           $ shasum --check --ignore-missing infractl-CHECKSUMS

From 48fd046934e083b86915bfc664bb0f3ba3511bbd Mon Sep 17 00:00:00 2001
From: Tom Martensen 
Date: Thu, 23 Nov 2023 09:39:32 +0100
Subject: [PATCH 7/7] add comment

---
 cmd/infractl/cli/upgrade/command.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmd/infractl/cli/upgrade/command.go b/cmd/infractl/cli/upgrade/command.go
index f7c615b5f..e3ef5bb70 100644
--- a/cmd/infractl/cli/upgrade/command.go
+++ b/cmd/infractl/cli/upgrade/command.go
@@ -64,6 +64,7 @@ func run(ctx context.Context, conn *grpc.ClientConn, cmd *cobra.Command, _ []str
 	if err != nil {
 		return nil, err
 	}
+	// also download checksums, and check them
 
 	infractlFilename, err := moveIntoPlace(tempFilename)
 	if err != nil {