Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-01 22:54:20 +01:00
Code Issues Projects Releases Wiki Activity
10,162 Commits 53 Branches 317 Tags 335 MiB
923a538570
Commit Graph

4692 Commits

Author SHA1 Message Date
AllForNothing
120e8dd3d1 Improve label selection for artifact list page 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-10-30 14:43:59 +08:00
Will Sun
a255f3e74d
Merge pull request #13376 from AllForNothing/p2p-css 
Fix a bug for editing p2p instance
 2020-10-29 19:57:51 +08:00
Will Sun
8fda6bbb83
Merge pull request #13386 from AllForNothing/align 
Fix css bug for adding p2p policy
 2020-10-29 19:57:14 +08:00
Greg
d1ee94bbc9
DTR replication support (#9512) 
Adding DTR replication support

Signed-off-by: Greg Sidelinger <gate@ilive4code.net>
 2020-10-29 18:54:44 +08:00
chlins
9887154a0a fix(preheat): add location when create instance and policy 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2020-10-29 18:16:59 +08:00
AllForNothing
1417be1ffc Fix css bug for adding p2p policy 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-10-29 09:25:35 +08:00
AllForNothing
cc1eb1de86 Fix a bug for editing p2p instance 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-10-29 09:14:14 +08:00
Will Sun
fc65f5bf69
Merge pull request #13375 from AllForNothing/rep-filter 
Fix filter bug for replication rule list
 2020-10-29 09:10:31 +08:00
Daniel Jiang
535728d11f
Merge pull request #13306 from heww/refactor-security-context 
refactor(security): use controller instead of promgr in security
 2020-10-29 02:39:59 +08:00
Flávio Ramalho
ef6414be3e
Fix deadlock on harbor-core initialization 
During the harbor core initialization if the database takes longer to
be ready there is a risk of deadlock when checking for the TCP connection
with the database.

The `TestTCPConn` function uses unbuffered channels to check when the
connection succeeds/timeouts. The timeout check is executed in parallel
with the connection check (this runs in a gorountine). The deadlock happens
when the goroutine execution takes longer than the function timeout
(hence setting `cancel <- 1`) and the DialTimeout call succeeds (hence
setting `success <- 1`). At this point both threads are waiting for the
channels values to be read.

This is reproducible mostly on slow systems where initializing the
database takes longer and finishes during the 5th time of the
`DialTimeout` call where it eventually exceeds the TestTCPConn timeout.

This fix sets the `success` and `cancel` channels as buffered
(non-blocking).

Signed-off-by: Flávio Ramalho <framalho@suse.com>
 2020-10-28 17:09:34 +01:00
AllForNothing
53dc8f0bcf Fix filter bug for replication rule list 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-10-28 12:29:33 +08:00
Will Sun
ec790d0afd
Merge pull request #13347 from AllForNothing/vul-list 
Improve vilnerability list UI
 2020-10-28 10:24:18 +08:00
Ziming Zhang
a7d906649c feature(replication) check namespace existing first for AWS adapter 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2020-10-26 16:40:13 +08:00
AllForNothing
5475738a28 Fix css and i18n bugs 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-10-26 16:09:13 +08:00
AllForNothing
64ddef2e1d Improve vilnerability list UI 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-10-23 15:03:33 +08:00
Daniel Jiang
9c1da3a405 Add more info in log message to help debug 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-10-22 18:55:01 +08:00
Daniel Jiang
eadb65f988
Merge pull request #13312 from reasonerjt/oidc-admin-group 
Add admin group support to OIDC auth mode
 2020-10-22 18:30:10 +08:00
Daniel Jiang
649c9814e4 Address review comment by Yan 
Resolve review comment in PR #13312

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-10-22 16:53:37 +08:00
AllForNothing
ea494af06e Fix a css bug of Clarity page size selection 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-10-22 16:48:35 +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
danfengliu
8af343f27a
Merge pull request #13324 from ywk253100/201021_project_cherry_pick 
Return the location header when creating proxy cache project
 2020-10-21 17:07:15 +08:00
Wenkai Yin(尹文开)
84971fc77d
Merge pull request #13316 from stonezdj/201020_dup_group_filter 
Remove dup call to createGroupSearchFilter in searchGroup
 2020-10-21 14:53:45 +08:00
Wenkai Yin
3021558272 Return the location header when creating proxy cache project 
Fixes #13303. Return the location header when creating proxy cache project

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-10-21 14:35:48 +08:00
Will Sun
1e421748bc
Merge pull request #13302 from AllForNothing/rep-rule 
Add page size options to datagrid
 2020-10-21 11:14:44 +08:00
Daniel Jiang
7c57e984a8
Merge pull request #13313 from AllForNothing/oidc 
[UI]Add admin group support to OIDC auth mode
 2020-10-21 11:10:28 +08:00
stonezdj
ca7258617b Remove dup call to createGroupSearchFilter in searchGroup 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2020-10-20 19:07:33 +08:00
AllForNothing
e7c53dc28a Add oidc admin group to oidc setting ui 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-10-20 17:47:00 +08:00
Daniel Jiang
f4ff369ed0 Add admin group support to OIDC auth mode 
Add oidc_admin_group to configuration, and make sure a token with the
group name in group claim has the admin authority.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-10-20 15:38:58 +08:00
chlins
73981062a9 fix: fix quay adapter catalog api return error 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2020-10-20 14:24:25 +08:00
AllForNothing
7b32fdb9f9 Add page size options to datagrid 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-10-19 18:42: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
Will Sun
69b6bfd50a
Merge pull request #13239 from AllForNothing/unlogged 
Allow un-logged users to visit public repos
 2020-10-19 11:22:43 +08:00
stonezdj(Daojun Zhang)
88005e5028
Merge pull request #13267 from stonezdj/201014_no_default_group_filter 
Refine ldap searchGroup function
 2020-10-19 09:58:04 +08:00
stonezdj(Daojun Zhang)
8156f74bf4
Merge pull request #13266 from stonezdj/201009_proxy_head_containerd 
Add middleware to proxy HEAD request for proxy cache project
 2020-10-16 20:26:01 +08:00
AllForNothing
59fe9830b5 Allow un-logged users to visit public repos 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-10-16 17:21:36 +08:00
Wenkai Yin(尹文开)
c491c4f513
Merge pull request #13257 from reasonerjt/jwt-refact 
Use pkg/token to generate JWT token
 2020-10-16 16:31:26 +08:00
stonezdj
20ef7d3219 Refine LDAP searchGroup function 
Search LDAP group with groupDN+filter, then match baseDN
Create a default filter when ldap group filter is empty
Fixes #13156

Signed-off-by: stonezdj <stonezdj@gmail.com>
 2020-10-16 16:20:41 +08:00
stonezdj
0641b300f3 Add middleware to proxy HEAD request for proxy cache project 
Fixes: #13153, containerd need to head manifest before pull image
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2020-10-16 13:02:32 +08: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
stonezdj(Daojun Zhang)
cdd0eee2d4
Merge pull request #13162 from stonezdj/200921_rating_limit 
Change the condition of LocalManifest
 2020-10-14 19:34:38 +08:00
stonezdj
ee4b16ccdb Change the condition of LocalManifest 
Compare the local digest and the remote digest when pull by tag
Use HEAD request (ManifestExist) instead of GET request (GetManifest) to avoid been throttled
For manifest list, it can avoid GET request because cached manifest list maybe different with the original manifest list
Make RemoteInterface public
Fixes #13112

Signed-off-by: stonezdj <stonezdj@gmail.com>
 2020-10-14 15:15:48 +08:00
stonezdj
9264105934 Add pull time for proxy cache artifact in first pull 
Fixes #13152

Signed-off-by: stonezdj <stonezdj@gmail.com>
 2020-10-14 13:35:42 +08:00
Daniel Jiang
c93858cdbc
Remove UT for helm hub adapter (#13255) 
The helm hub adapter will not work due to the shift to artifact hub and
the API has changed. more details see #13244
Remove the UT for helm hub adapter to unblock CI.
Later we need to rework the adapter to replicate from artifact hub.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-10-14 10:22:03 +08:00
Wenkai Yin(尹文开)
4d78fd4e4e
Merge pull request #13126 from Thoro/fix-10913-oidc-error-after-restart 
fix #10913: initialize oidc provider before calling Load
 2020-10-14 10:13:52 +08:00
Thomas Rosenstein
874b0b1c0c fix #10913: initialize provider before calling Load 
Signed-off-by: Thomas Rosenstein <thomas.rosenstein@creamfinance.com>
 2020-09-30 17:25:29 +02:00
stonezdj(Daojun Zhang)
5293c8ff4b
Merge pull request #13053 from reasonerjt/fix-ldap-admingroup 
Revert "Store User ID in session instead of the whole user model (#12…
 2020-09-30 20:18:30 +08:00
AllForNothing
e999a15b02 Handle 504 error from backend 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-09-28 18:09:05 +08:00
AllForNothing
8d9a18b539 Update UI package to latest version 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-09-25 09:46:05 +08:00
Will Sun
18f41bad88
Merge pull request #13085 from AllForNothing/replication 
Add disable/enable function to replication rules
 2020-09-24 17:35:51 +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
Wang Yan
1af4c5e7cb
bump up go-digest version (#12992) 
Signed-off-by: wang yan <wangyan@vmware.com>
 2020-09-24 16:47:29 +08:00
Wenkai Yin(尹文开)
a62f05893f
Merge pull request #13129 from ywk253100/200917_task_mgr 
Tiny improvement for the task manager
 2020-09-24 16:46:44 +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
stonezdj(Daojun Zhang)
20d4e86e0d
Merge pull request #13109 from Thoro/fix-encrypt-error-message 
Add error log in case encryption on config save fails
 2020-09-23 14:03:20 +08:00
Wenkai Yin(尹文开)
59f9ef7e5c
Abstract more info into the extra attributes for images (#13014) 
1. Abstract the "config" property(which contains labels) of config layer into the extra attributes for images
2. Try to get the author information from the "maintainer" label

fixes 12066
fixes 12734

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-09-23 10:42:47 +08:00
Thomas Rosenstein
452a0c9c45 Add error log in case encryption on config save fails 
Signed-off-by: Thomas Rosenstein <thomas.rosenstein@creamfinance.com>
 2020-09-22 10:09:47 +02:00
AllForNothing
074f70158e Improve i18n for tag deletion 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-09-18 09:33:24 +08:00
AllForNothing
abdbd79ed4 Add disable/enable function to replication rules 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-09-17 10:29:31 +08:00
AllForNothing
2d1c7ac76b Disable endpont input fot docker-hub and helm-hub 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-09-16 14:56:31 +08:00
Wenkai Yin(尹文开)
5d22644136
Merge pull request #13040 from bitsf/replication_ecr_auth_role 
feature(replication) enable role based auth for AWS ECR
 2020-09-15 19:13:05 +08:00
Ziming Zhang
699518a22e feature(replication) enable role based auth for AWS ECR 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2020-09-15 12:46:28 +08:00
Daniel Jiang
df106cf243 Revert "Store User ID in session instead of the whole user model (#12984)" 
This reverts commit 6fc0c9d75a.

Because this erases the AdminRoleInAuth attribute in user model as it is
not stored in DB and it will break the admin group of LDAP.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-09-15 10:05:31 +08:00
AllForNothing
60c2350088 Improve notary cmd on UI 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-09-14 18:39:22 +08:00
Will Sun
49c80f954c
Merge pull request #13025 from AllForNothing/uppercase 
Change EXECUTE button to uppercase
 2020-09-11 11:01:03 +08:00
Daniel Jiang
8846011571
Merge pull request #13017 from chlins/fix/webhook-verify-cert 
fix(webhook): fix the verify cert logic of webhook endpoint
 2020-09-11 02:18:57 +08:00
chlins
685d9277c4 fix(webhook): fix the verify cert logic of webhook endpoint 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2020-09-10 21:01:25 +08:00
Daniel Jiang
354eaac195
Escape the query string in list user (#13013) 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-09-10 20:17:53 +08:00
AllForNothing
01d4539a99 Change EXECUTE button to uppercase 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-09-10 11:09:13 +08:00
stonezdj(Daojun Zhang)
97b9cc2d5e
Merge pull request #12997 from stonezdj/200902_ldap_filter_fail 
Add ldap filter syntax validation when create search filter
 2020-09-09 16:21:01 +08:00
stonezdj
b9752f3112 Add ldap filter syntax validation when create search filter 
Correct ldap search filter is enclosed with '(' and ')'
Search ldap group with the ldap group base DN instead of group DN
Fixes #12613 LDAP Group Filter and Group Base DN have no affect

Signed-off-by: stonezdj <stonezdj@gmail.com>
 2020-09-09 10:07:07 +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
Will Sun
5586fe86bf
Merge pull request #12988 from AllForNothing/test-4 
Fix UI issues found on testing day
 2020-09-08 01:12:10 +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
AllForNothing
3fa3e14bb6 Fix UI issues found on testing day 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-09-07 12:50:48 +08:00
Daniel Jiang
6fc0c9d75a
Store User ID in session instead of the whole user model (#12984) 
This commit makes a change so that the user id will be stored in sessoin
after user login instead of user model to avoid data inconsistency when
user model changes.

Fixes #12934

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-09-07 11:43:37 +08:00
stonezdj(Daojun Zhang)
4267570e99
Merge pull request #12960 from heww/ignore-enable-content-trust-for-proxy-cache 
feat(project): ignore enable_content_trust for proxy project
 2020-09-07 11:25:53 +08:00
Daniel Jiang
2f7c8c2abd Check the tag in isArtifactSigned func 
This commit ensures that when CLI is pulling a tag, the content trust middleware check the data in notary to ensure the particular tag is signed, not only the digest.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-09-05 17:00:55 +08:00
Chlins Zhang
0465ad733f
Merge pull request #12916 from chlins/fix/project-deletion-needs-delete-preheat-policy 
fix(p2p): delete all preheat policies before delete project
 2020-09-03 17:32:20 +08:00
Daniel Jiang
66c3fa9eec
Return basic auth challenge for /v2/_catalog (#12956) 
Fixes #12192

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-09-03 11:31:57 +08:00
He Weiwei
f4938ca966
fix(scanner): move RemoveImmutableScanners before EnsureScanners (#12957) 
RemoveImmutableScanners may delete the default scanner, so move it
before the EnsureScanners.

Closes #12938

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-09-03 11:11:16 +08:00
He Weiwei
41c839af88 feat(project): ignore enable_content_trust for proxy project 
Ignore enable_content_trust metadata for proxy cache project, see
https://github.com/goharbor/harbor/issues/12940 to get more info

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-09-02 15:24:45 +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
chlins
e01de8b201 fix(p2p): delete all preheat policies before delete project 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2020-09-02 16:39:51 +08:00
Wenkai Yin
7816ff5e85 retry several times when failed to copy blob during the replication 
Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-09-02 16:07:20 +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
Wenkai Yin(尹文开)
560eba7bd1
Merge pull request #12894 from stonezdj/200827_dockerhub_offline 
Fallback to local repo on errors when proxy to remote repo
 2020-08-28 15:14:21 +08:00
Wenkai Yin(尹文开)
3abe8b8fab
Merge pull request #12456 from julienvey/fix-sql-typo 
Fix typo in sql log
 2020-08-28 10:04:27 +08:00
Wenkai Yin(尹文开)
bad704d38b
Merge pull request #12897 from reasonerjt/icon-refactor 
Fill in the icon of known artifacts in artifact controller
 2020-08-28 10:03:12 +08:00
Daniel Jiang
91e2779822 Fill in the icon of known artifacts in artifact controller 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-08-28 01:33:26 +08:00
Ziming Zhang
bda66e9e1f Add aws China regions ECR support, both of cn-north-1 and cn-northwest-1 endpoints. 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2020-08-27 23:43:16 +08:00
stonezdj
6967d73476 Fallback to local repo on errors when proxy to remote repo 
When the remote repo is offline or network issue or credential issue, fall back to local repo.
 Fixes #12853

Signed-off-by: stonezdj <stonezdj@gmail.com>
 2020-08-27 22:10:54 +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
He Weiwei
815ab61bc6
Merge pull request #12881 from heww/operator-from-security-username 
refactor(event): change default operator to username of security
 2020-08-26 15:42:36 +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
He Weiwei
793c5ca57b refactor(event): change default operator to username of security 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-08-26 05:52:02 +00:00
Steven Zou
87d18268e0
Merge pull request #12879 from kofj/fix_schedule_error_msg 
Fix schedule error msg.
 2020-08-26 11:04:10 +08:00
Steven Zou
79665ed997
Merge pull request #12875 from chlins/fix/disable-change-p2p-provider-vendor 
fix(p2p): disable change provider vendor type
 2020-08-26 10:59:50 +08:00
fanjiankong
bbad4db645 Fix schedule error msg. 
Signed-off-by: fanjiankong <fanjiankong@tencent.com>
 2020-08-25 23:41:15 +08:00
chlins
d8769a41cd fix(p2p): disable change provider vendor type 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2020-08-25 16:56:17 +08:00
AllForNothing
5ae55eff6c Fix UI issues found on round-2 testing day 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-08-25 13:10:45 +08:00
He Weiwei
2ab4fbefd6
Merge pull request #12862 from heww/fix-issue-12861 
fix(quota): change log to debug level when warning not found
 2020-08-24 16:37:58 +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
He Weiwei
356be80f56 fix(quota): change log to debug level when warning not found 
Closes #12861

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-08-24 07:55:46 +00:00
Daniel Jiang
c0602b5fb3
Merge pull request #12832 from ywk253100/200820_data 
Add id column to data_migration table
 2020-08-21 19:30:05 +08:00
Ted Guan
645dea36a6
Fix for duplicate webhook policy name (#12729) 
Signed-off-by: guanxiatao <guanxiatao@corp.netease.com>
 2020-08-20 18:02:13 +08:00
Wenkai Yin
975ef193dd Add id column to data_migration table 
Add id column to data_migration table and add logic to make sure there is only one data version record

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-08-20 17:43:15 +08:00
AllForNothing
b472907362 Change storage of csrf token from cookie to localstorage 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-08-20 16:22:25 +08:00
Daniel Jiang
05afb94b9b Store csrf token in the header of response instead of cookie 
The current approach will prevent the effectiveness of `Cache-Control`
header and gorilla's library add `Vary:Cookie` header in all responses.

We will set the token in a header of response so the response can be
cached when needed.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-08-20 15:46:02 +08:00
Will Sun
446ae4c173
Merge pull request #12817 from AllForNothing/test-2 
Fix issues with label target 2.1 and RC
 2020-08-20 15:13:27 +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
AllForNothing
56083cd5c9 Fix issues with label target 2.1 and RC 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-08-19 16:46:28 +08:00
wang yan
a7b9495ba0 Merge branch 'master' of https://github.com/goharbor/harbor into fix-resource-order 2020-08-19 15:30:48 +08:00
He Weiwei
d894d4c8bc
Merge pull request #12799 from wy65701436/fixes-12795 
fix gc job submit issue
 2020-08-19 15:27:02 +08:00
Will Sun
c35a39d432
Merge pull request #12814 from AllForNothing/ui-ut 
Improve UI UT for artifact list page
 2020-08-19 15:08:19 +08:00
AllForNothing
2b441a7ee5 Improve UI UT for artifact list page 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-08-19 12:45:39 +08:00
wang yan
1cc73bd92a Merge branch 'master' of https://github.com/goharbor/harbor into fix-resource-order 2020-08-19 12:21:45 +08:00
wang yan
648b80bc34 udpate resource list order 
1, order label by creation time.
2, order webhook policy by creation time.
3, order replication policy by creation time.

Signed-off-by: wang yan <wangyan@vmware.com>
 2020-08-19 11:20:31 +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
stonezdj(Daojun Zhang)
f7e1d186e0
Merge pull request #12792 from ywk253100/200814_proxy_cache 
Return 403 when trying to push artifacts into the proxy cache project…
 2020-08-18 16:22:51 +08:00
stonezdj(Daojun Zhang)
716625a769
Merge pull request #12793 from ywk253100/200816_disable_tag 
Disable the tag creation for the artifact under a proxy cache project
 2020-08-18 16:15:33 +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
44f7bf6739 fix gc job submit issue 
fixes #12795
Return 409 on triggering a GC job when there is a job ongoing.

Signed-off-by: wang yan <wangyan@vmware.com>
 2020-08-18 14:31:54 +08: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
Daniel Jiang
77281ca68b
Token service handling invalid resource (#12790) 
This commit updates the way token service handles invalid resource, for
example a resource without projectname.
It will clear the requested access instead of returning 500 error.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-08-18 10:37:20 +08:00
Will Sun
89b597a811
Merge pull request #12783 from AllForNothing/p2p-4 
Fix UI bugs found on testing day for target 2.1
 2020-08-18 10:29:52 +08:00
Will Sun
9671ff1f10
Merge pull request #12701 from AllForNothing/artifact-icon 
get artifact icon from backend API
 2020-08-18 10:29:15 +08:00
fanjiankong
09ba463cc7 Fix. 
Signed-off-by: fanjiankong <fanjiankong@tencent.com>
 2020-08-17 21:40:37 +08:00
He Weiwei
16d1613b10
Merge pull request #12786 from heww/fix-artifact-scan-permission 
fix(scan): fix the permission checking for artifact scanning
 2020-08-17 18:30:18 +08:00
He Weiwei
f659523f50 fix(scan): fix the permission checking for artifact scanning 
Closes #12778

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-08-17 09:55:38 +00: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
AllForNothing
b664c3c235 Fix UI bugs found on testing day for target 2.1 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-08-17 15:22:18 +08:00
He Weiwei
929fc8b3f7
Merge pull request #12787 from chlins/fix/preheat-get-log-api 
fix(preheat): fix the swagger definition of preheat get log api
 2020-08-17 14:54:12 +08:00
Wenkai Yin(尹文开)
2de10700d8
Merge pull request #12762 from monofone/10712-remove-forgot-password 
remove reset password dialog from sign-in component
 2020-08-17 14:24:36 +08:00
chlins
4f95c4d067 fix(preheat): fix the swagger definition of preheat get log api 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2020-08-17 12:41:02 +08:00
AllForNothing
e6541672d5 get artifact icon from backend API 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-08-17 10:21:47 +08:00
Wenkai Yin
e9ce631aa3 Disable the tag creation for the artifact under a proxy cache project 
Disable the tag creation for the artifact under a proxy cache project
Fixes #12713

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-08-16 22:02:30 +08:00
Wenkai Yin
a73742c0a7 Return 403 when trying to push artifacts into the proxy cache project to avoid the retrying in the docker client 
Return 403 when trying to push artifacts into the proxy cache project to avoid the retrying in the docker client
fixes #12731

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-08-16 21:22:22 +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
stonezdj(Daojun Zhang)
205f4f6695
Merge pull request #12768 from stonezdj/200813_bug12741 
Use orm.Context instead request context in background go routing
 2020-08-14 21:15:15 +08:00
stonezdj
ff937e90d3 Use orm.Context instead request context in background go routing 
Fixes #12741,
Avoid use ctx info in event handler because it is background go routine

Signed-off-by: stonezdj <stonezdj@gmail.com>
 2020-08-14 15:25:06 +08:00
Wenkai Yin
cca1dcca51 Use a separated database table to store the data version 
Use a separated database table to store the data version.
Fixes #12747

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-08-14 11:38:13 +08:00
Sören Rohweder
8e876cb946 remove reset password dialog from sign-in component 
As mentioned in #10712 forgot password should be removed. The
dialog was left in place.

Signed-off-by: Sören Rohweder <soeren.rohweder@fastleansmart.com>
 2020-08-13 08:27:07 +02: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
He Weiwei
e476286fdc
Merge pull request #12755 from heww/expired-blob-size 
fix(blob): make blob size in redis expired in 24 hours
 2020-08-13 11:23:27 +08:00
chlins
b3012ec08d fix(replication): fix quay adapter authorization 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2020-08-12 22:12:08 +08:00
He Weiwei
e3fd83aad1 fix(blob): make blob size in redis expired in 24 hours 
Closes #11873

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-08-12 11:45:50 +00:00
Wang Yan
980c6291df
fix gc foreign layer issue (#12736) 
fixes #12717

Signed-off-by: wang yan <wangyan@vmware.com>
 2020-08-12 16:43:26 +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
Yiyang Huang
b98b8b9159 Unify parameters for functions in Processor interface 
Signed-off-by: Yiyang Huang <huangyiyang@caicloud.io>
 2020-08-11 01:30:00 +08:00
Chlins Zhang
ad158964bb
Merge pull request #12690 from chlins/fix/preheat-disable-instance-precheck 
fix(preheat): add precheck before disable instance
 2020-08-10 17:36:29 +08:00
stonezdj(Daojun Zhang)
49f4559608
Merge pull request #12518 from stonezdj/202020717_duplicate_op 
Fix #12487: Proxy cache create duplicated operation log
 2020-08-10 17:01:07 +08:00
Wenkai Yin(尹文开)
d599cd98bf
Merge pull request #10455 from chlins/fix/quay-replication-adapter-refactor 
fix(replication): refactor quay adapter to fix authorization and supp…
 2020-08-10 16:37:19 +08:00
stonezdj
aa8b3a1343 Fix #12487: Proxy cache create duplicated operation log 
Change method UseLocalManifest to avoid pull manifest frequently

Signed-off-by: stonezdj <stonezdj@gmail.com>
 2020-08-10 16:27:59 +08:00
chlins
3340086af5 fix(preheat): add precheck before disable instance 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2020-08-10 15:35:44 +08:00
Wenkai Yin(尹文开)
e8f9fb63c0
Merge pull request #12674 from reasonerjt/standalone-db-migrator 
Provide a standalone migrator to migrate DB schema.
 2020-08-10 15:11:52 +08:00
Will Sun
f31b29a01c
Merge pull request #12675 from AllForNothing/p2p-3 
Add name and endpoint check for p2p-preheat
 2020-08-10 10:16:03 +08:00
Chlins Zhang
0cd820ae6c
Merge pull request #12669 from steven-zou/fix/reuse_pro_config 
fix(preheat):leverage project settings
 2020-08-08 13:23:37 +08:00
chlins
b765cfe0ce fix(replication): refactor quay adapter to fix authorization and support quay.io and enterprise quay (#10317) 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2020-08-08 13:17:01 +08:00
Chlins Zhang
6b9929d848
Merge pull request #12678 from chlins/fix/preheat-delete-instance-precheck 
fix(preheat): add precheck when delete instance
 2020-08-08 12:54:00 +08:00
Wenkai Yin
219b9910eb Show the detail error message when failed to fetch the artifacts during replication 
Show the detail error message when failed to fetch the artifacts during replication

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-08-07 18:31:02 +08:00
AllForNothing
041a489fad Add name and endpoint check for p2p-preheat 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-08-07 16:44:15 +08:00
chlins
5c433c0875 fix(preheat): add precheck when delete instance 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2020-08-07 14:06:35 +08:00
疯魔慕薇
19234cdb46
Merge pull request #12673 from chlins/fix/preheat-execution-and-task-pagination 
fix(preheat): add pagination for execution and task list api
 2020-08-06 23:08:21 +08:00
Daniel Jiang
4f94f59d2a Provide a standalone migrator to migrate DB schema. 
Fixes #11885
This part will not by default be packaged into release.
A README.md will be added in another commit.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-08-06 18:57:55 +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
Steven Zou
f7bb6dd233
Merge pull request #12665 from chlins/fix/preheat-list-providers-under-project 
fix(preheat): provider more info about p2p provider instance
 2020-08-06 16:57:21 +08:00
Steven Zou
4f90ebce9f
Merge pull request #12668 from chlins/fix/preheat-delete-policy 
fix(preheat): check running executions when delete policy
 2020-08-06 16:47:53 +08:00
Steven Zou
d7bb6dac17 fix(preheat):leverage project settings 
- use content trust settings of project configurations
- use vulnerability severity settings of project configurations

Signed-off-by: Steven Zou <szou@vmware.com>
 2020-08-06 14:15:21 +08:00
chlins
5a2d4dd552 fix(preheat): check running executions when delete policy 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2020-08-05 17:54:20 +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
chlins
89972f766f fix(preheat): provider more info about p2p provider instance 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2020-08-05 17:23:43 +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
Will Sun
5b4573c3ac
Merge pull request #12628 from AllForNothing/pull-by-tag 
Add pull command by tag for artifact detail page
 2020-08-04 09:59:54 +08:00
Will Sun
1006386572
Merge pull request #12641 from AllForNothing/improve-p2p-2 
Improve p2p UI
 2020-08-04 09:59:23 +08:00
Will Sun
18196edaa8
Merge pull request #12642 from AllForNothing/cron 
Improve cron component and create project component
 2020-08-04 09:58:52 +08:00
Chlins Zhang
dc58271d3e
Merge pull request #12649 from chlins/fix/prheat-log-display 
fix(preheat): fix preheat task log display
 2020-08-03 23:01:28 +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
AllForNothing
7065a7a0a7 Improve p2p UI 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-08-03 18:56:28 +08:00
Daniel Jiang
53577ceb13
Merge pull request #12650 from wy65701436/fix-gc-art-trash 
update GC job
 2020-08-03 18:54:22 +08:00
Wenkai Yin(尹文开)
bfb8f4aca0
Merge pull request #12622 from bitsf/fix_aliacr_pull 
fix[replicatioin] aliyun acr pull with repo filter
 2020-08-03 18:27:23 +08:00
Steven Zou
a6e85c1f8a
Merge pull request #12608 from bitsf/fix_gitlab_pull 
fix[replication] gitlab pull-based multi namespace
 2020-08-03 18:24:45 +08:00
AllForNothing
dff472c497 Improve cron component and create project component 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-08-03 17:36:54 +08:00
wang yan
e7c7c03b8c update GC job 
Remove the artifact trash record after manifest delete success.

Don't use the flush method is because that when all of records are removed, only GC job knows these informations, and they are in the memory. Once the jobservice is crashed and restarted at GC job execution phase, the trash records are lost, then these manifest are become orphan manifests, cannot be removed any more.
Signed-off-by: wang yan <wangyan@vmware.com>
 2020-08-03 12:08:00 +08:00
chlins
b008dffe70 fix(preheat): fix preheat task log display 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2020-08-03 09:45:18 +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
Wang Yan
9ce29c9dc8
update time format of audit log (#12629) 
fixes #11522

use the format: date-time as the format of audit op_time, then it could be rendered by FF and Chrome.

Signed-off-by: wang yan <wangyan@vmware.com>
 2020-07-30 17:29:25 +08:00
AllForNothing
58b8183503 Add pull command by tag for artifact detail page 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-07-30 16:38:45 +08:00
Wang Yan
e14e6938da
add gc read only job (#12591) 
Add the read only job as a back up plan, user still can use it but just with API, and specify the parameter read_only:true

Signed-off-by: wang yan <wangyan@vmware.com>
 2020-07-30 15:30:52 +08: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
疯魔慕薇
4dbbf79265
Merge pull request #12617 from steven-zou/fix/preheat_npe_issues 
fix(preheat): fix npe issues
 2020-07-30 08:14:28 +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
Daniel Jiang
1ee4b3dc82
Refine request checking for OIDC CLI secret (#12596) 
This commit makes OIDC CLI secret filter allow more URLs so that the
OIDC CLI secret can be used for replication

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-07-30 00:21:27 +08:00
Ziming Zhang
d16753ae96 fix[replicatioin] aliyun acr pull with repo filter 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2020-07-30 00:07:54 +08:00
stonezdj(Daojun Zhang)
5b1b94f25c
Merge pull request #12512 from ywk253100/200717_summary 
Include the registry info in the project summary API for proxy cache project
 2020-07-29 14:39:30 +08:00