forked from goharbor/harbor
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update swagger API to display SBOM content in addition API
complete task goharbor#20066 Signed-off-by: stonezdj <daojunz@vmware.com>
- Loading branch information
stonezdj
committed
Apr 10, 2024
1 parent
dd76fe4
commit a003aee
Showing
4 changed files
with
257 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,89 @@ | ||
// Copyright Project Harbor 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 sbom | ||
|
||
import ( | ||
"context" | ||
"encoding/json" | ||
"io" | ||
|
||
v1 "github.com/opencontainers/image-spec/specs-go/v1" | ||
|
||
"github.com/goharbor/harbor/src/controller/artifact/processor" | ||
"github.com/goharbor/harbor/src/controller/artifact/processor/base" | ||
"github.com/goharbor/harbor/src/lib/errors" | ||
"github.com/goharbor/harbor/src/lib/log" | ||
"github.com/goharbor/harbor/src/pkg/artifact" | ||
) | ||
|
||
const ( | ||
// processorArtifactTypeSBOM is the artifact type for SBOM, it's scope is only used in the processor | ||
processorArtifactTypeSBOM = "SBOM" | ||
// processorMediaType is the media type for SBOM, it's scope is only used to register the processor | ||
processorMediaType = "application/vnd.goharbor.harbor.sbom.v1" | ||
) | ||
|
||
func init() { | ||
pc := &Processor{} | ||
pc.ManifestProcessor = base.NewManifestProcessor() | ||
if err := processor.Register(pc, processorMediaType); err != nil { | ||
log.Errorf("failed to register processor for media type %s: %v", processorMediaType, err) | ||
return | ||
} | ||
} | ||
|
||
// Processor is the processor for SBOM | ||
type Processor struct { | ||
*base.ManifestProcessor | ||
} | ||
|
||
// AbstractAddition returns the addition for SBOM | ||
func (m *Processor) AbstractAddition(_ context.Context, art *artifact.Artifact, _ string) (*processor.Addition, error) { | ||
man, _, err := m.RegCli.PullManifest(art.RepositoryName, art.Digest) | ||
if err != nil { | ||
return nil, errors.Wrap(err, "failed to pull manifest") | ||
} | ||
_, payload, err := man.Payload() | ||
if err != nil { | ||
return nil, errors.Wrap(err, "failed to get payload") | ||
} | ||
manifest := &v1.Manifest{} | ||
if err := json.Unmarshal(payload, manifest); err != nil { | ||
return nil, err | ||
} | ||
// SBOM artifact should only have one layer | ||
if len(manifest.Layers) != 1 { | ||
return nil, errors.New(nil).WithCode(errors.NotFoundCode).WithMessage("The sbom is not found") | ||
} | ||
layerDgst := manifest.Layers[0].Digest.String() | ||
_, blob, err := m.RegCli.PullBlob(art.RepositoryName, layerDgst) | ||
if err != nil { | ||
return nil, errors.Wrap(err, "failed to pull the blob") | ||
} | ||
defer blob.Close() | ||
content, err := io.ReadAll(blob) | ||
if err != nil { | ||
return nil, err | ||
} | ||
return &processor.Addition{ | ||
Content: content, | ||
ContentType: processorMediaType, | ||
}, nil | ||
} | ||
|
||
// GetArtifactType the artifact type is used to display the artifact type in the UI | ||
func (m *Processor) GetArtifactType(_ context.Context, _ *artifact.Artifact) string { | ||
return processorArtifactTypeSBOM | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,166 @@ | ||
// Copyright Project Harbor 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 sbom | ||
|
||
import ( | ||
"context" | ||
"fmt" | ||
"io" | ||
"strings" | ||
"testing" | ||
|
||
"github.com/docker/distribution" | ||
v1 "github.com/opencontainers/image-spec/specs-go/v1" | ||
"github.com/stretchr/testify/mock" | ||
"github.com/stretchr/testify/suite" | ||
|
||
"github.com/goharbor/harbor/src/controller/artifact/processor/base" | ||
"github.com/goharbor/harbor/src/lib/errors" | ||
"github.com/goharbor/harbor/src/pkg/artifact" | ||
"github.com/goharbor/harbor/src/testing/pkg/registry" | ||
) | ||
|
||
type SBOMProcessorTestSuite struct { | ||
suite.Suite | ||
processor *Processor | ||
regCli *registry.Client | ||
} | ||
|
||
func (suite *SBOMProcessorTestSuite) SetupSuite() { | ||
suite.regCli = ®istry.Client{} | ||
suite.processor = &Processor{ | ||
&base.ManifestProcessor{ | ||
RegCli: suite.regCli, | ||
}, | ||
} | ||
} | ||
|
||
func (suite *SBOMProcessorTestSuite) TearDownSuite() { | ||
} | ||
|
||
func (suite *SBOMProcessorTestSuite) TestAbstractAdditionNormal() { | ||
manContent := `{ | ||
"schemaVersion": 2, | ||
"config": { | ||
"mediaType": "application/vnd.oci.image.config.v1+json", | ||
"digest": "sha256:e91b9dfcbbb3b88bac94726f276b89de46e4460b55f6e6d6f876e666b150ec5b", | ||
"size": 498 | ||
}, | ||
"layers": [ | ||
{ | ||
"mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip", | ||
"size": 32654, | ||
"digest": "sha256:abc" | ||
}] | ||
}` | ||
sbomContent := "this is a sbom content" | ||
reader := strings.NewReader(sbomContent) | ||
blobReader := io.NopCloser(reader) | ||
mani, _, err := distribution.UnmarshalManifest(v1.MediaTypeImageManifest, []byte(manContent)) | ||
suite.Require().NoError(err) | ||
suite.regCli.On("PullManifest", mock.Anything, mock.Anything).Return(mani, "sha256:123", nil).Once() | ||
suite.regCli.On("PullBlob", mock.Anything, mock.Anything).Return(int64(123), blobReader, nil).Once() | ||
addition, err := suite.processor.AbstractAddition(context.Background(), &artifact.Artifact{RepositoryName: "repo", Digest: "digest"}, "sbom") | ||
suite.Nil(err) | ||
suite.Equal(sbomContent, string(addition.Content)) | ||
} | ||
|
||
func (suite *SBOMProcessorTestSuite) TestAbstractAdditionMultiLayer() { | ||
manContent := `{ | ||
"schemaVersion": 2, | ||
"config": { | ||
"mediaType": "application/vnd.oci.image.config.v1+json", | ||
"digest": "sha256:e91b9dfcbbb3b88bac94726f276b89de46e4460b55f6e6d6f876e666b150ec5b", | ||
"size": 498 | ||
}, | ||
"layers": [ | ||
{ | ||
"mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip", | ||
"size": 32654, | ||
"digest": "sha256:abc" | ||
}, | ||
{ | ||
"mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip", | ||
"size": 843, | ||
"digest": "sha256:def" | ||
}, | ||
{ | ||
"mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip", | ||
"size": 531, | ||
"digest": "sha256:123" | ||
} | ||
] | ||
}` | ||
mani, _, err := distribution.UnmarshalManifest(v1.MediaTypeImageManifest, []byte(manContent)) | ||
suite.Require().NoError(err) | ||
suite.regCli.On("PullManifest", mock.Anything, mock.Anything).Return(mani, "sha256:123", nil).Once() | ||
_, err = suite.processor.AbstractAddition(context.Background(), &artifact.Artifact{RepositoryName: "repo", Digest: "digest"}, "sbom") | ||
suite.NotNil(err) | ||
} | ||
|
||
func (suite *SBOMProcessorTestSuite) TestAbstractAdditionPullBlobError() { | ||
manContent := `{ | ||
"schemaVersion": 2, | ||
"config": { | ||
"mediaType": "application/vnd.oci.image.config.v1+json", | ||
"digest": "sha256:e91b9dfcbbb3b88bac94726f276b89de46e4460b55f6e6d6f876e666b150ec5b", | ||
"size": 498 | ||
}, | ||
"layers": [ | ||
{ | ||
"mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip", | ||
"size": 32654, | ||
"digest": "sha256:abc" | ||
} | ||
] | ||
}` | ||
mani, _, err := distribution.UnmarshalManifest(v1.MediaTypeImageManifest, []byte(manContent)) | ||
suite.Require().NoError(err) | ||
suite.regCli.On("PullManifest", mock.Anything, mock.Anything).Return(mani, "sha256:123", nil).Once() | ||
suite.regCli.On("PullBlob", mock.Anything, mock.Anything).Return(int64(123), nil, errors.NotFoundError(fmt.Errorf("not found"))).Once() | ||
addition, err := suite.processor.AbstractAddition(context.Background(), &artifact.Artifact{RepositoryName: "repo", Digest: "digest"}, "sbom") | ||
suite.NotNil(err) | ||
suite.Nil(addition) | ||
} | ||
func (suite *SBOMProcessorTestSuite) TestAbstractAdditionNoSBOMLayer() { | ||
manContent := `{ | ||
"schemaVersion": 2, | ||
"config": { | ||
"mediaType": "application/vnd.oci.image.config.v1+json", | ||
"digest": "sha256:e91b9dfcbbb3b88bac94726f276b89de46e4460b55f6e6d6f876e666b150ec5b", | ||
"size": 498 | ||
} | ||
}` | ||
mani, _, err := distribution.UnmarshalManifest(v1.MediaTypeImageManifest, []byte(manContent)) | ||
suite.Require().NoError(err) | ||
suite.regCli.On("PullManifest", mock.Anything, mock.Anything).Return(mani, "sha256:123", nil).Once() | ||
_, err = suite.processor.AbstractAddition(context.Background(), &artifact.Artifact{RepositoryName: "repo", Digest: "digest"}, "sbom") | ||
suite.NotNil(err) | ||
} | ||
|
||
func (suite *SBOMProcessorTestSuite) TestAbstractAdditionPullManifestError() { | ||
suite.regCli.On("PullManifest", mock.Anything, mock.Anything).Return(nil, "sha256:123", errors.NotFoundError(fmt.Errorf("not found"))).Once() | ||
_, err := suite.processor.AbstractAddition(context.Background(), &artifact.Artifact{RepositoryName: "repo", Digest: "digest"}, "sbom") | ||
suite.NotNil(err) | ||
|
||
} | ||
|
||
func (suite *SBOMProcessorTestSuite) TestGetArtifactType() { | ||
suite.Equal(processorArtifactTypeSBOM, suite.processor.GetArtifactType(context.Background(), &artifact.Artifact{})) | ||
} | ||
|
||
func TestSBOMProcessorTestSuite(t *testing.T) { | ||
suite.Run(t, &SBOMProcessorTestSuite{}) | ||
} |