Commit Graph

2672 Commits

Author SHA1 Message Date
guanxiatao
b40ee6edc9 Set Event.Type value to event.EventTypeImageDelete instead of event.EventTypeImagePush when deleting
Signed-off-by: guanxiatao <guanxiatao@corp.netease.com>
2019-06-20 09:39:45 +08:00
Wenkai Yin
684df243b2 Support label filter for replication
Only the system level labels are supported to be used as the replication policy filter

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-06-19 20:46:44 +08:00
Steven Zou
89ad59b0d4
Merge pull request #8026 from steven-zou/fix_bug_#7988
add migration process for rdb as well as UT cases
2019-06-17 10:58:42 +08:00
Steven Zou
9bac5e602d
Merge pull request #8030 from ywk253100/190605_replication_bugfix
Fix replication bug
2019-06-13 19:12:29 +08:00
Wenkai Yin
5fef7585c7 Fix replication bug
Fixes #7875, fixes #7968

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-06-13 17:17:29 +08:00
Steven Zou
2bc1402357 add migration process for rdb as well as UT cases
fix issue #7988

Signed-off-by: Steven Zou <szou@vmware.com>
2019-06-12 12:29:51 +08:00
Daniel Jiang
c928924fa5
Merge pull request #8003 from reasonerjt/bump-up-go112
Bump up to go 1.12.5 enable go.mod
2019-06-11 13:21:32 +08:00
wang yan
a4b202d656 remove the id in the post body when to create a robot account
Signed-off-by: wang yan <wangyan@vmware.com>
2019-06-11 10:47:56 +08:00
Daniel Jiang
737eaa396c Bump up to go 1.12.5 enable go.mod
This commit bumps up the version of Go to compile the code to v1.12.5,
and shifts to go.mod for managing depedency.
Some code from "harbor/tests" to "harbor/src/testing" to avoid depedency
loop of modules.

