Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-23 10:45:45 +01:00
Code Issues Projects Releases Wiki Activity
9,858 Commits 48 Branches 317 Tags 352 MiB
ebef11476a
Commit Graph

9858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
danfengliu
ebef11476a
Merge pull request #13002 from danfengliu/upgrade-docker-in-drone-dockerfile 
Create Dockerfile for E2E py-test
 2020-09-15 14:16:11 +08:00
danfengliu
d99ea887f1
Merge pull request #12989 from danfengliu/Add-Checkpoint-for-LDAP-group-py-test 
Add checkpoint for LDAP group py-test
 2020-09-15 14:15:31 +08:00
Will Sun
55fedc5a9e
Merge pull request #13050 from AllForNothing/notary-cmd 
Improve notary cmd on UI
 2020-09-15 10:43:16 +08:00
danfengliu
86fb6fdc65 Add checkpoint for LDAP group py-test 
LDAP group has different role, user in group has the same role, as groups with different roles were added in project
member list, user should act like in different roles. for admin and dev role, there should be checkpoints to verify priviledges of each own.

Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-09-14 21:15:09 +08:00
AllForNothing
60c2350088 Improve notary cmd on UI 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-09-14 18:39:22 +08:00
danfengliu
0dda643bc5 Create Dockerfile for E2E py-test 
Robot tests have been always executed in docker container, but API pyt-test is not,
so rebuild Dockerfile for it. During that, some of tools have been upgraded, so API py-test
 scripts need some modification.

Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-09-14 02:36:18 +00:00
Will Sun
49c80f954c
Merge pull request #13025 from AllForNothing/uppercase 
Change EXECUTE button to uppercase
 2020-09-11 11:01:03 +08:00
He Weiwei
0444bb1a92
Merge pull request #12986 from hobti01/swag 
fix: Location and Paging support in swagger api
 2020-09-11 10:44:29 +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
danfengliu
f90f9a6984
Fix nightly issue caused UI changing (#13006) 
Some UI text display changed, it cause failure in nightly.

Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-09-09 15:20:13 +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
Qian Deng
1369089603
Merge pull request #13001 from ninjadq/fix_upgrade_trivy 
Fix trivy setting in upgrading script
 2020-09-08 18:59:30 +08:00
DQ
17f3bfccb4 Fix trivy setting in upgrading script 
Signed-off-by: DQ <dengq@vmware.com>
 2020-09-08 18:15:57 +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
8c2922860c
Merge pull request #12993 from heww/fix-issue-12968 
fix(project): change to use user id to query projects of member
 2020-09-07 16:13:56 +08:00
Daniel Jiang
efa34342af
Merge pull request #12964 from wy65701436/remove-tri-sec 
remove the secret file of travis
 2020-09-07 15:05:35 +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
wang yan
827158badc Merge branch 'master' of https://github.com/goharbor/harbor into remove-tri-sec 2020-09-07 11:57:22 +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
Tim Hobbs
4655334e02
fix: Location and Paging support in swagger api 
Signed-off-by: Tim Hobbs <timothy.hobbs@ic-consult.com>
 2020-09-06 21:06:38 +02:00
danfengliu
7cc3d7f81e
Merge pull request #12978 from danfengliu/fix-ci-python-package-installation-issue 
Fix git action CI python package installation
 2020-09-06 20:02:17 +08:00
Daniel Jiang
062600ef6f
Merge pull request #12972 from reasonerjt/content-trust-check-tag 
Check the tag in isArtifactSigned func
 2020-09-06 13:38:32 +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
danfengliu
34e2490154 Fix git action CI python package installation 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-09-03 20:41:55 +08:00
stonezdj(Daojun Zhang)
316f03492f
Merge pull request #12963 from danfengliu/fix-git-action-ci-missing-site-packages-issue 
Fix git action CI missing python sit packages issue
 2020-09-03 19:48:48 +08:00
danfengliu
2ca5c11675 Fix git action CI missing python sit packages issue 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-09-03 17:34:51 +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
wang yan
8384f5f39c remove the secret file of travis 
The secret file is used for the travis CI, depreciate it as the travis is not used anymore.

Signed-off-by: wang yan <wangyan@vmware.com>
 2020-09-03 13:36:40 +08:00
Wang Yan
088d1e7fb9
bump up base version to 2.2 (#12914) 
Signed-off-by: wang yan <wangyan@vmware.com>
 2020-09-03 13:12:45 +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
stonezdj(Daojun Zhang)
05489fca1e
Merge pull request #12947 from ywk253100/200902_replication 
retry several times when failed to copy blob during the replication
 2020-09-02 17:01:52 +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
wang yan
a01e82d208 Merge branch 'master' of https://github.com/goharbor/harbor into fix-swagger-dep 2020-09-02 16:26:58 +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
danfengliu
5c6a5b12c5
Merge pull request #12939 from danfengliu/fix-issue-of-missing-swagger-pkg-for-python 
Fix issue of missing swagger package for python API test
 2020-09-02 16:04:11 +08:00
danfengliu
931bde0df8 Fix issue of missing swagger package for python API test 
1. Python API test can't import packages from swagger maker, the reason is that python install packages to site-packages instead of dist-packages,
   so the current solution is to copy pakages from site back to dist, I will try to find a way of using ENV variable to fix this;

2. Remove a python library no longer be used.

Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-09-02 15:18:23 +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
bc3433194b
Merge pull request #12906 from steven-zou/fix/preheat-job 
fix(preheat):handle fail case of preheat in job
 2020-08-31 11:15:15 +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