Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-30 14:13:43 +01:00
Code Issues Projects Releases Wiki Activity
8,170 Commits 53 Branches 317 Tags 335 MiB
b566375d58
Commit Graph

3518 Commits

Author SHA1 Message Date
jwangyangls
ad46fd12aa
Merge pull request #9410 from jwangyangls/immetable-tag 
Add immutable tag in project detail
 2019-10-18 14:15:38 +08:00
Yang Wang (c)
bfe19711db Add immutable tag in project detail 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-10-18 11:28:39 +08:00
Will Sun
ad053fc017
Merge pull request #9449 from AllForNothing/tag-retention-paging 
Add server paging to tag-retention sub task list
 2019-10-18 10:36:16 +08:00
Will Sun
932ed32de5
Merge pull request #9440 from AllForNothing/cve-check 
Remove CVE ID check
 2019-10-18 10:32:18 +08:00
Wenkai Yin(尹文开)
5c5e475da4
Merge pull request #9415 from steven-zou/fix/pluggable_scanner_policy_check 
do changes to let the vul policy check compatible with new framework
 2019-10-18 09:39:20 +08:00
Wang Yan
51d3134e4f
Merge pull request #9427 from wy65701436/immutable-middleware 
add immutable tag middleware
 2019-10-17 20:28:34 +08:00
Steven Zou
0f16913635 rebase: resolve the code confilcts with master 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-10-17 17:42:41 +08:00
wang yan
da02b820ad add immutable tag middleware 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-10-17 16:58:11 +08:00
Will Sun
ddb83574a7
Merge pull request #9361 from AllForNothing/scanner-s3 
Add pluggable scanner UI
 2019-10-17 16:13:47 +08:00
Wenkai Yin(尹文开)
97ddff2ac8
Merge pull request #9434 from heww/clair-adapter 
build(clair): internal clair adapter when install with clair
 2019-10-17 16:06:10 +08:00
jwangyangls
12b8cfef61
Merge pull request #9413 from jwangyangls/reset-oidc-cli-secret 
Add new cli secret ui in profile
 2019-10-17 14:51:39 +08:00
jwangyangls
cf84026e3d
Merge pull request #9445 from jwangyangls/fix-copy-button-not-working 
Fix copy button not working
 2019-10-17 14:51:12 +08:00
sshijun
bbf61a11e3 Add server paging to tag-retention sub task list 
Signed-off-by: sshijun <sshijun@vmware.com>
 2019-10-17 14:36:41 +08:00
Yogi_Wang
4b202e9679 Fix copy button not working 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-10-17 13:35:12 +08:00
He Weiwei
8964a8697a build(clair): internal clair adapter when install with clair 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-10-17 12:00:51 +08:00
Yogi_Wang
8d4d2ee6fa Add new cli secret ui in profile 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-10-17 11:28:05 +08:00
Daniel Jiang
f0cb16cb86 Update OIDC token refresh process 
1) Disassociate id token from user session

2) Some OIDC providers do not return id_token in the response of refresh
request:
https://openid.net/specs/openid-connect-core-1_0.html#RefreshTokenResponse
When validating the CLI secret it will not validate the id token,
instead it will check the expiration of the access token, and try to
refresh it.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-10-17 11:26:18 +08:00
AllForNothing
c2e30b4bad Add scanner UI 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2019-10-17 10:27:54 +08:00
jwangyangls
8d65bd6da7
Merge pull request #9426 from jwangyangls/remove-validate-in-oidc-claim 
Remove validation about oidc claim group
 2019-10-17 10:03:47 +08:00
sshijun
645e9331b0 Remove CVE ID check 
Signed-off-by: sshijun <sshijun@vmware.com>
 2019-10-17 09:23:45 +08:00
Steven Zou
f18afc0a3f do changes to let the vul policy check compatiable with new framework 
- update the scan/scanner controller
- enhance the report summary generation
- do changes to the vulnerable handler
- remove the unused clair related code
- add more UT cases
- update the scan web hook event
- drop the unsed tables/index/triggers in sql schema

Signed-off-by: Steven Zou <szou@vmware.com>
 2019-10-16 23:15:26 +08:00
stonezdj(Daojun Zhang)
2973ddcf6b
Merge pull request #9428 from stonezdj/disable_self_reg 
Update default self_registration=false
 2019-10-16 17:41:21 +08:00
Wenkai Yin(尹文开)
32a2c41c3b
Merge pull request #9273 from gavinfish/typo 
Fix typos in core package
 2019-10-16 17:10:35 +08:00
stonezdj
3636a1afa5 Update default self_registration=false 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-10-16 01:33:48 -07:00
Ziming
3725667448
Merge branch 'master' into feat/gitlab 2019-10-16 14:34:21 +08:00
Qian Deng
6447294741
Merge pull request #9405 from heww/speed-up-test 
perf(test): speed up TestAddBlobsToProject test in dao pkg
 2019-10-16 13:45:58 +08:00
Yogi_Wang
baa5f1171e Remove validation about oidc claim group 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-10-16 11:17:36 +08:00
Wenkai Yin(尹文开)
372875ad64
Merge pull request #9393 from wy65701436/immutable-match 
add immutable match
 2019-10-15 18:51:43 +08:00
stonezdj(Daojun Zhang)
ff04b2c930
Merge pull request #9411 from wy65701436/fix-list-robot 
fix list robot account API return an internal error
 2019-10-15 17:47:38 +08:00
wang yan
ae4c698ab4 use only 1 repo and tag selector to match 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-10-15 16:44:17 +08:00
wang yan
288e4cc193 igonre the duplicate error when to insert project_blobs on quota syncing 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-10-15 14:14:58 +08:00
wang yan
5e8f7297f5 fix list robot account API return an internal error 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-10-15 12:29:44 +08:00
Will Sun
285d3e1e5c
Merge pull request #9189 from strainovic/patch-1 
Use external_url if exists on Add Repo Command chart details page
 2019-10-15 12:18:37 +08:00
He Weiwei
d9a539807b perf(test): speed up TestAddBlobsToProject test in dao pkg 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-10-14 16:46:01 +00:00
liuxu
79322f2df2 fix fatal error 
Signed-off-by: liuxu <liuxu623@gmail.com>
 2019-10-14 21:41:29 +08:00
