Commit Graph

7641 Commits

Author SHA1 Message Date
Steven Zou
a86afd6ebc Merge branch 'master' into feature/pluggable_scanner_s3_merge 2019-10-12 15:18:06 +08:00
xaleeks
21a0dd1d28
Merge pull request #9372 from stuclem/fix-typo
Fixed typo
2019-10-12 11:28:38 +08:00
Wang Yan
40d80f82ba
Merge pull request #9368 from reasonerjt/set-cli-secret-api
API for user to set the CLI secret
2019-10-11 18:38:58 +08:00
Wang Yan
d7375992b5
Merge pull request #9363 from wy65701436/robot-refactor
refactor robot api
2019-10-11 18:16:28 +08:00
Steven Zou
9fd8b6306c refactor code to reflect code review comments
- refactor the db schema \
- refactor  permission checking in API handlers \

to follow the latest code/interface changes

Signed-off-by: Steven Zou <szou@vmware.com>
2019-10-11 18:07:47 +08:00
wang yan
6f6f113f0f refactor robot api
1, add API controller for robot account, make it callable internally
2, add Manager to handler dao releate operation

Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-11 17:26:18 +08:00
Stuart Clements
67dfc5b35c Fixed typo 2019-10-11 09:16:22 +02:00
Daniel Jiang
53a13e165d API for user to set the CLI secret
This commit replace the API to generate CLI secret with a new API to
update the secret

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-10-11 14:15:08 +08:00
Wang Yan
454a427806
Merge pull request #9239 from danfengliu/project-metadata-verification-in-upgrade-verify-script
Add project meta data verifcation In nightly migrate pipeline
2019-10-11 14:05:33 +08:00
Steven Zou
58afd8e14b [stage3] support pluggable scanner
- implement scan controller
- add scan resource and update role bindings
- update registration model and related interfaces

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

- implement scan API to do scan/get report/get log
- update repository rest API to produce scan report summary
- update scan job hook handler
- update some UT cases

- update robot account making content
- hidden credential in the job log

Commnet scan related API test cases which will be re-activate later
fix #8985

fix the issues found by codacy

Signed-off-by: Steven Zou <szou@vmware.com>
2019-10-11 12:53:02 +08:00
Wenkai Yin(尹文开)
64f7e3bc65
Merge pull request #9364 from wy65701436/fix-migration-rerun
fix quota migration still execute on launch even data sync success
2019-10-11 11:23:17 +08:00
danfengliu
28251c7b04
Merge pull request #9352 from danfengliu/add-nightly-test-case-of-retag-under-readonly-mode-1
Add nightly test case of 'Retag should be forbidden when read only mode is set'
2019-10-11 10:30:48 +08:00
Danfeng Liu (c)
96a271f388 In nightly migrate pipeline, after migration, should check all the data which were populated, for now, project meta data were populated, but were not been verified, so I add these verification in this PR.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-10-11 10:28:02 +08:00
wang yan
8c155e0c50 fix quota migration still execute on launch even data sync success
This commit is to fix the issue for the following scenario:
1, user success migrate harbor to v1.9.0 from a previous version
2, add a project, push images into the project.
3, delete images and then to delete the project.
4, re-launch harbor.

After that, it still execute the quota migration as the condition doesn't consider the deleted projects usage.
And in this case, the harbor core crashes with a duplicate sql err, and unable to launch.

