Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-17 07:45:24 +01:00
Code Issues Projects Releases Wiki Activity
11,368 Commits 49 Branches 315 Tags 351 MiB
c2a3020e0e
Commit Graph

767 Commits

Author SHA1 Message Date
Daniel Jiang
dee6064e60
Merge pull request #14926 from reasonerjt/rm-common-dao-oidc-user-onboard 
Remove the onboard and update funcs for OIDC user from common/dao
 2021-05-20 19:34:59 +08:00
Daniel Jiang
66766a8f69 Remove the onboard and update funcs for OIDC user from common/dao 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2021-05-20 16:23:07 +08:00
ChenYu Zhang
a50f782beb
fix: change sql to improve the performance of catalog api (#14820) 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2021-05-20 15:52:53 +08:00
Daniel Jiang
8600b06975
Merge pull request #14925 from ywk253100/210520_perf 
Improve the performance of artifact related APIs
 2021-05-20 14:10:45 +08:00
Wenkai Yin(尹文开)
0fe551274d
Merge pull request #14921 from ywk253100/210519_db 
Clean up tech debt codes
 2021-05-20 13:44:10 +08:00
Wenkai Yin(尹文开)
36d76d8704
Merge pull request #14912 from ywk253100/210518_bug 
Truncate the string when deletinng the resources when the length exceeds the limit
 2021-05-20 12:09:36 +08:00
Wenkai Yin
998e392bb4 Clean up tech debt codes 
Clean up tech debt codes

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-05-20 11:47:46 +08:00
Wenkai Yin
dc059a9a8f Improve the performance of artifact related APIs 
Improve the performance of artifact related APIs by adding indexes and refactoring sql logic

Closes #13890 #14813 #14814

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-05-20 11:25:43 +08:00
Wenkai Yin(尹文开)
08ed886936
Merge pull request #14914 from ywk253100/210518_registry 
Update the field name of registry model
 2021-05-19 17:20:12 +08:00
Daniel Jiang
294ee52d7a
Merge pull request #14900 from reasonerjt/rm-common-dao-getuser-onboard 
Remove GetUser and Onboard from common/dao
 2021-05-19 11:21:00 +08:00
Wenkai Yin
315f490d3c Update the field name of registry model 
Update the field name of registry mode

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-05-18 17:26:20 +08:00
Wenkai Yin
5ebc8b4fdd Truncate the string when deletinng the resources when the length exceeds the limit 
Truncate the string when deletinng the resources when the length exceeds the limit

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-05-18 17:17:41 +08:00
Daniel Jiang
952644e23f Remove GetUser and Onboard from common/dao 
Replaced by funcs in src/pkg/user and src/controller/user

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2021-05-18 15:28:41 +08:00
He Weiwei
0c315d8aee
refactor: remove allowlist in GetSummary of scan controller (#14836) 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2021-05-18 14:01:59 +08:00
Vadim Bauer
1a3335edc5
Provide information about missing RBAC permissions in debug mode. (#14906) 
Signed-off-by: Vadim Bauer <vb@container-registry.com>

Co-authored-by: Vadim Bauer <vb@container-registry.com>
 2021-05-18 10:02:34 +08:00
He Weiwei
6f3607cebd
perf: cache the metadata of the scanner (#14879) 
1. Cache the metadata of scanner 30s.
2. Change the scanner client request timeout to 5s.

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2021-05-14 14:27:37 +08:00
Daniel Jiang
fa46b0d736
Merge pull request #14095 from jsoref/tokens 
Tokens
 2021-05-13 13:25:58 +08:00
Wang Yan
ad9569da26
refactor preheat model (#14858) 
Move the notification to preheat models

Signed-off-by: Wang Yan <wangyan@vmware.com>
 2021-05-12 22:29:01 +08:00
Qian Deng
17dd48e5a3
Merge pull request #14854 from ninjadq/upgrade_helm_chart 
Upgrade helm chart
 2021-05-12 19:33:03 +08:00
stonezdj(Daojun Zhang)
0dfc801a50
Error string should not be capitalized (#14840) 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2021-05-12 16:53:37 +08:00
Wenkai Yin
c04f3a2aac Fix duplicate execution record issue 
When the core service cannot response the checkin request in time, duplicated execution records may be created, this commit introduces the revision column to make sure there is only one record for one schedule trigger

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-05-12 15:40:52 +08:00
Daniel Jiang
bd9a1c6722
Merge pull request #14829 from reasonerjt/user-common-dao-cleanup 
Move user related funcs from common/dao
 2021-05-12 10:56:18 +08:00
stonezdj(Daojun Zhang)
a6d92ca807
Merge pull request #14777 from stonezdj/21apr15_declarative_config 
Implement declarative configure feature
 2021-05-12 09:21:57 +08:00
Daniel Jiang
6d0e391740 Move user related funcs from common/dao 
This commit moves more user related funcs, such as ChangePassword,
Login, ChangeUserProfile from common/dao to rely on /pkg/user and
pkg/oidc.
It also removes the code for resetting user's password as it's disabled.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2021-05-12 01:12:57 +08:00
Wang Yan
b714baae87
fixes immutable rule issue (#14849) 
fixes #14568

Signed-off-by: Wang Yan <wangyan@vmware.com>
 2021-05-11 23:28:03 +08:00
DQ
9a974d2b2c Upgrade Helm Client Version 
From version 3.1.1 to 3.4.2

Signed-off-by: DQ <dengq@vmware.com>
 2021-05-11 13:51:55 +00:00
stonezdj
3825220ca6 Implement declarative configure feature 
Add env CONFIG_OVERWRITE_JSON for declarative config
Init config with the json in CONFIG_OVERWRITE_JSON in main.go

Signed-off-by: stonezdj <stonezdj@gmail.com>
 2021-05-11 20:58:19 +08:00
Wenkai Yin(尹文开)
e006f4bab5
Support specifying multiple fields for default sorting (#14788) 
Support specifying multiple fields for default sorting
Fixes #14433

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-05-10 17:04:10 +08:00
Daniel Jiang
8fa45a5338 Bump up go-oidc to v3 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2021-05-06 16:07:16 +08:00
Daniel Jiang
a66809cf85
Remove register and userexists funcs from dao pkg (#14798) 
This commit replaces them with funcs with user pkg

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2021-05-05 17:55:56 +08:00
stonezdj(Daojun Zhang)
8f16831c75
Merge pull request #14717 from stonezdj/21pr16_verify_ldap_group_settings 
Add the ldap group config validation
 2021-04-30 10:19:43 +08:00
stonezdj
9010eeb832 Add the ldap group config validation 
When ldap_group_search_filter is set, check other required fields
When ldap_group_search_filter is empty, skip to attach group

Signed-off-by: stonezdj <stonezdj@gmail.com>
 2021-04-29 22:11:38 +08:00
Wang Yan
1dd3b9fd82
add storage consumption support (#14772) 
Return the total storage consumption in the statistic API

Signed-off-by: Wang Yan <wangyan@vmware.com>
 2021-04-29 12:36:25 +08:00
Wang Yan
f3260fdad1
move blob models (#14776) 
1, move project_blob into pkg
2, move artifact_blob into pkg

Signed-off-by: Wang Yan <wangyan@vmware.com>
 2021-04-29 12:36:08 +08:00
Wenkai Yin(尹文开)
9bbffa06db
Merge pull request #14662 from ywk253100/210413_dest_ns 
Refactor the replication policy destination namespace logic
 2021-04-29 11:18:43 +08:00
Wenkai Yin(尹文开)
30664995c7
Merge pull request #14762 from ywk253100/210427_task_not_found_master 
Read upstream job ID as ID when it isn't null
 2021-04-29 10:58:48 +08:00
Wenkai Yin
710c80078b Refactor the replication policy destination namespace logic 
Support specifying what part of the repository will be replaced by the provided namespace

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-04-28 10:16:20 +08:00
Wenkai Yin(尹文开)
c54e690f69
Merge pull request #14702 from ywk253100/210419_metadata 
Refactor project metadata API
 2021-04-27 18:02:09 +08:00
Wenkai Yin
0539f051a2 Read upstream job ID as ID when it isn't null 
Read upstream job ID as ID when it isn't null to fix the job not found error

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-04-27 14:47:26 +08:00
stonezdj(Daojun Zhang)
c946457eef
Return 409 instead of 500 for duplicate project member (#14727) 
Fixes #14621

Signed-off-by: stonezdj <stonezdj@gmail.com>
 2021-04-26 12:59:37 +08:00
Daniel Jiang
5b526b8dc7
Remove dependencies from pkg/oidc to common/dao (#14739) 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2021-04-26 10:56:49 +08:00
Wenkai Yin
311d6336a7 Refactor project metadata API 
Refactor project metadata API

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-04-20 22:27:17 +08:00
stonezdj(Daojun Zhang)
0b9cad33b1
Refine the code of config (#14675) 
Remove deps to common/dao
 Move Manager interface to config.go
 Remove duplicate code and change format of dao.go

Signed-off-by: stonezdj <stonezdj@gmail.com>
 2021-04-19 21:08:25 +08:00
Steven Zou
cae82dc3d0
Merge pull request #14676 from bitsf/update_adapter_region 
update aliyun and aws region
 2021-04-19 11:17:07 +08:00
Steven Zou
0a67e16922
Merge pull request #14677 from bitsf/fix_aws_checkRepository 
fix(replication) aws adapter checkRepository
 2021-04-19 11:16:05 +08:00
Ziming Zhang
e8450d99ce update aliyun and aws region 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2021-04-16 22:34:11 +08:00
Ziming Zhang
74bd82b3a1 fix(replication) aws adapter checkRepository 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2021-04-16 22:28:14 +08:00
Wenkai Yin(尹文开)
5f0e7cfd62
Merge pull request #14372 from chlins/fix/registry-auth-parse-time 
fix: add precheck when registry check token expired
 2021-04-16 18:17:02 +08:00
Wang Yan
6e3c9e29df
Api refactor label (#14650) 
* Refactor labl api

move to the new program model

Signed-off-by: wang yan <wangyan@vmware.com>

* continue resolve review comments

Signed-off-by: Wang Yan <wangyan@vmware.com>
 2021-04-15 17:27:58 +08:00
stonezdj
9807a5a9ff Merge branch 'master' into 21apr13_move_config_exp 
# Conflicts:
#	src/common/dao/project/projectmember_test.go
#	src/core/api/projectmember.go
#	src/core/auth/ldap/ldap_test.go
#	src/server/v2.0/handler/project.go
 2021-04-14 09:45:48 +08:00
stonezdj
751d404519 Refactor project member api to new programming model 
Add pkg/member/dao
    Add pkg/member/models
    Add pkg/member/manager
    Add controller/member
    Remove the old project member API

Signed-off-by: stonezdj <stonezdj@gmail.com>
 2021-04-13 21:28:54 +08:00
stonezdj
60478f4990 Move common config api to lib/config 
Register all config managers, and get it by getConfigManger()

Signed-off-by: stonezdj <stonezdj@gmail.com>
 2021-04-13 19:43:33 +08:00
Daniel Jiang
1d01db3d3c
Merge pull request #14604 from reasonerjt/users-api-refact-2 
API for users to new model
 2021-04-13 16:21:51 +08:00
Daniel Jiang
d4cd2b87bd API for users to new model 
This commit moves the legacy apis related to users to new model.
Some funcs under common/dao are left b/c they are used by other module,
which should also be shifted to leverage managers.
We'll handle them separately.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2021-04-13 11:11:50 +08:00
Ziming Zhang
c775e989df refactor retention dao 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2021-04-12 16:36:00 +08:00
Wenkai Yin(尹文开)
e4678dc7db
Merge pull request #14578 from ywk253100/210318_replication 
Improve the performance of replication
 2021-04-12 10:44:32 +08:00
Wenkai Yin
09c3d042ea Improve the performance of replication 
Improve the performance of replication by introducing a new API to check whether the blob can be mounted directly

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-04-12 09:54:25 +08:00
stonezdj
ac5e908597 Refactor user group to new programming model 
Add context to required methods
Add pkg/usergroup/dao
Add pkg/usergroup/manager
Add controller/usergroup/controller

Signed-off-by: stonezdj <stonezdj@gmail.com>
 2021-04-09 14:40:48 +08:00
stonezdj
107e468b60 Refactor configure api to new programming model 
Changes include:
1. Move core/config to controller/config
2. Change the job_service and gcreadonly to depends on lib/config instead of core/config
3. Move the config related dao, manager and driver to pkg/config
4. Adjust the invocation of the config API, most of then should provide a context parameter, when accessing system config, you can call it with background context, when accessing user config, the context should provide orm.Context

Signed-off-by: stonezdj <stonezdj@gmail.com>
 2021-04-09 08:10:11 +08:00
stonezdj(Daojun Zhang)
8d6f4ddc38
Merge pull request #14583 from reasonerjt/authproxy-admin-username 
Add attribute admin username for authproxy
 2021-04-08 16:56:47 +08:00
Qian Deng
c5d12ce8ee
Merge pull request #14542 from ninjadq/add_task_info_in_exporter 
Add task info in exporter
 2021-04-07 18:17:26 +08:00
Daniel Jiang
ad8eee8623 Add attribute admin username for authproxy 
This commit adds the attribute "http_authproxy_admin_usernames", which
is string that contains usernames separated by comma, when a user logs
in and the username in the tokenreview status matches the setting of
this attribute, the user will have administrator permission.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2021-04-07 18:14:59 +08:00
DQ
fd62932a1f Enhance: Refactor metrics exporter 
* refactor register logic
* remove unused code
* edit some wording

Signed-off-by: DQ <dengq@vmware.com>
 2021-04-07 14:57:30 +08:00
DQ
dcb28d8e30 Add test case for exporter 
add e2e test to verify exporter and jobservice metrics exist

Signed-off-by: DQ <dengq@vmware.com>
 2021-04-06 15:54:33 +08:00
Wenkai Yin(尹文开)
28596c3ffb
Refactor registry API (#14528) 
* Refactor registry API

Refactor registry API

Signed-off-by: Wenkai Yin <yinw@vmware.com>

* Fix bugs of replications

1. Fix the scheduled replication doesn't work issue
2. Fix the destination name lost issue when updating replication policy

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-03-31 15:49:23 +08:00
DQ
7eebbeebdf Add jobservice task queue related task 
add jobservice metrics
add redis client

Signed-off-by: DQ <dengq@vmware.com>
 2021-03-30 10:29:36 +00:00
Wang Yan
9ef50ed430
refactor notification (#14406) 
* Refactor webhook

refactor notification to new programming model

Signed-off-by: wang yan <wangyan@vmware.com>
 2021-03-22 17:27:23 +08:00
Wenkai Yin(尹文开)
b2f0a1f0f5
Merge pull request #14400 from ywk253100/210226_registry 
Refeactor replication policy APIs
 2021-03-22 15:02:46 +08:00
Wenkai Yin
8b1817be0f Fix the consume too much CPU issue 
1. Update execution status during the upgrade
2. Refine the execution sweeper

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-03-17 13:34:24 +08:00
Wenkai Yin
3d7fd070c7 Refeactor replication policy APIs 
Refeactor replication policy APIs

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-03-17 10:57:31 +08:00
Wang Yan
ad47007438 fix catalog duplicate result 
Add distinct to the sql to avoid duplicate records be returned

Signed-off-by: Wang Yan <wangyan@vmware.com>
 2021-03-16 12:37:33 +08:00
Wenkai Yin
43df3bf8a4 Add upgrade sql file introduced in 2.1.4 
1. Add upgrade sql file introduced in 2.1.4
2. Minor improvement for task/execution to cover corner cases

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-03-15 16:48:51 +08:00
Daniel Jiang
0d4992a41e
API for system CVE allowlist to new model (#14412) 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2021-03-12 10:23:48 +08:00
Wenkai Yin(尹文开)
4ef93565f3
Merge pull request #14369 from ywk253100/210303_sort 
Introduce "sort" in query to provide a general solution for sorting
 2021-03-11 09:28:34 +08:00
Wenkai Yin
506d1ad465 Introduce "sort" in query to provide a general solution for sorting 
Introduce "sort" in query to provide a general solution for sorting

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-03-11 08:25:49 +08:00
stonezdj
5a35b7a9c4 Move ldap API to new program model 
Fix some issue with the LDAP connection test

Signed-off-by: stonezdj <stonezdj@gmail.com>
 2021-03-10 16:26:45 +08:00
Wang Yan
85254ccc22
refactor immutable rule (#14371) 
Migrate immutable realted APIs to v2 swagger

Signed-off-by: wang yan <wangyan@vmware.com>
 2021-03-08 17:10:12 +08:00
Daniel Jiang
4c47b1777e
Merge pull request #14370 from reasonerjt/oidc-ping-refact 
Switch API to ping OIDC endpoint to new model
 2021-03-05 11:49:30 +08:00
chlins
12f3609e42 fix: add precheck when registry check token expired 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2021-03-04 18:23:04 +08:00
Daniel Jiang
e96c1cbced Switch API to ping OIDC endpoint to new model 
This commit updates the API POST /api/v2.0/system/oidc/ping to new
programming model, in which the code will be generated by go-swagger.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2021-03-04 15:44:11 +08:00
He Weiwei
ef0bdf6954 refactor: generate scanner APIs by go-swagger 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2021-03-03 04:23:36 +00:00
He Weiwei
9161a3fbdf
refactor: use ormer from the ctx for scanner ctl mgr and dao (#14313) 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2021-03-01 12:02:40 +08:00
Wang Yan
5c2d43ea38 add sorting for list blobs 
Signed-off-by: Wang Yan <wangyan@vmware.com>
 2021-02-26 11:52:56 +08:00
He Weiwei
4b033c266a refactor: generate quota APIs by go-swagger 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2021-02-25 08:19:55 +00:00
Daniel Jiang
51c8375425
Merge pull request #14220 from wy65701436/fix-codeql-quota 
fix quota dao sql injection
 2021-02-10 10:34:54 +08:00
Wang Yan
496a178eb3 fix quota dao sql injection 
Signed-off-by: Wang Yan <wangyan@vmware.com>
 2021-02-10 03:55:59 +08:00
Wenkai Yin
fe0216ce94 Fix sql issue for querying tasks 
Fix sql issue for querying tasks

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-02-09 22:15:06 +08:00
Wang Yan
21d35f9702
update blob list query (#14195) 
* update blob list query

Deprecate blob list parameters, and use the query for instead.

Signed-off-by: wang yan <wangyan@vmware.com>

* update per review comments

Signed-off-by: Wang Yan <wangyan@vmware.com>
 2021-02-09 17:08:26 +08:00
Ziming Zhang
ec83f49a1a fix(retention) migrate sql error 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2021-02-05 09:09:26 +00:00
He Weiwei
44ba7de738
fix: wrap report vuls record creating in transaction (#14176) 
Make the creating of the ReportVulnerabilityRecord in transaction to
avoid parallel problem

Closes #14171

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2021-02-05 12:15:52 +08:00
He Weiwei
de97b900cf
fix: remove default execution sweeper count (#14168) 
1. Remove the default execution sweeper count for execution vendor.
2. Set the execution sweeper count for gc, preheat, replication,
retention to 50.
3. Disable sweep for the executions of the scan job.

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2021-02-05 12:15:15 +08:00
Wenkai Yin
027c80ea58 Ignore the not found error in some cases 
Ignore the not found error in some cases
Fixes #14154

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-02-03 20:26:50 +08:00
Wang Yan
1b85c67f63
fix catalog performance issue (#14120) 
Signed-off-by: Wang Yan <wangyan@vmware.com>
 2021-01-31 21:31:21 +08:00
DQ
eb5e31a442 Chagne quota usage metric name 
from `harbor_project_usage_byte` to `harbor_project_quota_usage_byte`

Signed-off-by: DQ <dengq@vmware.com>
 2021-01-28 18:10:59 +08:00
Qian Deng
ebe05919be
Merge pull request #14078 from ninjadq/fix_self_registration_metric 
Fix metric label related things
 2021-01-28 17:27:53 +08:00
Josh Soref
d45ce5cbf1 Return instead of crashing when New() fails 
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
 2021-01-26 20:41:18 -05:00
Josh Soref
5be895cb39 Check return from token.DefaultTokenOptions() 
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
 2021-01-26 20:39:55 -05:00
DQ
a7241c1eb6 Fix: Support multiple type for artifact metrics 
artiact became a dict

Signed-off-by: DQ <dengq@vmware.com>
 2021-01-26 09:05:57 +00:00
DQ
66fd4a9728 change label project id to project name 
project_name is more accurate

Signed-off-by: DQ <dengq@vmware.com>
 2021-01-26 16:15:04 +08:00
DQ
23a02bd5a7 Fix sel registration in metric label 
Original type is bool, should convert it to string

Signed-off-by: DQ <dengq@vmware.com>
 2021-01-25 18:53:10 +08:00
He Weiwei
e0f7778027
fix: ignore tag in the scan webhook when it's empty (#14057) 
Closes #13464

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2021-01-22 20:08:36 +08:00
Qian Deng
045e1d9abe
Merge pull request #14040 from ninjadq/metric_improvement 
Metric improvement
 2021-01-22 17:13:57 +08:00
Wenkai Yin(尹文开)
63831dfd08
Merge pull request #14027 from ywk253100/210116_status 
Don't ignore the NotFoundErr when handling the status hook of tasks to avoid the status out of sync
 2021-01-20 17:07:18 +08:00
Wenkai Yin
e55c7d05ff Don't ignore the NotFoundErr when handling the status hook of tasks to avoid the status out of sync 
Don't ignore the NotFoundErr when handling the status hook of tasks to avoid the status out of sync
Fixes #14016

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-01-20 14:53:50 +08:00
He Weiwei
6a16d9a914
fix: correct Authorize of basic and berer authorizer (#14036) 
Closes #13734

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2021-01-20 14:33:28 +08:00
DQ
c59b437970 Remove empty label in harbor info 
some infomation can not get with guest user. So remove them

Signed-off-by: DQ <dengq@vmware.com>
 2021-01-20 10:53:55 +08:00
Wenkai Yin(尹文开)
c3b986cbcd
Merge pull request #14012 from ywk253100/210113_replication 
Query executions with both vendor type and ID when sweep the execution records
 2021-01-18 11:15:31 +08:00
Wenkai Yin
38e0f102bf Query executions with both vendor type and ID when sweep the execution records 
Query executions with both vendor type and ID when sweep the execution records

Fixes #13996

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-01-15 20:23:55 +08:00
Wang Yan
df8e7c45e3 fix robot list issue 
fixes #13985
Add sorting for listing the robot account

Signed-off-by: Wang Yan <wangyan@vmware.com>
 2021-01-15 11:56:53 +08:00
Daniel Jiang
6ae94d3790 Remove raw token from header in token review reuqest 
The server to handle token-review may have a limitation for the size of
the header.  When the token is huge the token review may fail.
This commit remove the necessary header to harden the flow.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2021-01-14 17:36:55 +08:00
Ziming Zhang
39fb500318 feat(retention) refactor to use go swagger api 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2021-01-08 07:09:28 +00:00
Steven Zou
1f79ce1181
Merge pull request #13554 from shaobo322/reform_compare_method 
reform job status compare method
 2021-01-08 12:49:39 +08:00
He Weiwei
755c6490f9
feat: remove duplicate CVE in scan report and summary (#13918) 
1. Remove the duplicate CVE records in the report/summary for the image
index.
2. Add scanner field in the scan overview for the API.

Closes #13913

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2021-01-08 11:00:43 +08:00
He Weiwei
9402077695
feat: save summary for the scan all execution (#13931) 
Compute the summary info for the scan all and save it to the extra attrs
of the execution.

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2021-01-08 10:10:31 +08:00
Wenkai Yin(尹文开)
3408f0b577
Merge pull request #13909 from ywk253100/210106_task 
Provide a mechanism to sweep the execution/task records in task manager
 2021-01-07 13:44:21 +08:00
Wenkai Yin
fb871dbbe8 Provide a mechanism to sweep the execution/task records in task manager 
Provide a mechanism to sweep the execution/task records in task manager
Fixes #13888

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-01-06 16:41:46 +08:00
stonezdj(Daojun Zhang)
b748852ee8
Merge pull request #13805 from stonezdj/201218_add_content_type_length 
Add content type and length in header
 2021-01-06 15:02:34 +08:00
Daniel Jiang
06e993ff76
Remove scanner-pull from system admin's permission (#13901) 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2021-01-06 12:35:58 +08:00
Ziming Zhang
8faa76a1b6 feat(retention) refactor task manager 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2021-01-05 12:08:03 +08:00
shaobo
434758b71e reform job status compare method 
Signed-off-by: shaobo <shaobo@caicloud.io>
 2021-01-04 21:34:53 +08:00
Wang Yan
0271efd3f7
enable visible when to list/create robot (#13840) 
1, enable the visible attribute when to create/list robots
2, rename package name from robot2 to robot

Signed-off-by: Wang Yan <wangyan@vmware.com>
 2021-01-04 10:24:31 +08:00
prahaladdarkin
a890b28e1e
Store vulnerability data from scanner into a relational format (#13616) 
feat: Store vulnerability report from scanner into a relational format

Convert vulnerability report JSON obtained  from scanner into a relational format describe in:https://github.com/goharbor/community/pull/145

Signed-off-by: prahaladdarkin <prahaladd@vmware.com>
 2020-12-25 08:47:46 +08:00
Wenkai Yin
923a538570 Provide the function to update extra attributes in the task manager 
Provide the function to update extra attributes in the task manager

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-12-24 15:52:37 +08:00
Wenkai Yin(尹文开)
d32a243508
Use the same transaction to remove the schedule to avoid dead lock in database (#13820) 
Use the same transaction to remove the schedule to avoid dead lock in database
Fixes #13808

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-12-23 15:37:51 +08:00
He Weiwei
8fa03e3739
refactor: remove code of scan all job (#13821) 
Remove code of scan all job as it's implemented by execution now.

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-12-22 11:39:18 +08:00
stonezdj
aa3002e7a5 Add content type and length in header 
Fixes #13740
Update ManifestExist to return Descriptor instead of digest
For docker 20.10 or containerd, it HEAD the manifest before pull, then
it GET the manifest with digest, add logic to handle this scenario and
correlate the tag between the digest in proxy cache

Signed-off-by: stonezdj <stonezdj@gmail.com>
 2020-12-21 20:21:28 +08:00
He Weiwei
ce6ed3eeb7 refactor(api): move scan all apis to go-swagger 
Move scan all APIs from beego to go-swagger.

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-12-21 02:17:02 +00:00
stonezdj
3334defd92 Revert "fix issue" 
This reverts commit e6f80259
This reverts commit 918fe125

Signed-off-by: stonezdj <stonezdj@gmail.com>

Revert "Add content type and length in header"

This reverts commit ca379111

Signed-off-by: stonezdj <stonezdj@gmail.com>
 2020-12-18 12:35:39 +08:00
stonezdj(Daojun Zhang)
05f327cfbd
Merge pull request #13751 from stonezdj/201211_add_content_type_length 
Add content type and length in header
 2020-12-17 18:19:38 +08:00
stonezdj
e6f80259f7 fix issue 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2020-12-17 16:33:17 +08:00
stonezdj
ca37911113 Add content type and length in header 
Fixes #13740
Update ManifestExist to return Descriptor instead of digest

Signed-off-by: stonezdj <stonezdj@gmail.com>
 2020-12-17 15:42:49 +08:00
Daniel Jiang
3b04d2f8f5
Escape the values to contains operator in dao packages (#13774) 
fixes #13018

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-12-16 14:19:20 +08:00
Wenkai Yin
69808f033e Tiny fixes for task manager 
1. Add update time for execution
2. Add unique constraint for schedule to avoid dup records when updating policies
3. Format replication log
4. Keep the webhook handler for legacy replication jobs to avoid jobservice resending the status change request

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-12-14 17:26:32 +08:00
He Weiwei
08580f9fec
refactor(scan): refactor scan/scan all job to task manager (#13684) 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-12-14 13:34:35 +08:00
Wenkai Yin(尹文开)
6569016d35
Merge pull request #13139 from wy65701436/migrate-gc 
Migrate gc to task manager
 2020-12-14 10:43:44 +08:00
Wang Yan
39e1a4f2b4 add extra attributes in the schedule table 
Signed-off-by: Wang Yan <wangyan@vmware.com>
 2020-12-14 02:28:52 +08:00
Wenkai Yin(尹文开)
43104ab0b9
Merge pull request #13724 from reasonerjt/http-auth-admin-grp 
Support admin group in http authproxy
 2020-12-11 13:06:26 +08:00
wang yan
1bb79d402d update code per review comments 
Signed-off-by: wang yan <wangyan@vmware.com>
 2020-12-10 16:08:52 +08:00
Daniel Jiang
60e3668d43 Support admin group in http authproxy 
This commit adds admin_groups into the configuration of http_auth
settings, it's a string in the form of "group1, group2".  If the token
review result shows the user is in one of the groups in the setting he
will have the administrator role in Harbor.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-12-10 15:57:15 +08:00
Wang Yan
dba5522d0b Migrate to task manager (#129) 
1, remove the gc to new programming model
2, move api define to harbor v2 swagger
3, leverage task & execution manager to manage gc job schedule, trigger and log.

Signed-off-by: wang yan <wangyan@vmware.com>
 2020-12-10 14:00:33 +08:00
DQ
85bf88c74e Add test case exporter 
- cache ut
- cli ut
- project collector ut
- system collector ut

Signed-off-by: DQ <dengq@vmware.com>
 2020-12-09 21:47:29 +08:00
DQ
d95f22448c Add cache for exporter 
Add timed cache for exporter
default cache time is 30s, cleanup job run every 4 hours

Signed-off-by: DQ <dengq@vmware.com>
 2020-12-09 21:22:40 +08:00
DQ
e6b53593ee Add exporter to harbor 
- add main file
- add pkg file
- update go.mod
- update vendor

Signed-off-by: DQ <dengq@vmware.com>
 2020-12-09 20:42:14 +08:00
Wang Yan
d2fa2e6b84
update robot secret (#13654) 
* update robot secret

1, use SHA256 to generate and validate robot secret instread of symmetric encryption.
2, update the patch input object

Signed-off-by: Wang Yan <wangyan@vmware.com>

* update robot secret

1, use SHA256 to generate and validate robot secret instread of symmetric encryption.
2, update the patch input object

Signed-off-by: Wang Yan <wangyan@vmware.com>
 2020-12-03 18:13:06 +08:00
Wang Yan
732e9a21cd
updates on robot accounts (#13623) 
* updates on robot accounts

1, add patch method to refresh secret of a robot
2, fix robot account update issue
3, add editable attribute to handle the version 1 robot account
4, add duration for robot account
5, hide secret for get/list robot account

Signed-off-by: wang yan <wangyan@vmware.com>

* update code per review comments

1, change expirate creation func to AddDate().
2, remove the scanner duration specification, use the default value.

Signed-off-by: Wang Yan <wangyan@vmware.com>
 2020-12-01 18:31:34 +08:00
Qian Deng
b80b1a7abf
Merge pull request #13617 from ninjadq/remove_clair_in_harbor_code 
Remove clair code in harbor
 2020-11-30 15:28:02 +08:00
Daniel Jiang
db8ce49133
Rework systeminfo API. (#13606) 
This commit rework the systeminfo API under new programming model.
Also fixes #9149

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-11-30 14:15:18 +08:00
DQ
590212b485 Remove clair related code 
- clair code in harbor core
- clair code in frontend
- clair code in robotcase

Signed-off-by: DQ <dengq@vmware.com>
 2020-11-27 14:01:04 +08:00
Wang Yan
02846194e0 parent 8e61a3ea31 
author Wang Yan <wangyan@vmware.com> 1605849192 +0800
committer Wang Yan <wangyan@vmware.com> 1606361046 +0800

update code per review comments

Signed-off-by: wang yan <wangyan@vmware.com>
 2020-11-26 14:10:12 +08:00
Wang Yan
8e61a3ea31 add robot account 2 api handler 
Signed-off-by: Wang Yan <wangyan@vmware.com>
 2020-11-26 11:10:05 +08:00
Wenkai Yin(尹文开)
fe8b628f0c
Merge pull request #13437 from ywk253100/200929_replication 
Refactor the replication execution
 2020-11-24 10:38:22 +08:00
Steven Zou
35a0fc7afd
Merge pull request #13330 from chlins/fix/scanner-apikey-authorization 
fix: fix scanner apikey type match error
 2020-11-23 17:06:35 +08:00
Wenkai Yin
294385c34d Refactor the replication execution 
1. Use the task manager to manage the underlying execution/task
2. Use the pkg/scheduler to schedule the periodical job
3. Apply the new program model
4. Migration the old data into the new data model

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-11-23 14:24:10 +08:00
Wenkai Yin(尹文开)
def782b6f8
Don't escape the name when doing the exact matching for tag (#13533) 
Don't escape the name when doing the exact matching for tag
Fixes #13106

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-11-18 14:34:48 +08:00
Wang Yan
3550b5e5e9 add robot mgr 
the robot account manager to handle the CRUD

Signed-off-by: wang yan <wangyan@vmware.com>
 2020-11-11 13:47:03 +08:00
Wang Yan
9723655378 update code per review comments 
1, rename table name to permission_policy
2, rename functions name

Signed-off-by: Wang Yan <wangyan@vmware.com>
 2020-11-10 18:11:31 +08:00
Wang Yan
ec15e320bf add role permission manager for robot enhancement 
1, add two db tables of role permission and rbac policy
2, add manager of these two tables

Signed-off-by: Wang Yan <wangyan@vmware.com>
 2020-11-10 16:49:29 +08:00
chlins
21b56d241a fix: fix scanner apikey type match error 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2020-10-21 18:29:19 +08:00
He Weiwei
ea0fbbeace refactor(security): use controller instead of promgr in security 
Use `project.Controller` instead of `promgr.ProjectManager` in security
implementations because we will remove `promgr` package later.

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-10-19 10:33:51 +00:00
Daniel Jiang
fb687aeef8 Use pkg/token to generate JWT token 
This commit refactors the approach to encode a token in handler of /service/token,
by reusing pkg/token to avoid inconsistency.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-10-15 16:16:44 +08:00
Wenkai Yin(尹文开)
8b9727f53f
Support store the cron type in the schedule (#13097) 
There is requirement that show the cron type(daily, weekly, etc.) on the UI, this commit adds the support for storing the cron type in the schedule model

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-09-24 16:48:56 +08:00
Wenkai Yin
1a4106a996 Tiny improvement for the task manager 
Add a new method "StopAndWait" which stops the execution and wait until the execution stopped or get an error

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-09-23 15:24:26 +08:00
Daniel Jiang
513c48d47c
Merge pull request #12936 from wy65701436/fix-swagger-dep 
remove the dependency on swagger models
 2020-09-08 18:14:42 +08:00
He Weiwei
6d50988c8b fix(project): change to use user id to query projects of member 
We know the user id when query projects by member, so use the user id
as entity_id directly in project_member, no need to join harbor_user
table.

Closes #12968

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-09-07 06:35:26 +00:00
Wang Yan
262f22f5ef
fix gc log issue (#12943) 
1, Do not log redis url, just log the user input from UI.
2, Format the artifact trash items.

Signed-off-by: wang yan <wangyan@vmware.com>
 2020-09-02 17:11:05 +08:00
wang yan
116d295462 remove the dependency on swagger models 
1, remove the pkg dependency on v2.0/server/models
2, remove the controller dependency on v2.0/server/models

Signed-off-by: wang yan <wangyan@vmware.com>
 2020-09-01 17:43:44 +08:00
Steven Zou
d4108e3fac fix(preheat):handle fail case of preheat in job 
Signed-off-by: Steven Zou <szou@vmware.com>
 2020-08-28 17:55:36 +08:00
Daniel Jiang
a651eb0949
Merge pull request #12883 from wy65701436/fixes-12254 
fix event log issue
 2020-08-27 16:52:24 +08:00
wang yan
b51aaac26e fix event log issue 
fixes #12554
Add string method for each event, and the detail can be logged in the core.log

Signed-off-by: wang yan <wangyan@vmware.com>
 2020-08-26 18:27:21 +08:00
Ziming Zhang
c3fde4e483 fix(replication) gcr deletion and tag deletion 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2020-08-26 15:18:05 +08:00
Wang Yan
ad47d2f444
fix upgrade issue (#12857) 
fixes #12849

1, gives a default value to blob status in the migration script, and use none to replace the empty string as
the StatusNone, that will more readable on debugging failure.

2, GC jobs marks all of blobs as StatusDelete in the mark phase, but if encounter any failure in the sweep phase,
GC job will quite and all of blobs are in StatusDelete. If user wants to execute the GC again, it will fail as the
StatusDelete cannot be marked as StatusDelete. So, add StatusDelete in the status map to make StatusDelete can be
marked as StatusDelete.

Signed-off-by: wang yan <wangyan@vmware.com>
 2020-08-24 16:08:15 +08:00
Wenkai Yin(尹文开)
d4f18139ef
Merge pull request #12618 from ywk253100/200729_tk_mgr 
Refresh the status of execution for every status changing of task
 2020-08-20 14:38:09 +08:00
Steven Zou
c1b6be6ac9
Merge pull request #12801 from heww/fix-issue-9471 
refactor(scan): remove duplicate CVESet types
 2020-08-19 10:37:10 +08:00
Ted Guan
eb317fb8cb
tag retention webhook support (#12749) 
Signed-off-by: guanxiatao <guanxiatao@corp.netease.com>
 2020-08-19 00:07:45 +08:00
He Weiwei
ef37bd1afb refactor(scan): remove duplicate CVESet types 
Closes #9471

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-08-18 06:33:17 +00:00
Wang Yan
da52e677e5
remove robot accounts when to delete a project (#12789) 
The robots associate with the project should be removed after the project is deleted.

Signed-off-by: wang yan <wangyan@vmware.com>
 2020-08-18 10:38:45 +08:00
fanjiankong
09ba463cc7 Fix. 
Signed-off-by: fanjiankong <fanjiankong@tencent.com>
 2020-08-17 21:40:37 +08:00
Wenkai Yin
0fd230c2d6 Refresh the status of execution for every status changing of task 
Refresh the status of execution for every status changing of task to support filtering executions by status directly

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-08-17 17:38:55 +08:00
He Weiwei
f309896f2f refactor(api): generate project apis by go-swagger 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-08-15 16:10:57 +00:00
Wenkai Yin
b1ddb5e2cc Implement the icon API to get the icon of artifact 
Implement the icon API to get the icon of artifact

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-08-15 08:40:38 +08:00
Wang Yan
01e4aa61f7
fix gc remove manifest issue (#12748) 
fixes #12720

The GC job doesn't remove the manifest of scheme1.MediaTypeSignedManifest as it's recognized by GC job.

Signed-off-by: wang yan <wangyan@vmware.com>
 2020-08-13 11:25:06 +08:00
Yiyang Huang
b98dc97fbd feat: enhanced default processor 
Signed-off-by: Yiyang Huang <huangyiyang.huangyy@bytedance.com>
 2020-08-11 01:31:02 +08:00
chlins
302e4c6659 fix(preheat): add pagination for execution and task list api 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2020-08-06 16:59:38 +08:00
Wenkai Yin
d6288a43e8 Do some refine for the scheduler 
1. Accept vendorType and vendorID when creating the schedule
2. Provide more methods in the scheduler interface to reduce the duplicated works of callers
3. Use a new ormer and transaction when creating the schedule

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-08-05 17:43:18 +08:00
fanjiankong
4570a46823 Fix bug of update preheat instance default. 
Signed-off-by: fanjiankong <fanjiankong@tencent.com>
 2020-08-04 18:54:03 +08:00
Chlins Zhang
6f6742894c
Merge pull request #12647 from chlins/refactor/preheat-policy-serialize 
refactor(preheat): refactor policy schema serialize funcs
 2020-08-03 23:01:01 +08:00
chlins
4446302330 refactor(preheat): refactor policy schema serialize funcs 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2020-08-02 14:43:30 +08:00
He Weiwei
df1bdc1020 refactor(project): add more methods to project controller and manager 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-07-31 17:55:35 +00:00
stonezdj(Daojun Zhang)
518a1721a7
Merge pull request #12571 from ywk253100/200723_proxy_cache_secret 
Limit the permission of secret used by proxy cache service
 2020-07-30 14:04:54 +08:00
Daniel Jiang
0a9219dcd6
Merge pull request #12615 from wy65701436/update-logs 
revise the blob logs
 2020-07-30 09:10:07 +08:00
Steven Zou
507d792655 fix(preheat): fix npe issues 
- fix npe issue in create/update policy
- fix issue of missing schedule job id in the preheat policy

Signed-off-by: Steven Zou <szou@vmware.com>

- increase the client timeout
 2020-07-30 00:29:26 +08:00
wang yan
20df844d5a revise the blob logs 
1, update typo in the update blob status sql, the typo will not impact the sql result.
2, correct blob status in the middleware & GC job log.

Signed-off-by: wang yan <wangyan@vmware.com>
 2020-07-29 12:45:30 +08:00
fanjiankong
3653d3cdef Schedule preheat policy. 
Signed-off-by: fanjiankong <fanjiankong@tencent.com>
 2020-07-29 00:36:34 +08:00
Steven Zou
d392e27ef9 fix(preheat):enhance preheat job 
- add job stop check points in preheat job
- add missing digest property for the preheat request sent to the provider

Signed-off-by: Steven Zou <szou@vmware.com>
 2020-07-28 22:19:00 +08:00
Steven Zou
8f6fb7db5b
Merge branch 'master' into fix/p2p_job_log 2020-07-27 22:47:15 +08:00
Steven Zou
1adaf58ab1 fix(preheat):improve preheat job logs 
Signed-off-by: Steven Zou <szou@vmware.com>
 2020-07-27 22:43:18 +08:00
Wenkai Yin
ced7b73322 Limit the permission of secret used by proxy cache service 
Limit the permission of secret used by proxy cache service, fixes #12257

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-07-27 10:15:00 +08:00
Steven Zou
522bd7a8ee
Merge pull request #12582 from steven-zou/fix/nothing_filtered_out_issue 
fix(p2p-preheat):fix issues of triggering preheat
 2020-07-26 22:05:22 +08:00
Steven Zou
716da7f3ff fix(p2p-preheat):fix issues of triggering preheat 
- fix invalid data type of vulnerability filter param
- add more debug logs
- add more logs in the preheat job
- fix issue of getting empty list when doing querying artifacts

Signed-off-by: Steven Zou <szou@vmware.com>
 2020-07-26 13:47:58 +08:00
Steven Zou
cafb2e819c
Merge pull request #12547 from kofj/fix-transaction 
Fix: preheat install update transaction.
 2020-07-24 16:33:29 +08:00