Will Sun
0076f23195
Merge pull request #9377 from zhoumeina/add_ut 
add more unit test
 2019-10-14 17:16:03 +08:00
Steven Zou
e0901410e1
Merge pull request #9381 from beautytiger/dev-191011-fixtime 
fix wrong time parse by wrong year representation
 2019-10-14 17:02:06 +08:00
Daniel Jiang
ee9e92b6dd
Merge pull request #9157 from phin1x/master 
Escape user dn in ldap group search filter
 2019-10-14 16:41:27 +08:00
wang yan
a3546478eb add immutable match 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-10-14 16:21:32 +08:00
wang yan
7c16cbfeef fix scan controller test introduced by api change 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-10-14 14:39:46 +08:00
wang yan
25f638a989 Merge branch 'master' of https://github.com/goharbor/harbor into robot-invisiable 2019-10-14 14:35:45 +08:00
wang yan
c597e46756 do not expose visible attribute of robot account to user 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-10-14 14:11:09 +08:00
Wang Yan
17ad4aca55
Merge pull request #9343 from ywk253100/191009_bug_fix 
Check the existence of project before the next action
 2019-10-14 11:27:34 +08:00
Wenkai Yin(尹文开)
7d0505593f
Merge pull request #8556 from chlins/feat/image-replication-adapter-for-quay.io 
Feat/image replication adapter for quay.io
 2019-10-14 09:16:45 +08:00
Steven Zou
6e8e601c8d make robot account with new robot controller 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-10-12 16:34:08 +08:00
Steven Zou
a86afd6ebc Merge branch 'master' into feature/pluggable_scanner_s3_merge 2019-10-12 15:18:06 +08:00
wang yan
3e81bd7f1d add visible attribute to robot account 
The commit is to make robot controller could create invisible robot account for internal use

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-10-12 00:51:48 +08:00
Guangming Wang
bea8609a58 fix wrong time parse by wrong year representation 
Signed-off-by: Guangming Wang <guangming.wang@daocloud.io>
 2019-10-11 22:59:40 +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
Meina Zhou
728cea5859 add more unit test 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2019-10-11 17:25:50 +08: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
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
chlins
4ab3b864ae feat: add image replication adapter for quay.io 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2019-10-11 10:00:07 +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
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
Wenkai Yin
a61c928e34 Check the existence of project before the next action 
Fixes #8234, check the existence of project to avoid the panic

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-10-09 16:54:10 +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
Meina Zhou
0660c66958 remove bootstrap 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2019-10-08 12:51:32 +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
Jie Shen
673f6e6068 Fix typos in core package 
Signed-off-by: Jie Shen <drfish.me@gmail.com>
 2019-09-26 19:56:27 +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
d2d0affcae
Merge pull request #9245 from ninjadq/check_logid 
Add checking for logid
 2019-09-26 10:26:49 +08:00
lxShaDoWxl
a40b0f349b In order to integrate with gitlab it is necessary to get a list of available repositories using gitlab api. This is because gitlab registry does not give access to _catalog 
Signed-off-by: lxShaDoWxl <lxshadowxkingxl@gmail.com>
 2019-09-25 21:32:00 +06: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
Wenkai Yin(尹文开)
3b75ff8a4d
Merge pull request #9252 from ywk253100/190925_sql 
Make the username required when searching user
 2019-09-25 18:26:33 +08:00
Wenkai Yin(尹文开)
ac17afac1f
Merge pull request #9243 from ninjadq/change_file_permission_of_joblog 
change the permission of job log file
 2019-09-25 17:45:21 +08:00
Mia ZHOU
5ebc3831ea
Merge pull request #9251 from zhoumeina/fix_coverage 
add more unit test
 2019-09-25 17:25:57 +08:00
He Weiwei
3e515bfabb feat(quota): skip to save blob size when quota disabled 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-09-25 09:19:20 +00:00
He Weiwei
d8c2bf6f86 fix(quota): handle range header missing in response 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-09-25 09:17:22 +00:00
stonezdj
cc22a175b9 Add immutable tag API 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-09-25 15:53:56 +08:00
Meina Zhou
f4a784909b add more unit test 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2019-09-25 15:29:17 +08:00
Steven Zou
c38e566a7e
Merge pull request #9195 from ywk253100/190920_ignore_cred 
Update the error log format
 2019-09-25 14:41:32 +08:00
DQ
e078b1c209 Add checking for logid 
the logid content need check before use

Signed-off-by: DQ <dengq@vmware.com>
 2019-09-25 13:55:32 +08:00
Wenkai Yin
83e7213d18 Make the username required when searching user 
Make the username required when searching user and remove the support for query email

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-09-25 13:32:29 +08:00
DQ
4333c3ad5c change the permission of job log file 
Log file permission from 644 to 600

Signed-off-by: DQ <dengq@vmware.com>
 2019-09-24 20:04:17 +08:00
Wenkai Yin(尹文开)
360334991e
Merge pull request #9198 from ywk253100/190923_ping 
Return the common error message when testing the webhook endpoint
 2019-09-24 18:51:21 +08:00
Wenkai Yin(尹文开)
4192a692cd
Merge pull request #9200 from ywk253100/190923_oidc_ping 
Return a common error message when testing the oidc provider
 2019-09-24 18:49:23 +08:00
Mia ZHOU
71dc9abcd6
Merge pull request #9226 from zhoumeina/fix_ut 
fix harbor portal unit test and set thresholds
 2019-09-24 16:52:23 +08:00
Meina Zhou
da85d5fef1 fix harbor portal unit test and set thresholds 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2019-09-24 15:15:49 +08:00
danfengliu
7844ca0a2f
Merge pull request #9214 from danfengliu/add-nightly-test-case-of-retag-under-readonly-mode 
Add id for system configuration repo-readonly-checkbox in UI code
 2019-09-24 10:43:55 +08:00
Danfeng Liu (c)
3c8db37616 Add id for system configuration repo-readonly-checkbox in UI code, and add element locator in robot case. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-09-23 21:55:27 +08:00
stonezdj(Daojun Zhang)
ec559b0585
Merge pull request #9123 from stonezdj/immutable_tags 
Add DAO for immutable tags
 2019-09-23 21:46:07 +08:00
Steven Zou
a73f896f23
Merge pull request #9154 from steven-zou/feature/pluggable_scanner_s2 
[stage2]support pluggable scanner
 2019-09-23 21:12:27 +08:00
