Commit Graph

6999 Commits

Author SHA1 Message Date
wang yan
6d0271ee5c Merge branch 'master' of https://github.com/goharbor/harbor into project-quota-dev 2019-07-10 10:57:10 +08:00
Steven Zou
185f4f3861 refine or.processor implementation and also add UT case
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-09 22:10:09 +08:00
Steven Zou
3409065438 implement policy builder
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-09 17:43:19 +08:00
Steven Zou
c36afcd07d add index for rule,selector and performer
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-09 15:10:53 +08:00
He Weiwei
41ba410bb2 Manager for quota
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-07-09 13:59:48 +08:00
Wang Yan
7fd0bbcbd2
Merge pull request #8230 from wy65701436/dao-artifact
add dao of artifact
2019-07-09 13:44:05 +08:00
Wang Yan
5660e5512b
Merge pull request #8206 from wy65701436/project-quota-yan-linux
Refactor interceptors code with chain
2019-07-09 13:29:18 +08:00
wang yan
c8a39c88a0 Merge branch 'project-quota-dev' of https://github.com/goharbor/harbor into project-quota-yan-linux 2019-07-09 11:12:23 +08:00
wang yan
7b38389898 update codes per review comments
Signed-off-by: wang yan <wangyan@vmware.com>

fix middlewares per review comments
1, add scheme1 and scheme2 check
2, change MustCompile to Compile

Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-09 11:08:19 +08:00
wang yan
b3c5137a2f add copyright and fix codecy
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-09 11:08:19 +08:00
wang yan
57821b1b4c Refactor interceptors code with chain
1, add a blob inteceptors for quota usage
2, add a manifest inteceptors for quota usage

Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-09 11:08:11 +08:00
Steven Zou
24ee32d7d1 define the base interfaces for the tag retention feature
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-09 09:40:59 +08:00
wang yan
0011331546 merge with latest code
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-08 23:44:37 +08:00
wang yan
24c3753581 add dao of artifact
Signed-off-by: wang yan <wangyan@vmware.com>

Add dao for quota

Signed-off-by: He Weiwei <hweiwei@vmware.com>

