Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-24 01:27:49 +01:00
Code Issues Projects Releases Wiki Activity
7,254 Commits 55 Branches 321 Tags 340 MiB
8eb17be13c
Commit Graph

2983 Commits

Author SHA1 Message Date
Wenkai Yin
6464dcbd51 Register the replication adapter for Helm Hub 
Register the replication adapter for Helm Hub

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-07-30 16:28:06 +08:00
Wenkai Yin
61f54cc4a9 Refactor retention launcher 
Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-07-30 16:10:33 +08:00
Will Sun
4a4de4a9c1
Merge pull request #8480 from AllForNothing/Test-refactor 
modify spec.ts file for project-policy-config.component.ts
 2019-07-30 16:00:14 +08:00
Wenkai Yin(尹文开)
9e6b022ce1
Merge pull request #8425 from ywk253100/190726_acr 
Fix #8319, got error when replicating image with Azure container registry
 2019-07-30 15:19:12 +08:00
Yogi_Wang
4adc94762d Fix many issue for harbor for ui 
1.filter input auto focus
2.filter is covered by datagrid
3.modify elements of click action in label
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-07-30 14:52:54 +08:00
Steven Zou
63d16d4b6b
Merge pull request #8475 from steven-zou/fix/add_del_job 
add retention job for deleting repository
 2019-07-30 14:19:46 +08:00
Wenkai Yin
4dac036013 Fix #8319, got error when replicating image with Azure container registry 
Fix #8319, got error when replicating image with Azure container registry

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-07-30 12:58:22 +08:00
Shijun Sun (c)
3ab9cdec74 modify spec.ts file for project-policy-config.component.ts 
Signed-off-by: Shijun Sun (c)<sshijun@vmware.com>
 2019-07-30 12:05:27 +08:00
Steven Zou
f29d50e6dd fix ut case failures 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-07-30 11:56:17 +08:00
Steven Zou
dcc79ca2a4
Merge pull request #8392 from AllForNothing/tag-retention 
add tag-retention tab to project detail


Ignore codacy at present.
 2019-07-30 11:44:21 +08:00
Wenkai Yin(尹文开)
b90874b06a
Merge pull request #8457 from bitsf/tag_retention_api_fix 
fix tag retention api bug
 2019-07-30 10:24:28 +08:00
Shijun Sun (c)
01b8e3690e add tag-retention tab to project detail 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2019-07-30 10:06:15 +08:00
Steven Zou
1e7f51615f fix conflicts in runtime/bootstrap.go 2019-07-30 09:52:22 +08:00
Steven Zou
3ca5116a53 add retention job for deleting repository 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-07-30 09:45:19 +08:00
Ziming
a5c31d7160
Merge pull request #8456 from ywk253100/190729_scheduler 
Register the scheduler job and fix bugs
 2019-07-30 08:57:10 +08:00
Ziming
81950980bd
fix ci 2019-07-30 08:33:32 +08:00
Steven Zou
4bf7f7b3e4
Merge pull request #8445 from steven-zou/fix/tag_retention 
refactor index registering processes
 2019-07-30 07:58:14 +08:00
Wenkai Yin(尹文开)
a85df489c0
Merge pull request #8435 from kofj/aliacr 
Aliyun ACR adapter
 2019-07-30 07:40:57 +08:00
Wenkai Yin
94c1cf8ac9 Register the scheduler job and fix bugs 
1. Register the scheduler job
2. Fix retention bugs

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-07-30 07:37:47 +08:00
Ziming Zhang
e8f9f58550 fix tag retention api bug 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I26bb4aade70f35132a345a945fa19d35e8c92571
 2019-07-29 19:29:03 +08:00
Daniel Jiang
2211be7a80
Merge pull request #8446 from reasonerjt/group-perm-merge 
Update GetRolesByGroupID
 2019-07-29 19:11:51 +08:00
Ziming Zhang
7cc29f0b90 fix tag retention api bug 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I2c295090de34d133671c01422a6812fa426e9be7
 2019-07-29 18:36:51 +08:00