danfengliu
7144f23857
Merge pull request #9204 from danfengliu/add-id-for-sign-up-btn 
Modify sign-up button xpath from relative html path to id
 2019-09-23 18:00:51 +08:00
stonezdj
29d2bcce99 Add DAO for immutable tags 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-09-23 16:45:07 +08:00
Steven Zou
d616bc3509 add scan report CRUD supporting and 
- change error collection in scan job
- add dead client checking in client pool
- change key word type to interface{} for q.Query
- update bearer authorizer
- add required UT cases

Signed-off-by: Steven Zou <szou@vmware.com>
 2019-09-23 16:21:39 +08:00
Danfeng Liu (c)
cca1fab069 Modify sign-up button xpath from relative html path to id, and modify script. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-09-23 15:40:27 +08:00
Wenkai Yin
c2e529576a Update the error log format 
Update the erro log format in jobservice

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-09-23 15:40:04 +08:00
Mia ZHOU
dfa9d61ef3
Merge pull request #9203 from zhoumeina/add_unit_test 
Karma test refactor to support test in portal and coverage report
 2019-09-23 15:27:52 +08:00
Ziming
df625f4ef9
Merge pull request #9177 from bitsf/fix_tag_retention_test 
adjust wait job timeout in test case
 2019-09-23 14:47:05 +08:00
Wenkai Yin
6efdfa5fb4 Return a common error message when testing the oidc provider 
Returning a common error when failed to test the oidc provider and printing the detail in the log

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-09-23 14:43:38 +08:00
Wenkai Yin
7056d6604b Return the common error message when testing the webhook endpoint 
This commit returns a common error message when testing the webhook endpoint and prints the detail in the log for debug

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-09-23 14:38:47 +08:00
Meina Zhou
898442370a Karma test refactor to support test in portal and coverage report 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2019-09-23 13:52:07 +08:00
Steven Zou
0c19eba8c2 [stage2]support pluggable scanner 
- add scanner rest API v1 spec
- implement v1 client which is used to talk to scanner adapter
- adjust data/orm models
- adjust code package structure

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

- implement scan client which is used to talk to scanner adapter
- implement scan job which take the work of communicating with scanner
- update scanner mgmt API routes
- add corresponding UT cases
 2019-09-23 09:37:54 +08:00
Nenad Strainovic
84d7307e28 Use external_url if exists on Add Repo Command chart details page 
Signed-off-by: strainovic <nenad.strainovic@gmail.com>
 2019-09-21 01:08:37 +02:00
Ziming Zhang
f6ac2687fa fix dayspl/daysps test 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I3c654e305f774c2329109888f68e708efeca721e
 2019-09-20 18:32:58 +08:00
Daniel Jiang
f491061b57
Merge pull request #8440 from gklp/gklp_issue_8197_wrong_header_content_type_after_redirection 
All redirect operations should have content-type as json
 2019-09-20 17:21:01 +08:00
Daniel Jiang
6effa2105a
Merge pull request #9142 from reasonerjt/oidc-groups 
Support OIDC groups
 2019-09-20 17:12:50 +08:00
jwangyangls
3144635ea1
Merge pull request #9139 from jwangyangls/add-oidc-claim 
Add oidc group claim in config-auth、member、administrator
 2019-09-20 15:58:31 +08:00
Yogi_Wang
63f135337e Add oidc group claim 
1. add oidc group claim in configration page
2. add oidc group-page in user page,you can go to it through clicking add-group button;
3. add oidc list page in administrator ,admin can go to this page
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-09-20 13:53:25 +08:00
Daniel Jiang
f1367064fb Address review comment 
Address review comments for commit
b21f9dc6f1

and resolve conflict

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-09-20 13:42:39 +08:00
Daniel Jiang
07dd14d3b5 Generate new session ID after login 
This commit mitigates the Session Fixation issue by making sure a new
session ID is generated each time user logs in to Harbor

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-09-19 20:51:50 +08:00
Fabian
1467f4bbb1 Escape User DN 
Signed-off-by: Fabian Weber <fa.weber@enbw.com>
 2019-09-19 14:29:09 +02:00
Daniel Jiang
b21f9dc6f1 Support OIDC groups 
This commit enable project admin to add group as project member when
Harbor is configured against OIDC as AuthN backend.

It populates the information of groups from ID Token based on the claim
that is set in OIDC settings.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-09-19 17:49:31 +08:00
danfengliu
c360e71d51
Merge pull request #9148 from AllForNothing/add-member-nightly 
Improve project name validator when adding new project
 2019-09-19 17:13:31 +08:00
Steven Zou
4c4897aef1
Merge pull request #9134 from steven-zou/feature/pluggable_scanners 
support pluggable scanner
 2019-09-19 16:08:24 +08:00
sshijun
6b2ba60c1e Improve project name validator when adding new project 
Signed-off-by: sshijun <sshijun@vmware.com>
 2019-09-19 13:53:36 +08:00
Yogi_Wang
450184c4ec Add id in repo info button 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-09-19 12:21:07 +08:00
Steven Zou
e324a4d623 support pluggable scanner 
- add DAO layer for scanner registration
- add CURD manager for scanner registration
- add API controller for plug scanner
- add REST APIs for CURD of plug scanner
- add migration sql:0011_1.10.0
- add scan interface definition (no implementations)
- add related UT cases with testify

fix #8979 #8990

Signed-off-by: Steven Zou <szou@vmware.com>
 2019-09-18 21:56:45 +08:00
Steven Zou
ae0c129b27
Merge pull request #9125 from wy65701436/refactor-selector 
refactor selector of retention
 2019-09-18 18:27:16 +08:00
jwangyangls
e226f0a258
Merge pull request #9137 from jwangyangls/fix-group-clarity-ui 
Supplement group ui
 2019-09-18 17:45:24 +08:00
wang yan
42a5db83b2 refactor selector of retention 
extract select from pkg/retention, move it to pkg/artselector to make it usable by immutable tag

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-09-18 16:38:41 +08:00
Will Sun
81a143855e
Merge pull request #9136 from AllForNothing/css-modify 
Modify css for add-memeber page and project-config page
 2019-09-18 16:29:20 +08:00
