Skip to content
Snippets Groups Projects
Unverified Commit 057b0170 authored by Bob Callaway's avatar Bob Callaway Committed by GitHub
Browse files

Set rekor-cli User-Agent header on requests (#684)


This sets the User-Agent header to match the format used in cosign of

rekor-cli/vX.Y.Z (OS) (ARCH)

Signed-off-by: default avatarBob Callaway <bob.callaway@gmail.com>
parent 520c3287
No related branches found
No related tags found
No related merge requests found
...@@ -79,7 +79,7 @@ var getCmd = &cobra.Command{ ...@@ -79,7 +79,7 @@ var getCmd = &cobra.Command{
} }
}, },
Run: format.WrapCmd(func(args []string) (interface{}, error) { Run: format.WrapCmd(func(args []string) (interface{}, error) {
rekorClient, err := client.GetRekorClient(viper.GetString("rekor_server")) rekorClient, err := client.GetRekorClient(viper.GetString("rekor_server"), client.WithUserAgent(UserAgent()))
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
...@@ -62,7 +62,7 @@ var logInfoCmd = &cobra.Command{ ...@@ -62,7 +62,7 @@ var logInfoCmd = &cobra.Command{
Long: `Prints info about the transparency log`, Long: `Prints info about the transparency log`,
Run: format.WrapCmd(func(args []string) (interface{}, error) { Run: format.WrapCmd(func(args []string) (interface{}, error) {
serverURL := viper.GetString("rekor_server") serverURL := viper.GetString("rekor_server")
rekorClient, err := client.GetRekorClient(serverURL) rekorClient, err := client.GetRekorClient(serverURL, client.WithUserAgent(UserAgent()))
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
...@@ -72,7 +72,7 @@ var logProofCmd = &cobra.Command{ ...@@ -72,7 +72,7 @@ var logProofCmd = &cobra.Command{
return nil return nil
}, },
Run: format.WrapCmd(func(args []string) (interface{}, error) { Run: format.WrapCmd(func(args []string) (interface{}, error) {
rekorClient, err := client.GetRekorClient(viper.GetString("rekor_server")) rekorClient, err := client.GetRekorClient(viper.GetString("rekor_server"), client.WithUserAgent(UserAgent()))
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
...@@ -96,7 +96,7 @@ var searchCmd = &cobra.Command{ ...@@ -96,7 +96,7 @@ var searchCmd = &cobra.Command{
}, },
Run: format.WrapCmd(func(args []string) (interface{}, error) { Run: format.WrapCmd(func(args []string) (interface{}, error) {
log := log.CliLogger log := log.CliLogger
rekorClient, err := client.GetRekorClient(viper.GetString("rekor_server")) rekorClient, err := client.GetRekorClient(viper.GetString("rekor_server"), client.WithUserAgent(UserAgent()))
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
...@@ -139,7 +139,7 @@ var timestampCmd = &cobra.Command{ ...@@ -139,7 +139,7 @@ var timestampCmd = &cobra.Command{
return nil return nil
}, },
Run: format.WrapCmd(func(args []string) (interface{}, error) { Run: format.WrapCmd(func(args []string) (interface{}, error) {
rekorClient, err := client.GetRekorClient(viper.GetString("rekor_server")) rekorClient, err := client.GetRekorClient(viper.GetString("rekor_server"), client.WithUserAgent(UserAgent()))
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
...@@ -73,7 +73,7 @@ var uploadCmd = &cobra.Command{ ...@@ -73,7 +73,7 @@ var uploadCmd = &cobra.Command{
Long: `This command takes the public key, signature and URL of the release artifact and uploads it to the rekor server.`, Long: `This command takes the public key, signature and URL of the release artifact and uploads it to the rekor server.`,
Run: format.WrapCmd(func(args []string) (interface{}, error) { Run: format.WrapCmd(func(args []string) (interface{}, error) {
ctx := context.Background() ctx := context.Background()
rekorClient, err := client.GetRekorClient(viper.GetString("rekor_server")) rekorClient, err := client.GetRekorClient(viper.GetString("rekor_server"), client.WithUserAgent(UserAgent()))
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
//
// Copyright 2022 The Sigstore Authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package app
import (
"fmt"
"runtime"
"sigs.k8s.io/release-utils/version"
)
var (
// uaString is meant to resemble the User-Agent sent by browsers with requests.
// See: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent
uaString = fmt.Sprintf("rekor-cli/%s (%s; %s)", version.GetVersionInfo().GitVersion, runtime.GOOS, runtime.GOARCH)
)
// UserAgent returns the User-Agent string which `rekor-cli` should send with HTTP requests.
func UserAgent() string {
return uaString
}
...@@ -87,7 +87,7 @@ var verifyCmd = &cobra.Command{ ...@@ -87,7 +87,7 @@ var verifyCmd = &cobra.Command{
return nil return nil
}, },
Run: format.WrapCmd(func(args []string) (interface{}, error) { Run: format.WrapCmd(func(args []string) (interface{}, error) {
rekorClient, err := client.GetRekorClient(viper.GetString("rekor_server")) rekorClient, err := client.GetRekorClient(viper.GetString("rekor_server"), client.WithUserAgent(UserAgent()))
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment