Commit Graph

7525 Commits

Author SHA1 Message Date
jwangyangls
596f299743
Merge pull request #8739 from AllForNothing/cve-add-id
add ids to key elements of CVE-whitelist UI for easy test
2019-08-20 13:51:24 +08:00
stonezdj(Daojun Zhang)
4384e11422
Merge pull request #8648 from stonezdj/regular_filter
Normalize LDAP filter for user filter and group filter
2019-08-20 13:47:32 +08:00
Wang Yan
f930786050
Merge pull request #8725 from heww/issue-8701
fix(quota): fix computeResources method of qutoa interceptor
2019-08-20 11:29:59 +08:00
Daniel Jiang
4921b0fb4c
Merge pull request #8494 from jwangyangls/fix-global-search
Fix redirect login page when enter harbor through global search
2019-08-20 11:22:21 +08:00
stonezdj
7c7b6d2710 Normalize LDAP filter for user filter and group filter
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-08-20 10:55:30 +08:00
Will Sun
c9f12bc273
Merge pull request #8727 from AllForNothing/tag-retention-bug
fix bugs for tag-retention
2019-08-20 10:46:53 +08:00
AllForNothing
88f1e198aa 1.add ids to key elements of CVE-whitelist UI for easy test
2.change decrible in UI
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-08-20 10:18:31 +08:00
Daniel Jiang
f674bb4e6c
Merge pull request #8590 from ninjadq/fix_registry_log_level
Fix: registry log level rendering issue
2019-08-20 09:11:56 +08:00
Daniel Jiang
f10fb67d6d
Merge pull request #8662 from stonezdj/email_sec2
Set default email to null if not provided
2019-08-20 09:01:50 +08:00
He Weiwei
75772aae11
refactor(quota): new error types for quota checking (#8726)
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-19 19:00:29 +08:00
Wang Yan
e0bf3229e0
Merge pull request #8734 from reasonerjt/bump-up-clair
Bump up Clair to v2.0.9
2019-08-19 18:28:33 +08:00
Yogi_Wang
2134492587 Fix error in Harbor
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-19 18:08:19 +08:00
Daniel Jiang
b34fda173c Bump up Clair to v2.0.9
Fixes #8584

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-08-19 16:19:29 +08:00
Wenkai Yin
a5d292c9c6 Fix bug of listing tags filtered by label
Fixes #8249

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-19 16:10:16 +08:00
Will Sun
c0497c1a8d
Merge pull request #8730 from AllForNothing/webhook-bug
fix UI bugs for Webhooks
2019-08-19 15:59:10 +08:00
Will Sun
786fb429d6
Merge pull request #8716 from AllForNothing/cve-bug
fix cve-whitelist bugs
2019-08-19 15:55:24 +08:00
AllForNothing
6f3cc0da20 fix bugs for tag-retention
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-08-19 15:51:30 +08:00
stonezdj
5fa8eb7854 Set default email to null if not provided
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-08-19 15:20:44 +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
f11d4922d5 fix UI bugs for Webhooks
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-08-19 14:41:28 +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
He Weiwei
1bbfc023f1 fix(quota): fix computeResources method of qutoa interceptor
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-18 16:14:36 +00: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
Wenkai Yin
5c286d799f Fix bug found in scheduler
The scheduler hook handler doesn't parse the job status struct when handling the hook. This commit fixes it.

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-16 13:54:57 +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
Tan Chao
39b939b329 merge from upstream 2019-08-16 09:42:52 +08:00
Tan Chao
4e0e9d26cc fix chinese translation mistake
Signed-off-by: Tan Chao <tanchao.org@gmail.com>
2019-08-16 09:31:07 +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
Ziming Zhang
4dc6f12784 fix rule conflict, id error
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I379f3c29cee742d346fb57ade397be64fd76f59d
2019-08-15 20:11:30 +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
Wenkai Yin
48b067f596 Handle the retention task status updating in concurrency
Compare the status code when updating retention task status to avoid the concurrent issue

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-15 18:36:18 +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