Yogi_Wang
069f884a7c Supplement group ui 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-09-18 16:02:58 +08:00
sshijun
e7b2b4bb03 Modify css for add-memeber page and project-config page. Format 
global.scss file

Signed-off-by: sshijun <sshijun@vmware.com>
 2019-09-18 14:58:44 +08:00
Will Sun
de550c4073
Merge pull request #8901 from phantooom/master 
fix portal Chinese translate
 2019-09-18 14:18:46 +08:00
jwangyangls
6dd2ae90a0
Merge pull request #9011 from jwangyangls/upgrade_clarity-2.1 
Upgrade angular from 7.1.3 to 8.2.0 and clarity from 1.0 to 2.2
 2019-09-18 10:45:40 +08:00
Yogi_Wang
a7c7a8e675 Upgrade angualr from 7.1.3 to 8.2.0 and clarity from 1.0 to 2.2 
Signed-off-by: Yogi_Wang <yawang@vmware.com>

Signed-off-by: Meina Zhou <meinaz@vmware.com>
Signed-off-by: sshijun <sshijun@vmware.com>
 2019-09-18 10:12:20 +08:00
wang yan
5498b5719b remove filter redeclared as imported package name in base.go 
It's introduced by https://github.com/goharbor/harbor/pull/8976

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-09-17 16:36:59 +08:00
Wang Yan
f77ce4aa3a
Merge pull request #8976 from ninjadq/add_auth_for_project_head 
Fix: Add authenticate to projects head
 2019-09-17 14:02:45 +08:00
Daniel Jiang
f36efa4dcd Add groups claim to OIDC configuration 
This commit add the new setting "oidc_groups_claim" to Harbor's
configurations.
And add "group_claim" to OIDCSetting struct.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-09-16 15:54:14 +08:00
sshijun
30e8e2bbe1 change element id in config page 
Signed-off-by: sshijun <sshijun@vmware.com>
 2019-09-12 15:55:05 +08:00
Daniel Jiang
753219834e
Merge pull request #8960 from ninjadq/upgrade_hash_alg_for_pswd 
Upgrade hash alg for pswd
 2019-09-12 11:22:39 +08:00
Wenkai Yin
089eb4c449 Add the port 8080 to the default URL of portal to avoid the health check API failure 
We changed the listenning port of portal from 80 to 8080 to run the process as non-root user, but the change didn't update the default URL of portal in source code, this causes the health check API fail.

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-09-11 10:45:55 +08:00
sshijun
026f3f4782 change button text from "ADD SYSTEM" to "COPY FROM SYSTEM" in project config page 
Signed-off-by: sshijun <sshijun@vmware.com>
 2019-09-10 16:11:10 +08:00
Wenkai Yin(尹文开)
f3af35f07a
Merge pull request #9021 from ywk253100/190909_scan_cron 
Check the status behind error when trying to update the scan schedule
 2019-09-10 13:15:27 +08:00
Wenkai Yin(尹文开)
52d0828718
Merge pull request #8981 from cd1989/replication-jobs-timezone 
[Cherry-Pick] Replication jobs timezone
 2019-09-10 09:59:33 +08:00
lxShaDoWxl
6937731744 feat(Registries): added gitlab adapter 
Signed-off-by: lxShaDoWxl <lxshadowxkingxl@gmail.com>
 2019-09-09 21:21:21 +06:00
DQ
ea5c27fcd5 Enhance: Upgrade encrypt alg to sha256 
previous sha1 will still used for old password

Signed-off-by: DQ <dengq@vmware.com>
 2019-09-09 21:48:21 +08:00
Yogi_Wang
537a501b49 Add page routing permission to prevent refresh from entering the error page 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-09-09 14:57:56 +08:00
Wenkai Yin
3b07be5a72 Check the status behind error when trying to update the scan schedule 
Check the status behind error when trying to update the scan schedule

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-09-09 13:31:10 +08:00
cd1989
08f15cee26 Handle zero time in UI 
Signed-off-by: cd1989 <chende@caicloud.io>
 2019-09-06 17:48:54 +08:00
cd1989
8990a621d6 Not use time pointer in model fields 
Signed-off-by: cd1989 <chende@caicloud.io>
 2019-09-06 17:48:08 +08:00
Ziming Zhang
722e45b20b add swagger for tag retention 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I0f3ed8085e231868de74c273ba85946826181d5b
 2019-09-06 17:27:20 +08:00
DQ
4ac145b45b Fix: Add authenticate to projects head 
Project head only allow authenticated user to call.

Signed-off-by: DQ <dengq@vmware.com>
 2019-09-06 14:50:47 +08:00
Daniel Jiang
76a79869df The default item list should be empty list,not null 
This commit make sure that the "items" in response of project level
CVE_whitelist is not null, even when it's null in the DB the API will
return an empty list

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-09-04 17:59:56 +08:00
Will Sun
697ec2a52f
Merge pull request #7952 from qiqizjl/log_bugs 
Fix some bugs in the Log page
 2019-09-04 10:10:28 +08:00
gklp
dee3defeff refactored 
Signed-off-by: gklp <gokalpkuscu@gmail.com>
 2019-09-03 21:46:52 +03:00
gklp
44a9e5d127 All redirect operations should have content-type as json 
Signed-off-by: gklp <gokalpkuscu@gmail.com>
 2019-09-03 21:46:52 +03:00
wang yan
d8e17b122e add read only for quota switcher 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-09-03 14:08:39 +08:00
Will Sun
cf1b7cbc41
Merge pull request #8916 from AllForNothing/nightly 
fix add-member nightly case failure
 2019-09-03 11:27:05 +08:00
jwangyangls
1165bd6d0c
Merge branch 'master' into log_bugs 2019-09-03 10:45:58 +08:00
Wang Yan
2194834b41
Merge pull request #8910 from heww/foreign-layers 
fix(quota): correct size quota for image with foreign layers
 2019-09-03 00:29:24 +08:00
Wang Yan
fd4c259821
Merge pull request #8919 from wy65701436/fix-setresusage-outofrange 
fix int out of range when to set usage in GC job
 2019-09-02 23:34:46 +08:00