慕薇疯魔
0d71eb363a Aliyun ACR adapter 
1. aliyun ACR registry adapter.
2. Unit test case.
3. Update go modules and vendor.

Signed-off-by: 疯魔慕薇 <kfanjian@gmail.com>
 2019-07-29 18:24:03 +08:00
Steven Zou
fa678a12cc fix the OR processor failure issue 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-07-29 17:43:20 +08:00
Ziming Zhang
b0f6000f16 fix tag retention api bug 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: Id01b3a00ee0fa18cb5b9e4a74bb61a76d7d29709
 2019-07-29 17:40:38 +08:00
Wenkai Yin(尹文开)
7fd06edccf
Merge pull request #8451 from ywk253100/190729_retention_task 
Add property "repository" to retention task
 2019-07-29 17:18:42 +08:00
Wenkai Yin(尹文开)
c99f12fe33
Merge pull request #8444 from bitsf/tag_retention_exec_status 
get execution status on the fly
 2019-07-29 17:08:37 +08:00
Steven Zou
640fcdaee3 enhance the label selector 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-07-29 16:31:47 +08:00
Wang Yan
ca20281b35
Merge pull request #8438 from wy65701436/fix-quota-bug 
Fix logic error in quota middlewware on handling failure response
 2019-07-29 16:02:57 +08:00
Ziming Zhang
ba47b4c00f get execution status on the fly 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: Iefcf8946d7a2c7a27bc22bd326ee9723b4b79c66
 2019-07-29 14:48:39 +08:00
Steven Zou
6479a22a08 refacor index registering processes 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-07-29 14:01:47 +08:00
Wenkai Yin
a55860d2df Add property "repository" to retention task 
Add property "repository" to retention task

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-07-29 13:47:18 +08:00
Wenkai Yin(尹文开)
89066faff2
Merge pull request #8437 from wy65701436/add-pull-time 
Update pull time in artifact table for docker image pull
 2019-07-29 11:24:41 +08:00
Daniel Jiang
37b7ab6174 Update GetRolesByGroupID 
This commit fixes #8432
When querying the role of group ID, all matched roles should be returned
instead of the minimal role ID.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-07-29 11:24:35 +08:00
Wenkai Yin(尹文开)
829d9a56b4
Merge pull request #8436 from kofj/improve_awsecr 
Improve awsecr parseRegion method.
 2019-07-29 11:23:09 +08:00
Ziming
5a390d2fa0
Merge pull request #8429 from ywk253100/190726_retention_chartserver 
Only listing chart repositories when chart server is enabled
 2019-07-28 22:52:34 +08:00
Ziming
67b65814d9
Merge pull request #8434 from ywk253100/190727_retention 
Fix bugs found in running the retention workflow
 2019-07-28 22:52:16 +08:00
wang yan
1975f4a71d Fix logic error in quota middlewware on handling failure response 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-07-28 12:37:58 +08:00
wang yan
a23ff4e448 Update pull time in artifact table for docker image pull 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-07-28 12:30:20 +08:00
疯魔慕薇
55cead910f Improve awsecr parseRegion method. 
Signed-off-by: 疯魔慕薇 <kfanjian@gmail.com>
 2019-07-28 11:16:44 +08:00
Wenkai Yin
ab792019db Fix bugs found in running the retention workflow 
Fix bugs found in running the retention workflow

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-07-28 10:36:57 +08:00
Wenkai Yin
9235dcff54 Only listing chart repositories when chart server is enabled 
Only listing chart repositories when chart server is enabled

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-07-28 09:08:41 +08:00
Ziming Zhang
83b045f5ec add ut for tag retention controller 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I1469ee13675537ec389a068e4bc29e457b402fa4
 2019-07-26 17:55:11 +08:00
Steven Zou
3a7066346b
Merge pull request #8418 from ywk253100/190725_retention_task_log 
Implement getting the retention task log
 2019-07-26 17:51:05 +08:00