Note that in short term we will still vendor the dependency.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-06-11 00:42:20 +08:00
jwangyangls
663826e1dc
Merge pull request #7905 from jwangyangls/fix_issue_daliy
Remove the Deplicate utils in lib and app , fix #6365
2019-05-31 14:32:28 +08:00
Yogi_Wang
c52cb4fc9a Remove the Deplicate utils in lib an app , fix #6365, #7807
1.remove the Deplicate utils in lib an app ,fix #6365
2.edit style fix #7807

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-30 10:15:57 +08:00
Qian Deng
592e40bacf
Merge pull request #7859 from wy65701436/return-robot-id
Return account id when to issue a robot
2019-05-29 10:55:20 +08:00
Yogi_Wang
200389b678 Fix bug when we use language with pt-br; change the harbor version from 1.7.x to 1.8
fix bug when we use language with pt-br;
change the harbor version from 1.7.x to 1.8
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-28 15:19:08 +08:00
Yogi_Wang
247d58232a Add robot permission of helm-chart pull/push
add robot permission of helm-chart pull/push

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-23 15:58:42 +08:00
jwangyangls
fbec3ee76f
Merge pull request #7865 from jwangyangls/edit_word_with_robot
Edit the words width vulnerability and robot;
2019-05-23 15:54:43 +08:00
jwangyangls
588287629a
Merge pull request #7844 from jwangyangls/http_to_httpClient
Change http to httpClient of all Api in harbor
2019-05-23 15:35:38 +08:00
Yogi_Wang
471fae6c92 Edit the words width vulnerability and robot;
edit the words width vulnerability and robot;

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-23 15:24:53 +08:00
Yogi_Wang
44054859b9 Change http to httpClient of all Api in harbor
change http to httpClient of all Api in harbor because  since Angular 4.3, Angular has abandoned HTTP and used HTTP Client instead.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-23 13:23:07 +08:00
wang yan
15ca9bfb81 Add ensure settings when to search user in auth proxy
This issue is regresssion that introduced by f92bc8076d (diff-42381e6df5f17ebd3d9165a325d5d8f4), the a.ensure() was removed from SearchUser(), which leads to the alwaysonboard cannot be updated.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-05-22 17:16:16 +08:00
wang yan
056cfc7e31 Return account id when to issue a robot
Signed-off-by: wang yan <wangyan@vmware.com>
2019-05-22 10:39:26 +08:00
wang yan
2068732eef add validation for robot account registration
Signed-off-by: wang yan <wangyan@vmware.com>
2019-05-15 15:03:35 +08:00
jwangyangls
a7f8f531f9
Merge pull request #7803 from jwangyangls/addcloseAlertInNewProject
Clear inlineAlert when reopen create project;change add robot error handle
2019-05-15 13:55:44 +08:00
Yogi_Wang
dfbc7b4f8c Clear inlineAlert when reopen create project;change add robot error handle
clear inlineAlert when reopen create project;change add robot error handle

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-15 13:19:15 +08:00
Wang Yan
3be14b7997
fix issue7793: ping ldap server is always success (#7795)
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-05-15 11:35:57 +08:00
Wenkai Yin
e399ffca54
Merge pull request #7799 from reasonerjt/oidc-onboard-user-name
Set the real name of OIDC user when onboarding
2019-05-15 11:35:42 +08:00
Qian Deng
4188c4db76
Merge pull request #7719 from ninjadq/fix_chart_relative_url_issue
Fix chart relative url issue
2019-05-15 10:02:07 +08:00
Daniel Jiang
5f11dbe675 Set the real name of OIDC user when onboarding
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-15 00:44:51 +08:00
stonezdj
99c0a5a498 fix issue7793: ping ldap server is always success
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-05-14 19:20:54 +08:00
Mia ZHOU
f807c3392f
Merge pull request #7782 from jwangyangls/add_oidc_login_control_redirect
Add a way to login to OIDC by clicking login button
2019-05-14 13:34:44 +08:00
Qian Deng
f607c5177d Fix frontend failure caused by absolute path
Fix failures because front downlowd chart using relative path

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-05-14 13:22:06 +08:00
Qian Deng
cd6c5a9f10 Enable absolute url in helm chart
assign public_url to chart-url
remove namespace merge in index.yaml

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-05-14 12:56:20 +08:00
Yogi_Wang
c8b6b41854 Add a way to login to OIDC by clicking login button
add a way to login to OIDC by clicking login button through response status 403

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-14 12:46:36 +08:00
Daniel Jiang
e963ee88c7 Update login controller to return 403 for redirection
As the UI cannot handle 302, update the login controller to return 403
and put the redirection URL in a json response body.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-13 18:16:06 +08:00
Yogi_Wang
131683b4ef Fix_cron schedule bug when call api ' get/schedule ' error
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-10 18:29:42 +08:00
Steven Zou
7576800eb2
Merge pull request #7370 from burdzwastaken/fix/spelling-credentail
Fix misspellings of the word credential
2019-05-10 17:28:50 +08:00
Daniel Jiang
d81afe274c Add filter to handle request with ID token (#7759)
This commit allows request with a valid ID token to access the API.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-10 16:58:25 +08:00
Wenkai Yin
7ee9063c2b
Merge pull request #7758 from ywk253100/190509_bug_fix
Fixes bug in replication
2019-05-10 16:49:19 +08:00
Wenkai Yin
8348c1fa4b
Merge pull request #7635 from heww/validation-failed-status-code
Return 400 status code for validation failed
2019-05-10 14:22:05 +08:00
Wenkai Yin
a7384fc881 Fixes bug in replication
Use internal service name rather than 127.0.0.1 when calling APIs of core in jobservice jobs

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-10 14:18:57 +08:00
Steven Zou
e091916d54 fix UT case failure (#7734)
Signed-off-by: Steven Zou <szou@vmware.com>
2019-05-10 13:15:44 +08:00
jwangyangls
4218206b59
Merge pull request #7753 from jwangyangls/addOidcMoreLink
Add Oidc more info link in configration
2019-05-10 10:37:52 +08:00
He Weiwei
58cbaaace8 Return 400 status code for validation failed
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-05-10 10:35:25 +08:00
Fangyuan Cheng
aa68471dfa
Merge pull request #7743 from pureshine/modify-text
Modify the prompt for deleting resources when creating a replication rule.
2019-05-10 00:17:47 +08:00
Yogi_Wang
cd42637f51 Add Oidc more info link in configration
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-10 00:04:33 +08:00
Wang Yan
774a9f8d75
Remove unused configure item cfg_expiration (#7744)
Signed-off-by: wang yan <wangyan@vmware.com>
2019-05-09 22:07:18 +08:00
Wenkai Yin
9cc203d15b
Merge pull request #7740 from ywk253100/190509_huawei
Rename the adapter name of huawei to huawei-SWR
2019-05-09 21:53:24 +08:00
Wenkai Yin
5ce57a24ac
Merge pull request #7739 from ywk253100/190508_upgrade
Fixes #7693, the filters of replication policy is lost after upgrade
2019-05-09 20:16:13 +08:00
jwangyangls
cc4da4bbbd
Merge pull request #7725 from jwangyangls/fixCancel_cannot_work
Fix question of `Cancel` of OIDC configuration does not work
2019-05-09 17:40:15 +08:00
Wenkai Yin
b73f8a96c3 Fix issue: replication cannot work when Harbor is deployed on Kubernetes whose hairpin mode is disabled (#7718)
Fix issue https://github.com/goharbor/harbor-helm/issues/222: replication cannot work when Harbor is deployed on Kubernetes whose hairpin mode is disabled

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-09 17:10:32 +08:00
Wenkai Yin
4f6116f9c0 Rename the adapter name of huawei to huawei-SWR
Rename the adapter name of huawei to huawei-SWR. Fixes #7732

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-09 17:00:00 +08:00
Mia ZHOU
4e583ad65a
Merge pull request #7731 from jwangyangls/fix_ui_issue1.8
Fix uncheck pull for the robot account generation, pull permission is still assigned
2019-05-09 16:42:11 +08:00
Mia ZHOU
94a6e997ad
Merge pull request #7735 from pureshine/refresh-gc
Automatically refresh the list when the status of gc history is pending or running
2019-05-09 16:41:29 +08:00
FangyuanCheng
83de21601b Modify the prompt for deleting resources when creating a replication rule.
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-09 15:38:41 +08:00
Wenkai Yin
8ca3c44b87 Fixes #7693, the filters of replication policy is lost after upgrade
Fixes #7693, the filters of replication policy is lost after upgrade

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-09 14:13:32 +08:00
wang yan
5c12c7713d Return 200 when to post an none schedule
1, Throw the error of job service to UI when to create job schedule.
2, Return 200 when to save none without schedule.

Fixed #7675

Signed-off-by: wang yan <wangyan@vmware.com>
2019-05-09 13:32:46 +08:00
FangyuanCheng
78c52eca8a Automatically refresh the list when the status of gc history is pending or running
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-09 13:15:11 +08:00
Daniel Jiang
cbbf2ea973 Redirect regular user to OIDC login page (#7717)
When the auth mode is OIDC, when a user login via Harbor's login form.
If the user does not exist or the user is onboarded via OIDC, he will be
redirected to the OIDC login page.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-09 10:53:40 +08:00
Fangyuan Cheng
1828537672
Merge pull request #7723 from pureshine/filter-loading
Fix filter will always show loading when call API failed
2019-05-09 10:41:24 +08:00
Yogi_Wang
48aac9ae2c Fix uncheck pull for the robot account generation, pull permission is still assigned
fix Uncheck pull for the robot account generation, pull permission is still assigned

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-09 00:37:49 +08:00
jwangyangls
67c5542dd8
Merge pull request #7716 from jwangyangls/fix_api_faild_always_show_loading
Fix always show loading indicator when call API failed;Z-Index issue in repository detail page when event popup widget open;Wrong robot token expiration in system settings when call API failed;UI hangs at deleting when to delete OIDC user
2019-05-08 22:40:23 +08:00
Wang Yan
095f7b2ff7
add scan all and gc schedule migration (#7628)
* add scan all and gc schedule migration

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

* Fix gofmt errors

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

* Update code according to review comments

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

* remove convertschedule return name just return value

Signed-off-by: wang yan <wangyan@vmware.com>
2019-05-08 19:11:33 +08:00
Wenkai Yin
6e07a62fe1 Fix #7579: cannot stop the execution during the initialization stage (#7721)
Fix #7579: cannot stop the execution during the initialization stage

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-08 19:11:18 +08:00
Daniel Jiang
f2abfcb598
Merge pull request #7724 from reasonerjt/logger-more-info
print more sectors of file path in logger
2019-05-08 18:28:52 +08:00
Fangyuan Cheng
7810c05fe3
Merge pull request #7697 from pureshine/fix-tooltip
Fix the cron tooltip in replication is not fully displayed in Firefox.
2019-05-08 17:26:20 +08:00
Steven Zou
b664b90b86
Merge pull request #7585 from steven-zou/add_get_jobs_API
add get jobs API to provide powerful job stats management
2019-05-08 17:17:33 +08:00
FangyuanCheng
5c12da4235 Fix filter will always show loading when call API failed
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-08 16:47:11 +08:00
Wenkai Yin
c557cb3ef3
Merge pull request #7667 from ywk253100/190507_dockerhub_ut
Add more unit test cases for docker hub adapter
2019-05-08 16:35:06 +08:00
Yogi_Wang
fe85d23a90 Merge branch 'master' of https://github.com/goharbor/harbor into fix_api_faild_always_show_loading 2019-05-08 16:33:01 +08:00
Yogi_Wang
03ffe4fade Fix question of Cancel of OIDC configuration does not work
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-08 16:26:22 +08:00
Daniel Jiang
4118769088 print more sectors of file path in logger
This would help as we have more and more source files having duplicated
names.
Fixes #7202

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-08 15:49:19 +08:00
FangyuanCheng
92315395ea Fix the cron tooltip in replication is not fully displayed in Firefox.
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-08 15:27:11 +08:00
Yogi_Wang
97acf44fbc Fix always show loading indicator when call API failed;Z-Index issue in repository detail page when event popup widget open;Wrong robot token expiration in system settings when call API failed
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-08 14:27:31 +08:00
Mia ZHOU
709406eb75
Merge pull request #7705 from pureshine/modify-override
Modify the tooltip of the override
2019-05-08 13:57:45 +08:00
Mia ZHOU
3604765d8a
Merge pull request #7715 from pureshine/cannot-save
Fix unable to save after entering invalid cron and then switching back to other schedules
2019-05-08 13:57:00 +08:00
Daniel Jiang
58aed3dde9
Merge pull request #7707 from renmaosheng/harbor-6838
Don't display password when calling api/users API.
2019-05-08 12:50:39 +08:00
Daniel Jiang
7469204ad6
Merge pull request #7666 from wy65701436/block-multiple-mf
add multiple manifest intercepetor handler
2019-05-08 12:21:32 +08:00
Wenkai Yin
01898c9dac
Merge pull request #7709 from reasonerjt/panic-refresh-oidc-token
Make sure panic is not thrown when refresh token
2019-05-08 12:17:32 +08:00
jwangyangls
f4f2278805
Merge pull request #7712 from jwangyangls/oidc_like_ldap
Fix “Delete” and "Reset Password" should be hidden in user management page;forget Password should be hidden when oidc mode;
2019-05-08 11:01:19 +08:00
jwangyangls
37c024621e
Merge pull request #7713 from jwangyangls/fix_configration_bug
Move redirectUrl tip,fix pattern with endpoint,fix incorrect tip message for invalid input of OIDC scope
2019-05-08 10:57:58 +08:00
jwangyangls
e510e5062b
Merge pull request #7714 from jwangyangls/fix_error_message_bug
Fix create project error show in modal;resolve the different color of notification in UI.
2019-05-08 10:55:00 +08:00
FangyuanCheng
a34f99cae4 Fix unable to save after entering invalid cron and then switching back to other schedules
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-08 10:48:48 +08:00
Mia ZHOU
2b5c511c76
Merge pull request #7654 from jwangyangls/remove_required_when_oidc_mode
Remove required  from filed "First and last name" on the OIDC user profile page
2019-05-08 10:06:05 +08:00
Yogi_Wang
0fbc5af2c9 Fix create project error show in modal;resolve the different color of notification in UI.
fix create project error show in modal;resolve the different color of notification in UI.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-08 03:15:22 +08:00
Yogi_Wang
f14e9c9d52 Fix “Delete” and "Reset Password" should be hidden in user management page;forget Password should be hidden when oidc mode;
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-08 01:40:32 +08:00
Yogi_Wang
af0a8355eb Remove required from filed "First and last name" on the OIDC user profile page,fix email username cannot save in profile
remove required  from filed "First and last name" on the OIDC user profile page.
fix email username cannot save in profile

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-08 01:24:18 +08:00
Yogi_Wang
6d0c2f51f3 Move redirectUrl tip,fix pattern with endpoint,fix incorrect tip message for invalid input of OIDC scope
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-08 00:43:44 +08:00
Daniel Jiang
c16b44d30b Make sure panic is not thrown when refresh token
Fixes #7695

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-07 20:30:07 +08:00
Steven Ren
8311ff729a Don't display password when calling api/users API.
This change fixes github issue 6838

Signed-off-by: Steven Ren <stevenr@stevenr-a01.vmware.com>
2019-05-07 18:40:36 +08:00
FangyuanCheng
8d30d24edd Modify the tooltip of the override
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-07 17:58:59 +08:00
Wenkai Yin
78aea0920d
Merge pull request #7664 from ywk253100/190507_adapter
Rename the adapter name of docker registry
2019-05-07 17:24:59 +08:00
Steven Zou
2562146faf adjust the order of robot test case of API_DB
Signed-off-by: Steven Zou <szou@vmware.com>
2019-05-07 16:13:31 +08:00
wang yan
ab08a576e4 add multiple manifest intercepetor handler
1, Add a interceptor to block request to upload manifest list
2, Discard notiification without tag.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-05-07 16:10:09 +08:00
Wenkai Yin
d74624d306 Iterate all paginations when listing projects and repositories (#7660)
Iterate all paginations when listing projects and repositories

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-07 13:34:48 +08:00
Wenkai Yin
4f7fe1452f Add more unit test cases for docker hub adapter
Add more unit test cases for docker hub adapter

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-07 13:32:56 +08:00
Mia ZHOU
09c5f9cfc8
Merge pull request #7663 from pureshine/fix-replication-bug
Fix will not get filter and trigger when switching from push to pull
2019-05-07 13:00:06 +08:00
Wenkai Yin
30b5852b49 Rename the adapter name of docker registry
Rename the adapter name of docker registry to "docker-registry"

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-07 12:52:34 +08:00
FangyuanCheng
3d43f3fefe Fix wrong data displayed when editing replication rule in a certain sequence.
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-07 11:59:05 +08:00
Wenkai Yin
b0e3b65ade Replicate just one image if the media type is manifest list (#7602)
Replicate just one image if the media type is manifest list

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-07 10:49:10 +08:00
Wenkai Yin
d27a6c0335 Fix a few bugs of replication (#7619)
1. handle the public/private property when creating the projects
2. extend the length of access_secret
3. update the task status by using orm functions

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-07 10:47:14 +08:00
jwangyangls
a58fb7086d
Merge pull request #7651 from jwangyangls/updateLibPackage
Update lib/package.json
2019-05-07 10:46:42 +08:00