He Weiwei
f44b75f398 fix(quota): correct size quota for image with foreign layers 
1. Sync blobs from manifest for image with foreign layers.
2. Ignore size of foreign layers when compute size quota.
3. Fix repo info of artifact when upgrade from 1.8 version.

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-09-02 14:10:58 +00:00
wang yan
d3f7d01a69 fix int out of range when to set usage in GC job 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-09-02 18:48:10 +08:00
Wenkai Yin(尹文开)
7d151946e0
Merge pull request #8917 from reasonerjt/fix-create-admin-user 
Disallow creating an admin user when registration
 2019-09-02 18:43:41 +08:00
sshijun
aab50ab642 fix add-member nightly case failure 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2019-09-02 17:10:25 +08:00
Wenkai Yin(尹文开)
d762e0730a
Merge pull request #8843 from heww/fix-chart-builder 
fix(chart,quota): fix path regexp of chart creation and deletion
 2019-09-02 15:59:18 +08:00
Daniel Jiang
1a57f67413
Merge pull request #8907 from airadier/handle-error-on-oidc-callback 
Handle error on OIDC callback
 2019-09-02 13:36:11 +08:00
Will Sun
33eaf37edf
Merge pull request #8890 from AllForNothing/imp-validator 
fix UI bug for tag-retention and project-quota
 2019-09-02 10:21:16 +08:00
xaleeks
8fd8c5f345
Merge pull request #8515 from ruzickap/patch-1 
Typo fix in en-us-lang.json
 2019-09-01 18:27:30 +08:00
Iradier, AlvaroJose
bf9ac08c89 Handle error on OIDC callback 
If wrong OIDC scopes are defined, or there are some configuration errors, the OIDC callback query string might contain "error=..." with an error message. Intercept this case and show an error to the user instead of trying to exchange the token with a missing "code" parameter.

Signed-off-by: Iradier, AlvaroJose <AlvaroJose.Iradier@adidas.com>

Change error variable name

Signed-off-by: Iradier, AlvaroJose <AlvaroJose.Iradier@adidas.com>
 2019-08-30 13:44:12 +02:00
Daniel Jiang
93f86e321b
Merge pull request #8903 from wy65701436/fix-8807 
fix #8807
 2019-08-30 18:23:05 +08:00
Wenkai Yin(尹文开)
8c67f71b5e
Merge pull request #8902 from wy65701436/fix-8888 
fix #8888
 2019-08-30 18:09:56 +08:00
wang yan
c28920c84f fix #8807 
Format the error of mount blob, return a http error so that the core can parse it.

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-30 16:29:47 +08:00
xiaorui.zou
a727915fde fix portal Chinese translate 
Signed-off-by: xiaorui.zou <zourui@mskj.com>
Signed-off-by: xiaorui.zou <xiaorui.zou@gmail.com>
 2019-08-30 15:33:08 +08:00
wang yan
dd9f028fe0 fix #8888 
the image may has the same blobs as the references, which causes the artifact & blobs
can not be inserted by unique constraint

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-30 15:30:05 +08:00
Wang Yan
240b718508
Merge pull request #8887 from wy65701436/fix-8886 
fix(quota/sync) #8886
 2019-08-30 15:06:35 +08:00
AllForNothing
f597b89100 fix UI bug for tag-retention and project-quota 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2019-08-30 13:34:37 +08:00
Ziming Zhang
22e7f22b30 tag retention fix duration and show trigger 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I7f93dd4c1b93b8d7e6b2c2a14fd4ccf128945def
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-08-30 11:48:11 +08:00
Wenkai Yin(尹文开)
881884786d
Merge pull request #8883 from bitsf/tag_retention_log 
enhance tag retention log
 2019-08-30 10:48:01 +08:00
Ziming Zhang
247ef1b884 enhance tag retention log 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: Id5946c2dd53868fdd5f5abbcca45e453bc9ba4fd
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-08-29 18:40:00 +08:00
wang yan
16b910e1cf fix(quota/sync) #8886 
The foreign layer won't be counted into project quota
NOTE: the foreign layer will be dumped from the registry in the migration

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-29 17:29:40 +08:00
Ziming Zhang
8fb6e2f65b verify permission of GetRetentionExecTaskLog 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I4bf4ddf3d3ed6f07a4618e242e2f3774996716d6
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-08-29 15:01:53 +08:00
Wang Yan
db5781bf78
Merge pull request #8860 from wy65701436/fix-quota-sync 
fix quota sync issues
 2019-08-29 13:45:38 +08:00
wang yan
5decb56369 update code per review comments 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-29 12:46:42 +08:00
Wang Yan
03309680ff
Merge pull request #8873 from bitsf/tag_retention_log_time 
show empty if time is 0
 2019-08-29 12:39:22 +08:00
Daniel Jiang
9fa70db866
Merge pull request #8867 from bitsf/tag_retention_same_digest_tag 
Tag retention same digest tag
 2019-08-29 12:26:44 +08:00