fix govet

Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-08 23:42:50 +08:00
Daniel Jiang
8f5f0031c7 Enable project level CVE whitelist
This commit update the project API to support "reuse_sys_cve_whitelist"
setting in project metadata and "cve_whitelist" in project request.
Also modify the interceptor to support project level CVE whitelist if
the reuse flag is false.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-07-08 18:55:54 +08:00
Yogi_Wang
c57087574a Add user group when http auth mode
add the pages  in project and system

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-08 17:28:38 +08:00
Ziming Zhang
0691a5ad9c fix replication dockerhub tls skip tls
Change-Id: I9584d89cf9bda2b782b0fd556450a81be0fc7510
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-07-08 08:17:26 +00:00
danfengliu
fa51ac6406
Add user027 and user028 to ldap service, it was added in ldap_test.ldif for nightly test. (#8158)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-07-08 15:30:08 +08:00
danfengliu
db012c816d
In nightly test case <Delete Multi Member>, 'action' was clicked, but the dropdown list was't not shown up, so we should add a comfirmation to make sure the expected element show up. (#8146)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-07-08 15:28:28 +08:00
Wenkai Yin(尹文开)
5f9420a5a7
Merge pull request #8190 from ywk253100/190701_replication
Merge Default ImageRegistry into the native adapter to reduce the duplicate code
2019-07-08 12:47:55 +08:00
Daniel Jiang
c296f0ddfb
Merge pull request #8176 from stonezdj/http_group
Refactor LDAP usergroup
2019-07-08 09:54:31 +08:00
wang yan
a95f8c556d Merge branch 'master' of https://github.com/goharbor/harbor into project-quota-dev 2019-07-05 15:49:17 +08:00
stonezdj
c0ed55445d Refactor LDAP group
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-07-05 14:44:18 +08:00
Wenkai Yin(尹文开)
0f28fe42fd
Merge pull request #8167 from ywk253100/190622_replication
Support v1 signed media type when do the replication
2019-07-05 14:33:22 +08:00
Wenkai Yin(尹文开)
c01bedb740
Merge pull request #8220 from reasonerjt/oidc-rotation-fix
Reload OIDC provider older than 3 seconds
2019-07-05 10:12:33 +08:00
Daniel Jiang
a75bc027de
Merge pull request #8213 from reasonerjt/oidc-helm-push
Handle helm push in OIDC filter
2019-07-04 15:56:50 +08:00
Daniel Jiang
88a5572f8e Reload OIDC provider older than 3 seconds
This commit make sure the OIDC is more actively recreated, to mitigate
the problem in #8177

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-07-04 14:55:34 +08:00
Wang Yan
5ec6e39a65
Merge pull request #8133 from heww/quota-dao
Add dao for quota
2019-07-04 13:23:19 +08:00
He Weiwei
4fedfa6580 Add dao for quota
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-07-04 11:53:26 +08:00
Steven Zou
63e2ce7606
Merge pull request #8209 from steven-zou/fix/enqueuer_schedule_slot
use separate key for the last periodic enqueue data
2019-07-03 21:48:21 +08:00
Steven Zou
8fc693d843
Merge pull request #8208 from steven-zou/fix/enqueuer_ut
fix failure ut case of job service
2019-07-03 17:32:13 +08:00
Daniel Jiang
8a9d352f54 Handle helm push in OIDC filter
Fixes #8130
Enable OIDC filter to handle requests to /api/chartrepo/*

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-07-03 17:29:37 +08:00
Steven Zou
b88159e747 use separate key for the last periodic enqueue data
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-03 17:08:23 +08:00
Daniel Jiang
5d887ad0d8
Merge pull request #8179 from reasonerjt/interceptor-use-whitelist
Apply CVE white list in interceptor
2019-07-03 15:12:33 +08:00
Steven Zou
1002e3ce17 fix failure ut case of job service
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-03 15:10:41 +08:00
Daniel Jiang
bba4b2a6a4 Apply CVE white list in interceptor
Interceptor will filter the vulnerability in whitelist while calculating
the serverity of an image and determine whether or not to block client
form pulling it.

It will use the system level whitelist in this commit, another commit
will switch to project level whitelist based on setting in a project.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-07-03 14:13:00 +08:00
Steven Zou
8bb18e73d2
Merge pull request #8159 from ywk253100/190627_label_filter
Update replication label filter
2019-07-03 13:08:54 +08:00
Wenkai Yin(尹文开)
6528070633
Merge pull request #8155 from markpeek/markpeek-makefile-typos
Fix a couple of error message typos in the Makefile
2019-07-03 10:31:00 +08:00
Wenkai Yin(尹文开)
a5b03fdf52
Merge pull request #8156 from markpeek/markpeek-compile-docs-goversion
Reflect change to golang:1.12.5 in the docs
2019-07-03 10:30:18 +08:00
Daniel Jiang
6f166bc02c
Merge pull request #8154 from markpeek/markpeek-registry-health-check
Switch registry health check to a 200 response url
2019-07-03 10:29:35 +08:00
He Weiwei
d85b1643ae
Merge pull request #8196 from heww/fix-project-member-read-permission
Fix read permission of project member read api
2019-07-02 15:41:19 +08:00
He Weiwei
720dcc72bd Fix read permission of project member read api
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-07-02 14:40:46 +08:00
stonezdj(Daojun Zhang)
07b358eff9
Merge pull request #8120 from stonezdj/update_ldap_config_doc
Update LDAP group documents
2019-07-02 13:07:40 +08:00
jwangyangls
02c5823915
Merge pull request #8182 from jwangyangls/fixVulnerabilityWidth
Fix the different width on vulnerability
2019-07-02 11:56:48 +08:00
jwangyangls
e87381d671
Merge pull request #8178 from jwangyangls/replicationAddLabelFilter
Add label filter in replication Ng
2019-07-02 11:55:55 +08:00
jwangyangls
1916f3c078
Merge pull request #8165 from AllForNothing/filter-ui
fix  filter ui bug : half filter is covered when there is one or two records in a datagrid
2019-07-02 11:07:07 +08:00
Yogi_Wang
9c07caa1a6 Add label filter in replication Ng
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-02 10:53:17 +08:00
Wenkai Yin
8768a5678c Merge Default ImageRegistry into the native adapter to reduce the duplicate code
Merge Default ImageRegistry into the native adapter to reduce the duplicate code

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-01 19:21:12 +08:00
Wenkai Yin(尹文开)
174cfd5de5
Merge pull request #8172 from cd1989/azure-acr-adapter
Implement azure acr adapter
2019-07-01 19:06:19 +08:00
Yogi_Wang
c3572028b9 Fix the different width on vulnerability
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-01 17:26:59 +08:00