Upstream
/
harbor
mirror of https://github.com/goharbor/harbor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into dependabot/go_modules/src/github.com/go-jose/go-jose/v3-3.0.3

This commit is contained in:
Shengwen YU 2024-03-28 17:29:21 +08:00 committed by GitHub
parent c7cee3d918 d58172c112
commit 8b8446e497
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 98 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/controller/scan/base_controller.go
View File

@ -379,7 +379,9 @@ func (bc *basicController) ScanAll(ctx context.Context, trigger string, async bo
}
err = bc.startScanAll(ctx, executionID)
log.Errorf("failed to start scan all, executionID=%d, error: %v", executionID, err)
if err != nil {
log.Errorf("failed to start scan all, executionID=%d, error: %v", executionID, err)
}
}(bc.makeCtx())
} else {
if err := bc.startScanAll(ctx, executionID); err != nil {

2
src/go.mod
View File

@ -52,7 +52,7 @@ require (
github.com/robfig/cron/v3 v3.0.1
github.com/spf13/viper v1.8.1
github.com/stretchr/testify v1.8.4
github.com/tencentcloud/tencentcloud-sdk-go v1.0.62
github.com/tencentcloud/tencentcloud-sdk-go v3.0.233+incompatible
github.com/vmihailenco/msgpack/v5 v5.4.1
github.com/volcengine/volcengine-go-sdk v1.0.97
go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.46.1

4
src/go.sum
View File

@ -611,8 +611,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
github.com/tencentcloud/tencentcloud-sdk-go v1.0.62 h1:Vnr3IqaafEuQUciG6D6EaeLJm26Mg8sjAfbI4OoeauM=
github.com/tencentcloud/tencentcloud-sdk-go v1.0.62/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
github.com/tencentcloud/tencentcloud-sdk-go v3.0.233+incompatible h1:q+D/Y9jla3afgsIihtyhwyl0c2W+eRWNM9ohVwPiiPw=
github.com/tencentcloud/tencentcloud-sdk-go v3.0.233+incompatible/go.mod h1:0PfYow01SHPMhKY31xa+EFz2RStxIqj6JFAJS+IkCi4=
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8=
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=

34
src/portal/package-lock.json generated
View File

@ -53,7 +53,7 @@
"eslint": "^8.41.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^4.2.1",
"express": "^4.17.1",
"express": "^4.19.2",
"https-proxy-agent": "^5.0.1",
"jasmine-core": "~4.5.0",
"jasmine-spec-reporter": "~7.0.0",
@ -6280,13 +6280,13 @@
"dev": true
},
"node_modules/body-parser": {
"version": "1.20.1",
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
"integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
"version": "1.20.2",
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
"integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
"dev": true,
"dependencies": {
"bytes": "3.1.2",
"content-type": "~1.0.4",
"content-type": "~1.0.5",
"debug": "2.6.9",
"depd": "2.0.0",
"destroy": "1.2.0",
@ -6294,7 +6294,7 @@
"iconv-lite": "0.4.24",
"on-finished": "2.4.1",
"qs": "6.11.0",
"raw-body": "2.5.1",
"raw-body": "2.5.2",
"type-is": "~1.6.18",
"unpipe": "1.0.0"
},
@ -7219,9 +7219,9 @@
"integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
},
"node_modules/cookie": {
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
"integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
"integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
"dev": true,
"engines": {
"node": ">= 0.6"
@ -9741,17 +9741,17 @@
"dev": true
},
"node_modules/express": {
"version": "4.18.2",
"resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
"integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
"version": "4.19.2",
"resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
"integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
"dev": true,
"dependencies": {
"accepts": "~1.3.8",
"array-flatten": "1.1.1",
"body-parser": "1.20.1",
"body-parser": "1.20.2",
"content-disposition": "0.5.4",
"content-type": "~1.0.4",
"cookie": "0.5.0",
"cookie": "0.6.0",
"cookie-signature": "1.0.6",
"debug": "2.6.9",
"depd": "2.0.0",
@ -16336,9 +16336,9 @@
}
},
"node_modules/raw-body": {
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
"integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
"version": "2.5.2",
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
"integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
"dev": true,
"dependencies": {
"bytes": "3.1.2",

2
src/portal/package.json
View File

@ -71,7 +71,7 @@
"eslint": "^8.41.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^4.2.1",
"express": "^4.17.1",
"express": "^4.19.2",
"https-proxy-agent": "^5.0.1",
"jasmine-core": "~4.5.0",
"jasmine-spec-reporter": "~7.0.0",

30
src/portal/src/app/base/left-side-nav/interrogation-services/scanner/config-scanner.component.html
View File

@ -139,9 +139,21 @@
<clr-dg-column class="width-240" [clrDgField]="'url'">{{
'SCANNER.ENDPOINT' | translate
}}</clr-dg-column>
<clr-dg-column>{{ 'SCANNER.HEALTH' | translate }}</clr-dg-column>
<clr-dg-column>{{ 'SCANNER.ENABLED' | translate }}</clr-dg-column>
<clr-dg-column>{{ 'SCANNER.AUTH' | translate }}</clr-dg-column>
<clr-dg-column class="width-120">{{
'SCANNER.HEALTH' | translate
}}</clr-dg-column>
<clr-dg-column class="width-120">{{
'SCANNER.ENABLED' | translate
}}</clr-dg-column>
<clr-dg-column class="width-120">{{
'SCANNER.AUTH' | translate
}}</clr-dg-column>
<clr-dg-column class="width-120">{{
'SCANNER.VULNERABILITY' | translate
}}</clr-dg-column>
<clr-dg-column class="width-120">{{
'SCANNER.SBOM' | translate
}}</clr-dg-column>
<clr-dg-column>{{
'SCANNER.DESCRIPTION' | translate
}}</clr-dg-column>
@ -198,6 +210,18 @@
<clr-dg-cell>{{
scanner.auth ? scanner.auth : 'None'
}}</clr-dg-cell>
<clr-dg-cell>{{
(supportCapability(scanner, 'vulnerability')
? 'SCANNER.SUPPORTED'
: 'SCANNER.NOT_SUPPORTED'
) | translate
}}</clr-dg-cell>
<clr-dg-cell>{{
(supportCapability(scanner, 'sbom')
? 'SCANNER.SUPPORTED'
: 'SCANNER.NOT_SUPPORTED'
) | translate
}}</clr-dg-cell>
<clr-dg-cell>{{ scanner.description }}</clr-dg-cell>
<scanner-metadata
*clrIfExpanded

4
src/portal/src/app/base/left-side-nav/interrogation-services/scanner/config-scanner.component.scss
View File

@ -18,6 +18,10 @@
min-width: 240px !important;
}
.width-120 {
min-width: 120px !important;
}
.margin-top-0 {
margin-top: 0;
}

11
src/portal/src/app/base/left-side-nav/interrogation-services/scanner/config-scanner.component.ts
View File

@ -178,6 +178,17 @@ export class ConfigurationScannerComponent implements OnInit, OnDestroy {
addSuccess() {
this.getScanners();
}
supportCapability(scanner: Scanner, capabilityType: string): boolean {
return scanner && scanner.metadata && capabilityType
? (
scanner?.metadata?.capabilities?.filter(
({ type }) => type === capabilityType
) ?? []
).length >= 1
: false;
}
changeStat() {
if (this.selectedRow) {
let scanner: ScannerRegistrationReq = clone(this.selectedRow);

4
src/portal/src/i18n/lang/de-de-lang.json
View File

@ -1433,6 +1433,10 @@
"NAME_REQUIRED": "Name ist erforderlich",
"NAME_REX": "Der Name muss mindestens 2 Zeichen lang sein. Mit Kleinbuchstaben, Ziffern und ._-. Er muss mit Buchstaben oder Ziffern beginnen.",
"DESCRIPTION": "Beschreibung",
"SBOM": "SBOM",
"VULNERABILITY": "Vulnerability",
"SUPPORTED": "Supported",
"NOT_SUPPORTED": "Not Supported",
"ENDPOINT": "Endpunkt",
"ENDPOINT_EXISTS": "URL existiert bereits",
"ENDPOINT_REQUIRED": "URL ist erforderlich",

4
src/portal/src/i18n/lang/en-us-lang.json
View File

@ -1434,6 +1434,10 @@
"NAME_REQUIRED": "Name is required",
"NAME_REX": "Name should be at least 2 characters long with lower case characters, numbers and ._- and must be start with characters or numbers.",
"DESCRIPTION": "Description",
"SBOM": "SBOM",
"VULNERABILITY": "Vulnerability",
"SUPPORTED": "Supported",
"NOT_SUPPORTED": "Not Supported",
"ENDPOINT": "Endpoint",
"ENDPOINT_EXISTS": "EndpointUrl already exists",
"ENDPOINT_REQUIRED": "EndpointUrl is required",

4
src/portal/src/i18n/lang/es-es-lang.json
View File

@ -1430,6 +1430,10 @@
"NAME_REQUIRED": "Name is required",
"NAME_REX": "Name should be at least 2 characters long with lower case characters, numbers and ._- and must be start with characters or numbers.",
"DESCRIPTION": "Description",
"SBOM": "SBOM",
"VULNERABILITY": "Vulnerability",
"SUPPORTED": "Supported",
"NOT_SUPPORTED": "Not Supported",
"ENDPOINT": "Endpoint",
"ENDPOINT_EXISTS": "EndpointUrl already exists",
"ENDPOINT_REQUIRED": "EndpointUrl is required",

4
src/portal/src/i18n/lang/fr-fr-lang.json
View File

@ -1431,6 +1431,10 @@
"NAME_REQUIRED": "Le nom est requis",
"NAME_REX": "Le nom doit comporter au moins 2 caractères avec des minuscules, des chiffres et. _- et doit commencer par des caractères ou des chiffres.",
"DESCRIPTION": "Description",
"SBOM": "SBOM",
"VULNERABILITY": "Vulnerability",
"SUPPORTED": "Supported",
"NOT_SUPPORTED": "Not Supported",
"ENDPOINT": "Endpoint",
"ENDPOINT_EXISTS": "L'URL de l'endpoint existe déjà",
"ENDPOINT_REQUIRED": "L'URL de l'endpoint est requise",

4
src/portal/src/i18n/lang/pt-br-lang.json
View File

@ -1430,6 +1430,10 @@
"NAME_REQUIRED": "Nome é obrigatório",
"NAME_REX": "O nome precisa ter no mínimo 2 caracteres. Pode conter apenas letras minúsculas, numeros, ou símbolos ._- e deve começar por uma letra ou número.",
"DESCRIPTION": "Descrição",
"SBOM": "SBOM",
"VULNERABILITY": "Vulnerability",
"SUPPORTED": "Supported",
"NOT_SUPPORTED": "Not Supported",
"ENDPOINT": "Endereço",
"ENDPOINT_EXISTS": "Endereço já usado por outro examinador",
"ENDPOINT_REQUIRED": "Endereço é obrigatório",

4
src/portal/src/i18n/lang/tr-tr-lang.json
View File

@ -1433,6 +1433,10 @@
"NAME_REQUIRED": "Name is required",
"NAME_REX": "Name should be at least 2 characters long with lower case characters, numbers and ._- and must be start with characters or numbers.",
"DESCRIPTION": "Description",
"SBOM": "SBOM",
"VULNERABILITY": "Vulnerability",
"SUPPORTED": "Supported",
"NOT_SUPPORTED": "Not Supported",
"ENDPOINT": "Endpoint",
"ENDPOINT_EXISTS": "EndpointUrl already exists",
"ENDPOINT_REQUIRED": "EndpointUrl is required",

4
src/portal/src/i18n/lang/zh-cn-lang.json
View File

@ -1429,6 +1429,10 @@
"NAME_REQUIRED": "名称为必填项",
"NAME_REX": "名称由小写字符、数字和._-组成且至少2个字符并以字符或者数字开头。",
"DESCRIPTION": "描述",
"SBOM": "SBOM",
"VULNERABILITY": "Vulnerability",
"SUPPORTED": "Supported",
"NOT_SUPPORTED": "Not Supported",
"ENDPOINT": "地址",
"ENDPOINT_EXISTS": "地址已存在",
"ENDPOINT_REQUIRED": "地址为必填项",

4
src/portal/src/i18n/lang/zh-tw-lang.json
View File

@ -1428,6 +1428,10 @@
"NAME_REQUIRED": "名稱必填",
"NAME_REX": "名稱必須由小寫字母、數字和 ._- 組成，至少2個字元，並且必須以字母或數字開頭。",
"DESCRIPTION": "描述",
"SBOM": "SBOM",
"VULNERABILITY": "Vulnerability",
"SUPPORTED": "Supported",
"NOT_SUPPORTED": "Not Supported",
"ENDPOINT": "端點",
"ENDPOINT_EXISTS": "端點 URL 已存在",
"ENDPOINT_REQUIRED": "端點 URL 必填",