From b0731753aea34c8a009d30854667aba2e52380ed Mon Sep 17 00:00:00 2001
From: Carlos Tadeu Panato Junior <ctadeu@gmail.com>
Date: Thu, 15 Apr 2021 16:36:01 +0200
Subject: [PATCH] update boilerplate header and apply go fmt (#275)
* update boilerplate header and apply go fmt
Signed-off-by: Carlos Panato <ctadeu@gmail.com>
* lints: fix golangci-lint issues
Signed-off-by: Carlos Panato <ctadeu@gmail.com>
* updated based on feedback
Signed-off-by: Carlos Panato <ctadeu@gmail.com>
---
.github/dependabot.yml | 17 ++++-
.github/workflows/codeql-analysis.yml | 17 ++++-
.github/workflows/main.yml | 45 +++++--------
.github/workflows/verify.yml | 49 +++++++++++++++
.golangci.yml | 38 +++++++++++
COPYRIGHT.txt | 5 +-
Dockerfile | 15 +++++
Makefile | 15 +++++
cmd/rekor-cli/app/format/wrap.go | 25 ++++++--
cmd/rekor-cli/app/get.go | 34 +++++-----
cmd/rekor-cli/app/log_info.go | 35 +++++------
cmd/rekor-cli/app/log_proof.go | 33 +++++-----
cmd/rekor-cli/app/pflags.go | 33 +++++-----
cmd/rekor-cli/app/pflags_test.go | 37 ++++++-----
cmd/rekor-cli/app/root.go | 38 +++++------
cmd/rekor-cli/app/root_test.go | 29 +++++----
cmd/rekor-cli/app/search.go | 36 +++++------
cmd/rekor-cli/app/state/state.go | 29 +++++----
cmd/rekor-cli/app/upload.go | 33 +++++-----
cmd/rekor-cli/app/verify.go | 34 +++++-----
cmd/rekor-cli/main.go | 28 ++++-----
cmd/rekor-server/app/root.go | 39 ++++++------
cmd/rekor-server/app/serve.go | 39 ++++++------
cmd/rekor-server/app/watch.go | 41 ++++++------
cmd/rekor-server/main.go | 29 +++++----
config/rekor.yaml | 15 +++++
config/watcher.yaml | 15 +++++
docker-compose.debug.yml | 15 +++++
docker-compose.yml | 15 +++++
openapi.yaml | 15 +++++
pkg/api/api.go | 32 +++++-----
pkg/api/entries.go | 63 +++++++++----------
pkg/api/error.go | 29 ++++-----
pkg/api/index.go | 38 ++++++-----
pkg/api/metrics.go | 15 +++++
pkg/api/tlog.go | 41 ++++++------
pkg/api/trillian_client.go | 34 +++++-----
.../entries/create_log_entry_parameters.go | 5 +-
.../entries/create_log_entry_responses.go | 5 +-
.../client/entries/entries_client.go | 5 +-
.../get_log_entry_by_index_parameters.go | 5 +-
.../get_log_entry_by_index_responses.go | 5 +-
.../get_log_entry_by_uuid_parameters.go | 5 +-
.../get_log_entry_by_uuid_responses.go | 5 +-
.../entries/search_log_query_parameters.go | 5 +-
.../entries/search_log_query_responses.go | 5 +-
pkg/generated/client/index/index_client.go | 5 +-
.../client/index/search_index_parameters.go | 5 +-
.../client/index/search_index_responses.go | 5 +-
pkg/generated/client/rekor_client.go | 5 +-
.../client/tlog/get_log_info_parameters.go | 5 +-
.../client/tlog/get_log_info_responses.go | 5 +-
.../client/tlog/get_log_proof_parameters.go | 5 +-
.../client/tlog/get_log_proof_responses.go | 5 +-
.../client/tlog/get_public_key_parameters.go | 5 +-
.../client/tlog/get_public_key_responses.go | 5 +-
pkg/generated/client/tlog/tlog_client.go | 5 +-
pkg/generated/models/consistency_proof.go | 5 +-
pkg/generated/models/error.go | 5 +-
pkg/generated/models/inclusion_proof.go | 5 +-
pkg/generated/models/log_entry.go | 5 +-
pkg/generated/models/log_info.go | 5 +-
pkg/generated/models/proposed_entry.go | 5 +-
pkg/generated/models/rekord.go | 5 +-
pkg/generated/models/rekord_schema.go | 5 +-
pkg/generated/models/rekord_v001_schema.go | 5 +-
pkg/generated/models/rpm.go | 5 +-
pkg/generated/models/rpm_schema.go | 5 +-
pkg/generated/models/rpm_v001_schema.go | 5 +-
pkg/generated/models/search_index.go | 5 +-
pkg/generated/models/search_log_query.go | 5 +-
.../restapi/configure_rekor_server.go | 4 +-
pkg/generated/restapi/doc.go | 5 +-
pkg/generated/restapi/embedded_spec.go | 5 +-
.../operations/entries/create_log_entry.go | 5 +-
.../entries/create_log_entry_parameters.go | 5 +-
.../entries/create_log_entry_responses.go | 5 +-
.../entries/create_log_entry_urlbuilder.go | 5 +-
.../entries/get_log_entry_by_index.go | 5 +-
.../get_log_entry_by_index_parameters.go | 5 +-
.../get_log_entry_by_index_responses.go | 5 +-
.../get_log_entry_by_index_urlbuilder.go | 5 +-
.../entries/get_log_entry_by_uuid.go | 5 +-
.../get_log_entry_by_uuid_parameters.go | 5 +-
.../get_log_entry_by_uuid_responses.go | 5 +-
.../get_log_entry_by_uuid_urlbuilder.go | 5 +-
.../operations/entries/search_log_query.go | 5 +-
.../entries/search_log_query_parameters.go | 5 +-
.../entries/search_log_query_responses.go | 5 +-
.../entries/search_log_query_urlbuilder.go | 5 +-
.../restapi/operations/index/search_index.go | 5 +-
.../index/search_index_parameters.go | 5 +-
.../index/search_index_responses.go | 5 +-
.../index/search_index_urlbuilder.go | 5 +-
.../restapi/operations/rekor_server_api.go | 5 +-
.../restapi/operations/tlog/get_log_info.go | 5 +-
.../tlog/get_log_info_parameters.go | 5 +-
.../operations/tlog/get_log_info_responses.go | 5 +-
.../tlog/get_log_info_urlbuilder.go | 5 +-
.../restapi/operations/tlog/get_log_proof.go | 5 +-
.../tlog/get_log_proof_parameters.go | 5 +-
.../tlog/get_log_proof_responses.go | 5 +-
.../tlog/get_log_proof_urlbuilder.go | 5 +-
.../restapi/operations/tlog/get_public_key.go | 5 +-
.../tlog/get_public_key_parameters.go | 5 +-
.../tlog/get_public_key_responses.go | 5 +-
.../tlog/get_public_key_urlbuilder.go | 5 +-
pkg/generated/restapi/server.go | 5 +-
pkg/log/log.go | 17 ++++-
pkg/pki/minisign/minisign.go | 35 ++++++-----
pkg/pki/minisign/minisign_test.go | 29 +++++----
pkg/pki/pgp/pgp.go | 32 +++++-----
pkg/pki/pgp/pgp_test.go | 29 +++++----
pkg/pki/pki.go | 32 +++++-----
pkg/pki/pki_test.go | 29 +++++----
pkg/pki/ssh/encode.go | 18 +++++-
pkg/pki/ssh/sign.go | 15 +++++
pkg/pki/ssh/sign_test.go | 29 ++++++---
pkg/pki/ssh/ssh.go | 29 +++++----
pkg/pki/ssh/verify.go | 15 +++++
pkg/pki/x509/x509.go | 29 +++++----
pkg/pki/x509/x509_test.go | 31 +++++----
pkg/types/README.md | 4 +-
pkg/types/rekord/rekord.go | 34 +++++-----
pkg/types/rekord/rekord_test.go | 30 ++++-----
pkg/types/rekord/v0.0.1/entry.go | 47 +++++++-------
pkg/types/rekord/v0.0.1/entry_test.go | 32 +++++-----
pkg/types/rpm/rpm.go | 34 +++++-----
pkg/types/rpm/rpm_test.go | 30 ++++-----
pkg/types/rpm/v0.0.1/entry.go | 53 ++++++++--------
pkg/types/rpm/v0.0.1/entry_test.go | 32 +++++-----
pkg/types/types.go | 29 +++++----
pkg/types/types_test.go | 32 +++++-----
pkg/util/fetch.go | 28 ++++-----
pkg/util/types.go | 31 ++++-----
pkg/util/yaml.go | 30 +++++----
rekor-server.yaml | 16 ++++-
scripts/createdb.sh | 15 +++++
scripts/storage.sql | 15 +++++
tests/e2e-test.sh | 15 +++++
tests/e2e_test.go | 15 +++++
tests/pgp.go | 15 +++++
tests/rpm.go | 28 ++++-----
tests/ssh.go | 15 +++++
tests/util.go | 15 +++++
tests/x509.go | 15 +++++
146 files changed, 1392 insertions(+), 1041 deletions(-)
create mode 100644 .github/workflows/verify.yml
create mode 100644 .golangci.yml
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a0aa389..e5ad238 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,7 +1,22 @@
+#
+# Copyright 2021 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.
+
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
version: 2
updates:
- - package-ecosystem: "gomod"
+ - package-ecosystem: "gomod"
directory: "/" # Location of package manifests
schedule:
interval: "daily"
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index a18d84f..81c91c2 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,5 +1,20 @@
+#
+# Copyright 2021 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.
+
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-name: "CodeQL"
+name: CodeQL
on:
push:
branches: [ main ]
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 88bf843..e1e461a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,66 +1,55 @@
-# This is a basic workflow to help you get started with Actions
+#
+# Copyright 2021 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.
name: CI
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the main branch
on:
push:
branches: [ main ]
pull_request:
branches: [ main ]
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
build:
- # The type of runner that the job will run on
runs-on: ubuntu-20.04
- # Steps represent a sequence of tasks that will be executed as part of the job
steps:
- # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- # Extract version of Go to use
- name: Extract version of Go to use
run: echo "GOVERSION=$(cat Dockerfile|grep golang | awk ' { print $2 } ' | sed -r 's/^.*://g'| uniq)" >> $GITHUB_ENV
- # Setup Go
- uses: actions/setup-go@v2
with:
go-version: ${{ env.GOVERSION }}
- # Download go-swagger
- name: download go-swagger
run : go install github.com/go-swagger/go-swagger/cmd/swagger@v0.27.0
- name: Validate OpenAPI with Swagger
run: swagger validate openapi.yaml
- # Make it
- name: Build
run: make -C $GITHUB_WORKSPACE all
- # Lint it
- - name: golangci-lint
- uses: golangci/golangci-lint-action@v2.5.2
- with:
- version: v1.37.1
- # Test It
- name: Test
run: go test -v ./...
- # Gosec It
- - name: Run Gosec Security Scanner
- uses: securego/gosec@v2.7.0
- env:
- GOROOT: ""
- with:
- args: ./...
- name: Ensure no files were modified as a result of the build
run: git update-index --refresh && git diff-index --quiet HEAD -- || git diff --exit-code
+
e2e:
- # The type of runner that the job will run on
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-20.04
needs: build
- # Steps represent a sequence of tasks that will be executed as part of the job
+
steps:
- name: download minisign
run: sudo add-apt-repository ppa:dysfunctionalprogramming/minisign && sudo apt-get update && sudo apt-get install minisign
- # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- name: Docker Build
run: docker-compose build
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
new file mode 100644
index 0000000..c5c061d
--- /dev/null
+++ b/.github/workflows/verify.yml
@@ -0,0 +1,49 @@
+#
+# Copyright 2021 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.
+
+name: Verify
+
+on: [push, pull_request]
+
+jobs:
+ license-check:
+ name: license boilerplate check
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-go@v2
+ with:
+ go-version: '1.16'
+ - name: Install addlicense
+ run: go install github.com/google/addlicense@latest
+ - name: Check license headers
+ run: |
+ set -e
+ addlicense -l apache -c 'The Sigstore Authors' -v *
+ git diff --exit-code
+
+ golangci:
+ name: lint
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: deps
+ run: sudo apt-get update && sudo apt-get install -yq libpcsclite-dev
+ - name: golangci-lint
+ uses: golangci/golangci-lint-action@v2
+ timeout-minutes: 5
+ with:
+ # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+ version: v1.39
diff --git a/.golangci.yml b/.golangci.yml
new file mode 100644
index 0000000..03ee275
--- /dev/null
+++ b/.golangci.yml
@@ -0,0 +1,38 @@
+#
+# Copyright 2021 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.
+
+linters:
+ enable:
+ - deadcode
+ - errcheck
+ - gofmt
+ - goimports
+ - gosec
+ - gocritic
+ - golint
+ - misspell
+output:
+ uniq-by-line: false
+issues:
+ exclude-rules:
+ - path: _test\.go
+ linters:
+ - errcheck
+ - gosec
+ max-issues-per-linter: 0
+ max-same-issues: 0
+run:
+ issues-exit-code: 1
+ timeout: 10m
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index 8b2da50..7a01c84 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -1,5 +1,5 @@
-/*
-Copyright The Rekor Authors.
+
+Copyright 2021 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.
@@ -12,4 +12,3 @@ 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.
-*/
diff --git a/Dockerfile b/Dockerfile
index f4bfe33..97634ae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,18 @@
+#
+# Copyright 2021 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.
+
FROM golang:1.16.3 AS builder
ENV APP_ROOT=/opt/app-root
ENV GOPATH=$APP_ROOT
diff --git a/Makefile b/Makefile
index 824d92d..4f9d8c5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,18 @@
+#
+# Copyright 2021 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.
+
.PHONY: all test clean clean-gen lint gosec
all: rekor-cli rekor-server
diff --git a/cmd/rekor-cli/app/format/wrap.go b/cmd/rekor-cli/app/format/wrap.go
index 4239388..99cf58b 100644
--- a/cmd/rekor-cli/app/format/wrap.go
+++ b/cmd/rekor-cli/app/format/wrap.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 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 format
import (
@@ -9,11 +24,11 @@ import (
"github.com/spf13/viper"
)
-type cobraCmd func(cmd *cobra.Command, args []string)
+type CobraCmd func(cmd *cobra.Command, args []string)
type formatCmd func(args []string) (interface{}, error)
-func WrapCmd(f formatCmd) cobraCmd {
+func WrapCmd(f formatCmd) CobraCmd {
return func(cmd *cobra.Command, args []string) {
obj, err := f(args)
if err != nil {
@@ -27,15 +42,15 @@ func WrapCmd(f formatCmd) cobraCmd {
if s, ok := obj.(fmt.Stringer); ok {
fmt.Print(s.String())
} else {
- fmt.Println(toJson(s))
+ fmt.Println(toJSON(s))
}
case "json":
- fmt.Println(toJson(obj))
+ fmt.Println(toJSON(obj))
}
}
}
-func toJson(i interface{}) string {
+func toJSON(i interface{}) string {
b, err := json.Marshal(i)
if err != nil {
log.Fatal(err)
diff --git a/cmd/rekor-cli/app/get.go b/cmd/rekor-cli/app/get.go
index 02e1f9a..2b3a7b4 100644
--- a/cmd/rekor-cli/app/get.go
+++ b/cmd/rekor-cli/app/get.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 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.
-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 (
@@ -25,14 +25,14 @@ import (
"time"
"github.com/go-openapi/runtime"
+ "github.com/spf13/cobra"
+ "github.com/spf13/viper"
+
"github.com/sigstore/rekor/cmd/rekor-cli/app/format"
"github.com/sigstore/rekor/pkg/generated/client/entries"
"github.com/sigstore/rekor/pkg/generated/models"
"github.com/sigstore/rekor/pkg/log"
"github.com/sigstore/rekor/pkg/types"
-
- "github.com/spf13/cobra"
- "github.com/spf13/viper"
)
type getCmdOutput struct {
diff --git a/cmd/rekor-cli/app/log_info.go b/cmd/rekor-cli/app/log_info.go
index 4c4ed8a..ab9e39b 100644
--- a/cmd/rekor-cli/app/log_info.go
+++ b/cmd/rekor-cli/app/log_info.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 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.
-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 (
@@ -27,19 +27,18 @@ import (
"strings"
"time"
- "github.com/sigstore/rekor/cmd/rekor-cli/app/state"
-
"github.com/google/trillian"
tclient "github.com/google/trillian/client"
tcrypto "github.com/google/trillian/crypto"
"github.com/google/trillian/merkle/logverifier"
rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
+ "github.com/spf13/cobra"
+ "github.com/spf13/viper"
"github.com/sigstore/rekor/cmd/rekor-cli/app/format"
+ "github.com/sigstore/rekor/cmd/rekor-cli/app/state"
"github.com/sigstore/rekor/pkg/generated/client/tlog"
"github.com/sigstore/rekor/pkg/log"
- "github.com/spf13/cobra"
- "github.com/spf13/viper"
)
type logInfoCmdOutput struct {
diff --git a/cmd/rekor-cli/app/log_proof.go b/cmd/rekor-cli/app/log_proof.go
index 16682da..55813cc 100644
--- a/cmd/rekor-cli/app/log_proof.go
+++ b/cmd/rekor-cli/app/log_proof.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 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.
-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 (
@@ -20,10 +20,11 @@ import (
"fmt"
"os"
- "github.com/sigstore/rekor/cmd/rekor-cli/app/format"
- "github.com/sigstore/rekor/pkg/generated/client/tlog"
"github.com/spf13/cobra"
"github.com/spf13/viper"
+
+ "github.com/sigstore/rekor/cmd/rekor-cli/app/format"
+ "github.com/sigstore/rekor/pkg/generated/client/tlog"
)
type logProofOutput struct {
diff --git a/cmd/rekor-cli/app/pflags.go b/cmd/rekor-cli/app/pflags.go
index 57a4038..cfd8aca 100644
--- a/cmd/rekor-cli/app/pflags.go
+++ b/cmd/rekor-cli/app/pflags.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 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.
-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 (
@@ -30,11 +30,12 @@ import (
"github.com/go-openapi/strfmt"
"github.com/go-openapi/swag"
+ "github.com/spf13/cobra"
+ "github.com/spf13/viper"
+
"github.com/sigstore/rekor/pkg/generated/models"
rekord_v001 "github.com/sigstore/rekor/pkg/types/rekord/v0.0.1"
rpm_v001 "github.com/sigstore/rekor/pkg/types/rpm/v0.0.1"
- "github.com/spf13/cobra"
- "github.com/spf13/viper"
)
func addSearchPFlags(cmd *cobra.Command) error {
diff --git a/cmd/rekor-cli/app/pflags_test.go b/cmd/rekor-cli/app/pflags_test.go
index 252e7f8..2155aa5 100644
--- a/cmd/rekor-cli/app/pflags_test.go
+++ b/cmd/rekor-cli/app/pflags_test.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
-
-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.
-*/
+//
+// Copyright 2021 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
@@ -23,10 +22,10 @@ import (
"net/http/httptest"
"testing"
- "github.com/sigstore/rekor/pkg/generated/models"
+ "github.com/spf13/cobra"
"github.com/spf13/viper"
- "github.com/spf13/cobra"
+ "github.com/sigstore/rekor/pkg/generated/models"
)
func TestArtifactPFlags(t *testing.T) {
@@ -119,13 +118,13 @@ func TestArtifactPFlags(t *testing.T) {
expectValidateSuccess: false,
},
{
- caseDesc: "non-existant rekord file",
+ caseDesc: "non-existent rekord file",
entry: "../../../tests/not_there.json",
expectParseSuccess: false,
expectValidateSuccess: false,
},
{
- caseDesc: "non-existant rekord url",
+ caseDesc: "non-existent rekord url",
entry: testServer.URL + "/not_found",
expectParseSuccess: true,
expectValidateSuccess: false,
diff --git a/cmd/rekor-cli/app/root.go b/cmd/rekor-cli/app/root.go
index 233aea0..5fa41f0 100644
--- a/cmd/rekor-cli/app/root.go
+++ b/cmd/rekor-cli/app/root.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Luke Hinds <lhinds@redhat.com>
+//
+// Copyright 2021 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.
-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 (
@@ -25,13 +25,13 @@ import (
"github.com/go-openapi/runtime"
httptransport "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt"
- "github.com/sigstore/rekor/pkg/generated/client"
- "github.com/sigstore/rekor/pkg/util"
+ homedir "github.com/mitchellh/go-homedir"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
-
- homedir "github.com/mitchellh/go-homedir"
"github.com/spf13/viper"
+
+ "github.com/sigstore/rekor/pkg/generated/client"
+ "github.com/sigstore/rekor/pkg/util"
)
var rootCmd = &cobra.Command{
@@ -43,7 +43,7 @@ var rootCmd = &cobra.Command{
},
}
-//Execute runs the base CLI
+// Execute runs the base CLI
func Execute() {
if err := rootCmd.Execute(); err != nil {
fmt.Println(err)
diff --git a/cmd/rekor-cli/app/root_test.go b/cmd/rekor-cli/app/root_test.go
index de8f309..490b9a6 100644
--- a/cmd/rekor-cli/app/root_test.go
+++ b/cmd/rekor-cli/app/root_test.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
-
-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.
-*/
+//
+// Copyright 2021 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
diff --git a/cmd/rekor-cli/app/search.go b/cmd/rekor-cli/app/search.go
index 9052414..160d780 100644
--- a/cmd/rekor-cli/app/search.go
+++ b/cmd/rekor-cli/app/search.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 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.
-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 (
@@ -26,17 +26,15 @@ import (
"path/filepath"
"strings"
- "github.com/go-openapi/swag"
-
"github.com/go-openapi/strfmt"
+ "github.com/go-openapi/swag"
+ "github.com/spf13/cobra"
+ "github.com/spf13/viper"
"github.com/sigstore/rekor/cmd/rekor-cli/app/format"
"github.com/sigstore/rekor/pkg/generated/client/index"
"github.com/sigstore/rekor/pkg/generated/models"
"github.com/sigstore/rekor/pkg/log"
-
- "github.com/spf13/cobra"
- "github.com/spf13/viper"
)
type searchCmdOutput struct {
diff --git a/cmd/rekor-cli/app/state/state.go b/cmd/rekor-cli/app/state/state.go
index 5f97ff2..bcc3989 100644
--- a/cmd/rekor-cli/app/state/state.go
+++ b/cmd/rekor-cli/app/state/state.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2021 Dan Lorenc <lorenc.d@gmail.com>
-
-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.
-*/
+//
+// Copyright 2021 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 state
diff --git a/cmd/rekor-cli/app/upload.go b/cmd/rekor-cli/app/upload.go
index 4918143..2c49d76 100644
--- a/cmd/rekor-cli/app/upload.go
+++ b/cmd/rekor-cli/app/upload.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Luke Hinds <lhinds@redhat.com>
+//
+// Copyright 2021 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.
-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 (
@@ -21,12 +21,13 @@ import (
"os"
"github.com/go-openapi/swag"
+ "github.com/spf13/cobra"
+ "github.com/spf13/viper"
+
"github.com/sigstore/rekor/cmd/rekor-cli/app/format"
"github.com/sigstore/rekor/pkg/generated/client/entries"
"github.com/sigstore/rekor/pkg/generated/models"
"github.com/sigstore/rekor/pkg/log"
- "github.com/spf13/cobra"
- "github.com/spf13/viper"
)
type uploadCmdOutput struct {
diff --git a/cmd/rekor-cli/app/verify.go b/cmd/rekor-cli/app/verify.go
index 481cef9..f0e7808 100644
--- a/cmd/rekor-cli/app/verify.go
+++ b/cmd/rekor-cli/app/verify.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Luke Hinds <lhinds@redhat.com>
+//
+// Copyright 2021 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.
-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 (
@@ -24,13 +24,13 @@ import (
"github.com/google/trillian/merkle/logverifier"
rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
+ "github.com/spf13/cobra"
+ "github.com/spf13/viper"
+
"github.com/sigstore/rekor/cmd/rekor-cli/app/format"
"github.com/sigstore/rekor/pkg/generated/client/entries"
"github.com/sigstore/rekor/pkg/generated/models"
"github.com/sigstore/rekor/pkg/log"
-
- "github.com/spf13/cobra"
- "github.com/spf13/viper"
)
type verifyCmdOutput struct {
diff --git a/cmd/rekor-cli/main.go b/cmd/rekor-cli/main.go
index fa9e727..5cb211e 100644
--- a/cmd/rekor-cli/main.go
+++ b/cmd/rekor-cli/main.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Luke Hinds <lhinds@redhat.com>
+//
+// Copyright 2021 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.
-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 main
import "github.com/sigstore/rekor/cmd/rekor-cli/app"
diff --git a/cmd/rekor-server/app/root.go b/cmd/rekor-server/app/root.go
index 85f9b2b..be17f83 100644
--- a/cmd/rekor-server/app/root.go
+++ b/cmd/rekor-server/app/root.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Luke Hinds <lhinds@redhat.com>
-
-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.
-*/
+//
+// Copyright 2021 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
@@ -20,11 +19,11 @@ import (
"fmt"
"os"
- "github.com/sigstore/rekor/pkg/log"
- "github.com/spf13/cobra"
-
homedir "github.com/mitchellh/go-homedir"
+ "github.com/spf13/cobra"
"github.com/spf13/viper"
+
+ "github.com/sigstore/rekor/pkg/log"
)
var cfgFile string
@@ -34,8 +33,8 @@ var logType string
var rootCmd = &cobra.Command{
Use: "rekor-server",
Short: "Rekor signature transparency log server",
- Long: `Rekor fulfills the signature transparency role of sigstore's software
- signing infrastructure. It can also be run on its own and is designed to be
+ Long: `Rekor fulfills the signature transparency role of sigstore's software
+ signing infrastructure. It can also be run on its own and is designed to be
extensible to work with different manifest schemas and PKI tooling`,
// Uncomment the following line if your bare application
// has an action associated with it:
diff --git a/cmd/rekor-server/app/serve.go b/cmd/rekor-server/app/serve.go
index 3aef9dd..d92b11d 100644
--- a/cmd/rekor-server/app/serve.go
+++ b/cmd/rekor-server/app/serve.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Luke Hinds <lhinds@redhat.com>
-
-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.
-*/
+//
+// Copyright 2021 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
@@ -21,18 +20,18 @@ import (
"net/http"
"github.com/go-openapi/loads"
+ "github.com/prometheus/client_golang/prometheus/promhttp"
+ "github.com/spf13/cobra"
+ "github.com/spf13/viper"
+
"github.com/sigstore/rekor/pkg/api"
+ "github.com/sigstore/rekor/pkg/generated/restapi"
"github.com/sigstore/rekor/pkg/generated/restapi/operations"
"github.com/sigstore/rekor/pkg/log"
"github.com/sigstore/rekor/pkg/types/rekord"
rekord_v001 "github.com/sigstore/rekor/pkg/types/rekord/v0.0.1"
"github.com/sigstore/rekor/pkg/types/rpm"
rpm_v001 "github.com/sigstore/rekor/pkg/types/rpm/v0.0.1"
-
- "github.com/prometheus/client_golang/prometheus/promhttp"
- "github.com/sigstore/rekor/pkg/generated/restapi"
- "github.com/spf13/cobra"
- "github.com/spf13/viper"
)
// serveCmd represents the serve command
diff --git a/cmd/rekor-server/app/watch.go b/cmd/rekor-server/app/watch.go
index 0f29527..43aac93 100644
--- a/cmd/rekor-server/app/watch.go
+++ b/cmd/rekor-server/app/watch.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2021 Dan Lorenc <lorenc.d@gmail.com>
-
-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.
-*/
+//
+// Copyright 2021 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
@@ -29,20 +28,20 @@ import (
"os"
"time"
+ _ "gocloud.dev/blob/fileblob" // fileblob
+ _ "gocloud.dev/blob/gcsblob"
+
"github.com/google/trillian"
tclient "github.com/google/trillian/client"
"github.com/google/trillian/merkle/rfc6962/hasher"
"github.com/google/trillian/types"
+ "github.com/spf13/cobra"
+ "github.com/spf13/viper"
+ "gocloud.dev/blob"
"github.com/sigstore/rekor/cmd/rekor-cli/app"
"github.com/sigstore/rekor/pkg/generated/client"
"github.com/sigstore/rekor/pkg/log"
-
- "github.com/spf13/cobra"
- "github.com/spf13/viper"
- "gocloud.dev/blob"
- _ "gocloud.dev/blob/fileblob"
- _ "gocloud.dev/blob/gcsblob"
)
const rekorSthBucketEnv = "REKOR_STH_BUCKET"
diff --git a/cmd/rekor-server/main.go b/cmd/rekor-server/main.go
index 4aaccb0..8e160e8 100644
--- a/cmd/rekor-server/main.go
+++ b/cmd/rekor-server/main.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Luke Hinds <lhinds@redhat.com>
-
-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.
-*/
+//
+// Copyright 2021 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 main
diff --git a/config/rekor.yaml b/config/rekor.yaml
index d394cb0..6b52403 100644
--- a/config/rekor.yaml
+++ b/config/rekor.yaml
@@ -1,3 +1,18 @@
+#
+# Copyright 2021 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.
+
apiVersion: apps/v1
kind: Deployment
metadata:
diff --git a/config/watcher.yaml b/config/watcher.yaml
index 416aca5..bacdadf 100644
--- a/config/watcher.yaml
+++ b/config/watcher.yaml
@@ -1,3 +1,18 @@
+#
+# Copyright 2021 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.
+
apiVersion: apps/v1
kind: Deployment
metadata:
diff --git a/docker-compose.debug.yml b/docker-compose.debug.yml
index 1c1565c..f2f9eeb 100644
--- a/docker-compose.debug.yml
+++ b/docker-compose.debug.yml
@@ -1,3 +1,18 @@
+#
+# Copyright 2021 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.
+
version: '3.4'
services:
rekor-server-debug:
diff --git a/docker-compose.yml b/docker-compose.yml
index bf6ae12..ff8b736 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,3 +1,18 @@
+#
+# Copyright 2021 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.
+
version: '3.4'
services:
mysql:
diff --git a/openapi.yaml b/openapi.yaml
index 0f4bf7c..e5bdb2d 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1,3 +1,18 @@
+#
+# Copyright 2021 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.
+
swagger: "2.0"
info:
title: Rekor
diff --git a/pkg/api/api.go b/pkg/api/api.go
index 0599f00..5239fa0 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Luke Hinds <lhinds@redhat.com>
-
-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.
-*/
+//
+// Copyright 2021 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 api
@@ -25,9 +24,10 @@ import (
"github.com/google/trillian/client"
"github.com/google/trillian/crypto/keyspb"
radix "github.com/mediocregopher/radix/v4"
- "github.com/sigstore/rekor/pkg/log"
"github.com/spf13/viper"
"google.golang.org/grpc"
+
+ "github.com/sigstore/rekor/pkg/log"
)
func dial(ctx context.Context, rpcServer string) (*grpc.ClientConn, error) {
diff --git a/pkg/api/entries.go b/pkg/api/entries.go
index cb371d0..d4b1e0d 100644
--- a/pkg/api/entries.go
+++ b/pkg/api/entries.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 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.
-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 api
import (
@@ -23,29 +23,24 @@ import (
"net/http"
"net/url"
- ttypes "github.com/google/trillian/types"
-
+ "github.com/go-openapi/runtime/middleware"
+ "github.com/go-openapi/strfmt"
+ "github.com/go-openapi/swag"
"github.com/google/trillian"
+ rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
+ ttypes "github.com/google/trillian/types"
"github.com/spf13/viper"
"golang.org/x/sync/errgroup"
-
- "github.com/go-openapi/swag"
-
"google.golang.org/genproto/googleapis/rpc/code"
"google.golang.org/grpc/codes"
- "github.com/sigstore/rekor/pkg/log"
- "github.com/sigstore/rekor/pkg/types"
-
"github.com/sigstore/rekor/pkg/generated/models"
-
- "github.com/go-openapi/runtime/middleware"
- "github.com/go-openapi/strfmt"
- rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
"github.com/sigstore/rekor/pkg/generated/restapi/operations/entries"
+ "github.com/sigstore/rekor/pkg/log"
+ "github.com/sigstore/rekor/pkg/types"
)
-//logEntryFromLeaf creates LogEntry struct from trillian structs
+// logEntryFromLeaf creates LogEntry struct from trillian structs
func logEntryFromLeaf(tc TrillianClient, leaf *trillian.LogLeaf, signedLogRoot *trillian.SignedLogRoot, proof *trillian.Proof) (models.LogEntry, error) {
root := &ttypes.LogRootV1{}
@@ -76,7 +71,7 @@ func logEntryFromLeaf(tc TrillianClient, leaf *trillian.LogLeaf, signedLogRoot *
return logEntry, nil
}
-//GetLogEntryAndProofByIndexHandler returns the entry and inclusion proof for a specified log index
+// GetLogEntryAndProofByIndexHandler returns the entry and inclusion proof for a specified log index
func GetLogEntryByIndexHandler(params entries.GetLogEntryByIndexParams) middleware.Responder {
tc := NewTrillianClient(params.HTTPRequest.Context())
@@ -103,7 +98,7 @@ func GetLogEntryByIndexHandler(params entries.GetLogEntryByIndexParams) middlewa
return entries.NewGetLogEntryByIndexOK().WithPayload(logEntry)
}
-//CreateLogEntryHandler creates new entry into log
+// CreateLogEntryHandler creates new entry into log
func CreateLogEntryHandler(params entries.CreateLogEntryParams) middleware.Responder {
httpReq := params.HTTPRequest
entry, err := types.NewEntry(params.ProposedEntry)
@@ -119,12 +114,12 @@ func CreateLogEntryHandler(params entries.CreateLogEntryParams) middleware.Respo
tc := NewTrillianClient(httpReq.Context())
resp := tc.addLeaf(leaf)
- //this represents overall GRPC response state (not the results of insertion into the log)
+ // this represents overall GRPC response state (not the results of insertion into the log)
if resp.status != codes.OK {
return handleRekorAPIError(params, http.StatusInternalServerError, fmt.Errorf("grpc error: %w", resp.err), trillianUnexpectedResult)
}
- //this represents the results of inserting the proposed leaf into the log; status is nil in success path
+ // this represents the results of inserting the proposed leaf into the log; status is nil in success path
insertionStatus := resp.getAddResult.QueuedLeaf.Status
if insertionStatus != nil {
switch insertionStatus.Code {
@@ -164,7 +159,7 @@ func CreateLogEntryHandler(params entries.CreateLogEntryParams) middleware.Respo
return entries.NewCreateLogEntryCreated().WithPayload(logEntry).WithLocation(getEntryURL(*httpReq.URL, uuid)).WithETag(uuid)
}
-//getEntryURL returns the absolute path to the log entry in a RESTful style
+// getEntryURL returns the absolute path to the log entry in a RESTful style
func getEntryURL(locationURL url.URL, uuid string) strfmt.URI {
// remove API key from output
query := locationURL.Query()
@@ -175,7 +170,7 @@ func getEntryURL(locationURL url.URL, uuid string) strfmt.URI {
}
-//GetLogEntryByUUIDHandler gets log entry and inclusion proof for specified UUID aka merkle leaf hash
+// GetLogEntryByUUIDHandler gets log entry and inclusion proof for specified UUID aka merkle leaf hash
func GetLogEntryByUUIDHandler(params entries.GetLogEntryByUUIDParams) middleware.Responder {
hashValue, _ := hex.DecodeString(params.EntryUUID)
tc := NewTrillianClient(params.HTTPRequest.Context())
@@ -203,7 +198,7 @@ func GetLogEntryByUUIDHandler(params entries.GetLogEntryByUUIDParams) middleware
return entries.NewGetLogEntryByUUIDOK().WithPayload(logEntry)
}
-//SearchLogQueryHandler searches log by index, UUID, or proposed entry and returns array of entries found with inclusion proofs
+// SearchLogQueryHandler searches log by index, UUID, or proposed entry and returns array of entries found with inclusion proofs
func SearchLogQueryHandler(params entries.SearchLogQueryParams) middleware.Responder {
httpReqCtx := params.HTTPRequest.Context()
resultPayload := []models.LogEntry{}
diff --git a/pkg/api/error.go b/pkg/api/error.go
index 17a8177..78d9767 100644
--- a/pkg/api/error.go
+++ b/pkg/api/error.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 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.
-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 api
import (
@@ -23,6 +23,7 @@ import (
"github.com/go-openapi/runtime/middleware"
"github.com/go-openapi/strfmt"
"github.com/mitchellh/mapstructure"
+
"github.com/sigstore/rekor/pkg/generated/models"
"github.com/sigstore/rekor/pkg/generated/restapi/operations/entries"
"github.com/sigstore/rekor/pkg/generated/restapi/operations/index"
diff --git a/pkg/api/index.go b/pkg/api/index.go
index 0b5fdb0..6ed73d3 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
-
-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.
-*/
+//
+// Copyright 2021 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 api
@@ -24,15 +23,14 @@ import (
"net/http"
"strings"
- "github.com/sigstore/rekor/pkg/pki"
-
- radix "github.com/mediocregopher/radix/v4"
-
"github.com/asaskevich/govalidator"
"github.com/go-openapi/runtime/middleware"
"github.com/go-openapi/swag"
+ radix "github.com/mediocregopher/radix/v4"
+
"github.com/sigstore/rekor/pkg/generated/models"
"github.com/sigstore/rekor/pkg/generated/restapi/operations/index"
+ "github.com/sigstore/rekor/pkg/pki"
"github.com/sigstore/rekor/pkg/util"
)
@@ -41,7 +39,7 @@ func SearchIndexHandler(params index.SearchIndexParams) middleware.Responder {
var result []string
if params.Query.Hash != "" {
- //validate this is only a valid sha256 hash
+ // validate this is only a valid sha256 hash
if !govalidator.IsSHA256(params.Query.Hash) {
return handleRekorAPIError(params, http.StatusBadRequest, errors.New("invalid hash value specified"), malformedHash)
}
diff --git a/pkg/api/metrics.go b/pkg/api/metrics.go
index 7a757e1..2e33e32 100644
--- a/pkg/api/metrics.go
+++ b/pkg/api/metrics.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 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 api
import (
diff --git a/pkg/api/tlog.go b/pkg/api/tlog.go
index edaf77a..2d2a4d8 100644
--- a/pkg/api/tlog.go
+++ b/pkg/api/tlog.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 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.
-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 api
import (
@@ -22,16 +22,16 @@ import (
"fmt"
"net/http"
- "github.com/sigstore/rekor/pkg/generated/models"
- "google.golang.org/grpc/codes"
-
"github.com/go-openapi/runtime/middleware"
"github.com/go-openapi/strfmt"
"github.com/google/trillian/types"
+ "google.golang.org/grpc/codes"
+
+ "github.com/sigstore/rekor/pkg/generated/models"
"github.com/sigstore/rekor/pkg/generated/restapi/operations/tlog"
)
-//GetLogInfoHandler returns the current size of the tree and the STH
+// GetLogInfoHandler returns the current size of the tree and the STH
func GetLogInfoHandler(params tlog.GetLogInfoParams) middleware.Responder {
tc := NewTrillianClient(params.HTTPRequest.Context())
@@ -66,7 +66,7 @@ func GetLogInfoHandler(params tlog.GetLogInfoParams) middleware.Responder {
return tlog.NewGetLogInfoOK().WithPayload(&logInfo)
}
-//GetLogProofHandler returns information required to compute a consistency proof between two snapshots of log
+// GetLogProofHandler returns information required to compute a consistency proof between two snapshots of log
func GetLogProofHandler(params tlog.GetLogProofParams) middleware.Responder {
if *params.FirstSize > params.LastSize {
return handleRekorAPIError(params, http.StatusBadRequest, nil, fmt.Sprintf(firstSizeLessThanLastSize, *params.FirstSize, params.LastSize))
@@ -102,10 +102,11 @@ func GetLogProofHandler(params tlog.GetLogProofParams) middleware.Responder {
RootHash: &hashString,
Hashes: proofHashes,
}
+
return tlog.NewGetLogProofOK().WithPayload(&consistencyProof)
}
-//GetPublicKeyHandler returns the public key used to verify the signature on the signed tree head
+// GetPublicKeyHandler returns the public key used to verify the signature on the signed tree head
func GetPublicKeyHandler(params tlog.GetPublicKeyParams) middleware.Responder {
tc := NewTrillianClient(params.HTTPRequest.Context())
diff --git a/pkg/api/trillian_client.go b/pkg/api/trillian_client.go
index b02e257..5c13b0a 100644
--- a/pkg/api/trillian_client.go
+++ b/pkg/api/trillian_client.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Luke Hinds <lhinds@redhat.com>
-
-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.
-*/
+//
+// Copyright 2021 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 api
@@ -22,6 +21,8 @@ import (
"fmt"
"time"
+ _ "github.com/google/trillian/merkle/rfc6962" // register hasher
+
"github.com/golang/protobuf/ptypes"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
@@ -30,7 +31,6 @@ import (
"github.com/google/trillian/client"
"github.com/google/trillian/crypto/keyspb"
"github.com/google/trillian/crypto/sigpb"
- _ "github.com/google/trillian/merkle/rfc6962" //register hasher
"github.com/google/trillian/types"
)
@@ -166,7 +166,7 @@ func (t *TrillianClient) addLeaf(byteValue []byte) *Response {
}
}
- //overwrite queued leaf that doesn't have index set
+ // overwrite queued leaf that doesn't have index set
resp.QueuedLeaf.Leaf = leafResp.getLeafAndProofResult.Leaf
return &Response{
diff --git a/pkg/generated/client/entries/create_log_entry_parameters.go b/pkg/generated/client/entries/create_log_entry_parameters.go
index 80f9799..c5ccd21 100644
--- a/pkg/generated/client/entries/create_log_entry_parameters.go
+++ b/pkg/generated/client/entries/create_log_entry_parameters.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/client/entries/create_log_entry_responses.go b/pkg/generated/client/entries/create_log_entry_responses.go
index 7e175eb..135bf9c 100644
--- a/pkg/generated/client/entries/create_log_entry_responses.go
+++ b/pkg/generated/client/entries/create_log_entry_responses.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/client/entries/entries_client.go b/pkg/generated/client/entries/entries_client.go
index 901885b..a6a9bf1 100644
--- a/pkg/generated/client/entries/entries_client.go
+++ b/pkg/generated/client/entries/entries_client.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/client/entries/get_log_entry_by_index_parameters.go b/pkg/generated/client/entries/get_log_entry_by_index_parameters.go
index 22a178a..405dee6 100644
--- a/pkg/generated/client/entries/get_log_entry_by_index_parameters.go
+++ b/pkg/generated/client/entries/get_log_entry_by_index_parameters.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/client/entries/get_log_entry_by_index_responses.go b/pkg/generated/client/entries/get_log_entry_by_index_responses.go
index d1bec16..8b510fc 100644
--- a/pkg/generated/client/entries/get_log_entry_by_index_responses.go
+++ b/pkg/generated/client/entries/get_log_entry_by_index_responses.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/client/entries/get_log_entry_by_uuid_parameters.go b/pkg/generated/client/entries/get_log_entry_by_uuid_parameters.go
index 928420a..560bee0 100644
--- a/pkg/generated/client/entries/get_log_entry_by_uuid_parameters.go
+++ b/pkg/generated/client/entries/get_log_entry_by_uuid_parameters.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/client/entries/get_log_entry_by_uuid_responses.go b/pkg/generated/client/entries/get_log_entry_by_uuid_responses.go
index 8141ee6..9d46b2f 100644
--- a/pkg/generated/client/entries/get_log_entry_by_uuid_responses.go
+++ b/pkg/generated/client/entries/get_log_entry_by_uuid_responses.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/client/entries/search_log_query_parameters.go b/pkg/generated/client/entries/search_log_query_parameters.go
index 8e759ab..459f120 100644
--- a/pkg/generated/client/entries/search_log_query_parameters.go
+++ b/pkg/generated/client/entries/search_log_query_parameters.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/client/entries/search_log_query_responses.go b/pkg/generated/client/entries/search_log_query_responses.go
index f28cb58..c459c0c 100644
--- a/pkg/generated/client/entries/search_log_query_responses.go
+++ b/pkg/generated/client/entries/search_log_query_responses.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/client/index/index_client.go b/pkg/generated/client/index/index_client.go
index 4a60e2c..bbe0f57 100644
--- a/pkg/generated/client/index/index_client.go
+++ b/pkg/generated/client/index/index_client.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 index
diff --git a/pkg/generated/client/index/search_index_parameters.go b/pkg/generated/client/index/search_index_parameters.go
index 2195b53..d54879b 100644
--- a/pkg/generated/client/index/search_index_parameters.go
+++ b/pkg/generated/client/index/search_index_parameters.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 index
diff --git a/pkg/generated/client/index/search_index_responses.go b/pkg/generated/client/index/search_index_responses.go
index 12415d8..587a938 100644
--- a/pkg/generated/client/index/search_index_responses.go
+++ b/pkg/generated/client/index/search_index_responses.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 index
diff --git a/pkg/generated/client/rekor_client.go b/pkg/generated/client/rekor_client.go
index 414a5b8..9605815 100644
--- a/pkg/generated/client/rekor_client.go
+++ b/pkg/generated/client/rekor_client.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 client
diff --git a/pkg/generated/client/tlog/get_log_info_parameters.go b/pkg/generated/client/tlog/get_log_info_parameters.go
index ebe29ac..f051485 100644
--- a/pkg/generated/client/tlog/get_log_info_parameters.go
+++ b/pkg/generated/client/tlog/get_log_info_parameters.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 tlog
diff --git a/pkg/generated/client/tlog/get_log_info_responses.go b/pkg/generated/client/tlog/get_log_info_responses.go
index 84909e3..d815750 100644
--- a/pkg/generated/client/tlog/get_log_info_responses.go
+++ b/pkg/generated/client/tlog/get_log_info_responses.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 tlog
diff --git a/pkg/generated/client/tlog/get_log_proof_parameters.go b/pkg/generated/client/tlog/get_log_proof_parameters.go
index bff003f..403dd38 100644
--- a/pkg/generated/client/tlog/get_log_proof_parameters.go
+++ b/pkg/generated/client/tlog/get_log_proof_parameters.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 tlog
diff --git a/pkg/generated/client/tlog/get_log_proof_responses.go b/pkg/generated/client/tlog/get_log_proof_responses.go
index 91d09f6..76ebadb 100644
--- a/pkg/generated/client/tlog/get_log_proof_responses.go
+++ b/pkg/generated/client/tlog/get_log_proof_responses.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 tlog
diff --git a/pkg/generated/client/tlog/get_public_key_parameters.go b/pkg/generated/client/tlog/get_public_key_parameters.go
index 2e8da30..cd6093d 100644
--- a/pkg/generated/client/tlog/get_public_key_parameters.go
+++ b/pkg/generated/client/tlog/get_public_key_parameters.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 tlog
diff --git a/pkg/generated/client/tlog/get_public_key_responses.go b/pkg/generated/client/tlog/get_public_key_responses.go
index e6b146f..47fab0f 100644
--- a/pkg/generated/client/tlog/get_public_key_responses.go
+++ b/pkg/generated/client/tlog/get_public_key_responses.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 tlog
diff --git a/pkg/generated/client/tlog/tlog_client.go b/pkg/generated/client/tlog/tlog_client.go
index 653684d..19a869a 100644
--- a/pkg/generated/client/tlog/tlog_client.go
+++ b/pkg/generated/client/tlog/tlog_client.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 tlog
diff --git a/pkg/generated/models/consistency_proof.go b/pkg/generated/models/consistency_proof.go
index c9c90ff..804ddd1 100644
--- a/pkg/generated/models/consistency_proof.go
+++ b/pkg/generated/models/consistency_proof.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 models
diff --git a/pkg/generated/models/error.go b/pkg/generated/models/error.go
index 4f8232f..ac14f20 100644
--- a/pkg/generated/models/error.go
+++ b/pkg/generated/models/error.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 models
diff --git a/pkg/generated/models/inclusion_proof.go b/pkg/generated/models/inclusion_proof.go
index 37bb9a9..6139981 100644
--- a/pkg/generated/models/inclusion_proof.go
+++ b/pkg/generated/models/inclusion_proof.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 models
diff --git a/pkg/generated/models/log_entry.go b/pkg/generated/models/log_entry.go
index 09c124a..0f73747 100644
--- a/pkg/generated/models/log_entry.go
+++ b/pkg/generated/models/log_entry.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 models
diff --git a/pkg/generated/models/log_info.go b/pkg/generated/models/log_info.go
index 20bc801..f51a1d4 100644
--- a/pkg/generated/models/log_info.go
+++ b/pkg/generated/models/log_info.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 models
diff --git a/pkg/generated/models/proposed_entry.go b/pkg/generated/models/proposed_entry.go
index 41611da..511b3f4 100644
--- a/pkg/generated/models/proposed_entry.go
+++ b/pkg/generated/models/proposed_entry.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 models
diff --git a/pkg/generated/models/rekord.go b/pkg/generated/models/rekord.go
index 00f51be..81c8ff0 100644
--- a/pkg/generated/models/rekord.go
+++ b/pkg/generated/models/rekord.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 models
diff --git a/pkg/generated/models/rekord_schema.go b/pkg/generated/models/rekord_schema.go
index 9d0bc06..7bf2783 100644
--- a/pkg/generated/models/rekord_schema.go
+++ b/pkg/generated/models/rekord_schema.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 models
diff --git a/pkg/generated/models/rekord_v001_schema.go b/pkg/generated/models/rekord_v001_schema.go
index a979c9b..00e51e6 100644
--- a/pkg/generated/models/rekord_v001_schema.go
+++ b/pkg/generated/models/rekord_v001_schema.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 models
diff --git a/pkg/generated/models/rpm.go b/pkg/generated/models/rpm.go
index ceb0973..d4fab01 100644
--- a/pkg/generated/models/rpm.go
+++ b/pkg/generated/models/rpm.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 models
diff --git a/pkg/generated/models/rpm_schema.go b/pkg/generated/models/rpm_schema.go
index 8bf7304..0304bbe 100644
--- a/pkg/generated/models/rpm_schema.go
+++ b/pkg/generated/models/rpm_schema.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 models
diff --git a/pkg/generated/models/rpm_v001_schema.go b/pkg/generated/models/rpm_v001_schema.go
index 15846c8..8ccd26c 100644
--- a/pkg/generated/models/rpm_v001_schema.go
+++ b/pkg/generated/models/rpm_v001_schema.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 models
diff --git a/pkg/generated/models/search_index.go b/pkg/generated/models/search_index.go
index c06bea0..c0427f6 100644
--- a/pkg/generated/models/search_index.go
+++ b/pkg/generated/models/search_index.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 models
diff --git a/pkg/generated/models/search_log_query.go b/pkg/generated/models/search_log_query.go
index fe83030..d1ebe10 100644
--- a/pkg/generated/models/search_log_query.go
+++ b/pkg/generated/models/search_log_query.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 models
diff --git a/pkg/generated/restapi/configure_rekor_server.go b/pkg/generated/restapi/configure_rekor_server.go
index 8ef7719..2ff1c62 100644
--- a/pkg/generated/restapi/configure_rekor_server.go
+++ b/pkg/generated/restapi/configure_rekor_server.go
@@ -89,13 +89,13 @@ func configureAPI(api *operations.RekorServerAPI) http.Handler {
api.ServerShutdown = func() {}
- //not cacheable
+ // not cacheable
api.AddMiddlewareFor("GET", "/api/v1/log", middleware.NoCache)
api.AddMiddlewareFor("GET", "/api/v1/log/proof", middleware.NoCache)
api.AddMiddlewareFor("GET", "/api/v1/log/entries", middleware.NoCache)
api.AddMiddlewareFor("GET", "/api/v1/log/entries/{entryUUID}", middleware.NoCache)
- //cache forever
+ // cache forever
api.AddMiddlewareFor("GET", "/api/v1/log/publicKey", cacheForever)
return setupGlobalMiddleware(api.Serve(setupMiddlewares))
diff --git a/pkg/generated/restapi/doc.go b/pkg/generated/restapi/doc.go
index 99ed0fd..526232a 100644
--- a/pkg/generated/restapi/doc.go
+++ b/pkg/generated/restapi/doc.go
@@ -1,6 +1,6 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -13,7 +13,6 @@
// 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 restapi Rekor
diff --git a/pkg/generated/restapi/embedded_spec.go b/pkg/generated/restapi/embedded_spec.go
index ba8c6e3..2b56688 100644
--- a/pkg/generated/restapi/embedded_spec.go
+++ b/pkg/generated/restapi/embedded_spec.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 restapi
diff --git a/pkg/generated/restapi/operations/entries/create_log_entry.go b/pkg/generated/restapi/operations/entries/create_log_entry.go
index 3414cb5..6860514 100644
--- a/pkg/generated/restapi/operations/entries/create_log_entry.go
+++ b/pkg/generated/restapi/operations/entries/create_log_entry.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/restapi/operations/entries/create_log_entry_parameters.go b/pkg/generated/restapi/operations/entries/create_log_entry_parameters.go
index 13e881d..dc624f2 100644
--- a/pkg/generated/restapi/operations/entries/create_log_entry_parameters.go
+++ b/pkg/generated/restapi/operations/entries/create_log_entry_parameters.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/restapi/operations/entries/create_log_entry_responses.go b/pkg/generated/restapi/operations/entries/create_log_entry_responses.go
index 0db0033..ddc2839 100644
--- a/pkg/generated/restapi/operations/entries/create_log_entry_responses.go
+++ b/pkg/generated/restapi/operations/entries/create_log_entry_responses.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/restapi/operations/entries/create_log_entry_urlbuilder.go b/pkg/generated/restapi/operations/entries/create_log_entry_urlbuilder.go
index 03c1d43..116f611 100644
--- a/pkg/generated/restapi/operations/entries/create_log_entry_urlbuilder.go
+++ b/pkg/generated/restapi/operations/entries/create_log_entry_urlbuilder.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/restapi/operations/entries/get_log_entry_by_index.go b/pkg/generated/restapi/operations/entries/get_log_entry_by_index.go
index 281f612..a27e5f6 100644
--- a/pkg/generated/restapi/operations/entries/get_log_entry_by_index.go
+++ b/pkg/generated/restapi/operations/entries/get_log_entry_by_index.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/restapi/operations/entries/get_log_entry_by_index_parameters.go b/pkg/generated/restapi/operations/entries/get_log_entry_by_index_parameters.go
index 6927e21..cbbb828 100644
--- a/pkg/generated/restapi/operations/entries/get_log_entry_by_index_parameters.go
+++ b/pkg/generated/restapi/operations/entries/get_log_entry_by_index_parameters.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/restapi/operations/entries/get_log_entry_by_index_responses.go b/pkg/generated/restapi/operations/entries/get_log_entry_by_index_responses.go
index 130c36b..3b14b1a 100644
--- a/pkg/generated/restapi/operations/entries/get_log_entry_by_index_responses.go
+++ b/pkg/generated/restapi/operations/entries/get_log_entry_by_index_responses.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/restapi/operations/entries/get_log_entry_by_index_urlbuilder.go b/pkg/generated/restapi/operations/entries/get_log_entry_by_index_urlbuilder.go
index 3249dd7..44ad564 100644
--- a/pkg/generated/restapi/operations/entries/get_log_entry_by_index_urlbuilder.go
+++ b/pkg/generated/restapi/operations/entries/get_log_entry_by_index_urlbuilder.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid.go b/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid.go
index 7231d60..ea40f90 100644
--- a/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid.go
+++ b/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_parameters.go b/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_parameters.go
index d6f8951..e97d938 100644
--- a/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_parameters.go
+++ b/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_parameters.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_responses.go b/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_responses.go
index be38342..ccabfba 100644
--- a/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_responses.go
+++ b/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_responses.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_urlbuilder.go b/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_urlbuilder.go
index 35c633e..2aaaea7 100644
--- a/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_urlbuilder.go
+++ b/pkg/generated/restapi/operations/entries/get_log_entry_by_uuid_urlbuilder.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/restapi/operations/entries/search_log_query.go b/pkg/generated/restapi/operations/entries/search_log_query.go
index 0fe6017..098e225 100644
--- a/pkg/generated/restapi/operations/entries/search_log_query.go
+++ b/pkg/generated/restapi/operations/entries/search_log_query.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/restapi/operations/entries/search_log_query_parameters.go b/pkg/generated/restapi/operations/entries/search_log_query_parameters.go
index cb354ad..2812649 100644
--- a/pkg/generated/restapi/operations/entries/search_log_query_parameters.go
+++ b/pkg/generated/restapi/operations/entries/search_log_query_parameters.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/restapi/operations/entries/search_log_query_responses.go b/pkg/generated/restapi/operations/entries/search_log_query_responses.go
index 2fcc9f6..3694ef3 100644
--- a/pkg/generated/restapi/operations/entries/search_log_query_responses.go
+++ b/pkg/generated/restapi/operations/entries/search_log_query_responses.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/restapi/operations/entries/search_log_query_urlbuilder.go b/pkg/generated/restapi/operations/entries/search_log_query_urlbuilder.go
index 13b318f..aa62f60 100644
--- a/pkg/generated/restapi/operations/entries/search_log_query_urlbuilder.go
+++ b/pkg/generated/restapi/operations/entries/search_log_query_urlbuilder.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 entries
diff --git a/pkg/generated/restapi/operations/index/search_index.go b/pkg/generated/restapi/operations/index/search_index.go
index 4eb6e8a..5848525 100644
--- a/pkg/generated/restapi/operations/index/search_index.go
+++ b/pkg/generated/restapi/operations/index/search_index.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 index
diff --git a/pkg/generated/restapi/operations/index/search_index_parameters.go b/pkg/generated/restapi/operations/index/search_index_parameters.go
index 6ff766e..596cec3 100644
--- a/pkg/generated/restapi/operations/index/search_index_parameters.go
+++ b/pkg/generated/restapi/operations/index/search_index_parameters.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 index
diff --git a/pkg/generated/restapi/operations/index/search_index_responses.go b/pkg/generated/restapi/operations/index/search_index_responses.go
index 626f2a9..4a16012 100644
--- a/pkg/generated/restapi/operations/index/search_index_responses.go
+++ b/pkg/generated/restapi/operations/index/search_index_responses.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 index
diff --git a/pkg/generated/restapi/operations/index/search_index_urlbuilder.go b/pkg/generated/restapi/operations/index/search_index_urlbuilder.go
index 419e816..22462c3 100644
--- a/pkg/generated/restapi/operations/index/search_index_urlbuilder.go
+++ b/pkg/generated/restapi/operations/index/search_index_urlbuilder.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 index
diff --git a/pkg/generated/restapi/operations/rekor_server_api.go b/pkg/generated/restapi/operations/rekor_server_api.go
index 1fa5336..b190e89 100644
--- a/pkg/generated/restapi/operations/rekor_server_api.go
+++ b/pkg/generated/restapi/operations/rekor_server_api.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 operations
diff --git a/pkg/generated/restapi/operations/tlog/get_log_info.go b/pkg/generated/restapi/operations/tlog/get_log_info.go
index 93a9164..2c7ccbc 100644
--- a/pkg/generated/restapi/operations/tlog/get_log_info.go
+++ b/pkg/generated/restapi/operations/tlog/get_log_info.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 tlog
diff --git a/pkg/generated/restapi/operations/tlog/get_log_info_parameters.go b/pkg/generated/restapi/operations/tlog/get_log_info_parameters.go
index 4897136..f6b7e15 100644
--- a/pkg/generated/restapi/operations/tlog/get_log_info_parameters.go
+++ b/pkg/generated/restapi/operations/tlog/get_log_info_parameters.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 tlog
diff --git a/pkg/generated/restapi/operations/tlog/get_log_info_responses.go b/pkg/generated/restapi/operations/tlog/get_log_info_responses.go
index f88529c..94efef2 100644
--- a/pkg/generated/restapi/operations/tlog/get_log_info_responses.go
+++ b/pkg/generated/restapi/operations/tlog/get_log_info_responses.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 tlog
diff --git a/pkg/generated/restapi/operations/tlog/get_log_info_urlbuilder.go b/pkg/generated/restapi/operations/tlog/get_log_info_urlbuilder.go
index 6111b05..e344fac 100644
--- a/pkg/generated/restapi/operations/tlog/get_log_info_urlbuilder.go
+++ b/pkg/generated/restapi/operations/tlog/get_log_info_urlbuilder.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 tlog
diff --git a/pkg/generated/restapi/operations/tlog/get_log_proof.go b/pkg/generated/restapi/operations/tlog/get_log_proof.go
index 3f305f7..c05f211 100644
--- a/pkg/generated/restapi/operations/tlog/get_log_proof.go
+++ b/pkg/generated/restapi/operations/tlog/get_log_proof.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 tlog
diff --git a/pkg/generated/restapi/operations/tlog/get_log_proof_parameters.go b/pkg/generated/restapi/operations/tlog/get_log_proof_parameters.go
index de4ce16..06a21d6 100644
--- a/pkg/generated/restapi/operations/tlog/get_log_proof_parameters.go
+++ b/pkg/generated/restapi/operations/tlog/get_log_proof_parameters.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 tlog
diff --git a/pkg/generated/restapi/operations/tlog/get_log_proof_responses.go b/pkg/generated/restapi/operations/tlog/get_log_proof_responses.go
index a01f9f6..7f842ad 100644
--- a/pkg/generated/restapi/operations/tlog/get_log_proof_responses.go
+++ b/pkg/generated/restapi/operations/tlog/get_log_proof_responses.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 tlog
diff --git a/pkg/generated/restapi/operations/tlog/get_log_proof_urlbuilder.go b/pkg/generated/restapi/operations/tlog/get_log_proof_urlbuilder.go
index 6087d45..44ee141 100644
--- a/pkg/generated/restapi/operations/tlog/get_log_proof_urlbuilder.go
+++ b/pkg/generated/restapi/operations/tlog/get_log_proof_urlbuilder.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 tlog
diff --git a/pkg/generated/restapi/operations/tlog/get_public_key.go b/pkg/generated/restapi/operations/tlog/get_public_key.go
index 5aaf8a2..82a1fd2 100644
--- a/pkg/generated/restapi/operations/tlog/get_public_key.go
+++ b/pkg/generated/restapi/operations/tlog/get_public_key.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 tlog
diff --git a/pkg/generated/restapi/operations/tlog/get_public_key_parameters.go b/pkg/generated/restapi/operations/tlog/get_public_key_parameters.go
index 6901f93..67ccd23 100644
--- a/pkg/generated/restapi/operations/tlog/get_public_key_parameters.go
+++ b/pkg/generated/restapi/operations/tlog/get_public_key_parameters.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 tlog
diff --git a/pkg/generated/restapi/operations/tlog/get_public_key_responses.go b/pkg/generated/restapi/operations/tlog/get_public_key_responses.go
index 6f978ad..a7f86b1 100644
--- a/pkg/generated/restapi/operations/tlog/get_public_key_responses.go
+++ b/pkg/generated/restapi/operations/tlog/get_public_key_responses.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 tlog
diff --git a/pkg/generated/restapi/operations/tlog/get_public_key_urlbuilder.go b/pkg/generated/restapi/operations/tlog/get_public_key_urlbuilder.go
index cb9d62c..fcc754d 100644
--- a/pkg/generated/restapi/operations/tlog/get_public_key_urlbuilder.go
+++ b/pkg/generated/restapi/operations/tlog/get_public_key_urlbuilder.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 tlog
diff --git a/pkg/generated/restapi/server.go b/pkg/generated/restapi/server.go
index 283a266..fdd6d04 100644
--- a/pkg/generated/restapi/server.go
+++ b/pkg/generated/restapi/server.go
@@ -1,7 +1,7 @@
// Code generated by go-swagger; DO NOT EDIT.
-// /*
-// Copyright The Rekor Authors.
+//
+// Copyright 2021 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.
@@ -14,7 +14,6 @@
// 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 restapi
diff --git a/pkg/log/log.go b/pkg/log/log.go
index e2ec244..ed3c684 100644
--- a/pkg/log/log.go
+++ b/pkg/log/log.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 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 log
import (
@@ -10,7 +25,7 @@ import (
"go.uber.org/zap/zapcore"
)
-// Set the default logger to development mode
+// Logger set the default logger to development mode
var Logger *zap.SugaredLogger
func init() {
diff --git a/pkg/pki/minisign/minisign.go b/pkg/pki/minisign/minisign.go
index e7e1cf3..0f5c71a 100644
--- a/pkg/pki/minisign/minisign.go
+++ b/pkg/pki/minisign/minisign.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
-
-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.
-*/
+//
+// Copyright 2021 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 minisign
@@ -45,7 +44,7 @@ func NewSignature(r io.Reader) (*Signature, error) {
inputString := inputBuffer.String()
signature, err := minisign.DecodeSignature(inputString)
if err != nil {
- //try to parse as signify
+ // try to parse as signify
lines := strings.Split(strings.TrimRight(inputString, "\n"), "\n")
if len(lines) != 2 {
return nil, fmt.Errorf("invalid signature provided: %v lines detected", len(lines))
@@ -61,6 +60,7 @@ func NewSignature(r io.Reader) (*Signature, error) {
copy(signature.KeyId[:], sigBytes[2:10])
copy(signature.Signature[:], sigBytes[10:])
}
+
s.signature = &signature
return &s, nil
}
@@ -128,12 +128,13 @@ func NewPublicKey(r io.Reader) (*PublicKey, error) {
inputString := inputBuffer.String()
key, err := minisign.DecodePublicKey(inputString)
if err != nil {
- //try as a standalone base64 string
+ // try as a standalone base64 string
key, err = minisign.NewPublicKey(inputString)
if err != nil {
return nil, fmt.Errorf("unable to read minisign public key: %w", err)
}
}
+
k.key = &key
return &k, nil
}
diff --git a/pkg/pki/minisign/minisign_test.go b/pkg/pki/minisign/minisign_test.go
index 300e5c1..f7aecd9 100644
--- a/pkg/pki/minisign/minisign_test.go
+++ b/pkg/pki/minisign/minisign_test.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
-
-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.
-*/
+//
+// Copyright 2021 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 minisign
diff --git a/pkg/pki/pgp/pgp.go b/pkg/pki/pgp/pgp.go
index b28c168..e645f1e 100644
--- a/pkg/pki/pgp/pgp.go
+++ b/pkg/pki/pgp/pgp.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
-
-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.
-*/
+//
+// Copyright 2021 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 pgp
@@ -25,10 +24,9 @@ import (
"io"
"net/http"
+ "golang.org/x/crypto/openpgp"
"golang.org/x/crypto/openpgp/armor"
"golang.org/x/crypto/openpgp/packet"
-
- "golang.org/x/crypto/openpgp"
)
// Signature Signature that follows the PGP standard; supports both armored & binary detached signatures
diff --git a/pkg/pki/pgp/pgp_test.go b/pkg/pki/pgp/pgp_test.go
index 5ad0d2c..b534ac2 100644
--- a/pkg/pki/pgp/pgp_test.go
+++ b/pkg/pki/pgp/pgp_test.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
-
-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.
-*/
+//
+// Copyright 2021 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 pgp
diff --git a/pkg/pki/pki.go b/pkg/pki/pki.go
index 1b273f6..c53116d 100644
--- a/pkg/pki/pki.go
+++ b/pkg/pki/pki.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
-
-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.
-*/
+//
+// Copyright 2021 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 pki
@@ -22,10 +21,9 @@ import (
"strings"
"github.com/sigstore/rekor/pkg/pki/minisign"
+ "github.com/sigstore/rekor/pkg/pki/pgp"
"github.com/sigstore/rekor/pkg/pki/ssh"
"github.com/sigstore/rekor/pkg/pki/x509"
-
- "github.com/sigstore/rekor/pkg/pki/pgp"
)
// PublicKey Generic object representing a public key (regardless of format & algorithm)
diff --git a/pkg/pki/pki_test.go b/pkg/pki/pki_test.go
index f3d7c36..0454a3e 100644
--- a/pkg/pki/pki_test.go
+++ b/pkg/pki/pki_test.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
-
-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.
-*/
+//
+// Copyright 2021 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 pki
diff --git a/pkg/pki/ssh/encode.go b/pkg/pki/ssh/encode.go
index 05ceac4..a048f09 100644
--- a/pkg/pki/ssh/encode.go
+++ b/pkg/pki/ssh/encode.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 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 ssh
import (
@@ -21,7 +36,8 @@ func Armor(s *ssh.Signature, p ssh.PublicKey) []byte {
HashAlgorithm: defaultHashAlgorithm,
Signature: string(ssh.Marshal(s)),
}
- copy(sig.MagicHeader[:], []byte(magicHeader))
+
+ copy(sig.MagicHeader[:], magicHeader)
enc := pem.EncodeToMemory(&pem.Block{
Type: pemType,
diff --git a/pkg/pki/ssh/sign.go b/pkg/pki/ssh/sign.go
index 20a461f..3bf2be8 100644
--- a/pkg/pki/ssh/sign.go
+++ b/pkg/pki/ssh/sign.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 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 ssh
import (
diff --git a/pkg/pki/ssh/sign_test.go b/pkg/pki/ssh/sign_test.go
index cb0fb8f..eb7027a 100644
--- a/pkg/pki/ssh/sign_test.go
+++ b/pkg/pki/ssh/sign_test.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 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 ssh
import (
@@ -53,7 +68,7 @@ gAATvvPoylyYUAAAAOdGVzdEByZWtvci5kZXYBAgMEBQ==
sshPublicKey = `ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDXofkiahE7uavjWvxnwkUF27qMgz7pdTwzSv0XzVG6EtirOv3PDWct4YKoXE9c0EqbxnIfYEKwEextdvB7zkgwczdJSHxf/18jQumLn/FuoCmugVSk1H5Qli/qzwBpaTnOk3WuakGuoYUl8ZAokKKgOKLA0aZJ1WRQ2ZCZggA3EkwNZiY17y9Q6HqdgQcH6XN8aAMADNVJdMAJb33hSRJjjsAPTmzBTishP8lYDoGRSsSE7/8XRBCEV5E4I8mI9GElcZwV/1KJx98mpH8QvMzXM1idFcwPRtt1NTAOshwgUU0Fu1x8lU5RQIa6ZKW36qNQLvLxy/BscC7B/mdLptoDs/ot9NimUXZcgCR1a2Q3o7Wi6jIgcgJcyV10Nba81ol4RdN4qPHnVZIzuo+dBkqwG3CMtB4Rj84+Qi+7zyU01hIPreoxQDXaayiGPBUUIiAlW9gsiuRWJzNnu3cvuWDLVfQIkjh7Wug58z+v2NOJ7IMdyERillhzDcvVHaq14+U= test@rekor.dev
`
// Generated with "ssh-keygen -C other-test@rekor.dev -f id_rsa"
- otherSshPrivateKey = `-----BEGIN OPENSSH PRIVATE KEY-----
+ otherSSHPrivateKey = `-----BEGIN OPENSSH PRIVATE KEY-----
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABlwAAAAdzc2gtcn
NhAAAAAwEAAQAAAYEAw/WCSWC9TEvCQOwO+T68EvNa3OSIv1Y0+sT8uSvyjPyEO0+p0t8C
g/zy67vOxiQpU5jN6MItjXAjMmeCm8GKMt6gk+cDoaAev/ZfjuzSL7RayExpmhBleh2X3G
@@ -92,7 +107,7 @@ VxSZNdKrYfM/v9o6sRaDRqSfH1dG8BvkUxPznTAF+JDxBENcKXYECcq9f6dcl1w5IEnNTD
Wry/EKQvgvOUjbAAAAFG90aGVyLXRlc3RAcmVrb3IuZGV2AQIDBAUG
-----END OPENSSH PRIVATE KEY-----
`
- otherSshPublicKey = `ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDD9YJJYL1MS8JA7A75PrwS81rc5Ii/VjT6xPy5K/KM/IQ7T6nS3wKD/PLru87GJClTmM3owi2NcCMyZ4KbwYoy3qCT5wOhoB6/9l+O7NIvtFrITGmaEGV6HZfcYouSRcX0AEU1yGVOpIs5mISMOg2lsW/XopPWwToKpbwOPFdCRCT0krrmEsf4HF5Yw0IQlVoKZrhfThomYLvMkCLnIZ55PRIpWoyiFq8X3Q7peJgUJAe7Bc8/Id+hyqC52ZeejPP7oPprEkpkzBCw2ndYq6Y6OXNafEEIIHWXaM3pFqDxonbbvuIwVdHCNMv/yNoSxbgqTKwN/QaNXb+KpuvSrlvRqsNhu/sKsYFH64fTAbP9miDXHmJkA05uFlQukOstUmJ0QxzbsdcFvs8yw0PLsEZhEHXJzR3TLzenyZSq86VZICvGfVacBk7TikCBOtyWuESHhlc6SfZKfzZ67cOlDyKeSiVjgh+eEh9s4h56ahQ2rW05Sq6GjD0YtEzog2J4csE= other-test@rekor.dev
+ otherSSHPublicKey = `ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDD9YJJYL1MS8JA7A75PrwS81rc5Ii/VjT6xPy5K/KM/IQ7T6nS3wKD/PLru87GJClTmM3owi2NcCMyZ4KbwYoy3qCT5wOhoB6/9l+O7NIvtFrITGmaEGV6HZfcYouSRcX0AEU1yGVOpIs5mISMOg2lsW/XopPWwToKpbwOPFdCRCT0krrmEsf4HF5Yw0IQlVoKZrhfThomYLvMkCLnIZ55PRIpWoyiFq8X3Q7peJgUJAe7Bc8/Id+hyqC52ZeejPP7oPprEkpkzBCw2ndYq6Y6OXNafEEIIHWXaM3pFqDxonbbvuIwVdHCNMv/yNoSxbgqTKwN/QaNXb+KpuvSrlvRqsNhu/sKsYFH64fTAbP9miDXHmJkA05uFlQukOstUmJ0QxzbsdcFvs8yw0PLsEZhEHXJzR3TLzenyZSq86VZICvGfVacBk7TikCBOtyWuESHhlc6SfZKfzZ67cOlDyKeSiVjgh+eEh9s4h56ahQ2rW05Sq6GjD0YtEzog2J4csE= other-test@rekor.dev
`
// Generated with ssh-keygen -C test@rekor.dev -t ed25519 -f id_ed25519
@@ -149,7 +164,7 @@ func TestFromOpenSSH(t *testing.T) {
}
// It should not verify if we check against another public key
- if err := Verify(bytes.NewReader(data), sigBytes, []byte(otherSshPublicKey)); err == nil {
+ if err := Verify(bytes.NewReader(data), sigBytes, []byte(otherSSHPublicKey)); err == nil {
t.Error("expected error with incorrect key")
}
@@ -195,7 +210,7 @@ func TestToOpenSSH(t *testing.T) {
// Create an allowed_signers file with two keys to check against.
allowedSigner := "test@rekor.dev " + tt.pub + "\n"
- allowedSigner += "othertest@rekor.dev " + otherSshPublicKey + "\n"
+ allowedSigner += "othertest@rekor.dev " + otherSSHPublicKey + "\n"
allowedSigners := write(t, []byte(allowedSigner), td, "allowed_signer")
// We use the correct principal here so it should work.
@@ -217,7 +232,7 @@ func TestRoundTrip(t *testing.T) {
data := []byte("my good data to be signed!")
// Create one extra signature for all the tests.
- otherSig, err := Sign(otherSshPrivateKey, bytes.NewReader(data))
+ otherSig, err := Sign(otherSSHPrivateKey, bytes.NewReader(data))
if err != nil {
t.Fatal(err)
}
@@ -256,7 +271,7 @@ func TestRoundTrip(t *testing.T) {
}
// Now check it against the wrong key.
- if err := Verify(bytes.NewReader(data), sig, []byte(otherSshPublicKey)); err == nil {
+ if err := Verify(bytes.NewReader(data), sig, []byte(otherSSHPublicKey)); err == nil {
t.Error("expected error!")
}
@@ -270,7 +285,7 @@ func TestRoundTrip(t *testing.T) {
t.Error("expected error!")
}
// It should work against the correct public key.
- if err := Verify(bytes.NewReader(data), otherSig, []byte(otherSshPublicKey)); err != nil {
+ if err := Verify(bytes.NewReader(data), otherSig, []byte(otherSSHPublicKey)); err != nil {
t.Error(err)
}
})
diff --git a/pkg/pki/ssh/ssh.go b/pkg/pki/ssh/ssh.go
index 2611101..05a4fb1 100644
--- a/pkg/pki/ssh/ssh.go
+++ b/pkg/pki/ssh/ssh.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2021 Dan Lorenc <lorenc.d@gmail.com>
-
-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.
-*/
+//
+// Copyright 2021 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 ssh
diff --git a/pkg/pki/ssh/verify.go b/pkg/pki/ssh/verify.go
index 5e8e48d..3bbc0ef 100644
--- a/pkg/pki/ssh/verify.go
+++ b/pkg/pki/ssh/verify.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 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 ssh
import (
diff --git a/pkg/pki/x509/x509.go b/pkg/pki/x509/x509.go
index 9208c53..bf0db8c 100644
--- a/pkg/pki/x509/x509.go
+++ b/pkg/pki/x509/x509.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2021 Dan Lorenc <lorenc.d@gmail.com>
-
-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.
-*/
+//
+// Copyright 2021 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 x509
diff --git a/pkg/pki/x509/x509_test.go b/pkg/pki/x509/x509_test.go
index e3d9a35..19bf50d 100644
--- a/pkg/pki/x509/x509_test.go
+++ b/pkg/pki/x509/x509_test.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2021 Dan Lorenc <lorenc.d@gmail.com>
-
-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.
-*/
+//
+// Copyright 2021 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 x509
@@ -190,7 +189,7 @@ func TestSignature_VerifyFail(t *testing.T) {
// Make some fake data, and tamper with the signature
data := []byte("hey! this is my test data")
sigBytes := signData(t, data, tt.priv)
- sigBytes[0] = sigBytes[0] - 1
+ sigBytes[0]--
s, err := NewSignature(bytes.NewReader(sigBytes))
if err != nil {
t.Fatal(err)
diff --git a/pkg/types/README.md b/pkg/types/README.md
index 75dcc66..0824065 100644
--- a/pkg/types/README.md
+++ b/pkg/types/README.md
@@ -2,12 +2,12 @@
## Description
-Rekor supports pluggable types (aka different schemas) for entries stored in the transparency log.
+Rekor supports pluggable types (aka different schemas) for entries stored in the transparency log.
### Currently supported types
- Rekord (default type) [schema](rekord/rekord_schema.json)
- - Versions: 0.0.1
+ - Versions: 0.0.1
## Base Schema
diff --git a/pkg/types/rekord/rekord.go b/pkg/types/rekord/rekord.go
index 861e2f5..5baeffc 100644
--- a/pkg/types/rekord/rekord.go
+++ b/pkg/types/rekord/rekord.go
@@ -1,29 +1,29 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 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.
-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 rekord
import (
"errors"
"fmt"
- "github.com/sigstore/rekor/pkg/types"
- "github.com/sigstore/rekor/pkg/util"
-
"github.com/go-openapi/swag"
+
"github.com/sigstore/rekor/pkg/generated/models"
+ "github.com/sigstore/rekor/pkg/types"
+ "github.com/sigstore/rekor/pkg/util"
)
const (
diff --git a/pkg/types/rekord/rekord_test.go b/pkg/types/rekord/rekord_test.go
index 00ca497..777dbf6 100644
--- a/pkg/types/rekord/rekord_test.go
+++ b/pkg/types/rekord/rekord_test.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
-
-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.
-*/
+//
+// Copyright 2021 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 rekord
@@ -22,6 +21,7 @@ import (
"testing"
"github.com/go-openapi/swag"
+
"github.com/sigstore/rekor/pkg/generated/models"
"github.com/sigstore/rekor/pkg/types"
)
diff --git a/pkg/types/rekord/v0.0.1/entry.go b/pkg/types/rekord/v0.0.1/entry.go
index 277a331..5c23f8a 100644
--- a/pkg/types/rekord/v0.0.1/entry.go
+++ b/pkg/types/rekord/v0.0.1/entry.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 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.
-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 rekord
import (
@@ -27,21 +27,18 @@ import (
"reflect"
"strings"
- "github.com/sigstore/rekor/pkg/log"
- "github.com/sigstore/rekor/pkg/types"
- "github.com/sigstore/rekor/pkg/util"
-
"github.com/asaskevich/govalidator"
-
"github.com/go-openapi/strfmt"
-
- "github.com/sigstore/rekor/pkg/pki"
- "github.com/sigstore/rekor/pkg/types/rekord"
-
"github.com/go-openapi/swag"
"github.com/mitchellh/mapstructure"
- "github.com/sigstore/rekor/pkg/generated/models"
"golang.org/x/sync/errgroup"
+
+ "github.com/sigstore/rekor/pkg/generated/models"
+ "github.com/sigstore/rekor/pkg/log"
+ "github.com/sigstore/rekor/pkg/pki"
+ "github.com/sigstore/rekor/pkg/types"
+ "github.com/sigstore/rekor/pkg/types/rekord"
+ "github.com/sigstore/rekor/pkg/util"
)
const (
@@ -370,7 +367,7 @@ func (v *V001Entry) Canonicalize(ctx context.Context) ([]byte, error) {
return bytes, nil
}
-//Validate performs cross-field validation for fields in object
+// Validate performs cross-field validation for fields in object
func (v V001Entry) Validate() error {
sig := v.RekordObj.Signature
diff --git a/pkg/types/rekord/v0.0.1/entry_test.go b/pkg/types/rekord/v0.0.1/entry_test.go
index 2c669a9..b9eaa1f 100644
--- a/pkg/types/rekord/v0.0.1/entry_test.go
+++ b/pkg/types/rekord/v0.0.1/entry_test.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
-
-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.
-*/
+//
+// Copyright 2021 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 rekord
@@ -29,8 +28,9 @@ import (
"github.com/go-openapi/strfmt"
"github.com/go-openapi/swag"
- "github.com/sigstore/rekor/pkg/generated/models"
"go.uber.org/goleak"
+
+ "github.com/sigstore/rekor/pkg/generated/models"
)
func TestMain(m *testing.M) {
diff --git a/pkg/types/rpm/rpm.go b/pkg/types/rpm/rpm.go
index 570bc4d..e6a729a 100644
--- a/pkg/types/rpm/rpm.go
+++ b/pkg/types/rpm/rpm.go
@@ -1,29 +1,29 @@
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 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.
-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 rpm
import (
"errors"
"fmt"
- "github.com/sigstore/rekor/pkg/types"
- "github.com/sigstore/rekor/pkg/util"
-
"github.com/go-openapi/swag"
+
"github.com/sigstore/rekor/pkg/generated/models"
+ "github.com/sigstore/rekor/pkg/types"
+ "github.com/sigstore/rekor/pkg/util"
)
const (
diff --git a/pkg/types/rpm/rpm_test.go b/pkg/types/rpm/rpm_test.go
index 78bc425..d553c7d 100644
--- a/pkg/types/rpm/rpm_test.go
+++ b/pkg/types/rpm/rpm_test.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
-
-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.
-*/
+//
+// Copyright 2021 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 rpm
@@ -22,6 +21,7 @@ import (
"testing"
"github.com/go-openapi/swag"
+
"github.com/sigstore/rekor/pkg/generated/models"
"github.com/sigstore/rekor/pkg/types"
)
diff --git a/pkg/types/rpm/v0.0.1/entry.go b/pkg/types/rpm/v0.0.1/entry.go
index 62024dc..f2cc03d 100644
--- a/pkg/types/rpm/v0.0.1/entry.go
+++ b/pkg/types/rpm/v0.0.1/entry.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 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.
-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 rpm
import (
@@ -29,23 +29,20 @@ import (
"strconv"
"strings"
- "github.com/sigstore/rekor/pkg/log"
- "github.com/sigstore/rekor/pkg/pki/pgp"
- "github.com/sigstore/rekor/pkg/types"
- "github.com/sigstore/rekor/pkg/types/rpm"
- "github.com/sigstore/rekor/pkg/util"
-
"github.com/asaskevich/govalidator"
-
- "github.com/go-openapi/strfmt"
-
- "github.com/sigstore/rekor/pkg/pki"
-
rpmutils "github.com/cavaliercoder/go-rpm"
+ "github.com/go-openapi/strfmt"
"github.com/go-openapi/swag"
"github.com/mitchellh/mapstructure"
- "github.com/sigstore/rekor/pkg/generated/models"
"golang.org/x/sync/errgroup"
+
+ "github.com/sigstore/rekor/pkg/generated/models"
+ "github.com/sigstore/rekor/pkg/log"
+ "github.com/sigstore/rekor/pkg/pki"
+ "github.com/sigstore/rekor/pkg/pki/pgp"
+ "github.com/sigstore/rekor/pkg/types"
+ "github.com/sigstore/rekor/pkg/types/rpm"
+ "github.com/sigstore/rekor/pkg/util"
)
const (
@@ -271,7 +268,7 @@ func (v *V001Entry) FetchExternalEntities(ctx context.Context) error {
if err != nil {
return closePipesOnError(err)
}
- //ReadPackageFile does not drain the entire reader so we need to discard the rest
+ // ReadPackageFile does not drain the entire reader so we need to discard the rest
if _, err = io.Copy(ioutil.Discard, rpmR); err != nil {
return closePipesOnError(err)
}
@@ -359,7 +356,7 @@ func (v *V001Entry) Canonicalize(ctx context.Context) ([]byte, error) {
return bytes, nil
}
-//Validate performs cross-field validation for fields in object
+// Validate performs cross-field validation for fields in object
func (v V001Entry) Validate() error {
key := v.RPMModel.PublicKey
if key == nil {
diff --git a/pkg/types/rpm/v0.0.1/entry_test.go b/pkg/types/rpm/v0.0.1/entry_test.go
index ac2a405..865e677 100644
--- a/pkg/types/rpm/v0.0.1/entry_test.go
+++ b/pkg/types/rpm/v0.0.1/entry_test.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
-
-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.
-*/
+//
+// Copyright 2021 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 rpm
@@ -29,8 +28,9 @@ import (
"github.com/go-openapi/strfmt"
"github.com/go-openapi/swag"
- "github.com/sigstore/rekor/pkg/generated/models"
"go.uber.org/goleak"
+
+ "github.com/sigstore/rekor/pkg/generated/models"
)
func TestMain(m *testing.M) {
diff --git a/pkg/types/types.go b/pkg/types/types.go
index 589fad9..206c817 100644
--- a/pkg/types/types.go
+++ b/pkg/types/types.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
-
-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.
-*/
+//
+// Copyright 2021 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 types
diff --git a/pkg/types/types_test.go b/pkg/types/types_test.go
index a59c0ec..5a7299e 100644
--- a/pkg/types/types_test.go
+++ b/pkg/types/types_test.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
-
-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.
-*/
+//
+// Copyright 2021 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 types
@@ -22,8 +21,9 @@ import (
"testing"
"github.com/go-openapi/strfmt"
- "github.com/sigstore/rekor/pkg/generated/models"
"go.uber.org/goleak"
+
+ "github.com/sigstore/rekor/pkg/generated/models"
)
func TestMain(m *testing.M) {
diff --git a/pkg/util/fetch.go b/pkg/util/fetch.go
index b1862a6..e9c95bb 100644
--- a/pkg/util/fetch.go
+++ b/pkg/util/fetch.go
@@ -1,18 +1,18 @@
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 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.
-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 util
import (
diff --git a/pkg/util/types.go b/pkg/util/types.go
index cf61162..7ff76af 100644
--- a/pkg/util/types.go
+++ b/pkg/util/types.go
@@ -1,24 +1,25 @@
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 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.
-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 util
import (
"sync"
"github.com/blang/semver"
+
"github.com/sigstore/rekor/pkg/log"
"github.com/sigstore/rekor/pkg/types"
)
@@ -41,7 +42,7 @@ func (vfm *VersionFactoryMap) Get(version string) (VersionFactory, bool) {
return nil, false
}
- //will return first function that matches
+ // will return first function that matches
for k, v := range vfm.VersionFactories {
semverRange, err := semver.ParseRange(k)
if err != nil {
diff --git a/pkg/util/yaml.go b/pkg/util/yaml.go
index 1396122..c3df27a 100644
--- a/pkg/util/yaml.go
+++ b/pkg/util/yaml.go
@@ -1,18 +1,17 @@
-/*
-Copyright © 2020 Bob Callaway <bcallawa@redhat.com>
-
-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.
-*/
+//
+// Copyright 2021 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 util
@@ -22,7 +21,6 @@ import (
"io/ioutil"
"github.com/ghodss/yaml"
-
"github.com/go-openapi/runtime"
)
diff --git a/rekor-server.yaml b/rekor-server.yaml
index 4358973..6c2bb3e 100644
--- a/rekor-server.yaml
+++ b/rekor-server.yaml
@@ -1,3 +1,18 @@
+#
+# Copyright 2021 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.
+
trillian_log_server:
address: "127.0.0.1"
port: 8091
@@ -5,4 +20,3 @@ trillian_log_server:
rekor_server:
address: "127.0.0.1"
port: 3000
-
diff --git a/scripts/createdb.sh b/scripts/createdb.sh
index d69bd78..487a9c8 100755
--- a/scripts/createdb.sh
+++ b/scripts/createdb.sh
@@ -1,4 +1,19 @@
#!/bin/bash
+#
+# Copyright 2021 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.
+
DB="test"
USER="test"
diff --git a/scripts/storage.sql b/scripts/storage.sql
index ca45417..eb77b6f 100644
--- a/scripts/storage.sql
+++ b/scripts/storage.sql
@@ -1,3 +1,18 @@
+--
+-- Copyright 2021 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.
+
# MySQL / MariaDB version of the tree schema
-- ---------------------------------------------
diff --git a/tests/e2e-test.sh b/tests/e2e-test.sh
index ec53f6b..2e8938a 100755
--- a/tests/e2e-test.sh
+++ b/tests/e2e-test.sh
@@ -1,4 +1,19 @@
#!/bin/bash
+#
+# Copyright 2021 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.
+
set -e
testdir=$(dirname "$0")
diff --git a/tests/e2e_test.go b/tests/e2e_test.go
index e15ccfd..ee2c5f9 100644
--- a/tests/e2e_test.go
+++ b/tests/e2e_test.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 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.
+
// +build e2e
package e2e
diff --git a/tests/pgp.go b/tests/pgp.go
index d40a350..c05a763 100644
--- a/tests/pgp.go
+++ b/tests/pgp.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 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.
+
// +build e2e
package e2e
diff --git a/tests/rpm.go b/tests/rpm.go
index 40217bb..5df862a 100644
--- a/tests/rpm.go
+++ b/tests/rpm.go
@@ -1,20 +1,20 @@
// +build e2e
-/*
-Copyright © 2021 Bob Callaway <bcallawa@redhat.com>
+//
+// Copyright 2021 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.
-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 e2e
import (
diff --git a/tests/ssh.go b/tests/ssh.go
index 110a4ae..9502301 100644
--- a/tests/ssh.go
+++ b/tests/ssh.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 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.
+
// +build e2e
package e2e
diff --git a/tests/util.go b/tests/util.go
index 6c5c049..09697b8 100644
--- a/tests/util.go
+++ b/tests/util.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 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.
+
// +build e2e
package e2e
diff --git a/tests/x509.go b/tests/x509.go
index 6321b60..6b2aa97 100644
--- a/tests/x509.go
+++ b/tests/x509.go
@@ -1,3 +1,18 @@
+//
+// Copyright 2021 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.
+
// +build e2e
package e2e
--
GitLab