Wenkai Yin
c49a09edb4 Implement getting the retention task log 
Implement getting the retention task log

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-07-26 16:19:37 +08:00
Wenkai Yin(尹文开)
d45674960f
Merge pull request #8417 from goharbor/project-quota-dev 
Add feature project quota dev
 2019-07-26 15:41:09 +08:00
jwangyangls
993643bb78
Merge pull request #8407 from jwangyangls/oidc-ping 
Add test button in configration width oidc mode
 2019-07-26 14:30:29 +08:00
wang yan
54101180ae Update log level for init proxy 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-07-26 13:39:06 +08:00
He Weiwei
c566a48880 fix(api,project): fix repo, chart count missing in project summary 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-07-26 13:15:44 +08:00
Yogi_Wang
9deeee5425 Add test button in configration width oidc mode 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-07-26 10:54:48 +08:00
jwangyangls
fe9eb9da20
Merge pull request #8339 from jwangyangls/quotaPerProject2 
Add project quotas  page in configration ,project
 2019-07-26 10:25:05 +08:00
wang yan
676b922c95 merge with latest master code with quota branch 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-07-26 01:32:45 +08:00
Wang Yan
b9ea3731f7
Merge pull request #8350 from wy65701436/blob-flow-dev 
Add size middleware to support quota
 2019-07-26 01:25:40 +08:00
Wang Yan
1dfc47d24e Add size middleware to support quota 
[Add]:
1, size middleware for quota size
2, count middleware for quota artifact count

[Support]:
1, put, patch, mount blob
2, put manifest

[Refactor]:
1, Add handle response for middlerware
2, Remove the modifyResponse for registry proxy
3, Use the custom response writer to recored status

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-07-26 00:28:36 +08:00
Yogi_Wang
b1b915354e Add project quotas in configration page 
include quotas page and edit quota page
add quota field  when create project

Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-07-25 18:49:49 +08:00
Wenkai Yin
2e9521ad45 Support to stop one execution of retention 
Support to stop one execution of retention

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-07-25 16:48:00 +08:00
He Weiwei
f3a2280033
Merge pull request #8384 from heww/quota-apis 
feat(quota,api): APIs for quotas
 2019-07-25 15:19:46 +08:00
He Weiwei
e625f2aa11 feat(quota,api): APIs for quotas 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-07-25 13:40:26 +08:00
Steven Zou
584dcd8571 support dry run of retention 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-07-25 12:53:19 +08:00
Steven Zou
b6c4ffee95
Merge pull request #8244 from mmpei/7980-chartReplication 
Support helm chart replication from helmhub
 2019-07-25 10:30:20 +08:00
jwangyangls
de6c2d51cf
Merge pull request #8370 from jwangyangls/fixUtIssue 
Fix UT issue about it should support pagination
 2019-07-25 10:22:40 +08:00
jwangyangls
8a6a4addb1
Merge pull request #8369 from jwangyangls/fixSomeIssue 
Fix issue
 2019-07-25 10:20:05 +08:00
wang yan
4763864dae merge with latest master code with quota feature branch 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-07-24 08:47:05 -07:00
Steven Zou
c44747fd3c merge code from master and fix conflicts 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-07-24 17:27:37 +08:00
Wenkai Yin(尹文开)
cd411f6588
Merge pull request #8385 from ywk253100/190724_task_hook 
Implement the webhook handler for retention task
 2019-07-24 17:22:57 +08:00