Wenkai Yin(尹文开)
5da4286ef4 Hard delete project metadata (#8856) 
Hard delete project metadata

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-08-29 12:14:39 +08:00
Ziming Zhang
57a34a7d8d show empty if time is 0 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I5acc13714dbb1dc1d8bf3f1c6c620a7d54f86910
 2019-08-29 12:10:22 +08:00
Ziming Zhang
6137065eba prevent retained tag with same digest deleted by other tag 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I527ec87f48348c6607b1c9529c90f5ad804bd8f6
 2019-08-29 10:21:13 +08:00
Mia ZHOU
9a4627c583
Merge pull request #8863 from jwangyangls/add-endpoint-id 
Add  id in endpoint url
 2019-08-29 09:30:13 +08:00
Will Sun
fb66d58334
Merge pull request #8864 from AllForNothing/master 
remove whitespaces when add tag-retention rule
 2019-08-29 08:56:52 +08:00
wang yan
942e793f20 fix quota sync issues 
1, fix #8858, add retry to ping backend service
2, fix #8859, split the blobs data when larger then 65535

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-28 18:59:25 +08:00
Daniel Jiang
b6db8a8a10 Disallow creating an admin user when registration 
This commit enhance the `POST /api/users` API to block request from non-admin to create
admin user.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-08-28 18:30:27 +08:00
Ziming Zhang
4248f7a45e prevent retained tag with same digest deleted by other tag 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I37a3ef0d4cff7214e35076453494d89f0ad84d43
 2019-08-28 18:27:35 +08:00
Ziming Zhang
8290af6d25 prevent retained tag with same digest deleted by other tag 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: Ie5f77db58e71636cd9aaf322bb3f83a0090f8877
 2019-08-28 18:24:55 +08:00
Ziming Zhang
063f2bfee9 prevent retained tag with same digest deleted by other tag 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I6a69b405b454ca0350677204e06bfa2b24616b33
 2019-08-28 17:48:42 +08:00
AllForNothing
16163f08c6 remove whitespaces when add tag-retention rule 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2019-08-28 17:31:57 +08:00
Yogi_Wang
21b59ab2a3 Add id in endpoint url 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-08-28 17:10:29 +08:00
Qian Deng
ed54b1da45
Merge pull request #8857 from wy65701436/fix-syne-readonly 
fix quota sync read only setting
 2019-08-28 17:04:02 +08:00
He Weiwei
2c1c816941
fix(database): generate db url by url.URL for schema upgrade (#8852) 
Closes #7948

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-08-28 16:59:22 +08:00
Ziming
94138137d5
add valid for rule (#8846) 
Change-Id: I82215a0cf1ec32a253c8db9bfafe7e25b26c9ad9
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-08-28 16:58:49 +08:00
wang yan
19a37282c1 fix quota sync read only setting 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-28 14:53:01 +08:00
jwangyangls
81c1e9892a
Merge pull request #8831 from jwangyangls/add-pleaseholder-hub 
Add placeholder in registry page when select helm-hub
 2019-08-28 13:40:01 +08:00
Wang Yan
6045a69457
Merge pull request #8853 from wy65701436/fix-pb-dao 
fix sql in remove blob from project
 2019-08-28 11:09:19 +08:00
Wang Yan
87893abc5e
Merge pull request #8829 from ywk253100/190822_retry_status 
Add status revision to handle retrying in replication task
 2019-08-28 10:55:13 +08:00
wang yan
19f543a025 fix sql in remove blob from project 
the project id is missing in the method, that makes GC to clean all of items,
and if quota will not compute twice for the existing manifest.

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-28 00:38:11 +08:00
Qian Deng
ea33561d95
Merge pull request #8747 from 928234269/patch1 
fixt typo "an user" to "a user"
 2019-08-27 18:26:11 +08:00
Wang Yan
be1e702d9d
Merge pull request #8787 from cd1989/core-hunging 
Fix core hung when stop problem
 2019-08-27 15:56:21 +08:00
Wang Yan
39f78ae768
Merge pull request #7872 from cd1989/config-redis-pool-idletimeout 
Config idle timeout for redis pool to avoid jobservice restarting
 2019-08-27 14:46:01 +08:00
Wenkai Yin
7924f37d86 Add status revision to handle retrying in replication task 
Add status revision to handle retrying in replication task

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-08-27 14:17:11 +08:00
Yogi_Wang
5c8a683645 Add placeholder in registry page when select helm-hub 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-08-27 12:00:44 +08:00
Wenkai Yin(尹文开)
7262cc4c1a
Merge pull request #8836 from wy65701436/update-quota-error 
Revise quota errors to make it more readable
 2019-08-27 11:34:36 +08:00
Will Sun
c4baa75c9d
Merge pull request #8834 from AllForNothing/tag-imp 
Improvement for rule validator of tag-retention
 2019-08-27 10:45:10 +08:00
jwangyangls
86ae7d65e5
Merge pull request #8830 from jwangyangls/tag-detail-scan-show-result 
Show the result about vulnerabilities number and vunerability list when click scan button
 2019-08-27 10:23:55 +08:00
He Weiwei
1d8eac8cf4 fix(chart,quota): fix path regexp of chart creation and deletion 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-08-27 01:04:10 +00:00
wang yan
f343b2ec45 Revise quota errors to make it more readable 
1, fix #8802, update the error formet
2, fix #8807, raise the real retag error to UI
3, fix #8832, raise the real chart error to chart client & ut

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-26 17:00:31 +08:00
wang yan
e3155e00d6 fix #8815 :add remove untagged blob record in table project_blob 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-26 15:57:19 +08:00
Shijun Sun (c)
ab6232e2de Improvement for rule validator of tag-retention UI and modify for errer message 
Signed-off-by: Shijun Sun (c) <sshijun@vmware.com>
 2019-08-26 15:33:15 +08:00
Yogi_Wang
b3341f3f8b Show the result about vulnerabilities number and vunerability list when click scan button 
we do not change the existing logic.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-08-26 10:50:49 +08:00
Steven Zou
a80969e7af fix rule logic bug described in #8817 (#8818) 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-08-23 18:49:44 +08:00
Ziming Zhang
52b9fbc8f3 fix tag retention model verify 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: Ifb237bbed4c6d7272ace62da7603e027c1481aef
 2019-08-23 15:48:33 +08:00
Wang Yan
e7488e37b6
Merge pull request #8788 from bitsf/tag_retention_validate_model 
add tag retention model test
 2019-08-23 13:57:51 +08:00
Ziming Zhang
39db65e90f add tag retention model test 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I3f8b06b994024fe6052b0dee87600ed932edaaff
 2019-08-23 13:24:28 +08:00
mmpei
d5f87063e4
Merge branch 'master' into official-wehook-events-20190811 2019-08-22 22:07:12 -05:00
Wang Yan
35e786e54c
Merge pull request #8794 from ywk253100/190822_retry_status 
Add status revision to retention task to handle retrying
 2019-08-23 10:54:35 +08:00
jwangyangls
503f5352f0
Merge pull request #8760 from jwangyangls/revert-8494-fix-global-search 
Revert "Fix redirect login page when enter harbor through global search"
 2019-08-23 10:33:03 +08:00
jwangyangls
8dd7530280
Merge pull request #8800 from jwangyangls/pull-time-sort 
Add the sortBy width push time and pull time  of tags
 2019-08-23 10:10:35 +08:00
peimingming
599d12a04d Fix bugs by comments for webhook 
Signed-off-by: peimingming <peimingming@corp.netease.com>
 2019-08-23 09:44:51 +08:00
cd1989
4b59346423 Exist core when signal received 
Signed-off-by: cd1989 <chende@caicloud.io>
 2019-08-23 09:34:41 +08:00
Will Sun
713f0168f9
Merge pull request #8712 from tan-chao/master 
fix chinese translation mistake #8426
 2019-08-23 09:16:44 +08:00
Wang Yan
299032d602
Merge pull request #8771 from wy65701436/fix-manifest-dup 
fix quota count size for same manifest in different repo
 2019-08-23 08:37:03 +08:00
Yogi_Wang
26483836b3 Add the sortBy width push time and pull time of tags 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-08-23 07:34:46 +08:00
wang yan
2d569192ab fix quota count size for same manifest in different repo 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-23 00:56:45 +08:00
Wang Yan
5488da1299
Merge pull request #8781 from BeHappyF/fix-8684 
fix UI bug for Webhooks
 2019-08-22 23:56:12 +08:00
Wang Yan
a4e2891e4d
Merge pull request #8792 from steven-zou/fix/issue-#8537 
reduce the expire time of job stats in redis DB
 2019-08-22 23:55:45 +08:00
He Weiwei
d6a6101fc2
fix(robot): make resource with projectId for robot in portal (#8798) 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-08-22 22:55:21 +08:00
Wenkai Yin
661470e7bc Add status revision to retention task to handle retrying 
Add status revision to retention task to handle retrying

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-08-22 20:04:25 +08:00
wang yan
83a3274a96 fix #8688 
use the docker defined error to avoid retry pushing on quota overflow

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-22 19:19:43 +08:00
Steven Zou
718e336302 reduce the expire time of job stats in redis DB 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-08-22 18:26:09 +08:00
Wenkai Yin(尹文开)
21f8290110
Merge pull request #8777 from heww/issue-8635 
fix(rbac): NewProjectNamespace in rbac only accept projectID
 2019-08-22 17:52:27 +08:00
Wang Yan
371a306dcf
Merge pull request #8784 from wy65701436/fix-migrator 
fix deleted project error when to migrate quota
 2019-08-22 16:34:49 +08:00
He Weiwei
311028be37
test: fix TestIsNegative (#8783) 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-08-22 15:27:49 +08:00
wang yan
dfa4301b21 fix deleted project error when to migrate quota 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-22 14:51:26 +08:00
Wenkai Yin(尹文开)
6198ed2634
Merge pull request #8758 from heww/issue-8681 
refactor(quota,middleware): skip overflow error when subtract resources
 2019-08-22 13:54:01 +08:00
Will Sun
5b9fcf28b0
Merge pull request #8779 from AllForNothing/tag-re 
modify metadate of tag-retention
 2019-08-22 12:57:00 +08:00
方彬
088f805753 fix UI bug for Webhooks 
Signed-off-by: 方彬 <fang_bingo@163.com>
 2019-08-22 12:00:43 +08:00
Steven Zou
dfdcb3c9cb
Merge pull request #8763 from bitsf/tag_retention_rule_order 
remove rule none and change rule order
 2019-08-22 11:58:15 +08:00
Wenkai Yin(尹文开)
e3d8fa845d
Merge pull request #8767 from steven-zou/fix/issue-#8525 
fix #8525: periodic job retry issue: job stats are not found
 2019-08-22 11:06:13 +08:00
AllForNothing
ec459e20ce modify metadate of tag-retention 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2019-08-22 10:09:50 +08:00
He Weiwei
8effdc6f18 fix(rbac): NewProjectNamespace in rbac only accept projectID 
Closes #8635

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-08-21 19:37:28 +00:00
Ziming Zhang
06e9467b06 1. remove rule none 
2. change rule orders
3. remove laber selector

Change-Id: Idc18a27cb0267f5f5c80a04b381e4a5dc6998508
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-08-21 20:24:33 +08:00
Will Sun
427a369d3a
Merge pull request #8764 from goharbor/ui-modify 
ui adjustment for tag-retention and webhook
 2019-08-21 18:39:25 +08:00
wang yan
e91ded65cb fix quota size usage in gc job, issue #https://github.com/goharbor/harbor/issues/8699 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-21 16:51:31 +08:00
Steven Zou
926ac44a67 fix #8525: periodic job retry issue: job stats is not found 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-08-21 16:30:47 +08:00
AllForNothing
e0b73f2729 ui adjustment for tag-retention and webhook 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2019-08-21 15:35:44 +08:00
Wang Yan
c1ad0518c9
Merge pull request #8582 from ethan-daocloud/patch-1 
core/main.go: logging message correction
 2019-08-21 13:49:00 +08:00
Wang Yan
4bccb17236
Merge pull request #8749 from heww/issue-8493 
fix(quota-driver): owner name of project quota reference object
 2019-08-21 13:47:17 +08:00
jwangyangls
cd6d3ec800 Revert "Fix redirect login page when enter harbor through global search" 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-08-21 11:37:27 +08:00
jwangyangls
8701007714
Merge pull request #8738 from jwangyangls/fix-error 
Fix error in Harbor
 2019-08-21 11:02:00 +08:00
928234269
7a4fde5ec9
fixt typo "an user" to "a user" 
Signed-off-by: 928234269 <longfei.shang@daocloud.io>
 2019-08-21 10:20:35 +08:00
Daniel Jiang
67077297b1
Merge pull request #7998 from dorukhanguloz/master 
Add Turkish Language
 2019-08-21 00:02:21 +08:00
He Weiwei
c22bf2539e refactor(quota,middleware): skip overflow error when subtract resources 
1. Skip overflow error when subtract resources
2. Take up resources before handle request and put it back when handle
failed for add action in quota interceptor
3. Free resources only after handle success for subtract action in quota
interceptor

Closes #8681

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-08-20 14:41:55 +00:00
Dorukhan Gülöz
5307e1398d Add Turkish Language 
Signed-off-by: dorukhanguloz dorukhanguloz@hotmail.com
Signed-off-by: Dorukhan Gülöz <dguloz@havelsan.com.tr>
 2019-08-20 13:58:25 +02:00
Wenkai Yin(尹文开)
f9aa154826
Merge pull request #8751 from steven-zou/fix/#8745 
fix #8745: job retry issue
 2019-08-20 19:01:30 +08:00
Dorukhan Gülöz
7d63620d42
Merge branch 'master' into master 2019-08-20 12:16:10 +02:00
Petr Ruzicka
d0692fcaa2 Typo fix in en-us-lang.json "Creat" -> "Create" 
Signed-off-by: Petr Ruzicka <petr.ruzicka@gmail.com>
 2019-08-20 11:25:29 +02:00
cd1989
db9b52d827 Config idle timeout for redis pool 
Signed-off-by: cd1989 <chende@caicloud.io>
 2019-08-20 17:23:32 +08:00
Steven Zou
217252a097
Merge pull request #8675 from ywk253100/190814_retention_task 
Handle the retention task status updating in concurrency
 2019-08-20 17:07:21 +08:00
Steven Zou
f6067d5474
Merge pull request #8708 from bitsf/tag_retention_rule_conflict 
fix rule conflict, id error
 2019-08-20 16:45:21 +08:00
Steven Zou
ace07b0c0a fix #8745: job retry issue 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-08-20 16:39:44 +08:00
He Weiwei
8eb17be13c fix(quota-driver): owner name of project quota reference object 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-08-20 07:03:11 +00:00
Wang Yan
92fa01d6cd
Merge pull request #8733 from ywk253100/190819_label 
Fix bug of listing tags filtered by label
 2019-08-20 14:17:41 +08:00
Wenkai Yin(尹文开)
29ab93ad9c
Merge pull request #8714 from ywk253100/190816_scheduler 
Fix bug found in scheduler
 2019-08-20 14:11:04 +08:00
Wenkai Yin(尹文开)
0086d1b211
Merge pull request #8586 from ethan-daocloud/patch-2 
project_test.go: many typos "respose" fixup
 2019-08-20 13:54:37 +08:00
jwangyangls
596f299743
Merge pull request #8739 from AllForNothing/cve-add-id 
add ids to key elements of CVE-whitelist UI for easy test
 2019-08-20 13:51:24 +08:00
stonezdj(Daojun Zhang)
4384e11422
Merge pull request #8648 from stonezdj/regular_filter 
Normalize LDAP filter for user filter and group filter
 2019-08-20 13:47:32 +08:00
Wang Yan
f930786050
Merge pull request #8725 from heww/issue-8701 
fix(quota): fix computeResources method of qutoa interceptor
 2019-08-20 11:29:59 +08:00
Daniel Jiang
4921b0fb4c
Merge pull request #8494 from jwangyangls/fix-global-search 
Fix redirect login page when enter harbor through global search
 2019-08-20 11:22:21 +08:00
stonezdj
7c7b6d2710 Normalize LDAP filter for user filter and group filter 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-08-20 10:55:30 +08:00
Will Sun
c9f12bc273
Merge pull request #8727 from AllForNothing/tag-retention-bug 
fix bugs for tag-retention
 2019-08-20 10:46:53 +08:00
AllForNothing
88f1e198aa 1.add ids to key elements of CVE-whitelist UI for easy test 
2.change decrible in UI
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2019-08-20 10:18:31 +08:00
Daniel Jiang
f10fb67d6d
Merge pull request #8662 from stonezdj/email_sec2 
Set default email to null if not provided
 2019-08-20 09:01:50 +08:00
He Weiwei
75772aae11
refactor(quota): new error types for quota checking (#8726) 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-08-19 19:00:29 +08:00
Yogi_Wang
2134492587 Fix error in Harbor 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-08-19 18:08:19 +08:00
Wenkai Yin
a5d292c9c6 Fix bug of listing tags filtered by label 
Fixes #8249

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-08-19 16:10:16 +08:00
Will Sun
c0497c1a8d
Merge pull request #8730 from AllForNothing/webhook-bug 
fix UI bugs for Webhooks
 2019-08-19 15:59:10 +08:00
Will Sun
786fb429d6
Merge pull request #8716 from AllForNothing/cve-bug 
fix cve-whitelist bugs
 2019-08-19 15:55:24 +08:00
AllForNothing
6f3cc0da20 fix bugs for tag-retention 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2019-08-19 15:51:30 +08:00
stonezdj
5fa8eb7854 Set default email to null if not provided 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-08-19 15:20:44 +08:00
AllForNothing
f11d4922d5 fix UI bugs for Webhooks 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2019-08-19 14:41:28 +08:00
AllForNothing
a8f773e678 fix cve-whitelist bugs 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2019-08-19 13:40:09 +08:00
Ziming
0c79352c9c
fix tag retention schedule none error (#8715) 
Change-Id: I04cad9d4c520db751bfa413bb139317563716501
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-08-19 12:25:54 +08:00
jwangyangls
94c930f150
Merge pull request #8720 from jwangyangls/fix-quota-bug 
Fix bug for harbor 1.9.0
 2019-08-19 11:20:25 +08:00
Yogi_Wang
48cb2da09b Fix bug for harbor 1.9.0 
1.modify the quota message.
2.fix replication ng bug when no filter.
3.fix summary ui style.
4.fix quota-edit page validation when input a large number

Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-08-19 10:38:19 +08:00
Daniel Jiang
b3abd0316b
Merge pull request #8713 from reasonerjt/fix-8702 
Avoid overwriting system CVE whitelist by mistake
 2019-08-19 01:42:58 +08:00
He Weiwei
1bbfc023f1 fix(quota): fix computeResources method of qutoa interceptor 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-08-18 16:14:36 +00:00
Daniel Jiang
504202ecfd
Merge pull request #8378 from Typositoire/ldap/nested-groups 
Search for LDAP_MATCHING_RULE_IN_CHAIN groups
 2019-08-18 16:07:16 +08:00
wang yan
b9d6108624 add ping for adapter to wait for service ready 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-16 16:03:12 +08:00
wang yan
6e11ecc6fc Update codes per review comments 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-16 14:58:52 +08:00
Wang Yan
7a41d89ac8 Add quota sync api toi to sync quota data with backend storage 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-16 14:55:46 +08:00
Daniel Jiang
022d4e6ae8
Merge pull request #7462 from cd1989/enable-tags-detail-param 
List simple tags when detail set to false
 2019-08-16 14:25:29 +08:00
Wenkai Yin
5c286d799f Fix bug found in scheduler 
The scheduler hook handler doesn't parse the job status struct when handling the hook. This commit fixes it.

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-08-16 13:54:57 +08:00
Daniel Jiang
30bb2ddcdf Avoid overwriting system CVE whitelist by mistake 
Fixes #8702
Also enforce the code to mitigate the potential risk.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-08-16 13:28:16 +08:00
Tan Chao
39b939b329 merge from upstream 2019-08-16 09:42:52 +08:00