[Workaroud]
Clean table of project_blob with: TRUNCATE TABLE project_blob, and re-launch harbor, wait for quota sync success.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-11 01:25:21 +08:00
danfengliu
ac0d3c991a Add nightly test case of 'Retag should be forbidden when system configuration read-only mode was set'.
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-10-10 17:13:19 +08:00
Daniel Jiang
49f12d0b16
Merge pull request #8786 from reasonerjt/fix-8622
Extract shared func for checkenv and install scripts
2019-10-10 16:53:51 +08:00
He Weiwei
6fbb77d65a
build(portal): npm registry configurable and build cache support (#9356)
1. Introduce NPM_REGISTRY in Makefile to support npm registry
configuration when build portal image.
2. Install npm pkgs before copy portal src so that build cache works for
npm install in portal image.

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-10-10 15:29:50 +08:00
Daniel Jiang
b9154a858b Extract shared func for checkenv and install scripts
This commit fixes #8622 by extract shared func into common.sh to avoid
inconsistency in future.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-10-10 15:07:09 +08:00
Mia ZHOU
a87ab69baa
Merge pull request #9351 from zhoumeina/add_ut
Add frontend unit test
2019-10-10 13:00:20 +08:00
Meina Zhou
e7f8ac6464 add unit test
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-10-10 12:07:27 +08:00
stonezdj(Daojun Zhang)
a2938c5d78
Merge pull request #9274 from wy65701436/immu-refatctor
refactor immutable dao code to align the new structure under pkg
2019-10-10 10:38:22 +08:00
Wenkai Yin(尹文开)
0a85acac9a
Merge pull request #9329 from chlins/feat/jfrog-docker-registry
feat(replication): support for jfrog artifactory docker image replica…
2019-10-10 09:41:41 +08:00
wang yan
8317100cda continue refactor API
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-09 23:06:35 +08:00
chlins
0e0c42d3c0 feat(replication): support for jfrog artifactory docker image replication
Signed-off-by: chlins <chlins.zhang@gmail.com>
2019-10-09 21:06:36 +08:00
jwangyangls
f5af75cc8a
Merge pull request #9332 from jwangyangls/fix-setting-golobal-harbor
Fix setting.json bug
2019-10-09 13:19:02 +08:00
Yogi_Wang
4347d2e06d Fix setting.json bug
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-10-09 11:50:45 +08:00
Mia ZHOU
d277e713c6
Merge pull request #9330 from zhoumeina/remove_bootstrap
Remove bootstrap
2019-10-08 13:34:03 +08:00
Meina Zhou
0660c66958 remove bootstrap
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-10-08 12:51:32 +08:00
danfengliu
e881372b90
Merge pull request #9312 from danfengliu/add-new-cve-id-for-redis
Fixed CVE whitelist test case of more CVE ID in image redis
2019-10-03 09:56:59 +08:00
danfengliu
feeb6fb2d8 1. Nightly test case failed due to more vulnerbility CVE IDs in image redis, so add 2 new CVE IDs in CVE Whitelist test cases. 2. A Keyword parameter error was fixed in this PR.
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-10-02 16:43:50 +08:00
danfengliu
f6759a0353
Merge pull request #9289 from danfengliu/add-cve-for-redis
Add a new CVE ID  for image redis in nightly CVE system and project level whitelist tests
2019-09-27 22:05:25 +08:00
danfengliu
0ff1ef8766
Merge pull request #9225 from danfengliu/add-retry-for-get-project-Quotas
Add a keyword 'Retry Keyword When Return Value Mismatch'
2019-09-27 17:23:38 +08:00
danfengliu
2298b96170 In nightly CVE whitelist tests, there be a new CVE occured in image redis, so add this for test verifcation.
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-09-27 17:20:06 +08:00
Wang Yan
fb8a1bf589
Merge pull request #9280 from heww/robot-acoount-improvement
fix(robot): robot account improvement
2019-09-27 13:02:20 +08:00
He Weiwei
4ce72e37c4 fix(robot): robot account improvement for policies
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-09-27 03:07:58 +00:00
Will Sun
94f6df9b47
Merge pull request #9282 from AllForNothing/master
fix language expression issue for tag retention
2019-09-27 10:55:33 +08:00
sshijun
717fcb555a fix language expression issue for tag retention
Signed-off-by: sshijun <sshijun@vmware.com>
2019-09-27 09:53:23 +08:00
wang yan
7c4fd79b5c refactor immutable dao code to align the new structure under pkg
1, add manager
2, move model dao to /pkg/dao

Signed-off-by: wang yan <wangyan@vmware.com>
2019-09-26 20:35:58 +08:00
xaleeks
fd2192edda
Merge pull request #9266 from goharbor/michmike-patch-1
Update SECURITY.md
2019-09-26 19:49:02 +08:00
Wang Yan
7e73dfb754
Merge pull request #9221 from wy65701436/fix-9186
patch registry fix of issue 2553
2019-09-26 19:34:18 +08:00
wang yan
3cf7e702be patch regsitry fix of issue 2553
This commit is target to fix harbor issue #9186, which root cause is mentioned by
https://github.com/docker/distribution/issues/2553, and fixed by https://github.com/docker/distribution/pull/2879.

As the latest distribution release(v2.7.1) does not contain this fix, but it will break the quota migraion process on S3 storage, we have to path this fix into Harbor regsitry binary.

[Tag Version]
It uses the issue number(2553) as the tag naming convention, like v2.7.1-patch-2553, means that we patch the fix of issue 2553 into v2.7.1.

[Note]
So far, this fix is only targets on docker regsitry v2.7.1. If the registry has this fix in new release, we'll move on.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-09-26 18:27:53 +08:00
Michael Michael
b89f563f90
Update SECURITY.md 2019-09-26 01:47:33 -05:00
Steven Zou
7bc83e8f6e
Merge pull request #9265 from ywk253100/190924_adopters
Update the adopters documentation
2019-09-26 14:29:45 +08:00
Wenkai Yin
ac7364fd11 Update the adopters documentation
Update the adopters documentation

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-09-26 14:26:48 +08:00
Wenkai Yin(尹文开)
cabe0b6243
Merge pull request #9253 from heww/patch-blob-upload-improvement
Patch blob upload improvement
2019-09-26 13:59:15 +08:00
Qian Deng
578adaa064
Merge pull request #9240 from ninjadq/add_extra_headers_in_nginx
Add headers in nginx config file
2019-09-26 10:27:08 +08:00
Qian Deng
d2d0affcae
Merge pull request #9245 from ninjadq/check_logid
Add checking for logid
2019-09-26 10:26:49 +08:00
Stuart Clements
36b7310824
Documenting tag retention issue (#9215) (#9255)
* Documenting tag retention issue

* Comments from Alex

* Typo
2019-09-25 15:41:30 +02:00
Qian Deng
ebd526ce8a
Merge pull request #9249 from ninjadq/update_db_migration_for_pswd
Move db change to new migration file
2019-09-25 21:36:29 +08:00
stonezdj(Daojun Zhang)
ce824a6eb9
Merge pull request #9141 from stonezdj/immutable_tag_api
Immutable tag api
2019-09-25 19:01:14 +08:00