Commit Graph

7238 Commits

Author SHA1 Message Date
Will Sun
786fb429d6
Merge pull request #8716 from AllForNothing/cve-bug
fix cve-whitelist bugs
2019-08-19 15:55:24 +08:00
Daniel Jiang
b15c6bcdc7
Merge pull request #8259 from amritanshu-pandey/feature/fix-typos
fix typos in prepare script
2019-08-19 15:09:24 +08:00
AllForNothing
a8f773e678 fix cve-whitelist bugs
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-08-19 13:40:09 +08:00
danfengliu
841ac24ebc
Add API test case sign image back to travis, despite codacy block it when pulling a pr. (#8617)
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-19 13:35:45 +08:00
Ziming
0c79352c9c
fix tag retention schedule none error (#8715)
Change-Id: I04cad9d4c520db751bfa413bb139317563716501
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-08-19 12:25:54 +08:00
jwangyangls
94c930f150
Merge pull request #8720 from jwangyangls/fix-quota-bug
Fix bug for harbor 1.9.0
2019-08-19 11:20:25 +08:00
Yogi_Wang
48cb2da09b Fix bug for harbor 1.9.0
1.modify the quota message.
2.fix replication ng bug when no filter.
3.fix summary ui style.
4.fix quota-edit page validation when input a large number

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-19 10:38:19 +08:00
Daniel Jiang
b3abd0316b
Merge pull request #8713 from reasonerjt/fix-8702
Avoid overwriting system CVE whitelist by mistake
2019-08-19 01:42:58 +08:00
Daniel Jiang
504202ecfd
Merge pull request #8378 from Typositoire/ldap/nested-groups
Search for LDAP_MATCHING_RULE_IN_CHAIN groups
2019-08-18 16:07:16 +08:00
Daniel Jiang
747bf849d2
Merge pull request #8670 from reasonerjt/proj-cve-wl-apitest
API test for project level CVE whitelist
2019-08-16 18:17:26 +08:00
Wang Yan
42bb5e1143
Merge pull request #8624 from wy65701436/quota-migration-dev
Add quota sync api to sync quota data with backend storage
2019-08-16 17:34:54 +08:00
danfengliu
2aa6f1aed7
Merge branch 'master' into add-sign-api-back-to-travis-despite-codacy-1 2019-08-16 16:28:49 +08:00
wang yan
ddb913f8d0 Add API test case sign image back to travis, despite codacy block it when pulling a pr.
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-16 01:26:36 -07:00
wang yan
b9d6108624 add ping for adapter to wait for service ready
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-16 16:03:12 +08:00
Wang Yan
aab3925dab
Merge pull request #8646 from bitsf/add_harbor_test_ca
use fix root CA for test
2019-08-16 15:19:22 +08:00
wang yan
6e11ecc6fc Update codes per review comments
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-16 14:58:52 +08:00
Wang Yan
7a41d89ac8 Add quota sync api toi to sync quota data with backend storage
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-16 14:55:46 +08:00
Daniel Jiang
022d4e6ae8
Merge pull request #7462 from cd1989/enable-tags-detail-param
List simple tags when detail set to false
2019-08-16 14:25:29 +08:00
Daniel Jiang
30bb2ddcdf Avoid overwriting system CVE whitelist by mistake
Fixes #8702
Also enforce the code to mitigate the potential risk.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-08-16 13:28:16 +08:00
Ziming
c279b7f3e9
fix retention rule compute error (#8664)
Change-Id: I16d7284b17508885e136f2d9ea5651978ba4a6d8
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-08-15 20:12:59 +08:00
Wenkai Yin(尹文开)
98ca45c93a
Merge pull request #8696 from bitsf/tag_retention_always_rule
add always rule again
2019-08-15 18:49:28 +08:00
Ziming Zhang
f854d4a25d add always rule again
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I34bac3b73e693b89e0b9debb28617352656ed1d9
2019-08-15 15:26:22 +08:00
Ziming
4944799f70
Merge pull request #8651 from bitsf/remove_tagretention_always
remove tag retention rule always
2019-08-15 14:35:26 +08:00
jwangyangls
0b393554b8
Merge pull request #8660 from jwangyangls/fix-bug-delete-image-scan-trigger-log-refresh
Fix scan is repeatedly triggered and refresh Logs failed
2019-08-15 12:46:05 +08:00
Qian Deng
89aed1a1ea
Merge pull request #8672 from ywk253100/190815_content_length
Set content length when pushing blobs
2019-08-15 12:45:35 +08:00
Yogi_Wang
3086a3eeb6 Fix scan is repeatedly triggered and refresh Logs failed/ init time not available
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-15 11:38:31 +08:00
Daniel Jiang
e4a78ba039 API test for project level CVE whitelist
This commit update test case to cover project level CVE whitelist.
It also fixes the swagger doc to add missing attributes

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-08-15 11:37:22 +08:00
Wenkai Yin
b94a99dded Set content length when pushing blobs
Set content length when pushing blobs

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-15 10:52:08 +08:00
Wang Yan
bf0b5a3fd0
Merge pull request #8663 from wy65701436/fix-quota-api
Fix quota switch fail to get project size
2019-08-15 10:49:49 +08:00
Wenkai Yin(尹文开)
8ccac663b1
Merge pull request #8661 from ywk253100/190814_dockerhub_adapter
Fix bug in native replication adapter
2019-08-15 10:21:19 +08:00
Qian Deng
4611630ab6
Merge pull request #8616 from heww/db-connection-pool
feat(configuration,db): connection pool configs for db
2019-08-15 09:48:20 +08:00
Daniel Jiang
b0c8561b54
Merge pull request #8189 from mmpei/8162-optimize-manifest-wait
Optimize fetch manifest loop when handling notification
2019-08-15 00:29:53 +08:00
Daniel Jiang
d9e1b90c5b
Merge pull request #8653 from vmlaguna/vmlaguna/template-fix
Close <a> tag in error template
2019-08-15 00:11:28 +08:00
wang yan
a947a4259d Fix quota switch fail to get project size
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-14 22:32:32 +08:00
stonezdj(Daojun Zhang)
032d57d8b2
Merge pull request #8656 from reasonerjt/cve_whitelist_apitest
API test for system level CVE whitelist
2019-08-14 18:26:06 +08:00
Wenkai Yin
2a57424f9d Fix bug in native replication adapter
Use the stardard token authentication work flow even though the credentail isn't provided

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-14 18:17:38 +08:00
Wang Yan
54cb39b7a7
Merge pull request #8655 from wy65701436/log-size
Add log in quota size handler
2019-08-14 16:09:45 +08:00
Pedro Laguna
3c34675e0f Close <a> tag in error template
The error template is missing a closing <a> tag in the link to the harbor portal.

Signed-off-by: Pedro Laguna <44469313+vmlaguna@users.noreply.github.com>
2019-08-14 08:37:44 +01:00
Daniel Jiang
d01597ba23 API test for system level CVE whitelist
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-08-14 14:59:58 +08:00
He Weiwei
98e1f68468 feat(configuration,db): connection pool configs for db
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-14 14:30:34 +08:00
Daniel Jiang
a545b460ed
Merge pull request #8642 from reasonerjt/swagger-doc-update
Fix issue in API swagger doc
2019-08-14 14:23:59 +08:00
Daniel Jiang
ca585f8b9c
Merge pull request #8640 from ninjadq/fix_permission_of_nginx_cert
Fix permission of nginx cert
2019-08-14 14:23:40 +08:00
wang yan
9601c9f206 Add log in quota size handler
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-14 14:10:09 +08:00
Ziming Zhang
2ca0b6bd1f use fix root CA for test
Change-Id: Ic663de04287d0cf963de71c3c18b43ed71f8139f
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-08-14 13:58:20 +08:00
Wang Yan
c252ca0b74
Merge pull request #8645 from wy65701436/quota-switch-api
Enable usage sync when switch quota setting
2019-08-14 13:48:33 +08:00
jwangyangls
b2b5d74456
Merge pull request #8623 from jwangyangls/replication-task-paging
Add paging from backend in replication task ui
2019-08-14 13:08:38 +08:00
wang yan
838a923d23 fix code by review
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-14 12:47:12 +08:00
wang yan
9e0addee55 Enable usage sync when switch quota setting
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-14 12:47:12 +08:00
jwangyangls
679bab9f80
Merge pull request #8638 from jwangyangls/quota-color-yellow
Add the warning color in quota when used/hard >0.7
2019-08-14 12:28:38 +08:00
danfengliu
1f53a47102
add replication testcase in api_db.robot file (#8636)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-08-14 10:45:20 +08:00