Ziming
43c2af9857 map retention with policy (#8313) 
Signed-off-by: Ziming Zhang <zziming@vmware.com>

Implement the API and controller of tag retention
 - API handler
 - retention controller
 - dao
 2019-07-24 17:22:26 +08:00
Wenkai Yin
e2808f12cf Implement the webhook handler for retention task 
Implement the webhook handler for retention task

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-07-24 14:32:05 +08:00
Wenkai Yin
1adf5c976e Create retention client with the configurations got from jobservice config 
As the retention client is only used in job which running in jobservice, the configurations that needed to init the client should be read from jobservice

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-07-24 13:10:10 +08:00
Wenkai Yin(尹文开)
94f0fb506b
Merge pull request #8134 from chlins/refactor/small-refactor-for-huawei-adapter 
refactor: adjust some logic in huawei adapter
 2019-07-24 12:13:23 +08:00
Wenkai Yin(尹文开)
c4836727be
Merge pull request #8377 from steven-zou/feature/tag_retention-logs 
print rich logs in the retention job
 2019-07-24 09:54:19 +08:00
Steven Zou
09c56bfa08 print rich logs in the retention job 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-07-24 09:02:51 +08:00
He Weiwei
ce58c58c01 feat(quota,api): quota support for create project API 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-07-24 01:02:51 +08:00
Yann David
51eb8bc60f
Search for LDAP_MATCHING_RULE_IN_CHAIN groups 
Signed-off-by: Yann David <davidyann88@gmail.com>
 2019-07-23 12:19:56 -04:00
Wenkai Yin
03cc8046eb Implement the task management in retention manager 
Implement the task management in retention manager

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-07-23 19:23:04 +08:00
Wenkai Yin
7362fae7cc Implement a common scheduler 
Implement a common scheduler that can be used globally

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-07-23 17:20:31 +08:00
Yogi_Wang
93c336c17d Fix UT issue about it should support pagination 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-07-23 12:30:12 +08:00
Yogi_Wang
54c142d555 Fix the quoestion of the file setting.json 
Clear the error message when Api failed

Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-07-23 11:56:44 +08:00
Steven Zou
ccad9c0a29 support stop in the retention job and register it 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-07-23 11:05:22 +08:00
wang yan
2292954a31 Merge branch 'master' of https://github.com/goharbor/harbor into project-quota-dev 2019-07-22 15:46:09 +08:00
Wang Yan
e8565a4539
Merge pull request #8335 from reasonerjt/add-oidc-ping-api 
Add API to ping OIDC endpoint
 2019-07-22 14:30:24 +08:00
Steven Zou
6401314a3d
Merge pull request #8356 from steven-zou/feature/tag_retention-ut 
add missing UT cases for index and builder components
 2019-07-22 12:47:38 +08:00
Wang Yan
834e604ec0
Merge pull request #8246 from ninjadq/fix_chart_museum_500_error 
Fix: Internal server error with messy code when chartmuseum not work
 2019-07-22 11:07:55 +08:00
Nathan Lowe
b4e169db26
Fix logger line() call if built outside of the repo root 
If harbor is built (or `go test`'d) in a different folder than the repo
root, the call to common/utils/log/line(...) will panic with an index
out of range runtime error because the separator can't find `harbor/src`
in the path.

Signed-off-by: Nathan Lowe <public@nlowe.me>
 2019-07-21 22:30:17 -04:00
Nathan Lowe
a15be60946
Retention: Implement Rule: Always Keep 
Signed-off-by: Nathan Lowe <public@nlowe.me>
 2019-07-21 22:16:47 -04:00
Steven Zou
01d3243156 add missing UT cases for index and builder components 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-07-22 10:05:50 +08:00
Jakub Onderka
1723b6fa90 Fixed typo in en-us-lang.json 
Signed-off-by: Jakub Onderka <jakub.onderka@gmail.com>
 2019-07-20 14:43:58 +02:00
Steven Zou
deb021eb48 rebase and fix name conflicts among packages and vars 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-07-19 22:37:54 +08:00
Bernardo Pastorelli
791394a2b1 Make jobservice use the proxy env variables (including no_proxy) 
Signed-off-by: Bernardo Pastorelli <berpast@hotmail.com>
 2019-07-19 16:32:17 +02:00
Steven Zou
c76c5d7a1f refactor packages to resolve the cycle importing issue 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-07-19 18:55:08 +08:00
Wenkai Yin
ddbde72d2e Move the pkg manager/controller declaration to the api package 
Move the pkg manager/controller declaration to the api package to avoid the dependency cycle

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-07-19 17:21:58 +08:00
peimingming
9f777ed43f Fix by comments 
Signed-off-by: peimingming <peimingming@corp.netease.com>
 2019-07-19 17:04:40 +08:00
Will Sun
d38a08b15a
Merge pull request #8341 from AllForNothing/robot-ui 
UI Modification: When New Robot
 2019-07-19 16:59:14 +08:00
Steven Zou
f0ea62caa9 Merge branch 'feature/tag_retention' into feature/tag_retention-performer 2019-07-19 16:00:13 +08:00
Steven Zou
c2b5d95e02 implement retain action performer 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-07-19 15:59:21 +08:00
AllForNothing
bd5b195019 UI Modification: When New Robot 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2019-07-19 14:47:30 +08:00
Wenkai Yin
5f1d2bd644 Fix package import cycle issue 
Fix package import cycle issue

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-07-19 13:50:55 +08:00
Will Sun
ec9c216274
Merge pull request #8332 from AllForNothing/time-error 
fix issue : time shown for scheduled scanning is incorrect
 2019-07-19 11:32:50 +08:00
He Weiwei
9c9b8d3a6d Merge branch 'master' into project-quota-dev 2019-07-19 10:02:51 +08:00
Daniel Jiang
96e2e0b145 Add API to ping OIDC endpoint 
This commit adds an API to help admin verify the OIDC endpoint is a
valid one.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-07-18 19:32:12 +08:00
stonezdj
13772b859e Fix OnBoardGroup issue 
Signed-off-by: stonezdj <stonezdj@gmail.com>

Fix issue when adding a HTTP user group to a project member, returns HTTP 500 error.
 2019-07-18 19:19:09 +08:00
AllForNothing
9404810a1c fix issue : time shown for scheduled scanning is incorrect 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2019-07-18 18:05:01 +08:00
AllForNothing
4979c4a49c The item in CVE whiltelist should be a click-able link 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2019-07-18 16:17:43 +08:00
Steven Zou
24190291b6 update doublestar pattern and the failed launcher UT cases 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-07-18 14:50:02 +08:00
Steven Zou
0994e5efc9
Merge pull request #8321 from nlowe/feat/retention/GH-6657-last-active-n 
Retention: Implement Evaluator: Retain Latest K 'Active'
 2019-07-18 12:03:41 +08:00
Steven Zou
c8d2a2384a
Merge pull request #8289 from nlowe/feat/retention/GH-6659-keep-most-recently-pulled 
Retention: Implement Evaluator: Keep N Most Recently Pulled
 2019-07-18 11:27:00 +08:00
Steven Zou
2d62b2eb33
Merge pull request #8317 from steven-zou/feature/retention-selectors 
implement label and regexp selectors
 2019-07-18 11:25:08 +08:00
Nathan Lowe
040b235472
Retention: Implement Evaluator: Retain Latest K 'Active' 
Signed-off-by: Nathan Lowe <public@nlowe.me>
 2019-07-17 23:14:29 -04:00
Steven Zou
746d082e2e Merge branch 'master' into feature/tag_retention 2019-07-18 10:40:49 +08:00
Steven Zou
be8a9c0446 implement label and regexp selectors 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-07-18 10:32:47 +08:00
Nathan Lowe
b61f45e038
Retention: Implement Evaluator: Keep N Most Recently Pulled 
Signed-off-by: Nathan Lowe <public@nlowe.me>
 2019-07-17 14:29:37 -04:00
Wang Yan
4cdb6fb975
Merge pull request #8239 from bitsf/fix_replication_dockerhub_tls 
fix replication dockerhub skip tls
 2019-07-17 15:35:29 +08:00
Wenkai Yin(尹文开)
a64e089773
Merge pull request #8210 from stonezdj/http_group_dao2 
Add HTTP group support
 2019-07-17 15:22:36 +08:00
DQ
af58195a29 Fix: Internal server error with messy code when chartmuseum not work 
log err when doesn't get data from chart museum

Signed-off-by: DQ <dengq@vmware.com>
 2019-07-17 15:14:50 +08:00
Wenkai Yin
d6c6231e08 Implement the retention client 
Implement the retention client

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-07-17 14:04:29 +08:00
Wang Yan
31c3413ddf
Merge pull request #8288 from wy65701436/mf-workflow-base 
Add quota workflow for manifest
 2019-07-17 11:25:30 +08:00
Steven Zou
0b2f94b0dd
Merge pull request #8256 from goharbor/feat/retention/GH-6661-retain-newer-than-n-days 
Retention: Implement Evaluator: Retain if created less than x days ago
 2019-07-17 00:04:40 +08:00
Steven Zou
3243d5bce1
Merge pull request #8255 from goharbor/feat/retention/GH-6660-keep-most-recent-n 
Retention: Implement Filter: Keep Latest K
 2019-07-17 00:04:02 +08:00
Ziming Zhang
815901ea33 fix 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I3f2d3c7f1e32b4983c31c23d9753f04239e3c82f
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-07-16 19:24:40 +08:00
stonezdj
bb2ae7c093 Add HTTP group feature 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-07-16 15:38:46 +08:00
Shijun Sun (c)
140a3da238 modify UT for cve-whitelist UI 
Signed-off-by: Shijun Sun (c) <sshijun@vmware.com>
 2019-07-16 15:24:15 +08:00
Ziming Zhang
c22c38994a retention api 
Change-Id: I70f2c34d6bb96ecf4cb5359e2b1ab2dbb99fdbf9
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-07-16 15:06:37 +08:00
wang yan
105518fe12 Merge branch 'master' of https://github.com/goharbor/harbor into project-quota-dev 2019-07-16 14:51:37 +08:00
Wang Yan
8ac6bdbbb0 Add quota workflow for quota 
1, apply count for manifest if it's a new image
2, insert data for artifact and artifact_blob

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-07-16 14:48:05 +08:00
Shijun Sun (c)
274ab7bcff add CVE-Whitelist 
Signed-off-by: Shijun Sun (c) <sshijun@vmware.com>
 2019-07-15 19:47:46 +08:00
Nathan Lowe
d7e6b1b621
Sort artifacts before processing and port tests to github.com/stretchr/testify/suite 
Signed-off-by: Nathan Lowe <public@nlowe.me>
 2019-07-14 22:45:36 -04:00
Nathan Lowe
f03ed9b14c
Port tests to github.com/stretchr/testify/suite 
Signed-off-by: Nathan Lowe <public@nlowe.me>
 2019-07-14 22:38:26 -04:00
chlins
fc713a1763 refactor: fix unit tests 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2019-07-12 11:33:31 +08:00
chlins
000fe3d084 refactor: adjust some logic in huawei adapter 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2019-07-12 11:33:30 +08:00
wang yan
f066d986b9 merge with latest master code 2019-07-11 20:21:15 +08:00
Wang Yan
b98ca7bf0b
Merge pull request #8237 from wy65701436/redis-locker 
add redis lock
 2019-07-11 20:10:16 +08:00
wang yan
ef14f0cf35 add redis lock, it will be used to lock digest in the quota scenario 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-07-11 19:24:24 +08:00
Wenkai Yin(尹文开)
44ad142d86
Merge pull request #8260 from ywk253100/190709_launcher 
Implement the launcher
 2019-07-11 18:21:04 +08:00
Wenkai Yin
91b050a01b Implement the launcher 
The commit implements the launcher for tag retention

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-07-11 17:18:46 +08:00
Steven Zou
69ff8ff8ba
Merge pull request #8277 from steven-zou/feature/tag_retentio_more_evaluators 
add more rule evaluators
 2019-07-11 14:09:29 +08:00
Steven Zou
07250469ac add more rule evaluators 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-07-11 10:50:10 +08:00
Steven Zou
52ca6de22a refactor the processor interface 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-07-11 00:23:19 +08:00
mmpei
f32670058a Fix by comments 
Signed-off-by: mmpei <peimingming@corp.netease.com>
 2019-07-10 17:31:59 +08:00
Wenkai Yin(尹文开)
3bebf7bc64
Merge pull request #8238 from reasonerjt/project-cve-whitelist 
Enable project level CVE whitelist
 2019-07-10 14:41:01 +08:00
jwangyangls
432f08b5b5
Merge pull request #8241 from jwangyangls/fixReplicationLabelFilterbug 
Fix bug when no labels
 2019-07-10 14:38:51 +08:00
jwangyangls
c73fa851ff
Merge pull request #8221 from jwangyangls/addGroupInhttpMode 
Add user group when http auth mode
 2019-07-10 14:38:31 +08:00
Steven Zou
9756195496 implement retention job 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-07-10 14:01:17 +08:00
Yogi_Wang
6ef82d4db9 Fix bug when no labels 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-07-10 13:02:34 +08:00
Nathan Lowe
8b174825c1
Retention: Implement Evaluator: Retain if created less than x days ago 
Signed-off-by: Nathan Lowe <public@nlowe.me>
 2019-07-09 23:46:26 -04:00
Nathan Lowe
4ecbe749e4
Retention: Implement Filter: Keep Latest K 
Signed-off-by: Nathan Lowe <public@nlowe.me>
 2019-07-09 23:24:56 -04:00
Wang Yan
155b0b0acd
Merge pull request #8175 from heww/quota-manager 
Add manager for quota
 2019-07-10 11:03:57 +08:00
peimingming
4946c7bba7 Add helm chart replication from helmhub 
Signed-off-by: peimingming <peimingming@corp.netease.com>
 2019-07-10 11:01:02 +08:00
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
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
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
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
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
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
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
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
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
mmpei
5dfc3f2402 Optimize fetch manifest loop when handling notification 
Signed-off-by: mmpei <peimingming@corp.netease.com>
 2019-07-01 17:54:52 +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
cd1989
c305103e05 Add unit test for azure adapter 
Signed-off-by: cd1989 <chende@caicloud.io>
 2019-07-01 14:31:12 +08:00
cd1989
2097e928d0 Implement azure acr adapter 
Signed-off-by: cd1989 <chende@caicloud.io>
 2019-06-29 18:34:48 +08:00
AllForNothing
322c79f348 fix filter ui bug #7700 
Signed-off-by: sshijun <sshijun@vmware.com>
 2019-06-28 15:48:24 +08:00
Wenkai Yin
6ba2ace0a6 Update replication label filter 
Support specify multiple labels in one label filter

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-06-28 15:03:58 +08:00
Wenkai Yin
d2a938812f Support v1 signed media type when do the replication 
Support v1 signed media type when do the replicatio

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-06-28 13:24:28 +08:00
Wenkai Yin
943dfd32fc Clean up the dao test for replication 
Clean up the dao test for replication

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-06-28 13:18:26 +08:00
Ziming
a69cea9952
Merge pull request #8028 from bitsf/replication_gcr_ui_1.9 
ui change: gcr/ecr driver for replication
 2019-06-27 14:16:34 +08:00
Ziming
50180f0d7a
Merge pull request #7946 from bitsf/replication_gcr_1.9 
gcr driver for replication
 2019-06-27 14:16:07 +08:00
Will Sun
108b9284a5
Merge pull request #8150 from AllForNothing/robot-account-helm-ui 
UI modification for creating robot account
 2019-06-27 13:23:39 +08:00
Ziming
af548e915e
Merge branch 'master' into replication_gcr_1.9 2019-06-27 11:27:33 +08:00
Steven Zou
5521b7b7ad
Merge pull request #7915 from bitsf/replication_ecr_1.9 
aws driver for replication
 2019-06-27 11:24:54 +08:00
Wenkai Yin(尹文开)
fce920bbee
Merge pull request #8075 from reasonerjt/sys-vuln-whitelist-api 
API for system level vulnerability whitelist
 2019-06-27 10:53:09 +08:00
Mark Peek
3cae31da54 Switch registry health check to a 200 response url 
The health check for the registry was using "/v2" which returned an
unauthorized response and put additional errors in the logs. Switch
to using "/" which returns an OK response with reduced logging.

Signed-off-by: Mark Peek <markpeek@vmware.com>
 2019-06-26 14:23:08 -07:00
Daniel Jiang
4aca812ff2 API for system level vulnerability whitelist 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-06-26 23:35:40 +08:00