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
Qian Deng
f14a16bedb
Merge pull request #11409 from heww/fix-issue-11367
...
fix(prepare): not accpet items of false value in external_redis
2020-04-03 13:27:34 +08:00
He Weiwei
77a8c3205f
fix(prepare): not accpet items of false value in external_redis
...
Item in yaml without value will be as None in python, which will make
the password of redis as `None` in `get_redis_configs`. This fix will
not accept items of `false value` in `external_redis` configurations.
Closes #11367
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2020-04-03 04:09:26 +00:00
Wenkai Yin(尹文开)
2783fd0950
Merge pull request #11276 from mmpei/offical-webhook-slack-fix
...
fix webhook slack test error
2020-04-03 10:37:21 +08:00
He Weiwei
c0246e2130
Merge pull request #11400 from heww/fix-issue-11391
...
fix(log): correct file and line when use logger
2020-04-02 22:23:15 +08:00
peimingming
5924658092
fix webhook slack test error
...
Signed-off-by: peimingming <peimingming@corp.netease.com>
2020-04-02 20:02:27 +08:00
He Weiwei
207463e91e
fix(log): correct file and line when use logger
...
1. When use the helper functions of log pkg, the depth is 4 to get the
correct file and line.
2. Whe use the default logger of log pkg, the depth is 3 to get the
correct file and line.
Closes #11391
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2020-04-02 10:49:38 +00:00
Will Sun
2c3552904d
Merge pull request #11393 from AllForNothing/improve-webhook
...
Improve webhook UI according to the UX
2020-04-02 17:51:13 +08:00
Wenkai Yin(尹文开)
df490d0cea
Merge pull request #11394 from wy65701436/move-log
...
move logger from common to lib
2020-04-02 14:58:33 +08:00
wang yan
7104461716
fix artifact dao UT issue
...
The update column should be PullTime instead of PushTime
Signed-off-by: wang yan <wangyan@vmware.com>
2020-04-02 14:45:43 +08:00
AllForNothing
ba5fd67b08
Improve webhook UI according to the UX
...
Signed-off-by: AllForNothing <sshijun@vmware.com>
2020-04-02 14:30:21 +08:00
wang yan
a11a70d941
move logger from common to lib
...
The logger is the fundamental library, so move it into lib folder
Signed-off-by: wang yan <wangyan@vmware.com>
2020-04-02 14:09:03 +08:00
Qian Deng
a702c32346
Merge pull request #11063 from ninjadq/fix_syslog_dir_in_tpl
...
Fix: fix logrotate is dir issue
2020-04-02 11:37:29 +08:00
jwangyangls
4ea7b13215
Merge pull request #11385 from jwangyangls/nightly-case-trivy-2
...
[Nightly] Project Level Image Serverity Policy
2020-04-02 11:14:21 +08:00
danfengliu
aa26e624b9
Merge pull request #11379 from danfengliu/add-nightly-test-of-push-helm-chart
...
Add nightly test of push helm chart
2020-04-02 10:29:21 +08:00
Yogi_Wang
01f8291bb7
[Nightly] Project Level Image Serverity Policy
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2020-04-02 10:16:57 +08:00
Qian Deng
0319baabcb
Merge pull request #11381 from ninjadq/enhance_migrate_config
...
Enhance migrate config
2020-04-02 10:00:38 +08:00
danfengliu
e3b31bb8dd
Add nightly test of push helm chart
...
1. Add push helm chart oci test in nightly;
2. Modify archive icon locator xpath;
Signed-off-by: danfengliu <danfengl@vmware.com>
2020-04-01 18:53:19 -07:00
xaleeks
530ee7efbb
Merge pull request #11378 from xaleeks/04012020_installation
...
small change
2020-04-01 21:33:15 -04:00
DQ
dc271e1a87
Add packaging to pipenv
...
Signed-off-by: DQ <dengq@vmware.com>
2020-04-01 22:54:47 +08:00
danfengliu
f11e713ada
Merge pull request #11380 from jwangyangls/nightly-case-trivy-1
...
[Nightly] add case about trivy
2020-04-01 22:45:40 +08:00
Steven Zou
1f6301267c
Merge pull request #11369 from steven-zou/fix/issue_#11361
...
fix[lua_scripts]:add default values for tonumber
2020-04-01 19:01:02 +08:00
Qian Deng
b1284da96b
Merge pull request #11360 from ninjadq/rever_chart_api_change
...
Rever chart api change
2020-04-01 18:58:57 +08:00
Wenkai Yin(尹文开)
d187a8e69e
Merge pull request #11333 from ywk253100/200325_copy
...
Update the existence checking logic when copying artifact
2020-04-01 18:09:20 +08:00
Wang Yan
4594d58ba8
add clean untagged blobs in gc job ( #11248 )
...
Fixes #11190 , delete all of non-referenced blobs of each project in GC job, thun the quota
can be released.
Signed-off-by: wang yan <wangyan@vmware.com>
2020-04-01 18:01:46 +08:00
Will Sun
b0d0b292cd
Merge pull request #11288 from AllForNothing/nightly-webhook
...
Fix nightly cases for webhook
2020-04-01 17:37:11 +08:00
Wenkai Yin(尹文开)
9f4f3be00d
Merge pull request #11364 from ywk253100/200331_replication
...
Some tiny improvement for replication
2020-04-01 17:29:08 +08:00