Ziming Zhang
572ebef685
feat(cicd) parameterize docker base image and external url
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2020-04-08 00:21:47 +08:00
Wenkai Yin(尹文开)
e1ba985b7c
Merge pull request #11436 from ywk253100/200404_repo_encode
...
Update APIs to only accept encoded repository name that contains slash
2020-04-07 23:14:44 +08:00
Wenkai Yin(尹文开)
bf6c4ff1f1
Merge pull request #11479 from ywk253100/200407_replication
...
Fix replication bug
2020-04-07 22:41:19 +08:00
Yogi_Wang
3775509ce5
Update APIs to only accept encoded repository name
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2020-04-07 22:40:39 +08:00
Wenkai Yin
2171634000
Fix replication bug
...
Remove the URL replacing logic temporarily to make replication work and will introduce a new solution for the hairpin issue
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2020-04-07 21:27:06 +08:00
Wenkai Yin
7188e01569
Update APIs to only accept encoded repository name that contains slash
...
Update APIs to only accept encoded repository name that contains slash
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2020-04-07 20:57:50 +08:00
Wenkai Yin(尹文开)
42801b76e2
Merge pull request #11382 from ywk253100/200331_security_context
...
Remove "GetMyProjects" and "GetProjectRoles" in the interface "security.Context"
2020-04-07 20:25:26 +08:00
Wenkai Yin
0a372a85eb
Remove "GetMyProjects" and "GetProjectRoles" in the interface "security.Context"
...
Fixes #11125 , remove "GetMyProjects" and "GetProjectRoles" in the interface "security.Context"
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2020-04-07 19:53:38 +08:00
Qian Deng
83f46869d5
Merge pull request #11477 from ninjadq/add_trivy_miss_entrypoint
...
Add missiong entrypoint file for trivy-adapter
2020-04-07 19:39:56 +08:00
DQ
6ae1b1dc97
Add missiong entrypoint file for trivy-adapter
...
Signed-off-by: DQ <dengq@vmware.com>
2020-04-07 10:39:07 +00:00
Qian Deng
1c8d5c6df5
Add spaces ( #11471 )
...
Fix typo of spaces cause failure
Signed-off-by: DQ <dengq@vmware.com>
2020-04-07 17:47:23 +08:00
Steven Zou
0fc7629865
fix[jobservice]:enqueue job with UTC
...
- schedule the periodical jobs following the UTC timezone
- e.g: 5 10 10 * * * means run jobs at UTC time 10:10:05 everyday
- fix issue #11466
Signed-off-by: Steven Zou <szou@vmware.com>
2020-04-07 17:10:19 +08:00
He Weiwei
3f567514b5
Merge pull request #11468 from wy65701436/remove-count-quota-code
...
remove the chart handling in quota
2020-04-07 16:51:07 +08:00
Daniel Jiang
c303dcf617
Remove the registry claim pacakge
...
This commit removes `src/pkg/token/claims/registry` that is not referenced by other
packages.
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2020-04-07 16:43:28 +08:00
Daniel Jiang
5bcd015d6f
Merge pull request #11469 from ninjadq/clean_up_migrator
...
Remove migrator flags in script
2020-04-07 16:37:24 +08:00
Wenkai Yin(尹文开)
88ae9c458c
Update tags related APIs ( #11435 )
...
* Update tags related APIs
1. Remove API for listing tags of repository
2. Add API for listing tags of artifact
3. Support filter artifact by tag name
Signed-off-by: Wenkai Yin <yinw@vmware.com>
* [OCI] modify artifact tag name check
1. switch api get tag list
2. modify artifact tag name check
Signed-off-by: Yogi_Wang <yawang@vmware.com>
Co-authored-by: Yogi_Wang <yawang@vmware.com>
2020-04-07 16:28:51 +08:00
Daniel Jiang
e064bd4c01
Merge pull request #11428 from ninjadq/fix_container_unhealth
...
Fix container unhealth
2020-04-07 15:57:00 +08:00
wang yan
a96d2f3746
remove the chart handling in quota
...
1, remove the chartmuseum controller
2, doesn't handle chartrepo url in v2 middleware
Signed-off-by: wang yan <wangyan@vmware.com>
2020-04-07 15:26:34 +08:00
He Weiwei
dd95866e6a
Merge pull request #11467 from heww/fix-issue-11131
...
fix(scan): dump nil slice of vulnerabilities as empty slice in report
2020-04-07 15:01:17 +08:00
DQ
1ae50b8d66
Remove migrator flags in script
...
Because migrator tool removed
Signed-off-by: DQ <dengq@vmware.com>
2020-04-07 14:57:10 +08:00
Wenkai Yin(尹文开)
5d55bd1d0c
Merge pull request #11463 from ywk253100/200407_copy
...
Update the logic of copy artifact
2020-04-07 14:36:27 +08:00
He Weiwei
e1ab30dadf
fix(scan): dump nil slice of vulnerabilities as empty slice in report
...
Closes #11131
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2020-04-07 06:20:25 +00:00
He Weiwei
8ddfe2d0a5
Merge pull request #11460 from heww/merge-scan-report
...
feat(scan): merge reports for image index
2020-04-07 13:07:52 +08:00
He Weiwei
43df7b2577
Merge pull request #11459 from heww/scan-cleanup
...
refactor: cleanup unused code about scan
2020-04-07 12:00:48 +08:00
DQ
4a836ea975
Fix health check url
...
health check url should depend on internal https
Signed-off-by: DQ <dengq@vmware.com>
2020-04-07 03:35:52 +00:00
Wenkai Yin
9bfabff4d2
Update the logic of copy artifact
...
1. Copy artifact will not return 409 anymore.
2. Make sure the tags of source artifact exist in the target artifact
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2020-04-07 10:55:55 +08:00
He Weiwei
6b066bade5
feat(scan): merge reports for image index
...
1. Merge the scanning reports of referenced artifacts for image index.
2. Add artifact info for report.
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2020-04-07 02:54:01 +00:00
Wenkai Yin(尹文开)
b819e7ae83
Merge pull request #11438 from ywk253100/200402_replication
...
Support replication between Harbor 2.0 and 1.x
2020-04-07 10:24:59 +08:00
Daniel Jiang
db10720e80
Merge pull request #11406 from reasonerjt/reenable-token-auth-for-cli-new
...
Reenable token auth for cli
2020-04-07 08:55:25 +08:00
He Weiwei
69ca7a0dae
refactor: cleanup unused code about scan
...
1. Cleanup unused code about clair.
2. Cleanup unused definitions in legacy_swagger.yaml about scan.
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2020-04-06 17:34:25 +00:00
He Weiwei
80027c3b86
Merge pull request #11397 from ywk253100/200402_chart_api
...
Add a seperated swagger file for chart API
2020-04-07 00:05:49 +08:00
He Weiwei
af552258ba
Merge pull request #11446 from heww/fix-swagger-yaml
...
fix(swagger): make json as default response
2020-04-06 17:55:44 +08:00
Wenkai Yin(尹文开)
e6f96e2a8b
Merge pull request #11427 from wy65701436/fixes-11280
...
Add trace information into internal error
2020-04-06 17:51:40 +08:00
Wenkai Yin(尹文开)
a63cc5c9dc
Merge pull request #11445 from wy65701436/remove-count-quota
...
deprecate quota count on artifact
2020-04-06 17:41:25 +08:00
wang yan
44825e819e
deprecate quota count on artifact
...
Fixes #11241
1, remove count quota from quota manager
2, remove count in DB scheme
3, remove UI relates on quota
4, update UT, API test and UI UT.
Signed-off-by: wang yan <wangyan@vmware.com>
2020-04-06 16:56:11 +08:00
Wenkai Yin
8f8b4d5e8d
Add a seperated swagger file for chart API
...
Add a seperated swagger file for chart API as these APIs have no version
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2020-04-06 16:30:26 +08:00
He Weiwei
0a1730edb8
fix(swagger): make json as default response
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2020-04-06 05:13:21 +00:00
DQ
cdb675bf3d
Add proxy cert file to jobservice when https enabled
...
jobservice may request via absolute path of url to harbor
Signed-off-by: DQ <dengq@vmware.com>
2020-04-04 17:44:34 +00:00
DQ
23ed189ed4
Add SAN to gencert script
...
add localhost and 127.0.0.1 to SAN
Signed-off-by: DQ <dengq@vmware.com>
2020-04-04 17:44:34 +00:00
Daniel Jiang
e8f98259dd
Make sure middleware handle scanner-pull claim for v2token
...
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2020-04-05 01:10:45 +08:00
Wenkai Yin
8f11cb7ff0
Support replication between Harbor 2.0 and 1.x
...
Fixes #11374 , fixes #11302 , support replication between Harbor 2.0 and 1.x by providing versioning adapter
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2020-04-04 22:08:11 +08:00
Wenkai Yin(尹文开)
9ca87b85a5
Merge pull request #11389 from wy65701436/fix-dao-ut
...
fix artifact dao UT issue
2020-04-04 10:32:03 +08:00
wang yan
8bd2dc6394
Add trace information into internal error
...
Fixes #10839
Add a StackTrace func in to Error, and log it when Harbor gets a internal
Signed-off-by: wang yan <wangyan@vmware.com>
2020-04-04 01:38:36 +08:00
He Weiwei
bd6c2f8870
fix(vulnerable,middleware): improve vulnerable middleware ( #11407 )
...
1. Prevent the pull action when scan report status is not successfuly.
2. Bypass the checking when no vulnerabilities not found.
3. Improve the returned message when prevented the pull action.
Closes #11202
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2020-04-04 00:54:57 +08:00
Daniel Jiang
08f9ffa000
Reenable token auth for cli
...
Docker CLI fails if it's not logged in upon seeing "basic" realm challenging while pinging the "/v2" endpoint. (#11266 )
Some CLI will send HEAD to artifact endpoint before pushing (#11188 )(#11271 )
To fix such problems, this commit re-introduce the token auth flow to the CLIs.
For a HEAD request to "/v2/xxx" with no "Authoirzation" header, the v2_auth middleware populates the
"Www-Authenticate" header to redirect it to token endpoint with proper
requested scope.
It also adds security context to based on the content of the JWT which has the claims of the registry.
So a request from CLI carrying a token signed by the "/service/token" will have proper permissions.
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2020-04-04 00:05:58 +08:00
danfengliu
616c2d9e0f
Merge pull request #11408 from jwangyangls/nightly-case-trivy-3
...
[Test Case] Add nightly case for CVE
2020-04-03 19:23:26 +08:00
xaleeks
542fefb9eb
Merge pull request #10349 from danfengliu/add-remove-into-notary-guide-doc
...
Add notary remove part in notary_guide.md
2020-04-03 05:51:14 -04:00
Yogi_Wang
2610fe530f
[Test Case] Add nightly case for CVE
...
1. add nightly case for cve
2. change translate words
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2020-04-03 16:59:45 +08:00
He Weiwei
e9543a1e3c
Fix merge scan summary ( #11392 )
...
* fix(scan): fix ScanStatus when merge NativeReportSummary
1. Running and success status is high priority when merge ScanStatus of
NativeReportSummary, otherwise chose the bigger status.
2. Merge scan logs of referenced artifacts when get the scan logs of
image index.
Closes #11265
Signed-off-by: He Weiwei <hweiwei@vmware.com>
* fix(portal): fix the annotation for the scan completed percent in scan overview
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2020-04-03 16:21:36 +08:00
danfengliu
0afb52b510
Add notary remove part in notary_guide.md
...
Signed-off-by: danfengliu <danfengl@vmware.com>
2020-04-03 14:54:21 +08:00